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

Commit 3a81fc20 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Greg Kroah-Hartman
Browse files

android, lmk: Send SIGKILL before setting TIF_MEMDIE. 



It was observed that setting TIF_MEMDIE before sending SIGKILL at
oom_kill_process() allows memory reserves to be depleted by allocations
which are not needed for terminating the OOM victim.

This patch reverts commit 6bc2b856 ("staging: android: lowmemorykiller:
set TIF_MEMDIE before send kill sig"), for oom_kill_process() was updated
to send SIGKILL before setting TIF_MEMDIE.

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cc95cd8

drivers/staging/android/lowmemorykiller.c

+4 −8
Original line number Diff line number Diff line
@@ -157,26 +157,22 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc) 
	}

	if (selected) {

		task_lock(selected);

		if (!selected->mm) {

			/* Already exited, cannot do mark_tsk_oom_victim() */

			task_unlock(selected);

			goto out;

		}

		send_sig(SIGKILL, selected, 0);

		/*

		 * FIXME: lowmemorykiller shouldn't abuse global OOM killer

		 * infrastructure. There is no real reason why the selected

		 * task should have access to the memory reserves.

		 */

		if (selected->mm)

			mark_oom_victim(selected);

		task_unlock(selected);

		lowmem_print(1, "send sigkill to %d (%s), adj %hd, size %d\n",

			     selected->pid, selected->comm,

			     selected_oom_score_adj, selected_tasksize);

		lowmem_deathpending_timeout = jiffies + HZ;

		send_sig(SIGKILL, selected, 0);

		rem += selected_tasksize;

	}

out:



	lowmem_print(4, "lowmem_scan %lu, %x, return %lu\n",

		     sc->nr_to_scan, sc->gfp_mask, rem);

	rcu_read_unlock();