Commit 4822acb1 authored by Haifeng Xu's avatar Haifeng Xu Committed by Andrew Morton
Browse files

mm, oom: do not check 0 mask in out_of_memory() 

Since commit 60e2793d ("mm, oom: do not trigger out_of_memory from the
#PF"), no user sets gfp_mask to 0.  Remove the 0 mask check and update the
comments.

Link: https://lkml.kernel.org/r/20230508073538.1168-1-haifeng.xu@shopee.com


Signed-off-by: default avatarHaifeng Xu <haifeng.xu@shopee.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Shakeel Butt <shakeelb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 97de10a9

mm/oom_kill.c

+3 −5
Original line number Diff line number Diff line
@@ -1130,12 +1130,10 @@ bool out_of_memory(struct oom_control *oc) 


	/*

	 * The OOM killer does not compensate for IO-less reclaim.

	 * pagefault_out_of_memory lost its gfp context so we have to

	 * make sure exclude 0 mask - all other users should have at least

	 * ___GFP_DIRECT_RECLAIM to get here. But mem_cgroup_oom() has to

	 * invoke the OOM killer even if it is a GFP_NOFS allocation.

	 * But mem_cgroup_oom() has to invoke the OOM killer even

	 * if it is a GFP_NOFS allocation.

	 */

	if (oc->gfp_mask && !(oc->gfp_mask & __GFP_FS) && !is_memcg_oom(oc))

	if (!(oc->gfp_mask & __GFP_FS) && !is_memcg_oom(oc))

		return true;



	/*