From mboxrd@z Thu Jan 1 00:00:00 1970 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 17718C77B7A for ; Thu, 25 May 2023 04:03:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 98FE8280001; Thu, 25 May 2023 00:03:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 940346B0078; Thu, 25 May 2023 00:03:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 807DD280001; Thu, 25 May 2023 00:03:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 7369D6B0075 for ; Thu, 25 May 2023 00:03:09 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 471B6120476 for ; Thu, 25 May 2023 04:03:09 +0000 (UTC) X-FDA: 80827432098.12.50A5E10 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf23.hostedemail.com (Postfix) with ESMTP id 8DFB8140012 for ; Thu, 25 May 2023 04:03:05 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=VO447nLY; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf23.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684987385; a=rsa-sha256; cv=none; b=DrWtz3AoSpst5Qul1UfJN6nJ3qnDzw7SmBnD3IRUHHvIabTvLBWeHduObUxexnrxzYQHQu pNdXzCg9Yc9Yl+q1sQZpduEV0NFsaUzQ2k/M5olLaY1cYESiXn9F39tRk2GVJFBClt9sS7 cTs2zI6zy6iOEO3aS6/+UCBgDDEtAf8= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=VO447nLY; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf23.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684987385; 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=WOXFBlEjJcJ6V9YFOI8yptpCpDKRZLgBqb3BFNypKaI=; b=1gg5JGNpFVuxWde2UJDldaMBDykmkcLYB2OKEgM3fILG1PvSw/KXnrakWbKQNX0zoLm3DB KY6Ut8e11mcu3oFP6EZKDngQ2kmfJoPAUCgpdWZqAPdH9b1H33xcn8JvEihAum3BDDSXRP uJt5jYyXwZ4dMdkjtvP/7sqw376VlIA= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-64d3bc502ddso1990999b3a.0 for ; Wed, 24 May 2023 21:03:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1684987384; x=1687579384; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=WOXFBlEjJcJ6V9YFOI8yptpCpDKRZLgBqb3BFNypKaI=; b=VO447nLYcNslTB95FdoOTJFuskVQk5jMcKcrP02WXeDjykcP5O7h70FE25NHPd1yFv V4lah2jbdvfrDYCxZH9TSktvenzbogw/teitAJ6Hd43cc2hQAZYnrAzlFxSOaTCqcZEY DE9HcPswNSY/ZvpSIXfcZEEA/RDdMPVCTj3R3LVLJ2T7g66Bh/OftP86auFWO43QYn0x 9c8fP4xxNH9Yg69myVOoct77jVdwhD3mOs4qiY1whhlIA9PIqoV5lxOJ2OkQOyIH1uXp UrrmDHERBpGc/UpuyXoMe5tVDKr3DH9Rbn21GdqzSaujFFDFbRjBt4LQxuR02H04bcKR PtUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684987384; x=1687579384; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WOXFBlEjJcJ6V9YFOI8yptpCpDKRZLgBqb3BFNypKaI=; b=OEtNxD61Y9AQnN7bwSVPqMkFdoFOZylhpzajiLazeqSE7A/B+0/OGOZVWglL/TFe9f e14SILvDIwDjdlxiBcu9PXpqBXXlph3EfDCDeUpJ9SH3RpFbKFPErjpU9KzsNpsfEF31 Pmt/ELhYFrcTQsGnjnN4ijpLyg64f6QMrDiHMPd1rCQ418oy6qBxssn/h1L6mhgdibgT MOMrOktk9ablcp8qPHKcS9f+Vj3imd2H4Yl+spr8b1ahW8kkbHgHMCspxX1fbF0UOKND QDFykG0+G/FWb/b+LF4VhVJT1L1f37hwFXPYIIF0k8lAW2xF0mNgpV79iAHEwBaqjCH4 vvYg== X-Gm-Message-State: AC+VfDxzLNfLJRzW2XNJJpa6y/cC5LOblFApoiKqtv9XTu7asSoUAcM8 KcVXid4j0kJbReiPHssV4AP6pg== X-Google-Smtp-Source: ACHHUZ5KDLvsnPMttA35NNkIYcWPtfzYRaU6CCRv6/FNJJk83SuplTOTM88OJQEdxRwdyk+G+FcUBA== X-Received: by 2002:a05:6a20:a115:b0:100:b137:3563 with SMTP id q21-20020a056a20a11500b00100b1373563mr19314283pzk.32.1684987384404; Wed, 24 May 2023 21:03:04 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id i11-20020aa7908b000000b0064c56d04316sm189916pfa.193.2023.05.24.21.03.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 21:03:04 -0700 (PDT) From: Haifeng Xu To: akpm@linux-foundation.org Cc: mhocko@suse.com, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH 2/3] mm/mm_init.c: account absent_page only if spanned_page is non-zero Date: Thu, 25 May 2023 04:01:49 +0000 Message-Id: <20230525040150.1588-2-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 8DFB8140012 X-Stat-Signature: mu53re6hcs3z3kf3sgemi557ybi4xh4j X-HE-Tag: 1684987385-699167 X-HE-Meta: U2FsdGVkX19pkQJZx7LjGgIwsSkcZL3KLdXZiI0D01MVvimRmx+CH8bZ2ZjkOJIXiMocweJrm1lDRsJPbwjXCT0HA4uv/WtLLcv3mW2koA+Qohmkkw72XXFVnUP4SEBrhUOCg1F8/nzUZYzXe/gJ4FUTOc1IW+CnvLoL7xe1aY8rPtB5uvCr3jz8t9gDqeI4NdjSt4RjO7KiwyvHbUVHyF7dCXvgZJx6UYG6Kx/JmVZJlvmGGYxyO9ywlt59axYDt6DOchZdqOCAf6uRvzV+//KfdqhVmq0yZgFX6YyaKY7lyFXOsMTtgGVMeN+uR3UFC9oY9R4ZXFFNWVTUHVyzm5FGyWlTgvoYi5LR0Apk04nIa+w8QRzsJxOlDKOsszOIhevH/dYfRmBZ7YD5lIKOLV4m8HcDrldj5oDWl/jMrb+tFhsNAm04su5OxdgI4cWDWweEvBEWcVhmBk/5t5MN0rgSxmg0zfhWyZcm3LrHWeMMx4YkCV3XpHYLPkxr3Tx1NlhOA2oblLvQQxYOID6RLeXJp9w+/C8h24bXzBPS4Q3l1BmyzNJmdkT7IPbbzMkzDDquofb+CAAH+9lNgESL01/S8ul4xuxet90h1a3I+pyDU24bGc2IszS8ejrBsuD883Nm451g8DGPUA2TMngBOO4YCLOy9I2hsZK2MbEncOBpPOiomnhsjhUrb029TIby5AzA1cSaS+kteyvDsnmn9DsdQb01dMjzzTHzYbn3bn1tB2vimNcx5bqnamznOgqNq2Eof0o0F+7Bt7plUuBHRauMQ5YHu2vrwk1dR5+aNVP1Dnso9fh0FcXnmrz3R4jzmx/O9x6T/MXiINlR2f+NARPf11s6GEt7GylBhrcJ7kkTxWuZbkC1zRW2d3PVyv1KdssdGGHG+D9tK6zf4+RhLogmxaxatWoVwp3uIXD6u2PLHBou80P+BhW+kTmnc1NxDzzV2UKxJ/G5Z07l+XB K56Iy1OQ 50MKeZy0cpdRfa0+cSd8tw9cwVbGfgblOTPuhYhjKsOaKkTXAxlQfwxNswVyIAeniSv+gLH20MlwiKDpT1TiJBUXH6GUVE4g3rr1HraZupP+TtTLybcsAfscg5yBM/DLfPVd5UspzissYTNJO834LZJtdd8ixp6wGwdS7MJkCIDNb+4+VbrZUMRlFK9CDFAJ6trni9JxAO79F8fz5P6R4c9V9g7rghA8cFL/iyckEuTiu9E4ZIuw5XM0fHAjcQT7NyuAUB/TCEX40Aovsvr0IZAYps7/V6pZDt41Q3Jkm8SA+4vkzWdG8HvmqCW2o+3aGyqfoNps6vl7JeLpw0QMNjDyZxiQBhqdTshKWIWs1Rl5Y7SusM3CfZkcdw02LVgr5bIBiqnzYLsZC5YHqPJcDk2U8q7esMbTD8ufb5z0CDNinOkU9s63YvKL5tdY7E1EYwiPD 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: If spanned_page is zero, it's pointless to calculate the number of absent_page. Also, the real size can be assigned to zero directly. Signed-off-by: Haifeng Xu --- mm/mm_init.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index cf55bba04b23..898af4eb9ce2 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1260,31 +1260,30 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, struct zone *zone = pgdat->node_zones + i; unsigned long zone_start_pfn, zone_end_pfn; unsigned long spanned, absent; - unsigned long size, real_size; + unsigned long real_size; spanned = zone_spanned_pages_in_node(pgdat->node_id, i, node_start_pfn, node_end_pfn, &zone_start_pfn, &zone_end_pfn); - absent = zone_absent_pages_in_node(pgdat->node_id, i, - node_start_pfn, - node_end_pfn); - - size = spanned; - real_size = size - absent; - - if (size) + if (spanned) { + absent = zone_absent_pages_in_node(pgdat->node_id, i, + node_start_pfn, + node_end_pfn); + real_size = spanned - absent; zone->zone_start_pfn = zone_start_pfn; - else + } else { + real_size = 0; zone->zone_start_pfn = 0; - zone->spanned_pages = size; + } + zone->spanned_pages = spanned; zone->present_pages = real_size; #if defined(CONFIG_MEMORY_HOTPLUG) zone->present_early_pages = real_size; #endif - totalpages += size; + totalpages += spanned; realtotalpages += real_size; } -- 2.25.1