From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754020AbcBWPHI (ORCPT ); Tue, 23 Feb 2016 10:07:08 -0500 Received: from outbound-smtp08.blacknight.com ([46.22.139.13]:56300 "EHLO outbound-smtp08.blacknight.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753344AbcBWPEy (ORCPT ); Tue, 23 Feb 2016 10:04:54 -0500 From: Mel Gorman To: Linux-MM Cc: Rik van Riel , Vlastimil Babka , Johannes Weiner , LKML , Mel Gorman Subject: [PATCH 10/27] mm, vmscan: By default have direct reclaim only shrink once per node Date: Tue, 23 Feb 2016 15:04:33 +0000 Message-Id: <1456239890-20737-11-git-send-email-mgorman@techsingularity.net> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1456239890-20737-1-git-send-email-mgorman@techsingularity.net> References: <1456239890-20737-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 --- mm/vmscan.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 0417f20aead7..fe004cb11b71 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2549,14 +2549,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. */ @@ -2568,6 +2560,7 @@ static void shrink_zones(struct zonelist *zonelist, struct scan_control *sc, unsigned long nr_soft_reclaimed; unsigned long nr_soft_scanned; gfp_t orig_mask; + pg_data_t *last_pgdat = NULL; /* * If the number of buffer_heads in the machine exceeds the maximum @@ -2580,11 +2573,18 @@ static void 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)) { - 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; + reclaim_idx = zone_idx(zone); /* * Take care memory controller reclaiming has small influence -- 2.6.4