[v1] microblaze: tag highmem_setup() with __meminit
diff mbox series

Message ID 20210301114749.47914-1-david@redhat.com
State Accepted
Commit 9dc12e4ccd97c07d5c9ed9ea4a75a5e16bc3700e
Headers show
Series
  • [v1] microblaze: tag highmem_setup() with __meminit
Related show

Commit Message

David Hildenbrand March 1, 2021, 11:47 a.m. UTC
With commit a0cd7a7c4bc0 ("mm: simplify free_highmem_page() and
free_reserved_page()") the kernel test robot complains about a warning:

WARNING: modpost: vmlinux.o(.text.unlikely+0x23ac): Section mismatch in
  reference from the function highmem_setup() to the function
  .meminit.text:memblock_is_reserved()

This has been broken ever since microblaze added highmem support,
because memblock_is_reserved() was already tagged with "__init" back then -
most probably the function always got inlined, so we never stumbled over
it.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: 2f2f371f8907 ("microblaze: Highmem support")
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Arvind Sankar <nivedita@alum.mit.edu>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
 arch/microblaze/mm/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Oscar Salvador March 1, 2021, 10:18 p.m. UTC | #1
On Mon, Mar 01, 2021 at 12:47:49PM +0100, David Hildenbrand wrote:
> With commit a0cd7a7c4bc0 ("mm: simplify free_highmem_page() and
> free_reserved_page()") the kernel test robot complains about a warning:
> 
> WARNING: modpost: vmlinux.o(.text.unlikely+0x23ac): Section mismatch in
>   reference from the function highmem_setup() to the function
>   .meminit.text:memblock_is_reserved()
> 
> This has been broken ever since microblaze added highmem support,
> because memblock_is_reserved() was already tagged with "__init" back then -
> most probably the function always got inlined, so we never stumbled over
> it.

It might be good to point out that we need __meminit instead of __init
because microblaze platform does not define CONFIG_ARCH_KEEP_MEMBLOCK,
and __init_memblock fallsback to that.

(I had to go and look as I was puzzled :-) )

Reviewed-by: Oscar Salvador <osalvador@suse.de>

> 
> Reported-by: kernel test robot <lkp@intel.com>
> Fixes: 2f2f371f8907 ("microblaze: Highmem support")
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Michal Simek <monstr@monstr.eu>
> Cc: Mike Rapoport <rppt@kernel.org>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Arvind Sankar <nivedita@alum.mit.edu>
> Cc: Ira Weiny <ira.weiny@intel.com>
> Cc: Randy Dunlap <rdunlap@infradead.org>
> Cc: Oscar Salvador <osalvador@suse.de>
> Cc: Anshuman Khandual <anshuman.khandual@arm.com>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
>  arch/microblaze/mm/init.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
> index 181e48782e6c..05cf1fb3f5ff 100644
> --- a/arch/microblaze/mm/init.c
> +++ b/arch/microblaze/mm/init.c
> @@ -52,7 +52,7 @@ static void __init highmem_init(void)
>  	pkmap_page_table = virt_to_kpte(PKMAP_BASE);
>  }
>  
> -static void highmem_setup(void)
> +static void __meminit highmem_setup(void)
>  {
>  	unsigned long pfn;
>  
> -- 
> 2.29.2
> 
>
David Hildenbrand March 2, 2021, 9:04 a.m. UTC | #2
On 01.03.21 23:18, Oscar Salvador wrote:
> On Mon, Mar 01, 2021 at 12:47:49PM +0100, David Hildenbrand wrote:
>> With commit a0cd7a7c4bc0 ("mm: simplify free_highmem_page() and
>> free_reserved_page()") the kernel test robot complains about a warning:
>>
>> WARNING: modpost: vmlinux.o(.text.unlikely+0x23ac): Section mismatch in
>>    reference from the function highmem_setup() to the function
>>    .meminit.text:memblock_is_reserved()
>>
>> This has been broken ever since microblaze added highmem support,
>> because memblock_is_reserved() was already tagged with "__init" back then -
>> most probably the function always got inlined, so we never stumbled over
>> it.
> 
> It might be good to point out that we need __meminit instead of __init
> because microblaze platform does not define CONFIG_ARCH_KEEP_MEMBLOCK,
> and __init_memblock fallsback to that.
> 
> (I had to go and look as I was puzzled :-) )
> 
> Reviewed-by: Oscar Salvador <osalvador@suse.de>

Thanks!

Whoever feels like picking this up (@Andrew?) can you add

"We need __meminit because __init_memblock defaults to that without 
CONFIG_ARCH_KEEP_MEMBLOCK" and __init_memblock is not used outside 
memblock code.
Michal Simek March 2, 2021, 1:28 p.m. UTC | #3
On 3/2/21 10:04 AM, David Hildenbrand wrote:
> On 01.03.21 23:18, Oscar Salvador wrote:
>> On Mon, Mar 01, 2021 at 12:47:49PM +0100, David Hildenbrand wrote:
>>> With commit a0cd7a7c4bc0 ("mm: simplify free_highmem_page() and
>>> free_reserved_page()") the kernel test robot complains about a warning:
>>>
>>> WARNING: modpost: vmlinux.o(.text.unlikely+0x23ac): Section mismatch in
>>>    reference from the function highmem_setup() to the function
>>>    .meminit.text:memblock_is_reserved()
>>>
>>> This has been broken ever since microblaze added highmem support,
>>> because memblock_is_reserved() was already tagged with "__init" back
>>> then -
>>> most probably the function always got inlined, so we never stumbled over
>>> it.
>>
>> It might be good to point out that we need __meminit instead of __init
>> because microblaze platform does not define CONFIG_ARCH_KEEP_MEMBLOCK,
>> and __init_memblock fallsback to that.
>>
>> (I had to go and look as I was puzzled :-) )
>>
>> Reviewed-by: Oscar Salvador <osalvador@suse.de>
> 
> Thanks!
> 
> Whoever feels like picking this up (@Andrew?) can you add
> 
> "We need __meminit because __init_memblock defaults to that without
> CONFIG_ARCH_KEEP_MEMBLOCK" and __init_memblock is not used outside
> memblock code.
> 

Applied with this line added.

Thanks,
Michal

Patch
diff mbox series

diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 181e48782e6c..05cf1fb3f5ff 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -52,7 +52,7 @@  static void __init highmem_init(void)
 	pkmap_page_table = virt_to_kpte(PKMAP_BASE);
 }
 
-static void highmem_setup(void)
+static void __meminit highmem_setup(void)
 {
 	unsigned long pfn;