Received: by 2002:ac0:8845:0:0:0:0:0 with SMTP id g63csp375901img; Thu, 28 Feb 2019 00:38:46 -0800 (PST) X-Google-Smtp-Source: AHgI3IbUpnMOOtp/sXZL8ouTzy04wpr6Dn+Rh+/VBXBt3dYSTu4TPrhUom3zUiZ3Z/iSp7maIs2U X-Received: by 2002:a63:f74c:: with SMTP id f12mr7334475pgk.195.1551343126899; Thu, 28 Feb 2019 00:38:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551343126; cv=none; d=google.com; s=arc-20160816; b=bsqcGZh9huXUgmxlQgX36ggfMw8ztzHUjzSrwCG8Rm8GZ4n/khW5S5IN1URgKCFpBX IpRcx6DKubKdHGb6RD93XDVv867Wqe/CDauhJxNfBk7qGeBNL2QTqwLhVOOHWZVaOm2y XrLugfo63o0J/G5XU8pkSFKJgqKlVp00XWdrfxd5hoJ6wvb0ezVmS+uBh2b8yd5/xwm2 IPjjsFG4knK+/tDMyO6qYaDS2j/0EKLMQiSJv2+0CPnAGTaUt6oAu8TIunDM3GBIhV9+ 2z8C2at0sm/3qkBUUOBNTiqLyTuvZgHCl9vgKxPK74cL1+kY/Z7cwYnz5OKi0bTxRqii mC7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=hmvEGKOKplAnFBosu5bUrD8YZOJIDz6WNkKWVzUdHeU=; b=kF2hyUqWd3DE6tFCal7M9APqNElJK39uEg1JzCgfWTjLnamgbpVzF3FOtTqQUdOIOi /+Z8/3KM41uo8KL8OfMga0Zkc2jsDpWnh5273xPcoYtcBTXHAd/bXcQVHJ0bJzRNdW5d VwUU8XUCnhfxSVAeCthYQmZxuALKAl/3P4zWtkJl8tzwjKFdTAxzJ5QyehgLmU7adizC QuBtzm83FAjgoUPmvpyX1rXrE1cnm9eARvAz4pH532f9B77LOawSiWFzY/hTnt4dDpGW XUmrB3IP/NWkpdKD0GoXPD3AVHgCzU37vhDoUpzvzn8GpTJBZuKjXIB88krXqNR/H689 CD4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d4si7717268pla.112.2019.02.28.00.38.31; Thu, 28 Feb 2019 00:38:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731875AbfB1Ifw (ORCPT + 99 others); Thu, 28 Feb 2019 03:35:52 -0500 Received: from relay.sw.ru ([185.231.240.75]:57904 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725999AbfB1Ift (ORCPT ); Thu, 28 Feb 2019 03:35:49 -0500 Received: from [172.16.25.12] (helo=i7.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gzHAK-0008R2-6M; Thu, 28 Feb 2019 11:35:40 +0300 From: Andrey Ryabinin To: Andrew Morton Cc: Johannes Weiner , Vlastimil Babka , Rik van Riel , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Ryabinin , Michal Hocko , Mel Gorman Subject: [PATCH v2 3/4] mm/compaction: pass pgdat to too_many_isolated() instead of zone Date: Thu, 28 Feb 2019 11:33:28 +0300 Message-Id: <20190228083329.31892-3-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190228083329.31892-1-aryabinin@virtuozzo.com> References: <20190228083329.31892-1-aryabinin@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org too_many_isolated() in mm/compaction.c looks only at node state, so it makes more sense to change argument to pgdat instead of zone. Signed-off-by: Andrey Ryabinin Acked-by: Vlastimil Babka Acked-by: Rik van Riel Cc: Johannes Weiner Cc: Michal Hocko Cc: Mel Gorman --- Changes since v1: - Added acks mm/compaction.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index a3305f13a138..b2d02aba41d8 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -738,16 +738,16 @@ isolate_freepages_range(struct compact_control *cc, } /* Similar to reclaim, but different enough that they don't share logic */ -static bool too_many_isolated(struct zone *zone) +static bool too_many_isolated(pg_data_t *pgdat) { unsigned long active, inactive, isolated; - inactive = node_page_state(zone->zone_pgdat, NR_INACTIVE_FILE) + - node_page_state(zone->zone_pgdat, NR_INACTIVE_ANON); - active = node_page_state(zone->zone_pgdat, NR_ACTIVE_FILE) + - node_page_state(zone->zone_pgdat, NR_ACTIVE_ANON); - isolated = node_page_state(zone->zone_pgdat, NR_ISOLATED_FILE) + - node_page_state(zone->zone_pgdat, NR_ISOLATED_ANON); + inactive = node_page_state(pgdat, NR_INACTIVE_FILE) + + node_page_state(pgdat, NR_INACTIVE_ANON); + active = node_page_state(pgdat, NR_ACTIVE_FILE) + + node_page_state(pgdat, NR_ACTIVE_ANON); + isolated = node_page_state(pgdat, NR_ISOLATED_FILE) + + node_page_state(pgdat, NR_ISOLATED_ANON); return isolated > (inactive + active) / 2; } @@ -774,8 +774,7 @@ static unsigned long isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, unsigned long end_pfn, isolate_mode_t isolate_mode) { - struct zone *zone = cc->zone; - pg_data_t *pgdat = zone->zone_pgdat; + pg_data_t *pgdat = cc->zone->zone_pgdat; unsigned long nr_scanned = 0, nr_isolated = 0; struct lruvec *lruvec; unsigned long flags = 0; @@ -791,7 +790,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, * list by either parallel reclaimers or compaction. If there are, * delay for some time until fewer pages are isolated */ - while (unlikely(too_many_isolated(zone))) { + while (unlikely(too_many_isolated(pgdat))) { /* async migration should just abort */ if (cc->mode == MIGRATE_ASYNC) return 0; -- 2.19.2