From patchwork Mon Jun 19 07:53:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Ni X-Patchwork-Id: 13284067 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 4CD25EB64D9 for ; Mon, 19 Jun 2023 07:53:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A09B08D0002; Mon, 19 Jun 2023 03:53:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B9728D0001; Mon, 19 Jun 2023 03:53:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 880EC8D0002; Mon, 19 Jun 2023 03:53:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 76A1F8D0001 for ; Mon, 19 Jun 2023 03:53:32 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3D5E81C8077 for ; Mon, 19 Jun 2023 07:53:32 +0000 (UTC) X-FDA: 80918732664.21.317C8C8 Received: from mail-ua1-f47.google.com (mail-ua1-f47.google.com [209.85.222.47]) by imf22.hostedemail.com (Postfix) with ESMTP id 82F78C0017 for ; Mon, 19 Jun 2023 07:53:30 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=gaS1jmYQ; spf=pass (imf22.hostedemail.com: domain of zhiguangni01@gmail.com designates 209.85.222.47 as permitted sender) smtp.mailfrom=zhiguangni01@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687161210; 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=8UZlSaz+w1Ep6SIUPTI+QMgqBAsFAMeLh04/7pzE/p4=; b=ID+26/po+GWr8UBWXpn53XTVIMXp1H9mTDtrO9i+YsMoqWNANk9K60TEuHrKqziPnXuyhn UJMhJtLbK1BEiBKcy1v8hG5k/VZ/SmDU8GSSUMScXcwcfDYtZAlS8e4T6ZCfZSyyRl5S9P eVJNDS3Ekya3kpBxutAhWj6q8EyLtTw= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=gaS1jmYQ; spf=pass (imf22.hostedemail.com: domain of zhiguangni01@gmail.com designates 209.85.222.47 as permitted sender) smtp.mailfrom=zhiguangni01@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687161210; a=rsa-sha256; cv=none; b=XqLBV0zbzAjFiv71AyOWSl6g9upiZm7tmIMcLEKuyeObAbOyDrTNmi2v5QX/ftDxvvBFRz rKf0vBrya5ysu/lN+oPegMdoMJGNUdtSFD+KH4QDHBxsIHd16fZkUmtCRne/r1XPtJPo6M wBmQiPyII4WTL2eeFjDBt8Vs2+qXwRA= Received: by mail-ua1-f47.google.com with SMTP id a1e0cc1a2514c-78cbc37c5b1so1091397241.0 for ; Mon, 19 Jun 2023 00:53:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687161209; x=1689753209; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8UZlSaz+w1Ep6SIUPTI+QMgqBAsFAMeLh04/7pzE/p4=; b=gaS1jmYQocQ5Low42uqy1uu8BIYiK7iIAgslOlZ1stML68LicHlPg2jsBamInq2BJD Tj94I/Wve8/kIzE/Iq0AMwKVEaJRTrRK8yBXZwqthP6Z7PeIc2RWG10fSgIb/y3yEovC h9NmNdXBH6ls/C/eBQKzeVvESlAY2wdC1uuVvR+brH3OoSRO2qmkCXCY1CGNYvXAsr+P 8YalDBuheshC4YoySLmJZ6DYtu8uSxQMrttFyMBb8/Xgzlg8MriKnlkczJ6GkO4eSfjB 4qZWi7SA92tFyICsd2LRiYCjj1wF/WrLGXYTbzGQ4//pNPoNLW0E1iJ+YvedWMOzOcIU MP6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687161209; x=1689753209; 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=8UZlSaz+w1Ep6SIUPTI+QMgqBAsFAMeLh04/7pzE/p4=; b=BAVdAy+53B3vHiY1M65+B4xK9LntWbdQnVWTBYADb0Dt15e7f4o5NDpFXDIoLJyqS+ CRzKb8pi2aVL/4CKNxEvfJ56Q7zzAseQHKJWUMdOKUgyK66ETR53FuCALiL9B7u5s2nB iQVQO6iAkT8KXq9TvXhL2t6BnOoJ6rJpZF3h1kI7HZvBKc2LvgjGaAU1sAV8DUYj2uGM EZ8z88s3kzG1Q6QFTKpMP6IS9FNyYxbQiEmBcg7lNjf1ZBMjV2tRpK3HLJdRAMGenVbL H3ykfb7vWhe31u3JlchxIDgAMW2spxhSA424E7ta+X/7S0KpdSydrUBjK5VWidGrQ0nE 22Vw== X-Gm-Message-State: AC+VfDwYfW+ePg3KYZiABGqfPYcxHNXa2G7aKheexjWohrdZ9zxXKFHI 34OCx2wu9Qvb9dai/iVqamI= X-Google-Smtp-Source: ACHHUZ7yyK1KcTiOqifjXZkPEx/BmkMtda9+pqKpPvFV1opxUumLsltZ3UP2vEhI5yUn8tjOCUvVXg== X-Received: by 2002:a05:6102:98:b0:440:ad55:a589 with SMTP id t24-20020a056102009800b00440ad55a589mr775290vsp.12.1687161209483; Mon, 19 Jun 2023 00:53:29 -0700 (PDT) Received: from aa-PC.zhaoxin.com ([180.169.121.82]) by smtp.gmail.com with ESMTPSA id n14-20020a635c4e000000b004fbd91d9716sm17819965pgm.15.2023.06.19.00.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 00:53:28 -0700 (PDT) From: Liam Ni To: rppt@kernel.org Cc: dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Liam Ni Subject: [PATCH V2] x86,NUMA:improve the execution efficiency of numa_meminfo_cover_memory() Date: Mon, 19 Jun 2023 15:53:15 +0800 Message-Id: <20230619075315.49114-1-zhiguangni01@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: 82F78C0017 X-Rspam-User: X-Stat-Signature: om9beh1iqqij9a8u1epekyiargnt5rrr X-Rspamd-Server: rspam01 X-HE-Tag: 1687161210-241703 X-HE-Meta: U2FsdGVkX1+mmWHgP3s+xJxlCiCafkD+20cbXxHC90cKEvkcsiX3cBjdLnEeykjNu8yqHd0DWu2hJUVobLVtQD5B8hCmObRpbvM9NSyevxsUbYSReY383LamfWOuNcoHK42KYVlWhNJVzWZP0ab3C1q7T3N3SEGbETzB9hKUeEfEHvADpLoDGREMX+QDJCU2aC4QRdFku+XmXa9R43GMvRPmL6xOerL2FOXfQM3Lu9A5AS6i5VOtyA97Qwf7mWVB9ePHWh1FaoSKlHE+gVmvfOn/dKahcyxkOnSuaq99n2u+W1WhFNCLpHvqP2NTVOvOPJYqt+nHxu7SnCYTyLSMq8BE9AxLRguqqjEkjuVgIU9/XDYBJ2h+QTLKtONHM6MkLU6ruysYg2E6P9XHXHPmQsJtkvFmek3GGOB5P8tZUTQXWXDSdfT9D7Rfbr2XUnTqTx8omy//JHk++TrDl27J2ocWq0WYCysKy4PkP89Rzd8klKymA8jzUF9j8FaYZJ6Vb/7SQTs+ovuuw8iAVC1Y7b+2lKXTpLBYny2kUiEkGGzFDyaEHxx/0R8cyEWMMkB4utIBkKzl92Hkbjrgv/jbGuFw14US/OEcjqrSUtFBqmbHjc5dmkZdCxicqCIX7N5XzhB84yfejUi7Sp6DoY2L/RZyIrOgLwXgMLtLt7oT5qPd/ZzRHlTLWSbXNXUB8TMKBONmhwBrEV/kDX6sv82nw/vTsoqgFay+Nk91XZY9eXILgrquFIpO38QJWdfAkbWMrpev3VgWctk86+FBSoMGFIl2Ao/ZL+uPbrIiFxvKxhUhA2QYvJdiOjPN8Rwx6OGTTms0dkkQFgzQ2ZqIpa6KOawqjTgmeAOVBZoDlwiSZDVKblpnMWaq4k+ZuxxdnD9+InormjoYAQyTi8Qn1oFa5KUVpvd1jnXfo59nSf2ysT+2/fDWt8UpCO7x48V0Kx3ofeKZvRbsa7+j+otPkIn nnZGNMX2 Q9HjvLeLQEejVQB14WRQ5SAimgl0NrtkZsevNwSR7d1j5iKQHLzAA/eHHCRuuys+Tydj6QAsVMuxgzyoimEceoXOZF8quCWfmu/1rtosoVWCyVpw8oGGVESSm3MYlftjg6G1CVf3lVPxGFWQN3sSVMw3SekvYv3elBEGg//QUVI98FC2uMs7PyltftYa7VmRnZaqYnWHc9uGo3YUy5+duGiSdkli8c41OH7SJHaS9kCDETd20oZKOn7hrl2BfQiliNec5BI2+7WOc3nEISDPqj7YUDwnLAjeKVMoKCQI5IdjnZDaPQuIaqH7GR1zyMvvJd/FLEv9W2AVaFPqV9TSfMe+KxYX0pdVNcYOby8AUHWWIgTeeoOi8I3AqgHD546GKhITksKjczoF4tBOa9S6uTCOW4aHSyv0EJubOyrG818ZTw8Tdnhmd1vSu47/pAaLkvQ5BSx7fmFSZXL3ep1rbRInH4gyyDLyU3t5ziiPg5o1MgsU= 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: The number of pages in memblock that doesn't have the node assigned,which also means that these pages are not in numa_info. So these pages can represent the number of lose pages. Signed-off-by: Liam Ni --- arch/x86/mm/numa.c | 25 ++++++------------------- include/linux/mm.h | 2 ++ mm/mm_init.c | 26 ++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 2aadb2019b4f..ffe3b771eac7 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -451,28 +451,15 @@ EXPORT_SYMBOL(__node_distance); * Sanity check to catch more bad NUMA configurations (they are amazingly * common). Make sure the nodes cover all memory. */ -static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi) +static bool __init numa_meminfo_cover_memory(void) { - u64 numaram, e820ram; - int i; - - numaram = 0; - for (i = 0; i < mi->nr_blks; i++) { - u64 s = mi->blk[i].start >> PAGE_SHIFT; - u64 e = mi->blk[i].end >> PAGE_SHIFT; - numaram += e - s; - numaram -= __absent_pages_in_range(mi->blk[i].nid, s, e); - if ((s64)numaram < 0) - numaram = 0; - } + u64 lo_pages; - e820ram = max_pfn - absent_pages_in_range(0, max_pfn); + lo_pages = without_node_pages_in_range(0, max_pfn); /* We seem to lose 3 pages somewhere. Allow 1M of slack. */ - if ((s64)(e820ram - numaram) >= (1 << (20 - PAGE_SHIFT))) { - printk(KERN_ERR "NUMA: nodes only cover %LuMB of your %LuMB e820 RAM. Not used.\n", - (numaram << PAGE_SHIFT) >> 20, - (e820ram << PAGE_SHIFT) >> 20); + if (lo_pages >= (1 << (20 - PAGE_SHIFT))) { + printk(KERN_ERR "NUMA: we lose more than 1M pages\n"); return false; } return true; @@ -583,7 +570,7 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) return -EINVAL; } } - if (!numa_meminfo_cover_memory(mi)) + if (!numa_meminfo_cover_memory()) return -EINVAL; /* Finally register nodes. */ diff --git a/include/linux/mm.h b/include/linux/mm.h index 0daef3f2f029..99b7b49f1378 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3043,6 +3043,8 @@ unsigned long __absent_pages_in_range(int nid, unsigned long start_pfn, unsigned long end_pfn); extern unsigned long absent_pages_in_range(unsigned long start_pfn, unsigned long end_pfn); +extern unsigned long without_node_pages_in_range(unsigned long start_pfn, + unsigned long end_pfn); extern void get_pfn_range_for_nid(unsigned int nid, unsigned long *start_pfn, unsigned long *end_pfn); diff --git a/mm/mm_init.c b/mm/mm_init.c index 3ddd18a89b66..1d5085a8f93b 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1132,6 +1132,32 @@ static void __init adjust_zone_range_for_zone_movable(int nid, } } +/** + * @start_pfn: The start PFN to start searching for holes + * @end_pfn: The end PFN to stop searching for holes + * + * Return: Return the number of page frames without node assigned within a range. + */ +unsigned long __init without_node_pages_in_range(unsigned long start_pfn, + unsigned long end_pfn) +{ + struct memblock_type *type = &memblock.memory; + struct memblock_region *r; + unsigned long num_pages; + int i, nid; + + for (i = 0; i < type->cnt; i++) { + r = &type->regions[i]; + nid = memblock_get_region_node(r); + + if (PFN_UP(r->base) >= PFN_DOWN(r->base + r->size)) + continue; + if (nid == NUMA_NO_NODE) + num_pages += PFN_DOWN(r->base + r->size) - PFN_UP(r->base); + } + return num_pages; +} + /* * Return the number of holes in a range on a node. If nid is MAX_NUMNODES, * then all holes in the requested range will be accounted for.