tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

memblock: drop redundant 'struct page *' argument from memblock_free_pages()

memblock_free_pages() currently takes both a struct page * and the
corresponding PFN. The page pointer is always derived from the PFN at
call sites (pfn_to_page(pfn)), making the parameter redundant and also
allowing accidental mismatches between the two arguments.

Simplify the interface by removing the struct page * argument and
deriving the page locally from the PFN, after the deferred struct page
initialization check. This keeps the behavior unchanged while making
the helper harder to misuse.

Signed-off-by: Shengming Hu <hu.shengming@zte.com.cn>
Reviewed-by: David Hildenbrand (Red Hat) <david@kernel.org>
Link: https://patch.msgid.link/tencent_F741CE6ECC49EE099736685E60C0DBD4A209@qq.com
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>

authored by

Shengming Hu and committed by
Mike Rapoport (Microsoft) 58e3e526 be05f571

+7 -8
+1 -2
mm/internal.h
··· 742 742 extern int __isolate_free_page(struct page *page, unsigned int order); 743 743 extern void __putback_isolated_page(struct page *page, unsigned int order, 744 744 int mt); 745 - extern void memblock_free_pages(struct page *page, unsigned long pfn, 746 - unsigned int order); 745 + extern void memblock_free_pages(unsigned long pfn, unsigned int order); 747 746 extern void __free_pages_core(struct page *page, unsigned int order, 748 747 enum meminit_context context); 749 748
+2 -2
mm/memblock.c
··· 1771 1771 end = PFN_DOWN(base + size); 1772 1772 1773 1773 for (; cursor < end; cursor++) { 1774 - memblock_free_pages(pfn_to_page(cursor), cursor, 0); 1774 + memblock_free_pages(cursor, 0); 1775 1775 totalram_pages_inc(); 1776 1776 } 1777 1777 } ··· 2216 2216 while (start + (1UL << order) > end) 2217 2217 order--; 2218 2218 2219 - memblock_free_pages(pfn_to_page(start), start, order); 2219 + memblock_free_pages(start, order); 2220 2220 2221 2221 start += (1UL << order); 2222 2222 }
+3 -2
mm/mm_init.c
··· 2480 2480 return table; 2481 2481 } 2482 2482 2483 - void __init memblock_free_pages(struct page *page, unsigned long pfn, 2484 - unsigned int order) 2483 + void __init memblock_free_pages(unsigned long pfn, unsigned int order) 2485 2484 { 2485 + struct page *page = pfn_to_page(pfn); 2486 + 2486 2487 if (IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) { 2487 2488 int nid = early_pfn_to_nid(pfn); 2488 2489
+1 -2
tools/testing/memblock/internal.h
··· 15 15 16 16 struct page {}; 17 17 18 - void memblock_free_pages(struct page *page, unsigned long pfn, 19 - unsigned int order) 18 + void memblock_free_pages(unsigned long pfn, unsigned int order) 20 19 { 21 20 } 22 21