From patchwork Wed Sep 28 22:32:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 12993202 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 95E43C6FA86 for ; Wed, 28 Sep 2022 22:33:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 05A1A6B007B; Wed, 28 Sep 2022 18:33:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0317D6B007D; Wed, 28 Sep 2022 18:33:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC6ED6B007E; Wed, 28 Sep 2022 18:33:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id CF0886B007B for ; Wed, 28 Sep 2022 18:33:53 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A4C2912071B for ; Wed, 28 Sep 2022 22:33:53 +0000 (UTC) X-FDA: 79962947946.16.9BE0573 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by imf29.hostedemail.com (Postfix) with ESMTP id 4EC1512000F for ; Wed, 28 Sep 2022 22:33:53 +0000 (UTC) Received: by mail-qt1-f179.google.com with SMTP id s18so8872995qtx.6 for ; Wed, 28 Sep 2022 15:33:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=cdp6gKq67l8BHxfvYyqMmk5Gv7X6BRjPu/o7++6IXk0=; b=URRpeJBFdppH8e/fE8Zn7u382jDrgAPrKGhvy+7Q9UV2n6l9mlnKvfUaPasfPDJqgk CD+pbglEc1OI5Fj/Ci2WqTozLVEtwoShQNGOrjiQFjdUvELjoZQctEpQ0qJlyiY1tPms mCJNKHtApeVTyeFWznRhP/VEmF+PEBVfL0Wj6h7o2eqTX4N+Rwbn+bTA29OKo7/TjhZr oFtvm1ZfUUbyXsguDLLXRWV61hzGuJRFQ3SHrca2K/fo6GpbBESMus7lg6s82a/2Xses 6HTILxedb1ZkW+eSgwHqH81i1xdlpXFU+5urGqxgxYDlYtqfNTdk8gQDSt36m8RjOxql PFVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=cdp6gKq67l8BHxfvYyqMmk5Gv7X6BRjPu/o7++6IXk0=; b=Tr97VZ56OluMRMZ1cgrJ9eGtVXOfT5XsmuJsEwThyKGU/yP5WaRaJ87mQSwhCaBCGt 9dUkbOK1bsvK1rE6/60rH0Da9cXZ67d2oRYtMNDCwwjoqG/LgZA5raz8wGzLwkEaHaTu ++vHGJv+nbEoN6a5Tv+5lJ8Drg41KsGCHp6MbuKWY3edzRJgOxLudnv+AZnQpr6TWowj uJXI1tq+7Pzv1xarAZRiyS7ndMu6WM+3e2uzpP/sRZwc9aEjOOWd4SFtQRQBmO48gyfe 87brpsq5neLVxEbGxEGJdj68JKYl2CYf4eWJB3ck1am1iF+0FaSrKVWR9qtMuteqXfDD sSfA== X-Gm-Message-State: ACrzQf2osSuGqTfex1OJfwZ1rewVFW71IkjGuQgJ1dwLoRDVlkLuQ2An rjexRQJK4rV2U/785LlUVqE= X-Google-Smtp-Source: AMsMyM5HlDloR0Q6E7bhHNQx3py83nBExasTaOUqKPuAI2ERKE88ypL9nf6ynZrpI0Y72+pqvQzwZg== X-Received: by 2002:a05:622a:190b:b0:35b:b5a2:eceb with SMTP id w11-20020a05622a190b00b0035bb5a2ecebmr25196qtc.529.1664404432585; Wed, 28 Sep 2022 15:33:52 -0700 (PDT) Received: from stbirv-lnx-3.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j188-20020a37b9c5000000b006bb83c2be40sm3963481qkf.59.2022.09.28.15.33.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 15:33:52 -0700 (PDT) From: Doug Berger To: Andrew Morton Cc: Jonathan Corbet , Mike Rapoport , Borislav Petkov , "Paul E. McKenney" , Neeraj Upadhyay , Randy Dunlap , Damien Le Moal , Muchun Song , KOSAKI Motohiro , Mel Gorman , Mike Kravetz , Florian Fainelli , David Hildenbrand , Oscar Salvador , Michal Hocko , Joonsoo Kim , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Doug Berger Subject: [PATCH v2 3/9] mm/page_alloc: calculate node_spanned_pages from pfns Date: Wed, 28 Sep 2022 15:32:55 -0700 Message-Id: <20220928223301.375229-4-opendmb@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928223301.375229-1-opendmb@gmail.com> References: <20220928223301.375229-1-opendmb@gmail.com> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=URRpeJBF; spf=pass (imf29.hostedemail.com: domain of opendmb@gmail.com designates 209.85.160.179 as permitted sender) smtp.mailfrom=opendmb@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664404433; a=rsa-sha256; cv=none; b=q3nJX5dJBAINkZLnitnZ9DHgDk4Bancr5kdh7IJsstfyZsCUUZVkAsdvEdp6cwh3QXeFF3 4dKfcoRcS35YagPqxLpQA2fF/a6H1R0M7699dh6lAUGFz8GpSQhJKj4/y5OC7oLZpdgJUu MfzOHtOgvSYOoXQHb49TXh7ox2K/XKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664404433; 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=cdp6gKq67l8BHxfvYyqMmk5Gv7X6BRjPu/o7++6IXk0=; b=K0FE4wKzkKIuwFs/t34pqMpluLLc01Zb4TnKYQ4zEshXwrtkPjwDSQ8lUaa93RFOkTPv5P aoklTU9ish0xaKVhPWfWqcpImwPF2sPZLb8MCYRaLNbYOm2Cz5IENoprQYJeMaVt+SzAQe tnBv1S/6aJWor9KZNmiaK+dw032SHJs= X-Rspam-User: Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=URRpeJBF; spf=pass (imf29.hostedemail.com: domain of opendmb@gmail.com designates 209.85.160.179 as permitted sender) smtp.mailfrom=opendmb@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam10 X-Stat-Signature: iyi479nr9tm5nqdrtzuyos6q8fmwuiyk X-Rspamd-Queue-Id: 4EC1512000F X-HE-Tag: 1664404433-280376 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: Since the start and end pfns of the node are passed as arguments to calculate_node_totalpages() they might as well be used to specify the node_spanned_pages value for the node rather than accumulating the spans of member zones. This prevents the need for additional adjustments if zones are allowed to overlap. Signed-off-by: Doug Berger --- mm/page_alloc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e5486d47406e..3412d644c230 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7452,7 +7452,7 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, unsigned long node_start_pfn, unsigned long node_end_pfn) { - unsigned long realtotalpages = 0, totalpages = 0; + unsigned long realtotalpages = 0; enum zone_type i; for (i = 0; i < MAX_NR_ZONES; i++) { @@ -7483,11 +7483,10 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, zone->present_early_pages = real_size; #endif - totalpages += size; realtotalpages += real_size; } - pgdat->node_spanned_pages = totalpages; + pgdat->node_spanned_pages = node_end_pfn - node_start_pfn; pgdat->node_present_pages = realtotalpages; pr_debug("On node %d totalpages: %lu\n", pgdat->node_id, realtotalpages); }