On Tue 12-07-16 22:29:22, Tetsuo Handa wrote: > Since no kernel code path needs to clear TIF_MEMDIE flag on a remote > thread we can drop the task parameter and enforce that actually. > > Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> > Acked-by: Michal Hocko <mhocko@xxxxxxxx> Please wait with this one along with removing exit_oom_victim from the oom reaper after we settle with the rest of the series. I believe we really need to handle oom_killer_disable in the same batch and that sounds outside of the scope of this series. I can even pick your patch and rebase it along with the rest that I have posted recently, unless you have objections of course. > --- > include/linux/oom.h | 2 +- > kernel/exit.c | 2 +- > mm/oom_kill.c | 5 ++--- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/include/linux/oom.h b/include/linux/oom.h > index 27be4ba..90e98ea 100644 > --- a/include/linux/oom.h > +++ b/include/linux/oom.h > @@ -90,7 +90,7 @@ extern enum oom_scan_t oom_scan_process_thread(struct oom_control *oc, > > extern bool out_of_memory(struct oom_control *oc); > > -extern void exit_oom_victim(struct task_struct *tsk); > +extern void exit_oom_victim(void); > > extern int register_oom_notifier(struct notifier_block *nb); > extern int unregister_oom_notifier(struct notifier_block *nb); > diff --git a/kernel/exit.c b/kernel/exit.c > index 84ae830..1b1dada 100644 > --- a/kernel/exit.c > +++ b/kernel/exit.c > @@ -511,7 +511,7 @@ static void exit_mm(struct task_struct *tsk) > mm_update_next_owner(mm); > mmput(mm); > if (test_thread_flag(TIF_MEMDIE)) > - exit_oom_victim(tsk); > + exit_oom_victim(); > } > > static struct task_struct *find_alive_thread(struct task_struct *p) > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > index 7ee6b70..fab0bec 100644 > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -692,10 +692,9 @@ void mark_oom_victim(struct task_struct *tsk) > /** > * exit_oom_victim - note the exit of an OOM victim > */ > -void exit_oom_victim(struct task_struct *tsk) > +void exit_oom_victim(void) > { > - if (!test_and_clear_tsk_thread_flag(tsk, TIF_MEMDIE)) > - return; > + clear_thread_flag(TIF_MEMDIE); > > if (!atomic_dec_return(&oom_victims)) > wake_up_all(&oom_victims_wait); > -- > 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>