malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm/oom-kill: Adjust oom_badness per Android expectations

Browse Source 
Allow selecting only tasks with oom_score_adj >= 0.

Change-Id: Iebbb487c711da98b8fcb367ba838b5fe0b260d4f
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
Signed-off-by: Richard Raya <rdxzv.dev@gmail.com>
This commit is contained in:
Patrick Daly 2019-10-16 15:27:37 -07:00 committed by Richard Raya
parent 297959f09c
commit 6c1efde3d9
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/proc/base.c
View File

@ -515,7 +515,7 @@ static int proc_oom_score(struct seq_file *m, struct pid_namespace *ns,
unsigned long totalpages = totalram_pages + total_swap_pages;
unsigned long points = 0;
points = oom_badness(task, NULL, NULL, totalpages) *
points = oom_badness(task, NULL, NULL, totalpages, true) *
1000 / totalpages;
seq_printf(m, "%lu\n", points);

8
include/linux/oom.h
View File

@ -38,6 +38,12 @@ struct oom_control {
*/
const int order;
/*
* Only kill positive adj tasks. Used to behave more like Android's
* lowmemorykiller.
*/
const bool only_positive_adj;
/* Used by oom implementation, do not set */
unsigned long totalpages;
struct task_struct *chosen;
@ -104,7 +110,7 @@ bool __oom_reap_task_mm(struct mm_struct *mm);
extern unsigned long oom_badness(struct task_struct *p,
struct mem_cgroup *memcg, const nodemask_t *nodemask,
unsigned long totalpages);
unsigned long totalpages, bool only_positive_adj);
extern bool out_of_memory(struct oom_control *oc);

10
mm/oom_kill.c
View File

@ -176,7 +176,8 @@ static bool oom_unkillable_task(struct task_struct *p,
* task consuming the most memory to avoid subsequent oom failures.
*/
unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg,
const nodemask_t *nodemask, unsigned long totalpages)
const nodemask_t *nodemask, unsigned long totalpages,
bool only_positive_adj)
{
long points;
long adj;
@ -195,6 +196,7 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg,
*/
adj = (long)p->signal->oom_score_adj;
if (adj == OOM_SCORE_ADJ_MIN ||
(only_positive_adj && adj < 0) ||
test_bit(MMF_OOM_SKIP, &p->mm->flags) ||
in_vfork(p)) {
task_unlock(p);
@ -316,7 +318,8 @@ static int oom_evaluate_task(struct task_struct *task, void *arg)
goto select;
}
points = oom_badness(task, NULL, oc->nodemask, oc->totalpages);
points = oom_badness(task, NULL, oc->nodemask, oc->totalpages,
oc->only_positive_adj);
if (!points || points < oc->chosen_points)
goto next;
@ -876,7 +879,8 @@ static void oom_kill_process(struct oom_control *oc, const char *message)
* oom_badness() returns 0 if the thread is unkillable
*/
child_points = oom_badness(child,
oc->memcg, oc->nodemask, oc->totalpages);
oc->memcg, oc->nodemask, oc->totalpages,
oc->only_positive_adj);
if (child_points > victim_points) {
put_task_struct(victim);
victim = child;