Received: by 2002:ac0:b08d:0:0:0:0:0 with SMTP id l13csp1710988imc; Fri, 22 Feb 2019 09:45:44 -0800 (PST) X-Google-Smtp-Source: AHgI3IaDmw7Sb/Kp/MEPX7l2frex6ueHPa2W3EwJj1GTrztjzucdwibpHOJZiIo6EqYm9+UrLnCN X-Received: by 2002:a63:2c0e:: with SMTP id s14mr5154359pgs.132.1550857544685; Fri, 22 Feb 2019 09:45:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550857544; cv=none; d=google.com; s=arc-20160816; b=ulCGvgwoglDrb8DyLsngyKWJaISBllwL2ecbO5fgrDJhqZckCg3D8jhkQlSHsWvgsc mhVb0I9QTwA4Zh98PvA+CvKfi9JUT/kSxHghPqMisc/qC/oGbJ6a3hPvbX7CtH68EtsZ W/MENUounHr9ZOHjKyTN6GXROZOVL1jzccoe6mSAwzonbJrQeUTwWywMwoZ8mc6t4H8x geIc3yfKTrfYzY4k1M8MP7LRIi8NU5S4raBvGqzU8f73gFJHgjTnbAJX+ovWeWodhWH+ IBkcLg7EcMSeParWwia3y3Dg7z6Mp/RVg3JXAvyNTbKxiXb0MWP6Yi8nJ46BZWQ+eye0 h+Bg== 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=npWLHy5QXMb4vE/qvQv7Q6UWWDaG70gQpg05ucqiQ+w=; b=o5hFUxfPxWMOB044gyZOn0VY6qNtO0h6Zj4PJA86XS+M4jHQCbx5rAdJbREdZX6wcc bKFvKFCm4hVnznzGU8GtgET5egipZVZc1DRrW1CBt8Iwi94NIk0UokLeup9x78EZZQ3F 6HHv/isl1XCZwwGUA/UuTNuRJQncqs+dwfzmSV+qywS+NHYQqfYBMc+3PaEbGOM/k+tA Fp9bywPM5pbFObI1ghvysPaMu82oigdoiTVnBMJ5/iIf7/8XckVqQn838Asf1rJYaMyT ILfqtF3j6lKu51RqelZh4uZQzCMk0vi9H3dkeaIcQcSsrfy52l3Flg1LdYG86OpJ0SOQ SJWA== 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 x6si1842926pfm.219.2019.02.22.09.45.29; Fri, 22 Feb 2019 09:45:44 -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 S1727294AbfBVRn2 (ORCPT + 99 others); Fri, 22 Feb 2019 12:43:28 -0500 Received: from relay.sw.ru ([185.231.240.75]:59688 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726671AbfBVRn2 (ORCPT ); Fri, 22 Feb 2019 12:43:28 -0500 Received: from [172.16.25.12] (helo=i7.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gxEr3-00010r-Bv; Fri, 22 Feb 2019 20:43:21 +0300 From: Andrey Ryabinin To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Ryabinin , Johannes Weiner , Michal Hocko , Vlastimil Babka , Rik van Riel , Mel Gorman Subject: [PATCH 3/5] mm/compaction: pass pgdat to too_many_isolated() instead of zone Date: Fri, 22 Feb 2019 20:43:35 +0300 Message-Id: <20190222174337.26390-3-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190222174337.26390-1-aryabinin@virtuozzo.com> References: <20190222174337.26390-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 Cc: Johannes Weiner Cc: Michal Hocko Cc: Vlastimil Babka Cc: Rik van Riel Cc: Mel Gorman --- 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