Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C45FDC77B60 for ; Mon, 24 Apr 2023 03:08:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B12D6B0075; Sun, 23 Apr 2023 23:08:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 262486B0078; Sun, 23 Apr 2023 23:08:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 150276B007B; Sun, 23 Apr 2023 23:08:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 05F4F6B0075 for ; Sun, 23 Apr 2023 23:08:17 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B35191402CC for ; Mon, 24 Apr 2023 03:08:16 +0000 (UTC) X-FDA: 80714800992.23.920F0CA Received: from out-44.mta1.migadu.com (out-44.mta1.migadu.com [95.215.58.44]) by imf07.hostedemail.com (Postfix) with ESMTP id DC7E140014 for ; Mon, 24 Apr 2023 03:08:13 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=QzwSL6mK; spf=pass (imf07.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.44 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682305694; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=rktJpHCoboWkL32TRaWgx22LE+khm36G3psZAXScPBI=; b=d1CMBWnMqnDnWXEJ6xkCQid/aV08Fd6g43LdggJhxaCedF99dYI80puwNrFOJQBZci4gQz 2GhbMAtp31uio/Bd6oT1BieldQbw+A0SkVy56hlKasPxVdCS5bFhpstgWjtxWE8Junt7hK AjfWW0e+YJ1azU413kqQ0Bz8oEhYyY8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=QzwSL6mK; spf=pass (imf07.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.44 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682305694; a=rsa-sha256; cv=none; b=b0at50kVzFKKCmu8x47ThdhlpS1PMCPKRirx83iSzYCY92qaFeScAQdvrtViFosEh3nxX0 1s+fsExhvMQs68LYK1fsaK7oyGCXMQOryjtTc4Fa5VQ0U1W6t8YCJZCHoKrqQrHkq2K4u2 E45mgowTgXha1lslLR8SG7Ovw1J9jPM= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1682305691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rktJpHCoboWkL32TRaWgx22LE+khm36G3psZAXScPBI=; b=QzwSL6mKb5iqX2DMZlKgThEskXLv7mneqOQYQDyOXOYwby5fL278UNJrV8qmr2TUQ4sYRg sG8j1Dc272/YBaHsUzv8fdaMM2spVEBQRbhmJtP579oW5ll+RlZSmc8tCjnQpX7mDRy8ZD rAPBNrbp5pqUFkj5RbAxpC0hhfzw+ls= From: Yajun Deng To: david@redhat.com, osalvador@suse.de, gregkh@linuxfoundation.org, rafael@kernel.org, akpm@linux-foundation.org, willy@infradead.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Yajun Deng Subject: [PATCH] mmzone: Introduce for_each_populated_zone_pgdat() Date: Mon, 24 Apr 2023 11:07:56 +0800 Message-Id: <20230424030756.1795926-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: DC7E140014 X-Stat-Signature: k86i8wdqzui4b9cw4so63qxd4wdeojfk X-HE-Tag: 1682305693-248375 X-HE-Meta: U2FsdGVkX1+YzIpCrS0+J9Pp0a4h7rB/yVkW39RWazItJNe7V6oFPpQCVqvjYQ6/NXvEuk9ECxIHlijOSqDgjHvhKI7p/iA5ClEaRSvyYhgIoDduKTAngVW+15HkHDiwy5Enl5aHCWKWBK76q7sXqhceTDuMhENlC4HZbvDh7mfEtkqNRrWisJCcfMehsjK5ZjGKc2DanDSS7HQOzuRPlc47QvF0eMPjXICz8r+NuhHN/1r1EgI4QIOeKFJdh3idlM89Vy7WKKufIDw7Q3sQPtTxU0wtsasJGwJOe50v7GsAF0FzysdYDPP0Jap768MU6la1qUDK686ArfDgfsrKx1FUjQCf9drN/eshPDdnVHDTXI2HcvI49/JoIT60ObGSP5QApWektq1hwd3yGExSSyV3ZVA1RT3B++enubYhiETL/6/8/9tMoziPnfxXSC8OjxWvrDmx7dlXxwEoOt2dbjaiY6uEfAn59WlwFVTYhqz9MNk+cpfzc9J/v5M51qeY+v/kruQvj1KB+c+zeKQGSoM+ECP86fQ8uz59Rmu2yP3tOKDo6LqBWZcyOQgIIAZdcD4iw0HRa1HcyvFiyXpyrMPz9JM8QiqdTlikfGsliroupoIwsHlAflQXq5gx+hzGtoE6W0vbhcptahewHyT8JTHTV8foLmdhqZ6GyQYBiNAkiwSNrijbnOhsR2wfM04/km2SUq94XF1d9BmyiMFRB36Ypzd6UFxYVtBZYGp7ZGfiKJ2TATDuIjidZHlYeZ9iAqhmqDNrP9xeEzK+40gOHwofizG7gjOQaqmIw8g4+SgvakaA42sbXe1FUJFWfLN7HS+9bgNdaCJDYWrQBXic4IYtiA57AHjVnjILYoOIqEP9Kk8wV9vQnuMRQWuIYuDnchj8v1lqMMtKWhtz38/xgkStWn2HdIH2b986JsD+6kPibh0YMZM7qEuRvgmHmYvoEOJwwdjaKyHBPNC8NSn wpAxth3Y /q8cZTSZfNJJ4kjkWr/qm+C1gY2ZkHLUVbcQMNZCP4egUfAkufUe1l2MgWbG86PkZp8HRGKbBZLrK3Ti3TNemTbpFlnnQnLfV4LQx7AAMfntQtUsfvIdMUKqJJuzY62u1+gXq X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Instead of define an index and determining if the zone has memory, introduce for_each_populated_zone_pgdat() helper that can be used to iterate over each populated zone in pgdat, and convert the most obvious users to it. This patch has no functional change. Signed-off-by: Yajun Deng --- drivers/base/memory.c | 7 ++----- include/linux/mmzone.h | 8 ++++++++ mm/compaction.c | 36 +++++++----------------------------- mm/page-writeback.c | 8 ++------ 4 files changed, 19 insertions(+), 40 deletions(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index b456ac213610..ad898b1c85c7 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -656,7 +656,6 @@ static struct zone *early_node_zone_for_memory_block(struct memory_block *mem, const unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block; struct zone *zone, *matching_zone = NULL; pg_data_t *pgdat = NODE_DATA(nid); - int i; /* * This logic only works for early memory, when the applicable zones @@ -666,10 +665,8 @@ static struct zone *early_node_zone_for_memory_block(struct memory_block *mem, * zones that intersect with the memory block are actually applicable. * No need to look at the memmap. */ - for (i = 0; i < MAX_NR_ZONES; i++) { - zone = pgdat->node_zones + i; - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { + if (!zone_intersects(zone, start_pfn, nr_pages)) continue; if (!matching_zone) { diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index a4889c9d4055..48e9f01c0b5d 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1580,6 +1580,14 @@ extern struct zone *next_zone(struct zone *zone); ; /* do nothing */ \ else +#define for_each_populated_zone_pgdat(zone, pgdat, max) \ + for (zone = pgdat->node_zones; \ + zone < pgdat->node_zones + max; \ + zone++) \ + if (!populated_zone(zone)) \ + ; /* do nothing */ \ + else + static inline struct zone *zonelist_zone(struct zoneref *zoneref) { return zoneref->zone; diff --git a/mm/compaction.c b/mm/compaction.c index c8bcdea15f5f..863f10c7e510 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -375,12 +375,9 @@ static void __reset_isolation_suitable(struct zone *zone) void reset_isolation_suitable(pg_data_t *pgdat) { - int zoneid; + struct zone *zone; - for (zoneid = 0; zoneid < MAX_NR_ZONES; zoneid++) { - struct zone *zone = &pgdat->node_zones[zoneid]; - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { /* Only flush if a full compaction finished recently */ if (zone->compact_blockskip_flush) @@ -2046,14 +2043,10 @@ static unsigned int fragmentation_score_zone_weighted(struct zone *zone) static unsigned int fragmentation_score_node(pg_data_t *pgdat) { unsigned int score = 0; - int zoneid; + struct zone *zone; - for (zoneid = 0; zoneid < MAX_NR_ZONES; zoneid++) { - struct zone *zone; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { - zone = &pgdat->node_zones[zoneid]; - if (!populated_zone(zone)) - continue; score += fragmentation_score_zone_weighted(zone); } @@ -2681,7 +2674,6 @@ enum compact_result try_to_compact_pages(gfp_t gfp_mask, unsigned int order, */ static void proactive_compact_node(pg_data_t *pgdat) { - int zoneid; struct zone *zone; struct compact_control cc = { .order = -1, @@ -2692,10 +2684,7 @@ static void proactive_compact_node(pg_data_t *pgdat) .proactive_compaction = true, }; - for (zoneid = 0; zoneid < MAX_NR_ZONES; zoneid++) { - zone = &pgdat->node_zones[zoneid]; - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { cc.zone = zone; @@ -2712,7 +2701,6 @@ static void proactive_compact_node(pg_data_t *pgdat) static void compact_node(int nid) { pg_data_t *pgdat = NODE_DATA(nid); - int zoneid; struct zone *zone; struct compact_control cc = { .order = -1, @@ -2722,12 +2710,7 @@ static void compact_node(int nid) .gfp_mask = GFP_KERNEL, }; - - for (zoneid = 0; zoneid < MAX_NR_ZONES; zoneid++) { - - zone = &pgdat->node_zones[zoneid]; - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { cc.zone = zone; @@ -2823,15 +2806,10 @@ static inline bool kcompactd_work_requested(pg_data_t *pgdat) static bool kcompactd_node_suitable(pg_data_t *pgdat) { - int zoneid; struct zone *zone; enum zone_type highest_zoneidx = pgdat->kcompactd_highest_zoneidx; - for (zoneid = 0; zoneid <= highest_zoneidx; zoneid++) { - zone = &pgdat->node_zones[zoneid]; - - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, highest_zoneidx + 1) { if (compaction_suitable(zone, pgdat->kcompactd_max_order, 0, highest_zoneidx) == COMPACT_CONTINUE) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index db7943999007..9a7bcf8fdfd5 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -272,13 +272,9 @@ static void wb_min_max_ratio(struct bdi_writeback *wb, static unsigned long node_dirtyable_memory(struct pglist_data *pgdat) { unsigned long nr_pages = 0; - int z; + struct zone *zone; - for (z = 0; z < MAX_NR_ZONES; z++) { - struct zone *zone = pgdat->node_zones + z; - - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { nr_pages += zone_page_state(zone, NR_FREE_PAGES); } -- 2.25.1