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 2D583C7EE2F for ; Wed, 7 Jun 2023 02:51:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 349AC8E0001; Tue, 6 Jun 2023 22:51:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F9B56B0072; Tue, 6 Jun 2023 22:51:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C0A28E0001; Tue, 6 Jun 2023 22:51:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0C6AC6B0071 for ; Tue, 6 Jun 2023 22:51:13 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C1E281206BE for ; Wed, 7 Jun 2023 02:51:12 +0000 (UTC) X-FDA: 80874425184.06.682E0C5 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf05.hostedemail.com (Postfix) with ESMTP id CA395100004 for ; Wed, 7 Jun 2023 02:51:10 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=bYiCLhPH; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf05.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686106271; a=rsa-sha256; cv=none; b=Q/uIpYFuFqpjb/0eT/KOmvRSB53RYR3vfgz7UWsjJY0VqksHYIGxtiZ13l/BIY73y/LsjC v4T6qJITjGDXHmC1OwH7BDWU7lJ89v4SluVdfUDP5rZ5/2YTk2SGjQwMeeJMPxQJapVGTL Q6yAzLBlrm5d1+YYg1GTYLfIfoQqqa4= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=bYiCLhPH; dmarc=pass (policy=reject) header.from=shopee.com; spf=pass (imf05.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.214.169 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=1686106270; 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=v2ax2figgKOg2flp2WzEe3WSnm61sq9EXkQEI4kHtRM=; b=TCC8RZeD4NEzx2C5MbL2hRzF9Ird8nvZih8bf4uojAknc3h9392frJ0cofPzIrdpUjCQdh OS+SYhDsw9V2i7ASce5N66SQ7qqnM6DGS9u3u7ZPqXeR3tZBkKv6z0FLWqYtzlDepVSUZJ FLtCzylAVfosMNyMjAeig1n/WCM1QQA= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b075e13a5eso60064035ad.3 for ; Tue, 06 Jun 2023 19:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1686106269; x=1688698269; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v2ax2figgKOg2flp2WzEe3WSnm61sq9EXkQEI4kHtRM=; b=bYiCLhPHy4LMGEt3Qd5bIN1/iRv9YAoOWI6mY7mKQwSKU4u3Srkodt/0b5tjiv+k9H KXmi09+TBPfrCmZ7GJvNI+7sHgusTtxD3yfwosnNtB4KdS/NlnRpIGth+jL7n9p1uoiX DkXeYUMxAsN+08QlMYuGuhmyngRt1qpKQio7s+oA0PR6jDKvj9b0KOZS+CR99GDAFxz7 GkZnz+anqOfxu5Ob8LKG8ffLjyX9RruCAhEBaq67MXu2P3BMpk9dLs2wiPmPLPTowa4F SZ01vmAZ0JDiFoatLHT/QwZUKs6/CsN/EpJAoZOrZGIWXvWoM7I7Fb0jtsFWzKCOAgxf D8FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686106269; x=1688698269; 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:message-id:reply-to; bh=v2ax2figgKOg2flp2WzEe3WSnm61sq9EXkQEI4kHtRM=; b=l9P3Kmyl6Hv8/rGsfKLg3+ff7d1YmVXrjFFwWvFLvYZsBRo3nCKhTuQ34cva1k/HR0 hKbalRevjynlS9/7fqV+gL7CETzTzIrJ3KQn2V5T3CM/8kiGMuOKSBa+A6ppPoAsIINe 4NA32o6H23B93w0uS8G73SuXJ59mAObu4K8S5cjIy8QmIHheILdBYnTPueoAX5UE6uqn fo3HF/EJ0OvMy7182q9Rs+Zd0WjsvBQt2c5sIfCaCaqKBf4R3Rj+yd1yhkAnzgKQL7Ky U+OhS4PcmKmUwu+iU/kp6kszs35P3sNE0qw9kQoQvtigmETFkB0f4JNvRiABt1utQTPu ryFA== X-Gm-Message-State: AC+VfDwrjsAbh1GIsJnyuwxsZnLSla5Pfjf++2F06kVdU8Z8DUSJDJFq GKInZKiYsVJuPKXKp7+FraoMEg== X-Google-Smtp-Source: ACHHUZ4EP8dF5XtjL1pzBueRKpoWxNruwp17dcMuGbUeRWvlS9kN6Iag3aBuOVg6tm17TObzZ0EFUg== X-Received: by 2002:a17:902:e846:b0:1ae:6a3:d058 with SMTP id t6-20020a170902e84600b001ae06a3d058mr4242727plg.36.1686106269476; Tue, 06 Jun 2023 19:51:09 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id a12-20020a170902eccc00b00186a2274382sm9239439plh.76.2023.06.06.19.51.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 19:51:09 -0700 (PDT) From: Haifeng Xu To: david@redhat.com Cc: rppt@kernel.org, osalvador@suse.de, mhocko@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Haifeng Xu Subject: [PATCH v2 2/2] mm/mm_init.c: remove reset_node_present_pages() Date: Wed, 7 Jun 2023 02:50:56 +0000 Message-Id: <20230607025056.1348-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: CA395100004 X-Stat-Signature: 5tsgtkmyf3izjgwswt6ke6tmou5foz6n X-HE-Tag: 1686106270-367938 X-HE-Meta: U2FsdGVkX18Zeeu9Gfcs28VRlQkT6eD/7Vf6gH0SR8Nhgxlv+CyFw8pWpIdn61CuaP8yBc/KuYi6cyRsvI06+mRVj4QEnsA80dK2cPQ+XXN4amyaTbAghPg3mxq9qL06OUsH0aifgzAw5jaiiVBA+7ywX6ocOHXrsw6mxYFj1JtQTfWewEq93qZbNzzAzolqWsWII/720OOW5LL2CpHFnPc4JHuopaUWUwv3djAijL9Zfzo49Co+XtschpN8VbEtAxifO4P8SUFCFpNZdy/UAD2kLOPanVN2RFpsF9xpoOOFWCmvDa9lNp0eN4hIIlG2fglfwxQr4ZnK1Iv8Dun0lIzap9YFRHNkGU5YSNo5WETNLsRfQM/m3EtkR9C/ymCxcQcFUpoxQ/OKdDnbw73PFQ8uJcuHDNgiihz06cYbuin0kkkhQNsUIZTE+BTD1ikJhdDZxbnfrQuBOpv6TDtIae84xxZB4DUddVPk5DCI/jQNB6PIAlVAp/J5mUVlq63CyL1Lltdbgrg8hKFM+XENMymX7fLaKZ1XgXFu6uvCWKtRqnWf2LTDiOaE2FtK1n1Ue9bHKBrWs6jDIrn2a4mEgbcsYYaMkxkz9CS57lUbqt8r50lTQV4hN6rF3v/I+66d1nxJCvq/dfjDsWAMtYlh9qZu92pA0dk6dBpYZgTpF2XCNyqwQHu18lngxWV+TeAtkCXo96YD2XlBs7zfzhp6m9wkJxaoitm1AwBnqcnssG3UyECxEfFPevL5VM/s817D0AHKBYXZbdYNLg/0Cqz8mcNZh8mclv2Xm7rUgaALWXmnm1pA0vw0CNfabJDky9uY9xODL2xjXjLygqR9+xJ4Ilf6XQ0Uir4XbRma+URfcKKjhMCaWQ+wDk/inRfdLJ1GE6NE6TVmpuQycFyrVw6VLlo3r+FmX5JN8se3FwJReGi79gjbUcjMwEiLgbfF7IcPev3KBAAt5U19hdrYu/k bUi1rt4a iWn8Fha0uTDqEUmec1TVOYcEj3E1JWNVi48Tqq4HKVkN40z9ExRiIJnixMNfdk533Kgh7UUO7XJFoP9DMazcIRKIFK7CKDkax3Vjb2RZMG2U8XJmnQthT+bvvMaPQjUkC2a1037gavVbZNWE2qLa5+BO6JbPXPzgDIEjpkU6y5JwRXR1J9JS0n+MIYEi5lyIz2TxLP4P7Rugl9jMNoxyNyXH6A3NZS+Gsn/mcTIAbePp2epINgkBmDdjVarp8JbA1hBF6IoppWJnrR8krdBsqQV0LIrGAf1etN+LR3t3WvHc8U0D+88kP70Im3wDo1cqQIujkpIUH3NjqLW58gswqVdObEAQyKvOae0UXWncsCTSge5xWFqihylodnGUq2VM9GiKSKpYEl2eigJnA89ti6h/co5K9+hhmhODHEnmECcIHFa+hsXIZ8wgidmWQa9GLMbnd+kkrhaXA+8q3XdVfme1IFQ== 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: reset_node_present_pages() only get called in hotadd_init_pgdat(), move the action that clear present pages to free_area_init_core_hotplug(), so the helper can be removed. Signed-off-by: Haifeng Xu Suggested-by: David Hildenbrand --- v2: - declare 'struct zone' within the for loop - fix comment layout --- mm/memory_hotplug.c | 18 ------------------ mm/mm_init.c | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 65e385f34679..ee1c0d9a4d5a 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1172,16 +1172,6 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, return ret; } -static void reset_node_present_pages(pg_data_t *pgdat) -{ - struct zone *z; - - for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++) - z->present_pages = 0; - - pgdat->node_present_pages = 0; -} - /* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ static pg_data_t __ref *hotadd_init_pgdat(int nid) { @@ -1204,14 +1194,6 @@ static pg_data_t __ref *hotadd_init_pgdat(int nid) */ build_all_zonelists(pgdat); - /* - * When memory is hot-added, all the memory is in offline state. So - * clear all zones' present_pages because they will be updated in - * online_pages() and offline_pages(). - * TODO: should be in free_area_init_core_hotplug? - */ - reset_node_present_pages(pgdat); - return pgdat; } diff --git a/mm/mm_init.c b/mm/mm_init.c index 78e67041ae9f..a02ba9a79b3d 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1507,6 +1507,8 @@ void __ref free_area_init_core_hotplug(struct pglist_data *pgdat) pgdat->kswapd_order = 0; pgdat->kswapd_highest_zoneidx = 0; pgdat->node_start_pfn = 0; + pgdat->node_present_pages = 0; + for_each_online_cpu(cpu) { struct per_cpu_nodestat *p; @@ -1514,8 +1516,17 @@ void __ref free_area_init_core_hotplug(struct pglist_data *pgdat) memset(p, 0, sizeof(*p)); } - for (z = 0; z < MAX_NR_ZONES; z++) - zone_init_internals(&pgdat->node_zones[z], z, nid, 0); + /* + * When memory is hot-added, all the memory is in offline state. So + * clear all zones' present_pages and managed_pages because they will + * be updated in online_pages() and offline_pages(). + */ + for (z = 0; z < MAX_NR_ZONES; z++) { + struct zone *zone = pgdat->node_zones + z; + + zone->present_pages = 0; + zone_init_internals(zone, z, nid, 0); + } } #endif -- 2.25.1