From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by kanga.kvack.org (Postfix) with ESMTP id A6AA7828E8 for ; Tue, 12 Apr 2016 06:27:00 -0400 (EDT) Received: by mail-wm0-f49.google.com with SMTP id a140so47583522wma.0 for ; Tue, 12 Apr 2016 03:27:00 -0700 (PDT) Received: from outbound-smtp10.blacknight.com (outbound-smtp10.blacknight.com. [46.22.139.15]) by mx.google.com with ESMTPS id ry17si33541560wjb.164.2016.04.12.03.26.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Apr 2016 03:26:59 -0700 (PDT) Received: from mail.blacknight.com (pemlinmail03.blacknight.ie [81.17.254.16]) by outbound-smtp10.blacknight.com (Postfix) with ESMTPS id 5322B1C1D50 for ; Tue, 12 Apr 2016 11:26:59 +0100 (IST) From: Mel Gorman Subject: [PATCH 10/28] mm, vmscan: By default have direct reclaim only shrink once per node Date: Tue, 12 Apr 2016 11:26:05 +0100 Message-Id: <1460456783-30996-11-git-send-email-mgorman@techsingularity.net> In-Reply-To: <1460456783-30996-1-git-send-email-mgorman@techsingularity.net> References: <1460456783-30996-1-git-send-email-mgorman@techsingularity.net> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , Linux-MM Cc: Rik van Riel , Vlastimil Babka , Johannes Weiner , LKML , Mel Gorman 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 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org