[Devel,rh7,v2,09/21] ms/mm: memcontrol: reclaim at least once for __GFP_NORETRY

Submitted by Andrey Ryabinin on Jan. 12, 2017, 9:47 a.m.


Message ID 20170112094738.7720-9-aryabinin@virtuozzo.com
State New
Series "Series without cover letter"
Headers show

Commit Message

Andrey Ryabinin Jan. 12, 2017, 9:47 a.m.
From: Johannes Weiner <hannes@cmpxchg.org>

Currently, __GFP_NORETRY tries charging once and gives up before even
trying to reclaim.  Bring the behavior on par with the page allocator
and reclaim at least once before giving up.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Vladimir Davydov <vdavydov@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit 28c34c291e746aab1c2bfd6d6609b2e47fa0978b)
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
 mm/memcontrol.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index f006cdd..3608d80 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2804,13 +2804,13 @@  retry:
 	if (!(gfp_mask & __GFP_WAIT))
 		goto nomem;
-	if (gfp_mask & __GFP_NORETRY)
-		goto nomem;
 	nr_reclaimed = mem_cgroup_reclaim(mem_over_limit, gfp_mask, flags);
 	if (mem_cgroup_margin(mem_over_limit) >= batch)
 		goto retry;
+	if (gfp_mask & __GFP_NORETRY)
+		goto nomem;
 	 * Even though the limit is exceeded at this point, reclaim
 	 * may have been able to free some pages.  Retry the charge