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 38CB9EB64D9 for ; Thu, 15 Jun 2023 14:20:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A963B6B0072; Thu, 15 Jun 2023 10:20:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A463F6B0074; Thu, 15 Jun 2023 10:20:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 935188E0001; Thu, 15 Jun 2023 10:20:44 -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 802B76B0072 for ; Thu, 15 Jun 2023 10:20:44 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 443B14089C for ; Thu, 15 Jun 2023 14:20:44 +0000 (UTC) X-FDA: 80905193208.01.700F853 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf02.hostedemail.com (Postfix) with ESMTP id 8FD5280024 for ; Thu, 15 Jun 2023 14:20:42 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=reIk64f9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of zhiguangni01@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhiguangni01@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686838842; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:dkim-signature; bh=7JGAswJvrN9ycwNK3V8LbKRDbgcmOmmNh+l9o4Hidpg=; b=xG6iBwWAKexYa1uCMPCLUU4EO3E5V5VgbtOv+3ENvaf/a1MDgjPGiEAmYC4gBCJ4wZakGd ABuzhP+vuT1CvsjYRqZOJeWjXXnGGuGQOvKRachNfPF7H5U2sXjEvPKXDCPXsvpPImgyNc YUkKXBTI8FvoI7NUdl1rrrtYm0xd8OU= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=reIk64f9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of zhiguangni01@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=zhiguangni01@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686838842; a=rsa-sha256; cv=none; b=xHrm6DYyX1mYZVJO10fq1GpiRXL6FT9ZJBzcwV7RMCSWcDmlUoMmYd9w7BYlf6eGg6z1+8 aF9hKo2elYs29iQ0I/xZ/Zr3K7ZRkQTISakfHlndZFwENghYLvdChrzDMHzR1gJSrl3yHA nG9gT9KytLanc0CMtG7F3GhO5cxJY3I= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6667defb5a3so1315603b3a.3 for ; Thu, 15 Jun 2023 07:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686838841; x=1689430841; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7JGAswJvrN9ycwNK3V8LbKRDbgcmOmmNh+l9o4Hidpg=; b=reIk64f9MXuAuPeWyNGo383hVNVC/u76gluY6eO7V5f/ec+hXKqIofT/ETvYjvPg0j HIJ0VrjPk7Gdmnte6rmdB2jU5na6GJXDFdTNGpOD5rLODVKI945tApGSxko9FhGTdaSj s1+DoKun9sSO3Whc1Dep5qihmEXSK6EwqN0KO0F8NcgWGeoxunariwSSn0MFZBQjgpAJ 2ESQ0jRb8VKKsN2fYU7mnODvdfX+rEeVfB7CoWNEVZWE91IFDtWD9DvGsPIMfniGtnAt pbhakwox3J2ADRdLtxAsMSl2rPmKhgOdeJqqo2R225KSeuQoZj1Fr46/MQ9VeF22Kzz+ bFKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686838841; x=1689430841; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7JGAswJvrN9ycwNK3V8LbKRDbgcmOmmNh+l9o4Hidpg=; b=GmMs5Y+6eHowV+1Yw4J6X8M/luNpeg+DElNkDbQz4yfNVZE/2wF+JHMEFajBxp0kba I14ViZh/1KRFeOhesncdsayuXJ11iy1sGcK83+JKz7qja9bYZyKx69gs0rFx3WLqhHVw DxprcTuG4DS1e/hbjmP4IIADnfD+UxbSmEaSX7sLvSmYQ788/GCAcaeku1xXJ5TzGlKV nT6l0kdSh5Wuc8lDzeJJtbX3qw/Aa05/Tqc4bW1sCw9q0x4+4+R+F45Ow5x7aFc9D/QX FPbe131Jnzb2dXShUNIejiXKk+ELUxjaewvR/amPg82+iRj9hUMp1to3JLYiv9yTKkR/ 6NDQ== X-Gm-Message-State: AC+VfDx6RKSH0D2uaPZackf+m6ULXbOPs5Xfb4H4wNeD0dPVz8o3eLRk astPxBEuWOTouZJuWCpX/CA= X-Google-Smtp-Source: ACHHUZ74ya95W5jl4Y1m5VmgCOFfbK98QmvK0eQULayH+Iq9tqGTxWC3lPlehCCJr54jmdKZYIulKg== X-Received: by 2002:a05:6a20:2d26:b0:10b:5ce1:beb9 with SMTP id g38-20020a056a202d2600b0010b5ce1beb9mr4993069pzl.33.1686838841170; Thu, 15 Jun 2023 07:20:41 -0700 (PDT) Received: from localhost.localdomain ([112.213.33.6]) by smtp.gmail.com with ESMTPSA id h25-20020aa786d9000000b0065055ad5754sm1571094pfo.64.2023.06.15.07.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 07:20:40 -0700 (PDT) From: Liam Ni To: dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, akpm@linux-foundation.org, rppt@kernel.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, zhiguangni01@gmail.com Subject: [PATCH] x86,NUMA:Get the number of ram pages directly in numa_meminfo_cover_memory() Date: Fri, 16 Jun 2023 00:20:16 +1000 Message-Id: <20230615142016.419570-1-zhiguangni01@gmail.com> X-Mailer: git-send-email 2.17.1 X-Rspamd-Queue-Id: 8FD5280024 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: dqrmg7z5s5qo1wj3qd679x3hqukia6gd X-HE-Tag: 1686838842-785011 X-HE-Meta: U2FsdGVkX19G79cIX1xbHIYPILM2xOVqnMj4schxwkgLkHsHK6qnL9keE34eGcuMBiCrV1E+z/mh2Av8uZR9tAWZdYvrmXN9gKXpp1I0tUoqWZhvKscNFnGMxGe2VpA3D9mtVM93UsKwaWHPPzIT2vb2RMl50llCX4ecyjwheBZaN2ST3KX01VZ5WDODpux2mpCwhHtvUePzX6t86cV+nOE22FaStaGZ7OMEU/L4RekvXNNjrrCf6SrSOhCJklOO5JY6OTGXE7hn1wSZ+DAemkzGc8AHwhFbfAFIl1rm/TIEFL0YDGnc7rkQ9PBKjunERl9CbRRwpJ6wEG3Si0TfFn722X1BueVcZ2hAUeKODk2uYzCcTLbXDW61CYL+mjkW+5gl2oDmxhjhXuKI2VPzC3en8kQIj33JvHN7RC1f5dPY6Rp4Q4k00ZQFEX5ewD5y/N/dvGNZLlU0ZHCrTcFFgxsV5/k78SlW48VJHY4aYWDB+QAO2sDuHuwVn8QuL9TYXxwz7CWJONdH+pSreKjdei+Ia2lUgDkhC0aULzA71a1icdkapx5bOyjmyY2tDVtK6fRCUrRCh87y3B+pRQcC9drsRkJMpG6R1A66tNZhdvgLluxx7Jzzs6E9fDV4ugqaXNLOhTc+vLlXkSQUy8B/OmYizhmLmghuAYwX7Ie0yJlriv9qaTiyFNFpvVecSvAZrqTyadjH+BDuc2k+hgTmG0FyLjVQgoJkd1mmMThvtMeJvhQ67ZMkAfqRC/0ir2g34SyVciK1UuTh4AIxLflReBUdN0DySsC8d6qlR9kuwHskZz7n+NAAZ0bCLVpp2E1QazR8en71N7I2mzsglbHS1DcLa7OFzCnVty9lBs0qnqdA0pEvnCq7Zg09TTycvrPvhEsqlaJGt9E5NrAijpJRoCHWjuOnFH4ttN5DsGwglB7rqr72MXyMpxC0qBZEJdWD7yACZgbyfo6vKErUZlA 6s0Ojl6N Lv0mIsLR+Ic5xzK2ToTlH/MB/cL30TjwFe7kfM/+Z9ofuDlt62uAog7acawAzSEWZm0PTAZXb7u3Y6OZwlnvnG4WyeEEAM/z+/lwK2K/xAHl3+PxFJ+u2TTE7AkVsa1aCTAnC2hLW6NpiVvFJt2y6i6r2pcdHA5gUCfkk3KFcRn3IHWCI2TUXN8V1417t0YOavyuv0um9JgcNQMmjuq6z+U/y/lrDPAEX50zjG5FykLbMUCSv3/krRyhRzPJBwheevv5fw3iIXdN7pr/hwYqkTHQ33by0jpKTqBD5ji7e5Gh+vuevxaYqc0LdOFILOHPJuU1AXAPOSZ/k953k5rOKfVhk9QAhg4kKTVqvSxmflZng/YZ4sPWbctGQkW5eNezTBQkk6cRub818OegtOZfS+tGznOHTAact4572fzCTBe57+v7oq8LcNj3TsbbInL3Lb6io8JOrJaNI29U= 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 a previous implementation,The ram page is calculated by counting the number of holes, however,the number of ram pages is calculated during hole calculation. Therefore,we can directly calculate the amount of ram pages. Signed-off-by: Liam Ni --- arch/x86/mm/numa.c | 4 ++-- include/linux/mm.h | 4 ++++ mm/mm_init.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 2aadb2019b4f..8ea0e956e3d7 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -461,12 +461,12 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi) 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); + numaram += __available_pages_in_range(mi->blk[i].nid, s, e); if ((s64)numaram < 0) numaram = 0; } - e820ram = max_pfn - absent_pages_in_range(0, max_pfn); + e820ram = available_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))) { diff --git a/include/linux/mm.h b/include/linux/mm.h index 0daef3f2f029..f7f8c3476d1e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3041,8 +3041,12 @@ void free_area_init(unsigned long *max_zone_pfn); unsigned long node_map_pfn_alignment(void); unsigned long __absent_pages_in_range(int nid, unsigned long start_pfn, unsigned long end_pfn); +unsigned long __available_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 available_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..33451afbc040 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1165,6 +1165,39 @@ unsigned long __init absent_pages_in_range(unsigned long start_pfn, return __absent_pages_in_range(MAX_NUMNODES, start_pfn, end_pfn); } +/* + * Return the number of avalible pages in a range on a node. If nid is MAX_NUMNODES, + * then all avalible pages in the requested range will be accounted for. + */ +unsigned long __init __available_pages_in_range(int nid, + unsigned long range_start_pfn, + unsigned long range_end_pfn) +{ + unsigned long nr_avalible; + unsigned long start_pfn, end_pfn; + int i; + + for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, NULL) { + start_pfn = clamp(start_pfn, range_start_pfn, range_end_pfn); + end_pfn = clamp(end_pfn, range_start_pfn, range_end_pfn); + nr_avalible += end_pfn - start_pfn; + } + return nr_avalible; +} + +/** + * available_pages_in_range - Return the number of available page frames within a range + * @start_pfn: The start PFN to start searching for holes + * @end_pfn: The end PFN to stop searching for holes + * + * Return: the number of available pages frames within a range. + */ +unsigned long __init available_pages_in_range(unsigned long start_pfn, + unsigned long end_pfn) +{ + return __available_pages_in_range(MAX_NUMNODES, start_pfn, end_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, -- 2.25.1