[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140603131635.GH1321@dhcp22.suse.cz>
Date: Tue, 3 Jun 2014 15:16:35 +0200
From: Michal Hocko <mhocko@...e.cz>
To: Johannes Weiner <hannes@...xchg.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Hugh Dickins <hughd@...gle.com>, Tejun Heo <tj@...nel.org>,
Vladimir Davydov <vdavydov@...allels.com>,
cgroups@...r.kernel.org, linux-mm@...ck.org,
linux-kernel@...r.kernel.org
Subject: Re: [patch 04/10] mm: memcontrol: reclaim at least once for
__GFP_NORETRY
On Thu 29-05-14 12:15:56, Johannes Weiner wrote:
> 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@...xchg.org>
Acked-by: Michal Hocko <mhocko@...e.cz>
> ---
> mm/memcontrol.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index e8d5075c081f..8957d6c945b8 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -2614,13 +2614,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
> --
> 1.9.3
>
--
Michal Hocko
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists