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 BF64CC7EE23 for ; Fri, 26 May 2023 08:53:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6413C6B0074; Fri, 26 May 2023 04:53:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CCFF900002; Fri, 26 May 2023 04:53:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 46B496B0078; Fri, 26 May 2023 04:53:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 3361C6B0074 for ; Fri, 26 May 2023 04:53:35 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 08C7C120E75 for ; Fri, 26 May 2023 08:53:35 +0000 (UTC) X-FDA: 80831792790.08.365DAA9 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf29.hostedemail.com (Postfix) with ESMTP id 36175120010 for ; Fri, 26 May 2023 08:53:32 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=ZE2T2CWU; spf=pass (imf29.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.214.170 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=1685091212; a=rsa-sha256; cv=none; b=Mdy/no3wOZuKMVGFgFWHeU5d1r0qmXb7K58OhOFdNZpFuxiJPQnBBw55cR8516jwKoFjFW Yu1Fs+fIRN4IadU4Po/1Hle4Iu+BM6+0cDQieTOqMKTxKPfhCPmuu7ipTzKu4LByAGKXOa yMwNmiohvAAqcPqA7eJSe6wnf7pZ6CQ= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=ZE2T2CWU; spf=pass (imf29.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.214.170 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=1685091212; 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=vULi8wP3cxO4TEAm2rbpl3Qmvd6xJYVlkRF7oAxYgxQ=; b=P74qY6WwxFPVavUreAxKl/Bb/0+SDeE1fjj2Fawh9U1qQ4UN3qa24EFOkDdnFhdpwP1KW0 epaxLtzP/mGLlWqWGsZlQ9QmD2O4jmJ7oB6Qlex4uSOs5NUd8AQdRFiJfbdrPYFaJBcfRv Y+6dkind5h8dFG1HwKlY913AAliOnww= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1ae452c2777so4770065ad.0 for ; Fri, 26 May 2023 01:53:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1685091211; x=1687683211; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vULi8wP3cxO4TEAm2rbpl3Qmvd6xJYVlkRF7oAxYgxQ=; b=ZE2T2CWUJ8fXrRdBuSxPnMkGmKH352ocr4/VgManWjp7N3POEfQ5B8IvhDcAtTJGLB ThDPY6JboiSIzxSskqNIa0/KYwVb4UK6lZZ/LQDgdCWPrRqXazsKIteW4P4gMSRmo5bL HB6RGmbwANNSjoZvuYiwvc2k2/VqnBRedk6pReISAUfpuhYz0p3rC9QnMgfofFH4OR9A uruWHE5HSQNPuR0El4DHtx8bzKE2C5r+MdDLcRoTmg7VEklCbFg1+b+y18f5ekAaUp2x c25eXq9xsnnY6GfgDyQ3tSlP9oBeZbz6UZCFhigMbA0Kkay+1I5rXas7FVdBQLVthnuU FiTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685091211; x=1687683211; 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=vULi8wP3cxO4TEAm2rbpl3Qmvd6xJYVlkRF7oAxYgxQ=; b=H19nhsYCr9Sm/Yf/CALcfOFexnQzf8JvSADky30w6+p79KORTBYoqcObPp6ivff9ml ajNz1x6aIHlHy4vRNLT2j7Uv5BToc0nm6UIKhijdK3ER2rfqYXK6JLtAuGO50f1SvY2v 8aJbkdDZ1feacjMxNxAq/KmlewYBsRX//e3WigCJF0GkVBi3rgw8B9ix9rtuPEGIMbTf JkHT1+5b+lj6tI84HHW30nMwmMEti13aq/fjbwjeJDkDzVJdB04OuGqqbpOtHvbnscuw HzsysD24qi68lijiYE29SJM5ZOAgNwJEk3IvoMv9YcfcT2ckRxxdG78AZ5LVKNJcr5ru EC2A== X-Gm-Message-State: AC+VfDwFvUY5J1C7zO0ovIK72gRJS6UWA0KzVBlqaS831zLWk+FTdtzh 6Lni5dI2SjcBVwd2DqfJIAnY7w== X-Google-Smtp-Source: ACHHUZ7i9Uo5IejiNNDJhMv1eKhCiZVnnIJJfyGnzZMigjzGlsUMnijNc1cjuVgvuJ3wRqNNAv5FXg== X-Received: by 2002:a17:903:44c:b0:1ae:4dda:c2e with SMTP id iw12-20020a170903044c00b001ae4dda0c2emr4829720plb.13.1685091211144; Fri, 26 May 2023 01:53:31 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 01:53:30 -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 1/2] mm/mm_init.c: introduce reset_memoryless_node_totalpages() Date: Fri, 26 May 2023 08:52:50 +0000 Message-Id: <20230526085251.1977-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 36175120010 X-Stat-Signature: fqkai75sn9jo9aryba8j4whd7xpe9nz7 X-Rspam-User: X-HE-Tag: 1685091212-197452 X-HE-Meta: U2FsdGVkX1/sf8Vd+xEWNPso+9nRfE+wfqTzRDsHCSDsa29cE4HAEnD34oNrirnWfPxBNRVNQ4u/tLUk666/x0iN6UmooBG8PW7VoWS6xeBzDrauDkIlfbeVO07MDWM5EPTHigpO9mgCaB6oIlRzvSb+/kxmwFcQCHDt7Br2pWiCaBsHv4FHx8Ocb5eYJJpcUlDMpy3rNdRp9/vZ1SAkLifHYuojFTgWac/Zsz2GqbYSMNorMs8pG/QB6gqIHZdRlZ2BWGJSBVyEE/aCeHjmnGtuB138TWYhmbOFL4f3MWBr/RMEqj0G+Muq0GS4Q05BgmLVLMPKGCT2eValblW3alyjCD2hRLdbz2XUBVdMIpyibG/Q5eZ0NtuUZybA7RqSVfDCgRa/VwAABD4oto7rusTlAxDHS34bdLxDEccT2Eqg18wyp+O0nqbKIk2dTilQOLMzgSanJmurgrmLRfZkvZCnazrTOxI8h8f1R66YdrXQJBLQo/v64+22z4LWvEEdm2iSq4c96VtWeig6UGI1OhkZZRmsGyomRPyZNO3v9wY427YyxQOQhIvPJcdCSlzmhjMYRsvyPHLV88ZPpqFuQiyEYkhN9j769sXeEA9tx7Hu14khlCKOhnlYerNIVwmw3fW8/zKgX5qTIkO37/vEsS431Jekbq9iBkm/rsvExbs5ONNHvK7+g7CqvBeD4RyTpdxuskzU+SgcHyF3TOvFpsm9ovUkVerReKKIllbZA5hEXSReE4AQhbMVNYLPaU/jj1gkiRtsgp0sM37oqusFYyWf01Yk0ElNNmNTsORejFFSbyZfYqQyQLGZ/VJvyUGgF0nzLpddH73j5+69GVEqstgEN5IHPJ9vb0jww937r9BlGD6Ngg3M5l2T56ramZcpIn8Lju47a6qw+AkJvi9/YdduG+FH1MbgLnHlgHKspsJowiIHtOhZhHC0F936cU1ObTWOw9lzaXcOC2f8WZ+ lbOqKYLw CtIcwqvQB1QLBAfaHkeWbeaindUzssFPTlBFPoGzqqsLdWywRWv7miw6y3ivqleG1temCGhKnCwh4eUPUXb/gN7fP27j6VJK5mEES9GSpJnFdE7hROYMCV5SI1p53aroNV4UqbYiOoFGuH6st6hbegOzLZ+kRMdRv3LGMDXQcUuGkQd00qkzPVauHJhUw8s/mIh3na09+2tZseAqvvI6U0OFD1MfE/BMW8neSE4K5pUJcQEVnX3Yfd0Nfi3B2Xf8Utc0X0QeWo5LMDAEBVqWm2lkOasEEQbwMQ7p2cWRb5EvurHhosQm3KFWPwb3Mww/QNdc3/Awxal/6J4jzPi8ThPvyoRdkCFp4VDbZuIxX+87xt7fhErPQecyvrUWfsZ3mv7udV73PEty+YZwZI3RRAN7ZokRghHTQsyF1tq10L4eMWjP8jkjP2VMj0CZtaNMGRSINrId0sVYg311Que3liyIjwf+jXFMUKJejiEST2CFiA0fHHRt1NtZVzCwbIL0UPEro 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: Currently, no matter whether a node actually has memory or not, calculate_node_totalpages() is used to account number of pages in zone/node. However, for node without memory, these unnecessary calculations can be skipped. All the zone/node page counts can be set to 0 directly. So introduce reset_memoryless_node_totalpages() to perform this action. Furthermore, calculate_node_totalpages() only gets called for the node with memory. Signed-off-by: Haifeng Xu Suggested-by: Mike Rapoport --- v2: - drop patch 2 in v1 - inroduce new function reset_memoryless_node_totalpages() - call calculate_node_totalpages only if node actually has memory --- mm/mm_init.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index 7f7f9c677854..f674e5798f7d 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1174,10 +1174,6 @@ static unsigned long __init zone_absent_pages_in_node(int nid, unsigned long zone_start_pfn, zone_end_pfn; unsigned long nr_absent; - /* When hotadd a new node from cpu_up(), the node should be empty */ - if (!node_start_pfn && !node_end_pfn) - return 0; - zone_start_pfn = clamp(node_start_pfn, zone_low, zone_high); zone_end_pfn = clamp(node_end_pfn, zone_low, zone_high); @@ -1227,9 +1223,6 @@ static unsigned long __init zone_spanned_pages_in_node(int nid, { unsigned long zone_low = arch_zone_lowest_possible_pfn[zone_type]; unsigned long zone_high = arch_zone_highest_possible_pfn[zone_type]; - /* When hotadd a new node from cpu_up(), the node should be empty */ - if (!node_start_pfn && !node_end_pfn) - return 0; /* Get the start and end of the zone */ *zone_start_pfn = clamp(node_start_pfn, zone_low, zone_high); @@ -1250,6 +1243,24 @@ static unsigned long __init zone_spanned_pages_in_node(int nid, return *zone_end_pfn - *zone_start_pfn; } +static void __init reset_memoryless_node_totalpages(struct pglist_data *pgdat) +{ + struct zone *z; + + for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++) { + z->zone_start_pfn = 0; + z->spanned_pages = 0; + z->present_pages = 0; +#if defined(CONFIG_MEMORY_HOTPLUG) + z->present_early_pages = 0; +#endif + } + + pgdat->node_spanned_pages = 0; + pgdat->node_present_pages = 0; + pr_debug("On node %d totalpages: 0\n", pgdat->node_id); +} + static void __init calculate_node_totalpages(struct pglist_data *pgdat, unsigned long node_start_pfn, unsigned long node_end_pfn) @@ -1702,11 +1713,13 @@ static void __init free_area_init_node(int nid) pr_info("Initmem setup node %d [mem %#018Lx-%#018Lx]\n", nid, (u64)start_pfn << PAGE_SHIFT, end_pfn ? ((u64)end_pfn << PAGE_SHIFT) - 1 : 0); + + calculate_node_totalpages(pgdat, start_pfn, end_pfn); } else { pr_info("Initmem setup node %d as memoryless\n", nid); - } - calculate_node_totalpages(pgdat, start_pfn, end_pfn); + reset_memoryless_node_totalpages(pgdat); + } alloc_node_mem_map(pgdat); pgdat_set_deferred_range(pgdat); -- 2.25.1