memblock: mark init_deferred_page as __init_memblock

[PATCH] memblock: mark init_deferred_page as __init_memblock

Posted by Arnd Bergmann 7 months, 4 weeks ago

From: Arnd Bergmann <arnd@arndb.de>

On architectures that set CONFIG_ARCH_KEEP_MEMBLOCK, memmap_init_kho_scratch_pages
is not discarded but calls a function that is:

WARNING: modpost: vmlinux: section mismatch in reference: memmap_init_kho_scratch_pages+0x120 (section: .text) -> init_deferred_page (section: .init.text)
ERROR: modpost: Section mismatches detected.
Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.

Mark init_deferred_page the same way as memmap_init_kho_scratch_pages
to avoid that warning. Unfortunately this requires marking additional
functions the same way to have them stay around as well.

Ideally memmap_init_kho_scratch_pages would become __meminit instead
of __init_memblock, but I could not convince myself that this is safe.

Fixes: 1b7936623970 ("memblock: introduce memmap_init_kho_scratch()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 mm/internal.h | 7 ++++---
 mm/mm_init.c  | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mm/internal.h b/mm/internal.h
index 838f840ded83..40464f755092 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -9,6 +9,7 @@
 
 #include <linux/fs.h>
 #include <linux/khugepaged.h>
+#include <linux/memblock.h>
 #include <linux/mm.h>
 #include <linux/mm_inline.h>
 #include <linux/pagemap.h>
@@ -543,7 +544,7 @@ extern int defrag_mode;
 
 void setup_per_zone_wmarks(void);
 void calculate_min_free_kbytes(void);
-int __meminit init_per_zone_wmark_min(void);
+int __init_memblock init_per_zone_wmark_min(void);
 void page_alloc_sysctl_init(void);
 
 /*
@@ -1532,9 +1533,9 @@ static inline bool pte_needs_soft_dirty_wp(struct vm_area_struct *vma, pte_t pte
 	return vma_soft_dirty_enabled(vma) && !pte_soft_dirty(pte);
 }
 
-void __meminit __init_single_page(struct page *page, unsigned long pfn,
+void __init_memblock __init_single_page(struct page *page, unsigned long pfn,
 				unsigned long zone, int nid);
-void __meminit __init_page_from_nid(unsigned long pfn, int nid);
+void __init_memblock __init_page_from_nid(unsigned long pfn, int nid);
 
 /* shrinker related functions */
 unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg,
diff --git a/mm/mm_init.c b/mm/mm_init.c
index 7bb5f77cf195..31cf8bc31cc2 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -578,7 +578,7 @@ static void __init find_zone_movable_pfns_for_nodes(void)
 	node_states[N_MEMORY] = saved_node_state;
 }
 
-void __meminit __init_single_page(struct page *page, unsigned long pfn,
+void __init_memblock __init_single_page(struct page *page, unsigned long pfn,
 				unsigned long zone, int nid)
 {
 	mm_zero_struct_page(page);
@@ -669,7 +669,7 @@ static inline void fixup_hashdist(void) {}
 /*
  * Initialize a reserved page unconditionally, finding its zone first.
  */
-void __meminit __init_page_from_nid(unsigned long pfn, int nid)
+void __init_memblock __init_page_from_nid(unsigned long pfn, int nid)
 {
 	pg_data_t *pgdat;
 	int zid;
@@ -744,7 +744,7 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn)
 	return false;
 }
 
-static void __meminit __init_deferred_page(unsigned long pfn, int nid)
+static void __init_memblock __init_deferred_page(unsigned long pfn, int nid)
 {
 	if (early_page_initialised(pfn, nid))
 		return;
@@ -769,7 +769,7 @@ static inline void __init_deferred_page(unsigned long pfn, int nid)
 }
 #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */
 
-void __meminit init_deferred_page(unsigned long pfn, int nid)
+void __init_memblock init_deferred_page(unsigned long pfn, int nid)
 {
 	__init_deferred_page(pfn, nid);
 }
-- 
2.39.5

Re: [PATCH] memblock: mark init_deferred_page as __init_memblock

Posted by Mike Rapoport 7 months, 4 weeks ago

On Wed, Apr 23, 2025 at 06:08:08PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> On architectures that set CONFIG_ARCH_KEEP_MEMBLOCK, memmap_init_kho_scratch_pages
> is not discarded but calls a function that is:
> 
> WARNING: modpost: vmlinux: section mismatch in reference: memmap_init_kho_scratch_pages+0x120 (section: .text) -> init_deferred_page (section: .init.text)
> ERROR: modpost: Section mismatches detected.
> Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.
> 
> Mark init_deferred_page the same way as memmap_init_kho_scratch_pages
> to avoid that warning. Unfortunately this requires marking additional
> functions the same way to have them stay around as well.
> 
> Ideally memmap_init_kho_scratch_pages would become __meminit instead
> of __init_memblock, but I could not convince myself that this is safe.

It should be __init even, as well as a few other kho-memblock
functions.
I'll run some builds to make sure I'm not missing anything.
 
> Fixes: 1b7936623970 ("memblock: introduce memmap_init_kho_scratch()")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  mm/internal.h | 7 ++++---
>  mm/mm_init.c  | 8 ++++----
>  2 files changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/mm/internal.h b/mm/internal.h
> index 838f840ded83..40464f755092 100644
> --- a/mm/internal.h
> +++ b/mm/internal.h
> @@ -9,6 +9,7 @@
>  
>  #include <linux/fs.h>
>  #include <linux/khugepaged.h>
> +#include <linux/memblock.h>
>  #include <linux/mm.h>
>  #include <linux/mm_inline.h>
>  #include <linux/pagemap.h>
> @@ -543,7 +544,7 @@ extern int defrag_mode;
>  
>  void setup_per_zone_wmarks(void);
>  void calculate_min_free_kbytes(void);
> -int __meminit init_per_zone_wmark_min(void);
> +int __init_memblock init_per_zone_wmark_min(void);
>  void page_alloc_sysctl_init(void);
>  
>  /*
> @@ -1532,9 +1533,9 @@ static inline bool pte_needs_soft_dirty_wp(struct vm_area_struct *vma, pte_t pte
>  	return vma_soft_dirty_enabled(vma) && !pte_soft_dirty(pte);
>  }
>  
> -void __meminit __init_single_page(struct page *page, unsigned long pfn,
> +void __init_memblock __init_single_page(struct page *page, unsigned long pfn,
>  				unsigned long zone, int nid);
> -void __meminit __init_page_from_nid(unsigned long pfn, int nid);
> +void __init_memblock __init_page_from_nid(unsigned long pfn, int nid);
>  
>  /* shrinker related functions */
>  unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg,
> diff --git a/mm/mm_init.c b/mm/mm_init.c
> index 7bb5f77cf195..31cf8bc31cc2 100644
> --- a/mm/mm_init.c
> +++ b/mm/mm_init.c
> @@ -578,7 +578,7 @@ static void __init find_zone_movable_pfns_for_nodes(void)
>  	node_states[N_MEMORY] = saved_node_state;
>  }
>  
> -void __meminit __init_single_page(struct page *page, unsigned long pfn,
> +void __init_memblock __init_single_page(struct page *page, unsigned long pfn,
>  				unsigned long zone, int nid)
>  {
>  	mm_zero_struct_page(page);
> @@ -669,7 +669,7 @@ static inline void fixup_hashdist(void) {}
>  /*
>   * Initialize a reserved page unconditionally, finding its zone first.
>   */
> -void __meminit __init_page_from_nid(unsigned long pfn, int nid)
> +void __init_memblock __init_page_from_nid(unsigned long pfn, int nid)
>  {
>  	pg_data_t *pgdat;
>  	int zid;
> @@ -744,7 +744,7 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn)
>  	return false;
>  }
>  
> -static void __meminit __init_deferred_page(unsigned long pfn, int nid)
> +static void __init_memblock __init_deferred_page(unsigned long pfn, int nid)
>  {
>  	if (early_page_initialised(pfn, nid))
>  		return;
> @@ -769,7 +769,7 @@ static inline void __init_deferred_page(unsigned long pfn, int nid)
>  }
>  #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */
>  
> -void __meminit init_deferred_page(unsigned long pfn, int nid)
> +void __init_memblock init_deferred_page(unsigned long pfn, int nid)
>  {
>  	__init_deferred_page(pfn, nid);
>  }
> -- 
> 2.39.5
> 

-- 
Sincerely yours,
Mike.

Re: [PATCH] memblock: mark init_deferred_page as __init_memblock

Posted by Mike Rapoport 7 months, 4 weeks ago

On Thu, Apr 24, 2025 at 07:29:29PM +0300, Mike Rapoport wrote:
> On Wed, Apr 23, 2025 at 06:08:08PM +0200, Arnd Bergmann wrote:
> > From: Arnd Bergmann <arnd@arndb.de>
> > 
> > On architectures that set CONFIG_ARCH_KEEP_MEMBLOCK, memmap_init_kho_scratch_pages
> > is not discarded but calls a function that is:
> > 
> > WARNING: modpost: vmlinux: section mismatch in reference: memmap_init_kho_scratch_pages+0x120 (section: .text) -> init_deferred_page (section: .init.text)
> > ERROR: modpost: Section mismatches detected.
> > Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.
> > 
> > Mark init_deferred_page the same way as memmap_init_kho_scratch_pages
> > to avoid that warning. Unfortunately this requires marking additional
> > functions the same way to have them stay around as well.
> > 
> > Ideally memmap_init_kho_scratch_pages would become __meminit instead
> > of __init_memblock, but I could not convince myself that this is safe.
> 
> It should be __init even, as well as a few other kho-memblock
> functions.
> I'll run some builds to make sure I'm not missing anything.

Yeah, it looks like everything inside CONFIG_MEMBLOCK_KHO_SCRATCH can be
just __init unconditionally:

diff --git a/mm/memblock.c b/mm/memblock.c
index 44d3bacf86a0..994792829ebe 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -942,17 +942,17 @@ int __init_memblock memblock_physmem_add(phys_addr_t base, phys_addr_t size)
 #endif
 
 #ifdef CONFIG_MEMBLOCK_KHO_SCRATCH
-__init_memblock void memblock_set_kho_scratch_only(void)
+__init void memblock_set_kho_scratch_only(void)
 {
 	kho_scratch_only = true;
 }
 
-__init_memblock void memblock_clear_kho_scratch_only(void)
+__init void memblock_clear_kho_scratch_only(void)
 {
 	kho_scratch_only = false;
 }
 
-void __init_memblock memmap_init_kho_scratch_pages(void)
+__init void memmap_init_kho_scratch_pages(void)
 {
 	phys_addr_t start, end;
 	unsigned long pfn;
  
> > Fixes: 1b7936623970 ("memblock: introduce memmap_init_kho_scratch()")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> >  mm/internal.h | 7 ++++---
> >  mm/mm_init.c  | 8 ++++----
> >  2 files changed, 8 insertions(+), 7 deletions(-)
> > 
> > diff --git a/mm/internal.h b/mm/internal.h
> > index 838f840ded83..40464f755092 100644
> > --- a/mm/internal.h
> > +++ b/mm/internal.h
> > @@ -9,6 +9,7 @@
> >  
> >  #include <linux/fs.h>
> >  #include <linux/khugepaged.h>
> > +#include <linux/memblock.h>
> >  #include <linux/mm.h>
> >  #include <linux/mm_inline.h>
> >  #include <linux/pagemap.h>
> > @@ -543,7 +544,7 @@ extern int defrag_mode;
> >  
> >  void setup_per_zone_wmarks(void);
> >  void calculate_min_free_kbytes(void);
> > -int __meminit init_per_zone_wmark_min(void);
> > +int __init_memblock init_per_zone_wmark_min(void);
> >  void page_alloc_sysctl_init(void);
> >  
> >  /*
> > @@ -1532,9 +1533,9 @@ static inline bool pte_needs_soft_dirty_wp(struct vm_area_struct *vma, pte_t pte
> >  	return vma_soft_dirty_enabled(vma) && !pte_soft_dirty(pte);
> >  }
> >  
> > -void __meminit __init_single_page(struct page *page, unsigned long pfn,
> > +void __init_memblock __init_single_page(struct page *page, unsigned long pfn,
> >  				unsigned long zone, int nid);
> > -void __meminit __init_page_from_nid(unsigned long pfn, int nid);
> > +void __init_memblock __init_page_from_nid(unsigned long pfn, int nid);
> >  
> >  /* shrinker related functions */
> >  unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg,
> > diff --git a/mm/mm_init.c b/mm/mm_init.c
> > index 7bb5f77cf195..31cf8bc31cc2 100644
> > --- a/mm/mm_init.c
> > +++ b/mm/mm_init.c
> > @@ -578,7 +578,7 @@ static void __init find_zone_movable_pfns_for_nodes(void)
> >  	node_states[N_MEMORY] = saved_node_state;
> >  }
> >  
> > -void __meminit __init_single_page(struct page *page, unsigned long pfn,
> > +void __init_memblock __init_single_page(struct page *page, unsigned long pfn,
> >  				unsigned long zone, int nid)
> >  {
> >  	mm_zero_struct_page(page);
> > @@ -669,7 +669,7 @@ static inline void fixup_hashdist(void) {}
> >  /*
> >   * Initialize a reserved page unconditionally, finding its zone first.
> >   */
> > -void __meminit __init_page_from_nid(unsigned long pfn, int nid)
> > +void __init_memblock __init_page_from_nid(unsigned long pfn, int nid)
> >  {
> >  	pg_data_t *pgdat;
> >  	int zid;
> > @@ -744,7 +744,7 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn)
> >  	return false;
> >  }
> >  
> > -static void __meminit __init_deferred_page(unsigned long pfn, int nid)
> > +static void __init_memblock __init_deferred_page(unsigned long pfn, int nid)
> >  {
> >  	if (early_page_initialised(pfn, nid))
> >  		return;
> > @@ -769,7 +769,7 @@ static inline void __init_deferred_page(unsigned long pfn, int nid)
> >  }
> >  #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */
> >  
> > -void __meminit init_deferred_page(unsigned long pfn, int nid)
> > +void __init_memblock init_deferred_page(unsigned long pfn, int nid)
> >  {
> >  	__init_deferred_page(pfn, nid);
> >  }
> > -- 
> > 2.39.5
> > 
> 
> -- 
> Sincerely yours,
> Mike.

-- 
Sincerely yours,
Mike.

Re: [PATCH] memblock: mark init_deferred_page as __init_memblock

Posted by Arnd Bergmann 7 months, 4 weeks ago

On Thu, Apr 24, 2025, at 21:21, Mike Rapoport wrote:
> On Thu, Apr 24, 2025 at 07:29:29PM +0300, Mike Rapoport wrote:
>> On Wed, Apr 23, 2025 at 06:08:08PM +0200, Arnd Bergmann wrote:

>> It should be __init even, as well as a few other kho-memblock
>> functions.
>> I'll run some builds to make sure I'm not missing anything.
>
> Yeah, it looks like everything inside CONFIG_MEMBLOCK_KHO_SCRATCH can be
> just __init unconditionally:

Right, I tried the same patch after your earlier comments and agree
this is better than my patch.

Tested-by: Arnd Bergmann <arnd@arndb.de>