torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'memblock-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Browse Source 
Pull memblock updates from Mike Rapoport:

 - update tools/include/linux/mm.h to fix memblock tests compilation

 - drop redundant struct page* parameter from memblock_free_pages() and
   get struct page from the pfn

 - add underflow detection for size calculation in memtest and warn
   about underflow when VM_DEBUG is enabled

* tag 'memblock-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  mm/memtest: add underflow detection for size calculation
  memblock: drop redundant 'struct page *' argument from memblock_free_pages()
  memblock test: include <linux/sizes.h> from tools mm.h stub
This commit is contained in:
Linus Torvalds
2026-02-14 12:39:34 -08:00
parent 8b3c75a39c f56ccc3246
commit 787fe1d43a
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mm/internal.h
View File

@@ -809,8 +809,7 @@ static inline void clear_zone_contiguous(struct zone *zone)
extern int __isolate_free_page(struct page *page, unsigned int order); extern int __isolate_free_page(struct page *page, unsigned int order);
extern void __putback_isolated_page(struct page *page, unsigned int order, extern void __putback_isolated_page(struct page *page, unsigned int order,
int mt); int mt);
extern void memblock_free_pages(struct page *page, unsigned long pfn, extern void memblock_free_pages(unsigned long pfn, unsigned int order);
unsigned int order);
extern void __free_pages_core(struct page *page, unsigned int order, extern void __free_pages_core(struct page *page, unsigned int order,
enum meminit_context context); enum meminit_context context);

4
mm/memblock.c
View File

@@ -1772,7 +1772,7 @@ void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
end = PFN_DOWN(base + size); end = PFN_DOWN(base + size);
for (; cursor < end; cursor++) { for (; cursor < end; cursor++) {
memblock_free_pages(pfn_to_page(cursor), cursor, 0); memblock_free_pages(cursor, 0);
totalram_pages_inc(); totalram_pages_inc();
} }
} }
@@ -2217,7 +2217,7 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
while (start + (1UL << order) > end) while (start + (1UL << order) > end)
order--; order--;
memblock_free_pages(pfn_to_page(start), start, order); memblock_free_pages(start, order);
start += (1UL << order); start += (1UL << order);
} }

2
mm/memtest.c
View File

@@ -50,6 +50,8 @@ static void __init memtest(u64 pattern, phys_addr_t start_phys, phys_addr_t size
start_bad = 0; start_bad = 0;
last_bad = 0; last_bad = 0;
VM_WARN_ON_ONCE(size < start_phys_aligned - start_phys);
for (p = start; p < end; p++) for (p = start; p < end; p++)
WRITE_ONCE(*p, pattern); WRITE_ONCE(*p, pattern);

5
mm/mm_init.c
View File

@@ -2474,9 +2474,10 @@ void *__init alloc_large_system_hash(const char *tablename,
return table; return table;
} }
void __init memblock_free_pages(struct page *page, unsigned long pfn, void __init memblock_free_pages(unsigned long pfn, unsigned int order)
unsigned int order)
{ {
struct page *page = pfn_to_page(pfn);
if (IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) { if (IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) {
int nid = early_pfn_to_nid(pfn); int nid = early_pfn_to_nid(pfn);

1
tools/include/linux/mm.h
View File

@@ -4,6 +4,7 @@
#include <linux/align.h> #include <linux/align.h>
#include <linux/mmzone.h> #include <linux/mmzone.h>
#include <linux/sizes.h>
#define PAGE_SHIFT 12 #define PAGE_SHIFT 12
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)

3
tools/testing/memblock/internal.h
View File

@@ -15,8 +15,7 @@ bool mirrored_kernelcore = false;
struct page {}; struct page {};
void memblock_free_pages(struct page *page, unsigned long pfn, void memblock_free_pages(unsigned long pfn, unsigned int order)
unsigned int order)
{ {
} }