On Sun 23-08-15 16:18:00, Tetsuo Handa wrote:
[...]
> >From 2c5c4da4c9c5a124820f53f138c456e07c9248bb Mon Sep 17 00:00:00 2001
> From: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
> Date: Fri, 31 Jul 2015 13:37:31 +0900
> Subject: [PATCH 1/2] mm,oom: Fix potentially killing unrelated process.
>
> At the for_each_process() loop in oom_kill_process(), we are comparing
> address of OOM victim's mm without holding a reference to that mm.
> If there are a lot of processes to compare or a lot of "Kill process
> %d (%s) sharing same memory" messages to print, for_each_process() loop
> could take very long time.
>
> It is possible that meanwhile the OOM victim exits and releases its mm,
> and then mm is allocated with the same address and assigned to some
> unrelated process. When we hit such race, the unrelated process will be
> killed by error. To make sure that the OOM victim's mm does not go away
> until for_each_process() loop finishes, get a reference on the OOM
> victim's mm before calling task_unlock(victim).
The race is quite unlikely but I guess it is possible
> Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
> ---
> mm/oom_kill.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/mm/oom_kill.c b/mm/oom_kill.c
> index 1ecc0bc..5249e7e 100644
> --- a/mm/oom_kill.c
> +++ b/mm/oom_kill.c
> @@ -552,8 +552,9 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p,
> victim = p;
> }
>
> - /* mm cannot safely be dereferenced after task_unlock(victim) */
> + /* Get a reference to safely compare mm after task_unlock(victim) */
> mm = victim->mm;
> + atomic_inc(&mm->mm_users);
> mark_oom_victim(victim);
> pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
> task_pid_nr(victim), victim->comm, K(victim->mm->total_vm),
> @@ -586,6 +587,7 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p,
> rcu_read_unlock();
>
> do_send_sig_info(SIGKILL, SEND_SIG_FORCED, victim, true);
> + mmput(mm);
> put_task_struct(victim);
> }
> #undef K
> --
> 1.8.3.1
--
Michal Hocko
SUSE Labs
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>