renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-20 19:43:58 +08:00
Code

memcg, oom: no oom-kill for __GFP_RETRY_MAYFAIL

Browse Source 
The documentation of __GFP_RETRY_MAYFAIL clearly mentioned that the OOM
killer will not be triggered and indeed the page alloc does not invoke OOM
killer for such allocations.  However we do trigger memcg OOM killer for
__GFP_RETRY_MAYFAIL.  Fix that.  This flag will used later to not trigger
oom-killer in the charging path for fanotify and inotify event
allocations.

Link: http://lkml.kernel.org/r/20190514212259.156585-1-shakeelb@google.com
Signed-off-by: Shakeel Butt <shakeelb@google.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Amir Goldstein <amir73il@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Shakeel Butt 2019-07-11 20:55:48 -07:00 committed by Linus Torvalds
parent aeb309b81c
commit 38d384932e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mm/memcontrol.c
View File

@ -2279,7 +2279,6 @@ static int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,
unsigned long nr_reclaimed; unsigned long nr_reclaimed;
bool may_swap = true; bool may_swap = true;
bool drained = false; bool drained = false;
bool oomed = false;
enum oom_status oom_status; enum oom_status oom_status;
if (mem_cgroup_is_root(memcg)) if (mem_cgroup_is_root(memcg))
@ -2366,7 +2365,7 @@ retry:
if (nr_retries--) if (nr_retries--)
goto retry; goto retry;
if (gfp_mask & __GFP_RETRY_MAYFAIL && oomed) if (gfp_mask & __GFP_RETRY_MAYFAIL)
goto nomem; goto nomem;
if (gfp_mask & __GFP_NOFAIL) if (gfp_mask & __GFP_NOFAIL)
@ -2385,7 +2384,6 @@ retry:
switch (oom_status) { switch (oom_status) {
case OOM_SUCCESS: case OOM_SUCCESS:
nr_retries = MEM_CGROUP_RECLAIM_RETRIES; nr_retries = MEM_CGROUP_RECLAIM_RETRIES;
oomed = true;
goto retry; goto retry;
case OOM_FAILED: case OOM_FAILED:
goto force; goto force;