From nobody Tue Dec 16 16:37:46 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4D5AC77B60 for ; Mon, 24 Apr 2023 03:08:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230121AbjDXDIX (ORCPT ); Sun, 23 Apr 2023 23:08:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229497AbjDXDIT (ORCPT ); Sun, 23 Apr 2023 23:08:19 -0400 Received: from out-62.mta1.migadu.com (out-62.mta1.migadu.com [95.215.58.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE1E31701 for ; Sun, 23 Apr 2023 20:08:15 -0700 (PDT) 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: quoted-printable X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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(st= ruct memory_block *mem, const unsigned long nr_pages =3D PAGES_PER_SECTION * sections_per_block; struct zone *zone, *matching_zone =3D NULL; pg_data_t *pgdat =3D NODE_DATA(nid); - int i; =20 /* * This logic only works for early memory, when the applicable zones @@ -666,10 +665,8 @@ static struct zone *early_node_zone_for_memory_block(s= truct memory_block *mem, * zones that intersect with the memory block are actually applicable. * No need to look at the memmap. */ - for (i =3D 0; i < MAX_NR_ZONES; i++) { - zone =3D 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 =20 +#define for_each_populated_zone_pgdat(zone, pgdat, max) \ + for (zone =3D 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 *zo= ne) =20 void reset_isolation_suitable(pg_data_t *pgdat) { - int zoneid; + struct zone *zone; =20 - for (zoneid =3D 0; zoneid < MAX_NR_ZONES; zoneid++) { - struct zone *zone =3D &pgdat->node_zones[zoneid]; - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { =20 /* Only flush if a full compaction finished recently */ if (zone->compact_blockskip_flush) @@ -2046,14 +2043,10 @@ static unsigned int fragmentation_score_zone_weight= ed(struct zone *zone) static unsigned int fragmentation_score_node(pg_data_t *pgdat) { unsigned int score =3D 0; - int zoneid; + struct zone *zone; =20 - for (zoneid =3D 0; zoneid < MAX_NR_ZONES; zoneid++) { - struct zone *zone; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { =20 - zone =3D &pgdat->node_zones[zoneid]; - if (!populated_zone(zone)) - continue; score +=3D fragmentation_score_zone_weighted(zone); } =20 @@ -2681,7 +2674,6 @@ enum compact_result try_to_compact_pages(gfp_t gfp_ma= sk, unsigned int order, */ static void proactive_compact_node(pg_data_t *pgdat) { - int zoneid; struct zone *zone; struct compact_control cc =3D { .order =3D -1, @@ -2692,10 +2684,7 @@ static void proactive_compact_node(pg_data_t *pgdat) .proactive_compaction =3D true, }; =20 - for (zoneid =3D 0; zoneid < MAX_NR_ZONES; zoneid++) { - zone =3D &pgdat->node_zones[zoneid]; - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { =20 cc.zone =3D zone; =20 @@ -2712,7 +2701,6 @@ static void proactive_compact_node(pg_data_t *pgdat) static void compact_node(int nid) { pg_data_t *pgdat =3D NODE_DATA(nid); - int zoneid; struct zone *zone; struct compact_control cc =3D { .order =3D -1, @@ -2722,12 +2710,7 @@ static void compact_node(int nid) .gfp_mask =3D GFP_KERNEL, }; =20 - - for (zoneid =3D 0; zoneid < MAX_NR_ZONES; zoneid++) { - - zone =3D &pgdat->node_zones[zoneid]; - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { =20 cc.zone =3D zone; =20 @@ -2823,15 +2806,10 @@ static inline bool kcompactd_work_requested(pg_data= _t *pgdat) =20 static bool kcompactd_node_suitable(pg_data_t *pgdat) { - int zoneid; struct zone *zone; enum zone_type highest_zoneidx =3D pgdat->kcompactd_highest_zoneidx; =20 - for (zoneid =3D 0; zoneid <=3D highest_zoneidx; zoneid++) { - zone =3D &pgdat->node_zones[zoneid]; - - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, highest_zoneidx + 1) { =20 if (compaction_suitable(zone, pgdat->kcompactd_max_order, 0, highest_zoneidx) =3D=3D 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 =3D 0; - int z; + struct zone *zone; =20 - for (z =3D 0; z < MAX_NR_ZONES; z++) { - struct zone *zone =3D pgdat->node_zones + z; - - if (!populated_zone(zone)) - continue; + for_each_populated_zone_pgdat(zone, pgdat, MAX_NR_ZONES) { =20 nr_pages +=3D zone_page_state(zone, NR_FREE_PAGES); } --=20 2.25.1