Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fec352ad authored by Patrick Daly's avatar Patrick Daly
Browse files

mm/oom-kill: Adjust oom_badness per Android expectations 



Allow selecting only tasks with oom_score_adj >= 0.

Change-Id: Iebbb487c711da98b8fcb367ba838b5fe0b260d4f
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 0ca93a33

fs/proc/base.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,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, false) *

					1000 / totalpages;

	seq_printf(m, "%lu\n", points);

include/linux/oom.h

+7 −1
Original line number Diff line number Diff line
@@ -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;
@@ -99,7 +105,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);

mm/oom_kill.c

+7 −3
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ static bool is_dump_unreclaim_slabs(void) 
 * 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;
@@ -312,6 +313,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);
@@ -433,7 +435,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;
@@ -1088,7 +1091,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;