memblock: move reserve_bootmem_range() to memblock.c and make it static
Mike Rapoport
maintainerPATCH v2 1/1 memblock: move reserve_bootmem_range() to memblock.c and make it static
From: "Mike Rapoport (Microsoft)" <[email protected]>
reserve_bootmem_region() is only called from memmap_init_reserved_pages() and it was in mm/mm_init.c because of its dependecies on static init_deferred_page().
Since init_deferred_page() is not static anymore, move reserve_bootmem_region(), rename it to memmap_init_reserved_range() and make it static.
Update the comment describing it to better reflect what the function does and drop bogus comment about reserved pages in free_bootmem_page().
Update memblock test stubs to reflect the core changes.
--- include/linux/bootmem_info.h | 4 ---- include/linux/mm.h | 3 --- mm/memblock.c | 31 ++++++++++++++++++++++++++++--- mm/mm_init.c | 25 ------------------------- tools/include/linux/mm.h | 2 -- tools/testing/memblock/internal.h | 9 +++++++++ tools/testing/memblock/mmzone.c | 4 ---- 7 files changed, 37 insertions(+), 41 deletions(-)
include/linux/bootmem_info.h +0 -4
@@ -44,10 +44,6 @@ static inline void free_bootmem_page(struct page *page) {enum bootmem_type type =bootmem_type (page); -/* -* The reserve_bootmem_region sets the reserved flag on bootmem -* pages. -*/ VM_BUG_ON_PAGE (page_ref_count (page) !=2 , page);if (type ==SECTION_INFO || type ==MIX_SECTION_INFO )
include/linux/mm.h +0 -3
@@ -3686,9 +3686,6 @@ extern unsigned long free_reserved_area(void *start, void *end,extern void adjust_managed_page_count (struct page *page,long count); -extern void reserve_bootmem_region (phys_addr_t start, -phys_addr_t end,int nid); -/* Free the reserved page into the buddy system, so it gets managed. */ void free_reserved_page (struct page *page);
mm/memblock.c +28 -3
@@ -973,7 +973,7 @@ __init void memmap_init_kho_scratch_pages(void)/* * Initialize struct pages for free scratch memory. * The struct pages for reserved scratch memory will be set up in -* reserve_bootmem_region() +* memmap_init_reserved_pages() */ __for_each_mem_range (i, &memblock.memory,NULL ,NUMA_NO_NODE ,MEMBLOCK_KHO_SCRATCH , &start, &end, &nid) {
@@ -2240,6 +2240,31 @@ static unsigned long __init __free_memory_core(phys_addr_t start,return end_pfn - start_pfn; } +/* +* Initialised pages do not have PageReserved set. This function is called +* for each reserved range and marks the pages PageReserved. +* When deferred initialization of struct pages is enabled it also ensures +* that struct pages are properly initialised. +*/ +static void __init memmap_init_reserved_range (phys_addr_t start, +phys_addr_t end,int nid) +{ +unsigned long pfn; + +for_each_valid_pfn (pfn,PFN_DOWN (start),PFN_UP (end)) { +struct page *page =pfn_to_page (pfn); + +init_deferred_page (pfn, nid); + +/* +* no need for atomic set_bit because the struct +* page is not visible yet so nobody should +* access it yet. +*/ +__SetPageReserved (page); + } +} +static void __init memmap_init_reserved_pages (void ) {struct memblock_region *region;
@@ -2259,7 +2284,7 @@ static void __init memmap_init_reserved_pages(void) end = start + region->size;if (memblock_is_nomap (region)) -reserve_bootmem_region (start, end, nid); +memmap_init_reserved_range (start, end, nid);memblock_set_node (start, region->size, &memblock.reserved, nid); }
@@ -2284,7 +2309,7 @@ static void __init memmap_init_reserved_pages(void)if (!numa_valid_node (nid)) nid =early_pfn_to_nid (PFN_DOWN (start)); -reserve_bootmem_region (start, end, nid); +memmap_init_reserved_range (start, end, nid); } } }
mm/mm_init.c +0 -25
@@ -772,31 +772,6 @@ void __meminit init_deferred_page(unsigned long pfn, int nid)__init_deferred_page (pfn, nid); } -/* -* Initialised pages do not have PageReserved set. This function is -* called for each range allocated by the bootmem allocator and -* marks the pages PageReserved. The remaining valid pages are later -* sent to the buddy page allocator. -*/ -void __meminit reserve_bootmem_region (phys_addr_t start, -phys_addr_t end,int nid) -{ -unsigned long pfn; - -for_each_valid_pfn (pfn,PFN_DOWN (start),PFN_UP (end)) { -struct page *page =pfn_to_page (pfn); - -__init_deferred_page (pfn, nid); - -/* -* no need for atomic set_bit because the struct -* page is not visible yet so nobody should -* access it yet. -*/ -__SetPageReserved (page); - } -} -/* If zone is ZONE_MOVABLE but memory is mirrored, it is an overlapped init */ static bool __meminit overlap_memmap_init (unsigned long zone,unsigned long *pfn)
tools/include/linux/mm.h +0 -2
@@ -32,8 +32,6 @@ static inline phys_addr_t virt_to_phys(volatile void *address)return (phys_addr_t )address; } -void reserve_bootmem_region (phys_addr_t start,phys_addr_t end,int nid); -static inline void totalram_pages_inc (void ) { }
tools/testing/memblock/internal.h +9 -0
@@ -29,4 +29,13 @@ static inline unsigned long free_reserved_area(void *start, void *end, return 0; } +#define for_each_valid_pfn (pfn, start_pfn, end_pfn) \ + for ((pfn) = (start_pfn); (pfn) < (end_pfn); (pfn)++) + +static inline void init_deferred_page (unsigned long pfn,int nid) +{ +} + +#define __SetPageReserved (p) ((void)(p)) +#endif
tools/testing/memblock/mmzone.c +0 -4
@@ -11,10 +11,6 @@ struct pglist_data *next_online_pgdat(struct pglist_data *pgdat)return NULL ; } -void reserve_bootmem_region (phys_addr_t start,phys_addr_t end,int nid) -{ -} -void atomic_long_set (atomic_long_t *v,long i) { }
Signature · 1 line
2.53.0
Quoted 10 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
reserve_bootmem_region()is only called frommemmap_init_reserved_pages()and it was inmm/mm_init.cbecause of its dependecies on staticinit_deferred_page().Since
init_deferred_page()is not static anymore, movereserve_bootmem_region(), rename it tomemmap_init_reserved_range()and make it static.
Quoted 7 lines
Update the comment describing it to better reflect what the function does and drop bogus comment about reserved pages in
free_bootmem_page().Update memblock test stubs to reflect the core changes.
Signed-off-by Mike Rapoport (Microsoft) <[email protected]>---
Signature · 3 lines
Cheers, David
Quoted 10 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
reserve_bootmem_region()is only called frommemmap_init_reserved_pages()and it was inmm/mm_init.cbecause of its dependecies on staticinit_deferred_page().Since
init_deferred_page()is not static anymore, movereserve_bootmem_region(), rename it tomemmap_init_reserved_range()and make it static.
Quoted 6 lines
Update the comment describing it to better reflect what the function does and drop bogus comment about reserved pages in
free_bootmem_page().Update memblock test stubs to reflect the core changes.
Signed-off-by Mike Rapoport (Microsoft) <[email protected]>
LGTM and passed local tests so:
Quoted 185 lines
--- include/linux/bootmem_info.h | 4 ---- include/linux/mm.h | 3 --- mm/memblock.c | 31 ++++++++++++++++++++++++++++--- mm/mm_init.c | 25 ------------------------- tools/include/linux/mm.h | 2 -- tools/testing/memblock/internal.h | 9 +++++++++ tools/testing/memblock/mmzone.c | 4 ---- 7 files changed, 37 insertions(+), 41 deletions(-)include/linux/bootmem_info.h +0
-4@@ -44,10 +44,6 @@ static inline void free_bootmem_page(struct page *page) {enum bootmem_type type =bootmem_type (page); -/* -* The reserve_bootmem_region sets the reserved flag on bootmem -* pages. -*/ VM_BUG_ON_PAGE (page_ref_count (page) !=2 , page);if (type ==SECTION_INFO || type ==MIX_SECTION_INFO )include/linux/mm.h +0
-3@@ -3686,9 +3686,6 @@ extern unsigned long free_reserved_area(void *start, void *end,extern void adjust_managed_page_count (struct page *page,long count); -extern void reserve_bootmem_region (phys_addr_t start, -phys_addr_t end,int nid); -/* Free the reserved page into the buddy system, so it gets managed. */ void free_reserved_page (struct page *page);mm/memblock.c +28
-3@@ -973,7 +973,7 @@ __init void memmap_init_kho_scratch_pages(void)/* * Initialize struct pages for free scratch memory. * The struct pages for reserved scratch memory will be set up in -* reserve_bootmem_region() +* memmap_init_reserved_pages() */ __for_each_mem_range (i, &memblock.memory,NULL ,NUMA_NO_NODE ,MEMBLOCK_KHO_SCRATCH , &start, &end, &nid) {@@ -2240,6 +2240,31 @@ static unsigned long __init __free_memory_core(phys_addr_t start,return end_pfn - start_pfn; } +/* +* Initialised pages do not have PageReserved set. This function is called +* for each reserved range and marks the pages PageReserved. +* When deferred initialization of struct pages is enabled it also ensures +* that struct pages are properly initialised. +*/ +static void __init memmap_init_reserved_range (phys_addr_t start, +phys_addr_t end,int nid) +{ +unsigned long pfn; + +for_each_valid_pfn (pfn,PFN_DOWN (start),PFN_UP (end)) { +struct page *page =pfn_to_page (pfn); + +init_deferred_page (pfn, nid); + +/* +* no need for atomic set_bit because the struct +* page is not visible yet so nobody should +* access it yet. +*/ +__SetPageReserved (page); + } +} +static void __init memmap_init_reserved_pages (void ) {struct memblock_region *region;@@ -2259,7 +2284,7 @@ static void __init memmap_init_reserved_pages(void) end = start + region->size;if (memblock_is_nomap (region)) -reserve_bootmem_region (start, end, nid); +memmap_init_reserved_range (start, end, nid);memblock_set_node (start, region->size, &memblock.reserved, nid); }@@ -2284,7 +2309,7 @@ static void __init memmap_init_reserved_pages(void)if (!numa_valid_node (nid)) nid =early_pfn_to_nid (PFN_DOWN (start)); -reserve_bootmem_region (start, end, nid); +memmap_init_reserved_range (start, end, nid); } } }mm/mm_init.c +0
-25@@ -772,31 +772,6 @@ void __meminit init_deferred_page(unsigned long pfn, int nid)__init_deferred_page (pfn, nid); } -/* -* Initialised pages do not have PageReserved set. This function is -* called for each range allocated by the bootmem allocator and -* marks the pages PageReserved. The remaining valid pages are later -* sent to the buddy page allocator. -*/ -void __meminit reserve_bootmem_region (phys_addr_t start, -phys_addr_t end,int nid) -{ -unsigned long pfn; - -for_each_valid_pfn (pfn,PFN_DOWN (start),PFN_UP (end)) { -struct page *page =pfn_to_page (pfn); - -__init_deferred_page (pfn, nid); - -/* -* no need for atomic set_bit because the struct -* page is not visible yet so nobody should -* access it yet. -*/ -__SetPageReserved (page); - } -} -/* If zone is ZONE_MOVABLE but memory is mirrored, it is an overlapped init */ static bool __meminit overlap_memmap_init (unsigned long zone,unsigned long *pfn)tools/include/linux/mm.h +0
-2@@ -32,8 +32,6 @@ static inline phys_addr_t virt_to_phys(volatile void *address)return (phys_addr_t )address; } -void reserve_bootmem_region (phys_addr_t start,phys_addr_t end,int nid); -static inline void totalram_pages_inc (void ) { }tools/testing/memblock/internal.h +9
-0@@ -29,4 +29,13 @@ static inline unsigned long free_reserved_area(void *start, void *end, return 0; } +#define for_each_valid_pfn (pfn, start_pfn, end_pfn) \ + for ((pfn) = (start_pfn); (pfn) < (end_pfn); (pfn)++) + +static inline void init_deferred_page (unsigned long pfn,int nid) +{ +} + +#define __SetPageReserved (p) ((void)(p)) +#endif tools/testing/memblock/mmzone.c +0
-5@@ -11,10 +11,6 @@ struct pglist_data *next_online_pgdat(struct pglist_data *pgdat)return NULL ; } -void reserve_bootmem_region (phys_addr_t start,phys_addr_t end,int nid) -{ -} -void atomic_long_set (atomic_long_t *v,long i) { } --
Quoted 2 lines
2.53.0
FYI I saw the below when running make in tools/testing/memblock, doesn't look related to this change but maybe something to address?
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D CONFIG_PHYS_ADDR_T_64BIT -c -o memblock.o memblock.cmemblock.c: In function ‘memblock_add_range.isra’:
memblock.c:710:17: warning: ‘end_rgn’ may be used uninitialized [-Wmaybe-uninitialized]
710 | memblock_merge_regions(type, start_rgn, end_rgn);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~memblock.c:616:42: note: ‘end_rgn’ was declared here
616 | int idx, nr_new, start_rgn = -1, end_rgn;
| ^~~~~~~
Mike Rapoport
maintainerQuoted 14 lines · Lorenzo Stoakes (Oracle)
Quoted 13 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
reserve_bootmem_region()is only called frommemmap_init_reserved_pages()and it was inmm/mm_init.cbecause of its dependecies on staticinit_deferred_page().Since
init_deferred_page()is not static anymore, movereserve_bootmem_region(), rename it tomemmap_init_reserved_range()and make it static.Update the comment describing it to better reflect what the function does and drop bogus comment about reserved pages in
free_bootmem_page().
Quoted 7 lines
Quoted 3 lines
Update memblock test stubs to reflect the core changes.
Signed-off-by Mike Rapoport (Microsoft) <[email protected]>LGTM and passed local tests so:
Reviewed-by Lorenzo Stoakes (Oracle) <[email protected]>
Thanks!
Quoted 6 lines
Quoted 1 line
---
FYI I saw the below when running make in
tools/testing/memblock, doesn't look related to this change but maybe something to address?
Quoted 8 lines
cc -I. -I../../include -Wall -O2 -fsanitize=address -fsanitize=undefined -D
CONFIG_PHYS_ADDR_T_64BIT-c -o memblock.omemblock.cmemblock.c: In function ‘memblock_add_range.isra’:
memblock.c:710:17: warning: ‘end_rgn’ may be used uninitialized [-Wmaybe-uninitialized]710 | memblock_merge_regions(type, start_rgn, end_rgn); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~memblock.c:616:42: note: ‘end_rgn’ was declared here
616 | int idx,nr_new,start_rgn= -1,end_rgn;
| ^~~~~~~
Oddly enough it does not warn in the kernel build, so I kept ignoring this :) Should be fixed indeed.
Signature · 2 lines
Sincerely yours, Mike.
Quoted 9 lines · Mike Rapoport
reserve_bootmem_region()is only called frommemmap_init_reserved_pages()and it was inmm/mm_init.cbecause of its dependecies on staticinit_deferred_page().Since
init_deferred_page()is not static anymore, movereserve_bootmem_region(), rename it tomemmap_init_reserved_range()and make it static.[...]
Applied to for-next branch of memblock.git tree, thanks!
[1/1] memblock: move reserve_bootmem_range() to memblock.c and make it static
commit: 6e56179632b784109f11174d4c2bf9716fdb328f
tree: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
branch: for-next
--
Sincerely yours,
Mike.