From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754144AbcDOJPU (ORCPT ); Fri, 15 Apr 2016 05:15:20 -0400 Received: from outbound-smtp08.blacknight.com ([46.22.139.13]:46876 "EHLO outbound-smtp08.blacknight.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751884AbcDOJPR (ORCPT ); Fri, 15 Apr 2016 05:15:17 -0400 From: Mel Gorman To: Andrew Morton , Linux-MM Cc: Rik van Riel , Vlastimil Babka , Johannes Weiner , Jesper Dangaard Brouer , LKML , Mel Gorman Subject: [PATCH 09/27] mm, vmscan: By default have direct reclaim only shrink once per node Date: Fri, 15 Apr 2016 10:13:15 +0100 Message-Id: <1460711613-2761-10-git-send-email-mgorman@techsingularity.net> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1460711613-2761-1-git-send-email-mgorman@techsingularity.net> References: <1460711613-2761-1-git-send-email-mgorman@techsingularity.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Direct reclaim iterates over all zones in the zonelist and shrinking them but this is in conflict with node-based reclaim. In the default case, only shrink once per node. Signed-off-by: Mel Gorman Acked-by: Johannes Weiner --- mm/vmscan.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index ef1cfa835138..f0bb2412fc01 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2545,14 +2545,6 @@ static inline bool compaction_ready(struct zone *zone, int order) * try to reclaim pages from zones which will satisfy the caller's allocation * request. * - * We reclaim from a zone even if that zone is over high_wmark_pages(zone). - * Because: - * a) The caller may be trying to free *extra* pages to satisfy a higher-order - * allocation or - * b) The target zone may be at high_wmark_pages(zone) but the lower zones - * must go *over* high_wmark_pages(zone) to satisfy the `incremental min' - * zone defense algorithm. - * * If a zone is deemed to be full of pinned pages then just give it a light * scan then give up on it. * @@ -2567,6 +2559,7 @@ static bool shrink_zones(struct zonelist *zonelist, struct scan_control *sc, unsigned long nr_soft_scanned; gfp_t orig_mask; bool reclaimable = false; + pg_data_t *last_pgdat = NULL; /* * If the number of buffer_heads in the machine exceeds the maximum @@ -2579,11 +2572,17 @@ static bool shrink_zones(struct zonelist *zonelist, struct scan_control *sc, for_each_zone_zonelist_nodemask(zone, z, zonelist, classzone_idx, sc->nodemask) { - if (!populated_zone(zone)) { - sc->reclaim_idx--; - classzone_idx--; + BUG_ON(!populated_zone(zone)); + + /* + * Shrink each node in the zonelist once. If the zonelist is + * ordered by zone (not the default) then a node may be + * shrunk multiple times but in that case the user prefers + * lower zones being preserved + */ + if (zone->zone_pgdat == last_pgdat) continue; - } + last_pgdat = zone->zone_pgdat; /* * Take care memory controller reclaiming has small influence -- 2.6.4