android, lmk: avoid setting TIF_MEMDIE if process has already exited
TIF_MEMDIE should not be set on a process if it does not have a valid ->mm, and this is protected by task_lock(). If TIF_MEMDIE gets set after the mm has detached, and the process fails to exit, then the oom killer will defer forever waiting for it to exit. Make sure that the mm is still valid before setting TIF_MEMDIE by way of mark_tsk_oom_victim(). Cc: "Arve Hjønnevåg" <arve@android.com> Cc: Riley Andrews <riandrews@android.com> Acked-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
56f40e5210
commit
e1099a69a6
|
@ -156,20 +156,27 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
|
||||||
p->pid, p->comm, oom_score_adj, tasksize);
|
p->pid, p->comm, oom_score_adj, tasksize);
|
||||||
}
|
}
|
||||||
if (selected) {
|
if (selected) {
|
||||||
lowmem_print(1, "send sigkill to %d (%s), adj %hd, size %d\n",
|
task_lock(selected);
|
||||||
selected->pid, selected->comm,
|
if (!selected->mm) {
|
||||||
selected_oom_score_adj, selected_tasksize);
|
/* Already exited, cannot do mark_tsk_oom_victim() */
|
||||||
lowmem_deathpending_timeout = jiffies + HZ;
|
task_unlock(selected);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
* FIXME: lowmemorykiller shouldn't abuse global OOM killer
|
* FIXME: lowmemorykiller shouldn't abuse global OOM killer
|
||||||
* infrastructure. There is no real reason why the selected
|
* infrastructure. There is no real reason why the selected
|
||||||
* task should have access to the memory reserves.
|
* task should have access to the memory reserves.
|
||||||
*/
|
*/
|
||||||
mark_tsk_oom_victim(selected);
|
mark_tsk_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);
|
send_sig(SIGKILL, selected, 0);
|
||||||
rem += selected_tasksize;
|
rem += selected_tasksize;
|
||||||
}
|
}
|
||||||
|
out:
|
||||||
lowmem_print(4, "lowmem_scan %lu, %x, return %lu\n",
|
lowmem_print(4, "lowmem_scan %lu, %x, return %lu\n",
|
||||||
sc->nr_to_scan, sc->gfp_mask, rem);
|
sc->nr_to_scan, sc->gfp_mask, rem);
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
|
Loading…
Reference in a new issue