From nobody Wed Dec 17 23:49:49 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 71489C77B61 for ; Mon, 17 Apr 2023 03:52:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230232AbjDQDwv (ORCPT ); Sun, 16 Apr 2023 23:52:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229593AbjDQDwr (ORCPT ); Sun, 16 Apr 2023 23:52:47 -0400 Received: from out-20.mta1.migadu.com (out-20.mta1.migadu.com [95.215.58.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81372A4 for ; Sun, 16 Apr 2023 20:52:45 -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=1681703561; 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=N1rIn34+I9+LMC5x+RgqWpX2I7AwIm2eyZEXSYzzQWE=; b=bRJ70dlyX4rS4tJEJU7dR4YfnCkk4eXbdUlgcIo9FX8iGh7GFxItdrdzozlfUkkI5Jy0+T Uzal4FJNdETzepC7uKDOz3XX/Xzhw273vNF3201SUXanEY2N8Hn4GXYwB2kkfvj+2x36uj 8Qa8YzKxlyXhD/HZ54cZUmRvobMvwqw= From: Yajun Deng To: hannes@cmpxchg.org, vbabka@suse.cz, mhocko@suse.com, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH] lib/show_mem.c: Use for_each_populated_zone() simplify code Date: Mon, 17 Apr 2023 11:52:26 +0800 Message-Id: <20230417035226.4013584-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" The __show_mem() needs to iterate over all zones that have memory, we can simplify the code by using for_each_populated_zone(). Signed-off-by: Yajun Deng Acked-by: Michal Hocko Acked-by: Vlastimil Babka --- lib/show_mem.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/show_mem.c b/lib/show_mem.c index 0d7585cde2a6..1485c87be935 100644 --- a/lib/show_mem.c +++ b/lib/show_mem.c @@ -10,26 +10,19 @@ =20 void __show_mem(unsigned int filter, nodemask_t *nodemask, int max_zone_id= x) { - pg_data_t *pgdat; unsigned long total =3D 0, reserved =3D 0, highmem =3D 0; + struct zone *zone; =20 printk("Mem-Info:\n"); __show_free_areas(filter, nodemask, max_zone_idx); =20 - for_each_online_pgdat(pgdat) { - int zoneid; + for_each_populated_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; + total +=3D zone->present_pages; + reserved +=3D zone->present_pages - zone_managed_pages(zone); =20 - total +=3D zone->present_pages; - reserved +=3D zone->present_pages - zone_managed_pages(zone); - - if (is_highmem_idx(zoneid)) - highmem +=3D zone->present_pages; - } + if (is_highmem(zone)) + highmem +=3D zone->present_pages; } =20 printk("%lu pages RAM\n", total); --=20 2.25.1