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 CBA17C77B7C for ; Fri, 26 May 2023 08:53:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6DD696B0075; Fri, 26 May 2023 04:53:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6670A6B0078; Fri, 26 May 2023 04:53:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E06E6B007B; Fri, 26 May 2023 04:53:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 3E8776B0075 for ; Fri, 26 May 2023 04:53:39 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 0A375A00FF for ; Fri, 26 May 2023 08:53:39 +0000 (UTC) X-FDA: 80831792958.17.39EAC04 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf19.hostedemail.com (Postfix) with ESMTP id 5026C1A0017 for ; Fri, 26 May 2023 08:53:36 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=NklE6Udu; spf=pass (imf19.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685091216; 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=NMzZohBzm3grNkWqlJ2ehF7xySxE1C3rcpeNbqkLyjs=; b=XAFCeAnNK9DF5yXN0BAsJpGm2DLeeQwKgfuPGIK78LC2gsZ8VZR9c6cYgUdWT8FRwRWt+s m1J64QdTh7jnyXI2PyGYdIrO3w8qgyaVNRlraSovtd2+vPjNzza3NLVurgWJ33qjPdRRSt hYBonKB9DfIJ52fTeXSauU8ResbQhhA= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=NklE6Udu; spf=pass (imf19.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685091216; a=rsa-sha256; cv=none; b=ukog60QIsx3y9DYeUw85T12m1iYg4HfyJKWtZijpE2/L9q616RzE/euYh3iM3+tec+2NQL CmxNf3yO4JekpLwx4baopAxKd8wGsUUqFLz66W2xsILLi9qKv0jFED3jo59qsQTFJWoLPW Jfymnix5KjPkjuC8+gO9Dk0kLdmKQkg= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1ae58e4b295so3498505ad.2 for ; Fri, 26 May 2023 01:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1685091215; x=1687683215; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NMzZohBzm3grNkWqlJ2ehF7xySxE1C3rcpeNbqkLyjs=; b=NklE6UduAZJgJ1Ah+MN/NOXVNOB5UfOrDgXfh9g4uEkWBp2EI9bEPw442dfm096hwU vZGQokxLy8z83csOSqPszmJ0Bm9/ejb8bvj/O1sEq1qMU2PBJuI9rI1Kdpp/Ami3ozsC HY3Rf6ZYy3SpldjCO0W6d5Rr5ZvcZmiSVoiOOw5yLLiz8yKYAMLGvF42vW4jeomqnBMF gELfAS86efZ+CKjIRbVxj/Ku00cZWjonhjkqoX6WQjHUhs/G7S6yMbm60ssyymm+7UKF Tg0Qwa6PIYcuDB6s8nlw+Xv+1raP4X1jw4EB2OI5FT2tZe+OXUDs8fqvP0s1T7HX/PP0 45wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685091215; x=1687683215; 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=NMzZohBzm3grNkWqlJ2ehF7xySxE1C3rcpeNbqkLyjs=; b=P3zCyXCKs03uSuYIIrywYslMCO0tQA1jV9fcCLndkss3dDmUQwn9S3QDBdRiNwAedT hAZUfOZ/yfRWfPVonQarHTGA+Du9A+LUXJXXt58HksTB9a3yQvvdov57v0+1/ZXIYMVL 1CuXNTFp6fBoSjTLlrucj/aU8XWE93ABOrnJ/aiqjL1p27qN8PX9RBxsQpbg7g1/RWrL s3YfjaWht6jzAO3mWotgqz9iW3Roc0i7aLOumA/17qhFTWjm4jNgMj5SD2+4fMjKIQAF WDEYO6q0yojw2C5Bhpp6Sk25H6T3bsd56XIplL7s86YT8wJNduDd/rS8ac77+058FHJf MXeA== X-Gm-Message-State: AC+VfDw37LM+683n7vBtCUo6Zj1z4Ri4iwcQWSySn8mIvqDW9AfjpElQ yyW0mgtKi4opOdWqUx56U00NYg== X-Google-Smtp-Source: ACHHUZ57GUUtJWBhLw+aLAVkXRdNHyadME+8V5cu9DIh0bVby1WyvCh7fFKc+hcauC6S7WOndaZX0Q== X-Received: by 2002:a17:903:1d2:b0:1af:b7cd:5961 with SMTP id e18-20020a17090301d200b001afb7cd5961mr2070704plh.1.1685091215033; Fri, 26 May 2023 01:53:35 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id t13-20020a170902b20d00b0019ee045a2b3sm2713911plr.308.2023.05.26.01.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 01:53:34 -0700 (PDT) From: Haifeng Xu To: rppt@kernel.org Cc: akpm@linux-foundation.org, mhocko@suse.com, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH v2 2/2] mm/mm_init.c: do not calculate zone_start_pfn/zone_end_pfn in zone_absent_pages_in_node() Date: Fri, 26 May 2023 08:52:51 +0000 Message-Id: <20230526085251.1977-2-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5026C1A0017 X-Rspam-User: X-Stat-Signature: bjf4m5ijx4gnm8q8dec4tyzxqjodbka8 X-Rspamd-Server: rspam01 X-HE-Tag: 1685091216-675405 X-HE-Meta: U2FsdGVkX1/38x2xFEVQzkGTcNukVmHYfrHwSAHMtRmPDTjvarRvtIZAFOYf62mcj9C7yTxups+RYfDmTRLBTVUUJSMMlaa5+4FfClRnPpS0bhENsqpr4D32mXRlnB16/B97Z0juSK9GTELYZSv6bmiFeLhvD/4EEqpR3LNHyT2sTVxTWLfEGi1domXdst5HI54PAJeXfWzhOOY1Tp6zngGCgl7CN00MbaDRZvaTaC8NUyy9k6+CboZb4qXJU3LA5r16sRRnsWe5oKIpcbs578EuV9ayZgW7PqzxM1dzoRie0gG7M47U/Nf7tXJxc7qKCMv3rKDvLbWcm6CnULq34vw6xF6TL67UPxJj1DnNhz+GyICG3qhoL6gUyWgTkdtXv5Qvj2SoNcvx9j+r2RBAWl4feP6f1NYvSQ4bSqmvPYaN3jzH3VPXg3pwVdpvPOlyCAqe79ffIPExGviyYYUSot3DLNC8koNT+pRb2Kpjv99nngzWcYOfPj1w35jUFXoQG/O2wD6rO1X0Oz1QLJ5eXl3wzhh76e3KcQsArpi7eSkX3i4xxwqfoZzpMs9Bupg7FZatfUhV1aV3GXpIoDSVAtX9GJVUKlpF8NACwmFC2v1U5aqR5UJma4llXKVvJO05eBeGGepmRdex/bH3hSMd9p/F1bPfOkL9/vdomXLet99t1em7kQdewtUN1XPJbu+hhyL8hmxS8dVXJtqxeCujtfDI/Cm8SMrUnwMV406H+zPhj1IMnEOankCKFqxViPcjHAXnjXlQyWzuaxgGXnlBHl0RtLSR9ni2GlfqO1Ghk1bsSgxhiSKt0wAejWjAKiInG3CSSPn6t4R7fCXgsC4+Rg5yduuP8gCv0ToUZSDrWEdAw72xVY+etdAXCwBFwPssyVQ04CwG4HaR0m8qfB2mJB24ATZ67ePlBTSdSCJyiwNCqqO2EkOVvdDYwxLZtrpJqnj4DLv5n4pRh/XssbB sNWhLzjW Ec0rNKdKf2Yc22rvi3bUCOUMvnRmjOlDtNNzvm7nxTGKteQul0a3JuBiiGWYPB1pelFqyESBA5vddupI259ud71+9zcRZFSrQC5P60wyP2tMzQaU+g1bYaEzcBbznVhaIPNBI49o6O7RJSpJzlU+5cVWoaWvzwSJ9YNfAF9MhjDVoG2NNeWDSLFxZ1GF2F9fjAxRiAsohsin3tVREeDLw8CXK3y8x+uxrpaclIOvSDKSPwPCYS9fgwnBbpR+lgACrIr4rsxr4j4fAbyMeAgoIMkaOqXoa9XCW0V+P6pmSNX+yiH56HFuDZa8zVQY9FNHwDgWK7M0ULAKRIS/RSuX4naIx963Sb2Xttd+3l1JNdbVQ5o2s2+VeX3UCrTZXc0yx9AdC9Re81mqh3Xg1WCnlI4uLz44zHyLYIGk3YyBjX90xJgi2/6X881gmrgXUeu/upk0h/PGzUcayTIb3fRE1G5uKECKpsRMY9ksqL6m/fPosOTooC9+QYCj+Ovnzj5rMdAJr 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 calculate_node_totalpages(), zone_start_pfn/zone_end_pfn are already calculated in zone_spanned_pages_in_node(), so use them as parameters instead of node_start_pfn/node_end_pfn and the duplicated calculation process can de dropped. Signed-off-by: Haifeng Xu Suggested-by: Mike Rapoport --- v2: - remove unrelated whitespace changes - do not replace pgdat->node_id with a local variable - remove redundant variable 'size' - add check that whether a zone is empty or not --- mm/mm_init.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index f674e5798f7d..2d91bb52c619 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1166,20 +1166,15 @@ unsigned long __init absent_pages_in_range(unsigned long start_pfn, /* Return the number of page frames in holes in a zone on a node */ static unsigned long __init zone_absent_pages_in_node(int nid, unsigned long zone_type, - unsigned long node_start_pfn, - unsigned long node_end_pfn) + unsigned long zone_start_pfn, + unsigned long zone_end_pfn) { - unsigned long zone_low = arch_zone_lowest_possible_pfn[zone_type]; - unsigned long zone_high = arch_zone_highest_possible_pfn[zone_type]; - unsigned long zone_start_pfn, zone_end_pfn; unsigned long nr_absent; - zone_start_pfn = clamp(node_start_pfn, zone_low, zone_high); - zone_end_pfn = clamp(node_end_pfn, zone_low, zone_high); + /* zone is empty, we don't have any absent pages */ + if (zone_start_pfn == zone_end_pfn) + return 0; - adjust_zone_range_for_zone_movable(nid, zone_type, - node_start_pfn, node_end_pfn, - &zone_start_pfn, &zone_end_pfn); nr_absent = __absent_pages_in_range(nid, zone_start_pfn, zone_end_pfn); /* @@ -1272,7 +1267,7 @@ 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, @@ -1280,23 +1275,22 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, &zone_start_pfn, &zone_end_pfn); absent = zone_absent_pages_in_node(pgdat->node_id, i, - node_start_pfn, - node_end_pfn); + zone_start_pfn, + zone_end_pfn); - size = spanned; - real_size = size - absent; + real_size = spanned - absent; - if (size) + if (spanned) zone->zone_start_pfn = zone_start_pfn; else 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