From patchwork Thu May 11 06:56:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13237529 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 2CC1BC7EE22 for ; Thu, 11 May 2023 06:56:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C215F280001; Thu, 11 May 2023 02:56:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD2196B007B; Thu, 11 May 2023 02:56:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A99A0280001; Thu, 11 May 2023 02:56:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 9DB466B0078 for ; Thu, 11 May 2023 02:56:50 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6767F8075A for ; Thu, 11 May 2023 06:56:50 +0000 (UTC) X-FDA: 80777066580.09.A35CEE2 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf01.hostedemail.com (Postfix) with ESMTP id 162D540006 for ; Thu, 11 May 2023 06:56:47 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=B1AdjYaS; spf=pass (imf01.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1683788208; 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:in-reply-to:references:references:dkim-signature; bh=FcUMPhZLV34hYlzE+VhgToLGhCDhKRAAr0+UFU4akJQ=; b=T4jV+Gc/oeyfxfHEDc6G0UQrSWJv47BN4epCAzvRSCtbd7uUjov2NsNwrUWqrlA2ELDCU/ hWWlu7T6vJB09B4IfvhvXjoLjer4aoGk0w3kI0PdiIdkrJRnbu3WHX2rl1NaPVAMPmHo3Q 1n+vzdTSJTubuR6C8Mrfq+yewk0yAks= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683788208; a=rsa-sha256; cv=none; b=A/UJpYUmygDsHhRYyMDmctaIvbrYijywWWx94BMJNyPGgeTP+mNet92O3SkpFzlLc14kV0 Dow3tFotD0tEloOQUwCDs9yvVhAFuX/42IyF0E9MebPaZ10St287/um7kBbTnLaN4oHEuF 5namAABqtWLPr6aJJRE7ueoq6VcEkik= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=B1AdjYaS; spf=pass (imf01.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683788208; x=1715324208; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KdrDQdJZ6+h4q+PuPHT7D4LwVdhv/LqAu3N0e9ln1IM=; b=B1AdjYaS6h7pecTFUw7gm+v7i8+BoCCvK+0K0xcGEfnQUd5IfVs0C2Jn Aue4PfMW+8GbFl3sC92ayt1Iiq3vdBj6hp3+NqNROP9QcWw/LOqzWMFA9 OkUxZlf8a3foI/UkpWQrjOIBdHDgWInjgb9oVzfhq8CkTa7FlZBiQSOrX /szThqyHm2lDdgH1az+k7TJUmELTmbyGcB4oWH8n0Kx0KUri7ZpX7ZVo6 Xr9X0vPkfUm926sRuV5AR56Xr+rNW9QIrajMRxzdCxMHVaXdfs0lLCrXT zlDkFNxH+rgf+IoKC5wYTdGX1A9u90KfQW+T4hDNPRp0EAjgL8gBX2AHA A==; X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="436744524" X-IronPort-AV: E=Sophos;i="5.99,266,1677571200"; d="scan'208";a="436744524" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 23:56:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="823855310" X-IronPort-AV: E=Sophos;i="5.99,266,1677571200"; d="scan'208";a="823855310" Received: from chaoyan1-mobl2.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.31.95]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 23:56:43 -0700 From: Huang Ying To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Arjan Van De Ven , Andrew Morton , Huang Ying , Mel Gorman , Vlastimil Babka , David Hildenbrand , Johannes Weiner , Dave Hansen , Michal Hocko , Pavel Tatashin , Matthew Wilcox Subject: [RFC 4/6] mm: avoid show invalid zone in /proc/zoneinfo Date: Thu, 11 May 2023 14:56:05 +0800 Message-Id: <20230511065607.37407-5-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230511065607.37407-1-ying.huang@intel.com> References: <20230511065607.37407-1-ying.huang@intel.com> MIME-Version: 1.0 X-Stat-Signature: tubqtj18a1zfrr1gtkn1h9bza4a9w3ej X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 162D540006 X-HE-Tag: 1683788207-294450 X-HE-Meta: U2FsdGVkX19G196Xmycf7pZzVg7e1Ceugk9Yl2LJA6EyzegVyIw5noBAZ+j/627LSDXd2nyry+y0EHPQP32gaXHWBXuv1aORWypTbJVjlATJtA/l5F2uOdy1PQg75cizIh31E3uFw+a0wtIDuchVwbA+Zp/9U0H6dlfNfRmkdCw19EMW0jONcXsvKFZLLBrywJG0hHWZCAvhKCcEFm9shbg2WOXFf77retrY020tkx9FBSo6D+29DZGczdDFLox7Qlt4KWE4ll9BQ20nBafqU+2fnqayGv829Wwug0UqS7JDRzxXA4vWpF1TYwTXtp8uXdkq21QmaJGGZz3OHB7MYGR3f1GVgUHqkH7tHSpYPzf8BPfYYqCU5lDna9dgjQISqCNPq7498rAVJ/7nAlIh1G97sREfGuy9yRXYzqX2VN6c/l2wTiCjIRRDWdHC0v6r7Wa+E6ajS9DRZ8WEXNBq9NhjWn893MwYFcQKjG3IMKMfk9zCGGjSEsQMXEJ7lrYEOEZNymha8Z2kpsHCpRQ6PIeWeUQ1csmol//j0uxzpcwPf3E8mgu1Qfho03MP5ugA437/lFrlcLEeg9uFDIunwBe6fcgxp5X0YPnPpfw4RblnvdqkU0U7YUJUPz52uj660KgYal5M6DJHnSi6A/zzgKlFOQoa/+I7SXSBLFypJKgnuOvADzqO3jPgsZtMkhTSg+ZtbwZ9RetEUssKgXSUfoNfGLPLsz2CGXtX/c1Z/ziteboNav8dzcCnPX+wOpyOZ+sKJxBBzALHowNkQRQyiSib3j1pK3S/6SJlXvo+0USrRESg22dDi8DHMENCYzqowY9PJOQCR8aPjP+xvaXfAhBuD9hR0rwtM713SOis6viEy7Z3QtTPXcpq4fpjodwbcLlYWI/B4F2fHmIxSNvxUrb2L5bdK6s19mtAR9WVCiXt+I4ppUj/5QWl//TKPC4dkhNcpsBqVm9khk9nauU IVRn5i/b zPrI+81HKSPezlyHVo5r4+wtzL9kkBlDLe0crqMqcLHkXoZ6ApTip6Q8IZtO+JdJhWSlANcOSou8AblL1AR0MsW0NVZdAgH7wYTcFZGRdAunjYEJaJkPswzW/ZpHtnkbxBkE+gmhQImIfqw1WTNNOkRtyrAhCb4ChZ6Dv0+Na7iIJwwBRYwfPE9axLrFnqV40J8H2iIsmXhnJ1NUL4/fE/tBiK2zVawcWujpigFmKVJMWdQnUQldyeBV7NN1g2lCfEMvmMwemI61jv8u7tVUTvSoZybnl2YT3DL+Vfs2fpxINlKOWg2wM3rV2PuZNliy3DeD58E4ZGAhSBRuBmyZIiDRQi/8outArV3S2lSq/x+x/fiNd6bwJZ1+dCHm4smSXQ1JDkXUzV3nwf/aBrQPfkhvN66g2Ifdh+XKj 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: In the following patch of the series, one or multiple zone instances may be created for one zone type. So the total number of zone instances of a node becomes dynamic based on system configurations. So, the real zone instance number instead of static max zone number is used to show zone information in /proc/zoneinfo. Signed-off-by: "Huang, Ying" Cc: Mel Gorman Cc: Vlastimil Babka Cc: David Hildenbrand Cc: Johannes Weiner Cc: Dave Hansen Cc: Michal Hocko Cc: Pavel Tatashin Cc: Matthew Wilcox --- include/linux/mmzone.h | 5 +++++ mm/vmstat.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 0c569c5fa0d1..18d64cf1263c 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1809,6 +1809,11 @@ static inline int last_zone_idx(pg_data_t *pgdat, enum zone_type zt) return pgdat->node_zone_types[zt].last_zone_idx; } +static inline int last_zone_idx_pgdat(pg_data_t *pgdat) +{ + return last_zone_idx(pgdat, MAX_NR_ZONE_TYPES - 1); +} + #ifdef CONFIG_SPARSEMEM #include #endif diff --git a/mm/vmstat.c b/mm/vmstat.c index 1ea6a5ce1c41..bade3f50d1f8 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1441,8 +1441,9 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat, struct zone *zone; struct zone *node_zones = pgdat->node_zones; unsigned long flags; + int last_zone_idx = last_zone_idx_pgdat(pgdat); - for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; ++zone) { + for (zone = node_zones; zone - node_zones <= last_zone_idx; ++zone) { if (assert_populated && !populated_zone(zone)) continue;