From: Mike Rapoport <rppt@kernel•org>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Alexander Potapenko <glider@google•com>,
Alexander Viro <viro@zeniv•linux.org.uk>,
Andreas Larsson <andreas@gaisler•com>,
Ard Biesheuvel <ardb@kernel•org>, Borislav Petkov <bp@alien8•de>,
Brendan Jackman <jackmanb@google•com>,
"Christophe Leroy (CS GROUP)" <chleroy@kernel•org>,
Catalin Marinas <catalin.marinas@arm•com>,
Christian Brauner <brauner@kernel•org>,
"David S. Miller" <davem@davemloft•net>,
Dave Hansen <dave.hansen@linux•intel.com>,
David Hildenbrand <david@kernel•org>,
Dmitry Vyukov <dvyukov@google•com>,
Ilias Apalodimas <ilias.apalodimas@linaro•org>,
Ingo Molnar <mingo@redhat•com>, Jan Kara <jack@suse•cz>,
Johannes Weiner <hannes@cmpxchg•org>,
"Liam R. Howlett" <Liam.Howlett@oracle•com>,
Lorenzo Stoakes <lorenzo.stoakes@oracle•com>,
Madhavan Srinivasan <maddy@linux•ibm.com>,
Marco Elver <elver@google•com>,
Marek Szyprowski <m.szyprowski@samsung•com>,
Masami Hiramatsu <mhiramat@kernel•org>,
Michael Ellerman <mpe@ellerman•id.au>,
Michal Hocko <mhocko@suse•com>, Mike Rapoport <rppt@kernel•org>,
Nicholas Piggin <npiggin@gmail•com>,
"H. Peter Anvin" <hpa@zytor•com>, Rob Herring <robh@kernel•org>,
Robin Murphy <robin.murphy@arm•com>,
Saravana Kannan <saravanak@kernel•org>,
Suren Baghdasaryan <surenb@google•com>,
Thomas Gleixner <tglx@kernel•org>,
Vlastimil Babka <vbabka@kernel•org>,
Will Deacon <will@kernel•org>, Zi Yan <ziy@nvidia•com>,
devicetree@vger•kernel.org, iommu@lists•linux.dev,
kasan-dev@googlegroups•com, linux-arm-kernel@lists•infradead.org,
linux-efi@vger•kernel.org, linux-fsdevel@vger•kernel.org,
linux-kernel@vger•kernel.org, linux-mm@kvack•org,
linux-trace-kernel@vger•kernel.org,
linuxppc-dev@lists•ozlabs.org, sparclinux@vger•kernel.org,
x86@kernel•org
Subject: [PATCH v2 6/9] memblock: extract page freeing from free_reserved_area() into a helper
Date: Mon, 23 Mar 2026 09:48:33 +0200 [thread overview]
Message-ID: <20260323074836.3653702-7-rppt@kernel.org> (raw)
In-Reply-To: <20260323074836.3653702-1-rppt@kernel.org>
From: "Mike Rapoport (Microsoft)" <rppt@kernel•org>
There are two functions that release pages to the buddy allocator late in
the boot: free_reserved_area() and memblock_free_late().
Currently they are using different underlying functionality,
free_reserved_area() runs each page being freed via free_reserved_page()
and memblock_free_late() uses memblock_free_pages() -> __free_pages_core(),
but in the end they both boil down to a loop that frees a range page by
page.
Extract the loop frees pages from free_reserved_area() into a helper and
use that helper in memblock_free_late().
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel•org>
---
mm/memblock.c | 55 +++++++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 26 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index eb086724802a..ccdf3d225626 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -893,26 +893,12 @@ int __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size)
return memblock_remove_range(&memblock.memory, base, size);
}
-unsigned long free_reserved_area(void *start, void *end, int poison, const char *s)
+static unsigned long __free_reserved_area(phys_addr_t start, phys_addr_t end,
+ int poison)
{
- phys_addr_t start_pa, end_pa;
unsigned long pages = 0, pfn;
- /*
- * end is the first address past the region and it may be beyond what
- * __pa() or __pa_symbol() can handle.
- * Use the address included in the range for the conversion and add
- * back 1 afterwards.
- */
- if (__is_kernel((unsigned long)start)) {
- start_pa = __pa_symbol(start);
- end_pa = __pa_symbol(end - 1) + 1;
- } else {
- start_pa = __pa(start);
- end_pa = __pa(end - 1) + 1;
- }
-
- for_each_valid_pfn(pfn, PFN_UP(start_pa), PFN_DOWN(end_pa)) {
+ for_each_valid_pfn(pfn, PFN_UP(start), PFN_DOWN(end)) {
struct page *page = pfn_to_page(pfn);
void *direct_map_addr;
@@ -934,7 +920,29 @@ unsigned long free_reserved_area(void *start, void *end, int poison, const char
free_reserved_page(page);
pages++;
}
+ return pages;
+}
+
+unsigned long free_reserved_area(void *start, void *end, int poison, const char *s)
+{
+ phys_addr_t start_pa, end_pa;
+ unsigned long pages;
+
+ /*
+ * end is the first address past the region and it may be beyond what
+ * __pa() or __pa_symbol() can handle.
+ * Use the address included in the range for the conversion and add back
+ * 1 afterwards.
+ */
+ if (__is_kernel((unsigned long)start)) {
+ start_pa = __pa_symbol(start);
+ end_pa = __pa_symbol(end - 1) + 1;
+ } else {
+ start_pa = __pa(start);
+ end_pa = __pa(end - 1) + 1;
+ }
+ pages = __free_reserved_area(start_pa, end_pa, poison);
if (pages && s)
pr_info("Freeing %s memory: %ldK\n", s, K(pages));
@@ -1810,20 +1818,15 @@ void *__init __memblock_alloc_or_panic(phys_addr_t size, phys_addr_t align,
*/
void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
{
- phys_addr_t cursor, end;
+ phys_addr_t end = base + size - 1;
- end = base + size - 1;
memblock_dbg("%s: [%pa-%pa] %pS\n",
__func__, &base, &end, (void *)_RET_IP_);
- kmemleak_free_part_phys(base, size);
- cursor = PFN_UP(base);
- end = PFN_DOWN(base + size);
- for (; cursor < end; cursor++) {
- memblock_free_pages(cursor, 0);
- totalram_pages_inc();
- }
+ kmemleak_free_part_phys(base, size);
+ __free_reserved_area(base, base + size, -1);
}
+
/*
* Remaining API functions
*/
--
2.53.0
next prev parent reply other threads:[~2026-03-23 7:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-23 7:48 [PATCH v2 0/9] memblock: improve late freeing of reserved memory Mike Rapoport
2026-03-23 7:48 ` [PATCH v2 1/9] memblock: reserve_mem: fix end caclulation in reserve_mem_release_by_name() Mike Rapoport
2026-03-23 7:48 ` [PATCH v2 2/9] powerpc: fadump: pair alloc_pages_exact() with free_pages_exact() Mike Rapoport
2026-03-23 7:48 ` [PATCH v2 3/9] powerpc: opal-core: " Mike Rapoport
2026-03-23 7:48 ` [PATCH v2 4/9] mm: move free_reserved_area() to mm/memblock.c Mike Rapoport
2026-03-30 9:00 ` Vlastimil Babka (SUSE)
2026-03-23 7:48 ` [PATCH v2 5/9] memblock: make free_reserved_area() more robust Mike Rapoport
2026-03-23 7:48 ` Mike Rapoport [this message]
2026-03-23 7:48 ` [PATCH v2 7/9] memblock: make free_reserved_area() update memblock if ARCH_KEEP_MEMBLOCK=y Mike Rapoport
2026-03-23 7:48 ` [PATCH v2 8/9] memblock, treewide: make memblock_free() handle late freeing Mike Rapoport
2026-03-23 7:48 ` [PATCH v2 9/9] memblock: warn when freeing reserved memory before memory map is initialized Mike Rapoport
[not found] ` <20260327140109.7561-1-spasswolf@web.de>
2026-03-27 17:12 ` Warning from free_reserved_area() in next-20260325+ Mike Rapoport
2026-03-25 8:51 ` [PATCH v2 0/9] memblock: improve late freeing of reserved memory Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260323074836.3653702-7-rppt@kernel.org \
--to=rppt@kernel$(echo .)org \
--cc=Liam.Howlett@oracle$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andreas@gaisler$(echo .)com \
--cc=ardb@kernel$(echo .)org \
--cc=bp@alien8$(echo .)de \
--cc=brauner@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chleroy@kernel$(echo .)org \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=davem@davemloft$(echo .)net \
--cc=david@kernel$(echo .)org \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=dvyukov@google$(echo .)com \
--cc=elver@google$(echo .)com \
--cc=glider@google$(echo .)com \
--cc=hannes@cmpxchg$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=ilias.apalodimas@linaro$(echo .)org \
--cc=iommu@lists$(echo .)linux.dev \
--cc=jack@suse$(echo .)cz \
--cc=jackmanb@google$(echo .)com \
--cc=kasan-dev@googlegroups$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-efi@vger$(echo .)kernel.org \
--cc=linux-fsdevel@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-trace-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=lorenzo.stoakes@oracle$(echo .)com \
--cc=m.szyprowski@samsung$(echo .)com \
--cc=maddy@linux$(echo .)ibm.com \
--cc=mhiramat@kernel$(echo .)org \
--cc=mhocko@suse$(echo .)com \
--cc=mingo@redhat$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=npiggin@gmail$(echo .)com \
--cc=robh@kernel$(echo .)org \
--cc=robin.murphy@arm$(echo .)com \
--cc=saravanak@kernel$(echo .)org \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=surenb@google$(echo .)com \
--cc=tglx@kernel$(echo .)org \
--cc=vbabka@kernel$(echo .)org \
--cc=viro@zeniv$(echo .)linux.org.uk \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
--cc=ziy@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox