Messages in this thread Patch in this message | | | Date | Fri, 17 Oct 2014 09:46:54 +0200 | From | Michal Hocko <> | Subject | [PATCH -v2] freezer: check OOM kill while being frozen |
| |
On Thu 16-10-14 19:33:39, Cong Wang wrote: > On Thu, Oct 16, 2014 at 3:22 PM, Oleg Nesterov <oleg@redhat.com> wrote: > > On 10/16, Cong Wang wrote: > >> > >> On Thu, Oct 16, 2014 at 2:35 PM, Oleg Nesterov <oleg@redhat.com> wrote: > >> > > >> > If a task B is already frozen, it sleeps in D state. > >> > > >> > If OOM selects B as a victim after that, it won't be woken by > >> > SIGKILL, thus it obviously can't call should_thaw_current() and > >> > notice TIF_MEMDIE. > >> > >> I see your point now, it would be more clear if you can just quote > >> the patch instead of changelog. > >> > >> So are you saying the loop in __refrigerator() is useless? > > > > No. > > > >> Since > >> it will always stay in asleep after schedule()? > > > > Not always. But it will stay asleep in this particular case. > > Hmm, so we still need to wake it up in oom killer: > > if (test_tsk_thread_flag(task, TIF_MEMDIE)) { > if (unlikely(frozen(task))) > wake_up_state(task, TASK_UNINTERRUPTIBLE); > > I will update the patch if Michal doesn't.
I think we should rather get back to __thaw_task here.
Andrew could you replace the previous version by this one, please? Again I am sorry I haven't caught that before. --- From 830324c8be8b499e1d18a73076cf4d126c4ac486 Mon Sep 17 00:00:00 2001 From: Cong Wang <xiyou.wangcong@gmail.com> Date: Thu, 4 Sep 2014 15:30:41 -0700 Subject: [PATCH -v2] freezer: check OOM kill while being frozen
Since f660daac474c6f (oom: thaw threads if oom killed thread is frozen before deferring) OOM killer relies on being able to thaw a frozen task to handle OOM situation but a3201227f803 (freezer: make freezing() test freeze conditions in effect instead of TIF_FREEZE) has reorganized the code and stopped clearing freeze flag in __thaw_task. This means that the target task only wakes up and goes into the fridge again because the freezing condition hasn't changed for it. This reintroduces the bug fixed by f660daac474c6f.
Fix the issue by checking for TIF_MEMDIE thread flag and get away from the fridge if it is set.
Changes since v1 - return __thaw_task into oom_scan_process_thread because oom_kill_process will not wake task in the fridge because it is sleeping uninterruptible
[mhocko@suse.cz: rewrote the changelog] Fixes: a3201227f803 (freezer: make freezing() test freeze conditions in effect instead of TIF_FREEZE) Cc: stable@vger.kernel.org # 3.3+ Cc: David Rientjes <rientjes@google.com> Cc: Michal Hocko <mhocko@suse.cz> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Cc: Tejun Heo <tj@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Acked-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: Michal Hocko <mhocko@suse.cz> --- kernel/freezer.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/kernel/freezer.c b/kernel/freezer.c index aa6a8aadb911..77ad6794b610 100644 --- a/kernel/freezer.c +++ b/kernel/freezer.c @@ -45,13 +45,28 @@ bool freezing_slow_path(struct task_struct *p) if (pm_nosig_freezing || cgroup_freezing(p)) return true; - if (pm_freezing && !(p->flags & PF_KTHREAD)) + if (!(p->flags & PF_KTHREAD)) return true; return false; } EXPORT_SYMBOL(freezing_slow_path); +static bool should_thaw_current(bool check_kthr_stop) +{ + if (!freezing(current)) + return true; + + if (check_kthr_stop && kthread_should_stop()) + return true; + + /* It might not be safe to check TIF_MEMDIE for pm freeze. */ + if (cgroup_freezing(current) && test_thread_flag(TIF_MEMDIE)) + return true; + + return false; +} + /* Refrigerator is place where frozen processes are stored :-). */ bool __refrigerator(bool check_kthr_stop) { @@ -67,8 +82,7 @@ bool __refrigerator(bool check_kthr_stop) spin_lock_irq(&freezer_lock); current->flags |= PF_FROZEN; - if (!freezing(current) || - (check_kthr_stop && kthread_should_stop())) + if (should_thaw_current(check_kthr_stop)) current->flags &= ~PF_FROZEN; spin_unlock_irq(&freezer_lock); -- 2.1.1 -- Michal Hocko SUSE Labs
| |