Re: [patch] oom: thaw threads if oom killed thread is frozen before deferring

Michal Hocko
2011-09-29T16:32:46Z

On Thu 29-09-11 15:02:04, Michal Hocko wrote:
[...]
> From 3c6c4b4f1a21c34ea1db76b765ce671ca97d9c3e Mon Sep 17 00:00:00 2001
> From: Michal Hocko <mhocko@suse.cz>
> Date: Thu, 29 Sep 2011 13:45:22 +0200
> Subject: [PATCH] freezer: Get out of refrigerator if fatal signals are
> pending
>
> We should make sure that the current task doesn't enter refrigerator if
> it has fatal signals pending because it should get to the signals
> processing as soon as possible. Thaw the process if it is either
> freezing or still frozen to prevent from races with thaw_process.
>
> This closes a possible race when OOM killer selects a task which is
> about to enter the fridge but it is not set as frozen yet. This will
> lead to a livelock because select_bad_process would skip that task due
> to TIF_MEMDIE set for the process but there is no chance for further
> process.
> oom_kill_task refrigerator
> set_tsk_thread_flag(p, TIF_MEMDIE);
> force_sig(SIGKILL, p);
> if (frozen(p))
> thaw_process(p)
> frozen_process();
> [...]
> if (!frozen(current))
> break;
> schedule();
>
> select_bad_process
> [...]
> if (test_tsk_thread_flag(p, TIF_MEMDIE))
> return ERR_PTR(-1UL);
>
> Let's skip try_to_freeze in get_signal_to_deliver if fatal signals are
> pending to make sure that we will not somebody will keep us looping
> between refrigerator and get_signal_to_deliver for ever.

I have just read through the description again. I have rewritten it
several times and this is the messed up result. Sorry about that.
The endless loop is not possible as we will handle the fatal signal
after we get back from try_to_freeze and die.
It should read:

"
Let's skip try_to_freeze in get_signal_to_deliver if fatal signals are
pending to make sure that we will not get back to refrigerator again
just to get back immediately.
"

>
> Signed-off-by: Michal Hocko <mhocko@suse.cz>
> ---
> kernel/freezer.c | 5 +++++
> kernel/signal.c | 4 +++-
> 2 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/freezer.c b/kernel/freezer.c
> index 7b01de9..0531661 100644
> --- a/kernel/freezer.c
> +++ b/kernel/freezer.c
> @@ -48,6 +48,11 @@ void refrigerator(void)
> current->flags |= PF_FREEZING;
>
> for (;;) {
> + if (fatal_signal_pending(current)) {
> + if (freezing(current) || frozen(current))
> + thaw_process(current);
> + break;
> + }
> set_current_state(TASK_UNINTERRUPTIBLE);
> if (!frozen(current))
> break;
> diff --git a/kernel/signal.c b/kernel/signal.c
> index 291c970..bc97a6a 100644
> --- a/kernel/signal.c
> +++ b/kernel/signal.c
> @@ -2147,8 +2147,10 @@ relock:
> * While in TASK_STOPPED, we were considered "frozen enough".
> * Now that we woke up, it's crucial if we're supposed to be
> * frozen that we freeze now before running anything substantial.
> + * Let's ignore the freezing request if we are about to die anyway.
> */
> - try_to_freeze();
> + if (!fatal_signal_pending(curret))
> + try_to_freeze();
>
> spin_lock_irq(&sighand->siglock);
> /*
> --
> 1.7.6.3
>
> --
> Michal Hocko
> SUSE Labs
> SUSE LINUX s.r.o.
> Lihovarska 1060/12
> 190 00 Praha 9
> Czech Republic