It would really help if you CCed all people who participated in the previous discussion... and Andrew (CCed now) to pick up the patch as well. On Sun 24-01-16 00:38:51, Tetsuo Handa wrote: > After the OOM killer is disabled during suspend operation, > any !__GFP_NOFAIL && __GFP_FS allocations are forced to fail. > Thus, any !__GFP_NOFAIL && !__GFP_FS allocations should be > forced to fail as well. > > Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> > Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx> > Acked-by: Michal Hocko <mhocko@xxxxxxxx> > Acked-by: David Rientjes <rientjes@xxxxxxxxxx> > --- > mm/page_alloc.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 6463426..2f71caa 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -2749,8 +2749,12 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order, > * XXX: Page reclaim didn't yield anything, > * and the OOM killer can't be invoked, but > * keep looping as per tradition. > + * > + * But do not keep looping if oom_killer_disable() > + * was already called, for the system is trying to > + * enter a quiescent state during suspend. > */ > - *did_some_progress = 1; > + *did_some_progress = !oom_killer_disabled; > goto out; > } > if (pm_suspended_storage()) > -- > 1.8.3.1 > > -- > 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> -- 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>