From nobody Mon Feb 9 09:10:00 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AF192222B6 for ; Thu, 1 May 2025 22:55:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746140114; cv=none; b=kVPUWK43bjaY+1vylHWaJJih3xZDm/cVN9D+D4Nk2Q7O1OQ+XcN44p9Px41KQayJd6AESQ15/bB5ws1c0gnuRIjowTx9U4yKbCOc2Zyw4f6Ogq6JRrbTfLETH3ickoVvGLB7lEbDBrZ8ccwpoBrn9TFdoI9S29VtwP0lfsIRffw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746140114; c=relaxed/simple; bh=lQ1JeZDfXRw0ewSvT/LjA5UvDXuaPjmgOYM4YIi+KGs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XZ69Vw5icIvEhhJeV+iBhhynkq9mnqelPit5D9cdQ9rghkALV6gGMFOwjOKonBDtioWu8yLM1SJ/JEcU0WDxdfT5ZTqVMypowxNUuWULoa9OIRdAmq0pUcUh0rGf9cuIErmDrDQSH8WHtx0D7IIisLadGrPGsRIm6qY83y4TqJ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--changyuanl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=cFds3ZvW; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--changyuanl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="cFds3ZvW" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ff52e1c56fso2114421a91.2 for ; Thu, 01 May 2025 15:55:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1746140110; x=1746744910; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=IBXx3gMWZ4e1/486vCXXB36Jvx0Iv06j/aSQbPFzpYQ=; b=cFds3ZvWePDKwllv/bNV2FtVpdk8WsKaiTC7aKOm+L0NoT1DBBmA7KTd73fFuf42lF 3gE5Vyao9vTAqSuq3lO/KesofqJ3h/rH3OaRmdGu64gTQ1kWtYvGo9SxUG9hEykS9RHW cx4HDwEYzDTX3Qr6tO6GFg0fODI8hW9IO50i9fCsfPTI+QAWWs8xuBh+gWEvgdaozVhe +irRXUe9z9+1vW2ocO28JC904xCdUAkpJxW9QTVy1VO3CU+tergbgCmDigZ6nAbuXuw1 uzUr+bJGue7DGMuiO4N6n5WcxRouIgMv3kPCKEFiod32yh8VD9z5Lzz2jvuIF0hRGtz1 i0tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140110; x=1746744910; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IBXx3gMWZ4e1/486vCXXB36Jvx0Iv06j/aSQbPFzpYQ=; b=dfyeEITKMDaB7b7t+fYzEghiFRK26VIdMRzPN5abtDkRRqL4+kzRSo37jJxm0x6V7w fG6JhR3FgVbli+qtv5vwfktOtNTsBABYMow6xeE7yRuDceMAJNwiBttE9W0/La5YY7xl lrM93Jo9dg0H3ev1WESkqo48Lr26TFTrxZbMeYBhL7pOQ516zDtSCsiSe1uibs5lBGfl bNbSJCS/tzH5KXtE1Q1qXWax2oJ7g84OcoSXXz58bBZZB8ciGbb6hAAhvDqKFU9EA6ym +1mPesXr1G73GpMWVZ9hbLdJpmbs2urVd5emx6zYYqdXzP9aqYmFCjVbSh2lyRWdUofA LJlg== X-Gm-Message-State: AOJu0Yy4V69Blg1JpzVYJCgml2cfVEbe4MB2znEAy0++F6OVGagZq8mE v4LRQKi4/ngQoMoknKD1OCmxnfL68xJ0jKkVl/BBTZzo03Bv6bHGRcQ6p5sliIKTUMd5B9kOsMm +JNrjqbUshQCA3lmdtPTY2rZjTfeyrXZH7E1BZu4OprzyXmZfQ6AWCBMuKubA3CPiCnkHXdgOE0 ac7xT4l2PwaaXt1g/vq/wJcI8lNj1hMc8rTxqzzutKEySOjKfQeyTY04inTZUu7Q== X-Google-Smtp-Source: AGHT+IF6wVLtGXo1h2D9rxsxB3YBB2fff/f8/QAEMXAEMlSh64adupjEsddmCTy7JT42/bhVOMWpHxt5OhuYLHRn X-Received: from pjbnc3.prod.google.com ([2002:a17:90b:37c3:b0:301:a339:b558]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:58ee:b0:2fe:b8b9:5aa6 with SMTP id 98e67ed59e1d1-30a4e6971ebmr1189853a91.31.1746140110497; Thu, 01 May 2025 15:55:10 -0700 (PDT) Date: Thu, 1 May 2025 15:54:08 -0700 In-Reply-To: <20250501225425.635167-1-changyuanl@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250501225425.635167-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.906.g1f30a19c02-goog Message-ID: <20250501225425.635167-2-changyuanl@google.com> Subject: [PATCH v7 01/18] memblock: add MEMBLOCK_RSRV_KERN flag From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: changyuanl@google.com, akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Mike Rapoport (Microsoft)" to denote areas that were reserved for kernel use either directly with memblock_reserve_kern() or via memblock allocations. Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- include/linux/memblock.h | 19 ++++++++- mm/memblock.c | 40 +++++++++++++++---- tools/testing/memblock/tests/alloc_api.c | 22 +++++----- .../memblock/tests/alloc_helpers_api.c | 4 +- tools/testing/memblock/tests/alloc_nid_api.c | 20 +++++----- 5 files changed, 73 insertions(+), 32 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index ef5a1ecc6e595..6c00fbc085132 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -42,6 +42,9 @@ extern unsigned long long max_possible_pfn; * kernel resource tree. * @MEMBLOCK_RSRV_NOINIT: memory region for which struct pages are * not initialized (only for reserved regions). + * @MEMBLOCK_RSRV_KERN: memory region that is reserved for kernel use, + * either explictitly with memblock_reserve_kern() or via memblock + * allocation APIs. All memblock allocations set this flag. */ enum memblock_flags { MEMBLOCK_NONE =3D 0x0, /* No special request */ @@ -50,6 +53,7 @@ enum memblock_flags { MEMBLOCK_NOMAP =3D 0x4, /* don't add to kernel direct mapping */ MEMBLOCK_DRIVER_MANAGED =3D 0x8, /* always detected via a driver */ MEMBLOCK_RSRV_NOINIT =3D 0x10, /* don't initialize struct pages */ + MEMBLOCK_RSRV_KERN =3D 0x20, /* memory reserved for kernel use */ }; =20 /** @@ -116,7 +120,19 @@ int memblock_add_node(phys_addr_t base, phys_addr_t si= ze, int nid, int memblock_add(phys_addr_t base, phys_addr_t size); int memblock_remove(phys_addr_t base, phys_addr_t size); int memblock_phys_free(phys_addr_t base, phys_addr_t size); -int memblock_reserve(phys_addr_t base, phys_addr_t size); +int __memblock_reserve(phys_addr_t base, phys_addr_t size, int nid, + enum memblock_flags flags); + +static __always_inline int memblock_reserve(phys_addr_t base, phys_addr_t = size) +{ + return __memblock_reserve(base, size, NUMA_NO_NODE, 0); +} + +static __always_inline int memblock_reserve_kern(phys_addr_t base, phys_ad= dr_t size) +{ + return __memblock_reserve(base, size, NUMA_NO_NODE, MEMBLOCK_RSRV_KERN); +} + #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP int memblock_physmem_add(phys_addr_t base, phys_addr_t size); #endif @@ -476,6 +492,7 @@ static inline __init_memblock bool memblock_bottom_up(v= oid) =20 phys_addr_t memblock_phys_mem_size(void); phys_addr_t memblock_reserved_size(void); +phys_addr_t memblock_reserved_kern_size(phys_addr_t limit, int nid); unsigned long memblock_estimated_nr_free_pages(void); phys_addr_t memblock_start_of_DRAM(void); phys_addr_t memblock_end_of_DRAM(void); diff --git a/mm/memblock.c b/mm/memblock.c index 0a53db4d9f7be..2dc95ecdee5ce 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -492,7 +492,7 @@ static int __init_memblock memblock_double_array(struct= memblock_type *type, * needn't do it */ if (!use_slab) - BUG_ON(memblock_reserve(addr, new_alloc_size)); + BUG_ON(memblock_reserve_kern(addr, new_alloc_size)); =20 /* Update slab flag */ *in_slab =3D use_slab; @@ -642,7 +642,7 @@ static int __init_memblock memblock_add_range(struct me= mblock_type *type, #ifdef CONFIG_NUMA WARN_ON(nid !=3D memblock_get_region_node(rgn)); #endif - WARN_ON(flags !=3D rgn->flags); + WARN_ON(flags !=3D MEMBLOCK_NONE && flags !=3D rgn->flags); nr_new++; if (insert) { if (start_rgn =3D=3D -1) @@ -902,14 +902,15 @@ int __init_memblock memblock_phys_free(phys_addr_t ba= se, phys_addr_t size) return memblock_remove_range(&memblock.reserved, base, size); } =20 -int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) +int __init_memblock __memblock_reserve(phys_addr_t base, phys_addr_t size, + int nid, enum memblock_flags flags) { phys_addr_t end =3D base + size - 1; =20 - memblock_dbg("%s: [%pa-%pa] %pS\n", __func__, - &base, &end, (void *)_RET_IP_); + memblock_dbg("%s: [%pa-%pa] nid=3D%d flags=3D%x %pS\n", __func__, + &base, &end, nid, flags, (void *)_RET_IP_); =20 - return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0= ); + return memblock_add_range(&memblock.reserved, base, size, nid, flags); } =20 #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP @@ -1460,14 +1461,14 @@ phys_addr_t __init memblock_alloc_range_nid(phys_ad= dr_t size, again: found =3D memblock_find_in_range_node(size, align, start, end, nid, flags); - if (found && !memblock_reserve(found, size)) + if (found && !__memblock_reserve(found, size, nid, MEMBLOCK_RSRV_KERN)) goto done; =20 if (numa_valid_node(nid) && !exact_nid) { found =3D memblock_find_in_range_node(size, align, start, end, NUMA_NO_NODE, flags); - if (found && !memblock_reserve(found, size)) + if (found && !memblock_reserve_kern(found, size)) goto done; } =20 @@ -1752,6 +1753,28 @@ phys_addr_t __init_memblock memblock_reserved_size(v= oid) return memblock.reserved.total_size; } =20 +phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit,= int nid) +{ + struct memblock_region *r; + phys_addr_t total =3D 0; + + for_each_reserved_mem_region(r) { + phys_addr_t size =3D r->size; + + if (r->base > limit) + break; + + if (r->base + r->size > limit) + size =3D limit - r->base; + + if (nid =3D=3D memblock_get_region_node(r) || !numa_valid_node(nid)) + if (r->flags & MEMBLOCK_RSRV_KERN) + total +=3D size; + } + + return total; +} + /** * memblock_estimated_nr_free_pages - return estimated number of free pages * from memblock point of view @@ -2441,6 +2464,7 @@ static const char * const flagname[] =3D { [ilog2(MEMBLOCK_NOMAP)] =3D "NOMAP", [ilog2(MEMBLOCK_DRIVER_MANAGED)] =3D "DRV_MNG", [ilog2(MEMBLOCK_RSRV_NOINIT)] =3D "RSV_NIT", + [ilog2(MEMBLOCK_RSRV_KERN)] =3D "RSV_KERN", }; =20 static int memblock_debug_show(struct seq_file *m, void *private) diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/membl= ock/tests/alloc_api.c index 68f1a75cd72c4..c55f67dd367d0 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -134,7 +134,7 @@ static int alloc_top_down_before_check(void) PREFIX_PUSH(); setup_memblock(); =20 - memblock_reserve(memblock_end_of_DRAM() - total_size, r1_size); + memblock_reserve_kern(memblock_end_of_DRAM() - total_size, r1_size); =20 allocated_ptr =3D run_memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 @@ -182,7 +182,7 @@ static int alloc_top_down_after_check(void) =20 total_size =3D r1.size + r2_size; =20 - memblock_reserve(r1.base, r1.size); + memblock_reserve_kern(r1.base, r1.size); =20 allocated_ptr =3D run_memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 @@ -231,8 +231,8 @@ static int alloc_top_down_second_fit_check(void) =20 total_size =3D r1.size + r2.size + r3_size; =20 - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); =20 allocated_ptr =3D run_memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 @@ -285,8 +285,8 @@ static int alloc_in_between_generic_check(void) =20 total_size =3D r1.size + r2.size + r3_size; =20 - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); =20 allocated_ptr =3D run_memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 @@ -422,7 +422,7 @@ static int alloc_limited_space_generic_check(void) setup_memblock(); =20 /* Simulate almost-full memory */ - memblock_reserve(memblock_start_of_DRAM(), reserved_size); + memblock_reserve_kern(memblock_start_of_DRAM(), reserved_size); =20 allocated_ptr =3D run_memblock_alloc(available_size, SMP_CACHE_BYTES); =20 @@ -608,7 +608,7 @@ static int alloc_bottom_up_before_check(void) PREFIX_PUSH(); setup_memblock(); =20 - memblock_reserve(memblock_start_of_DRAM() + r1_size, r2_size); + memblock_reserve_kern(memblock_start_of_DRAM() + r1_size, r2_size); =20 allocated_ptr =3D run_memblock_alloc(r1_size, SMP_CACHE_BYTES); =20 @@ -655,7 +655,7 @@ static int alloc_bottom_up_after_check(void) =20 total_size =3D r1.size + r2_size; =20 - memblock_reserve(r1.base, r1.size); + memblock_reserve_kern(r1.base, r1.size); =20 allocated_ptr =3D run_memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 @@ -705,8 +705,8 @@ static int alloc_bottom_up_second_fit_check(void) =20 total_size =3D r1.size + r2.size + r3_size; =20 - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); =20 allocated_ptr =3D run_memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testi= ng/memblock/tests/alloc_helpers_api.c index 3ef9486da8a09..e5362cfd2ff30 100644 --- a/tools/testing/memblock/tests/alloc_helpers_api.c +++ b/tools/testing/memblock/tests/alloc_helpers_api.c @@ -163,7 +163,7 @@ static int alloc_from_top_down_no_space_above_check(voi= d) min_addr =3D memblock_end_of_DRAM() - SMP_CACHE_BYTES * 2; =20 /* No space above this address */ - memblock_reserve(min_addr, r2_size); + memblock_reserve_kern(min_addr, r2_size); =20 allocated_ptr =3D memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr); =20 @@ -199,7 +199,7 @@ static int alloc_from_top_down_min_addr_cap_check(void) start_addr =3D (phys_addr_t)memblock_start_of_DRAM(); min_addr =3D start_addr - SMP_CACHE_BYTES * 3; =20 - memblock_reserve(start_addr + r1_size, MEM_SIZE - r1_size); + memblock_reserve_kern(start_addr + r1_size, MEM_SIZE - r1_size); =20 allocated_ptr =3D memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr); =20 diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/m= emblock/tests/alloc_nid_api.c index 49bb416d34ffc..562e4701b0e02 100644 --- a/tools/testing/memblock/tests/alloc_nid_api.c +++ b/tools/testing/memblock/tests/alloc_nid_api.c @@ -324,7 +324,7 @@ static int alloc_nid_min_reserved_generic_check(void) min_addr =3D max_addr - r2_size; reserved_base =3D min_addr - r1_size; =20 - memblock_reserve(reserved_base, r1_size); + memblock_reserve_kern(reserved_base, r1_size); =20 allocated_ptr =3D run_memblock_alloc_nid(r2_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -374,7 +374,7 @@ static int alloc_nid_max_reserved_generic_check(void) max_addr =3D memblock_end_of_DRAM() - r1_size; min_addr =3D max_addr - r2_size; =20 - memblock_reserve(max_addr, r1_size); + memblock_reserve_kern(max_addr, r1_size); =20 allocated_ptr =3D run_memblock_alloc_nid(r2_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -436,8 +436,8 @@ static int alloc_nid_top_down_reserved_with_space_check= (void) min_addr =3D r2.base + r2.size; max_addr =3D r1.base; =20 - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); =20 allocated_ptr =3D run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -499,8 +499,8 @@ static int alloc_nid_reserved_full_merge_generic_check(= void) min_addr =3D r2.base + r2.size; max_addr =3D r1.base; =20 - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); =20 allocated_ptr =3D run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -563,8 +563,8 @@ static int alloc_nid_top_down_reserved_no_space_check(v= oid) min_addr =3D r2.base + r2.size; max_addr =3D r1.base; =20 - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); =20 allocated_ptr =3D run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -909,8 +909,8 @@ static int alloc_nid_bottom_up_reserved_with_space_chec= k(void) min_addr =3D r2.base + r2.size; max_addr =3D r1.base; =20 - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); =20 allocated_ptr =3D run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, --=20 2.49.0.906.g1f30a19c02-goog