2021-05-11 09:06:24

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] ARM: mark prepare_page_table as __init

From: Arnd Bergmann <[email protected]>

In some configurations when building with gcc-11, prepare_page_table
does not get inline, which causes a build time warning for a section
mismatch:

WARNING: modpost: vmlinux.o(.text.unlikely+0xce8): Section mismatch in reference from the function prepare_page_table() to the (unknown reference) .init.data:(unknown)
The function prepare_page_table() references
the (unknown reference) __initdata (unknown).
This is often because prepare_page_table lacks a __initdata
annotation or the annotation of (unknown) is wrong.

Mark the function as __init to avoid the warning regardless of the
inlining.

Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/arm/mm/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 051f4f82414b..5220b8147f40 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1246,7 +1246,7 @@ void __init adjust_lowmem_bounds(void)
memblock_set_current_limit(memblock_limit);
}

-static inline void prepare_page_table(void)
+static inline __init void prepare_page_table(void)
{
unsigned long addr;
phys_addr_t end;
--
2.29.2


2021-05-11 09:15:37

by Ard Biesheuvel

[permalink] [raw]
Subject: Re: [PATCH] ARM: mark prepare_page_table as __init

On Tue, 11 May 2021 at 11:04, Arnd Bergmann <[email protected]> wrote:
>
> From: Arnd Bergmann <[email protected]>
>
> In some configurations when building with gcc-11, prepare_page_table
> does not get inline, which causes a build time warning for a section
> mismatch:
>
> WARNING: modpost: vmlinux.o(.text.unlikely+0xce8): Section mismatch in reference from the function prepare_page_table() to the (unknown reference) .init.data:(unknown)
> The function prepare_page_table() references
> the (unknown reference) __initdata (unknown).
> This is often because prepare_page_table lacks a __initdata
> annotation or the annotation of (unknown) is wrong.
>
> Mark the function as __init to avoid the warning regardless of the
> inlining.
>
> Signed-off-by: Arnd Bergmann <[email protected]>

I think the inline should be dropped here. Either inlining is
absolutely required for correct code generation (which is rare), or
the inline is optional, and better left up to the compiler, especially
given that this is __init code so the time/space tradeoff is moot
anyway.

With or without that change,

Acked-by: Ard Biesheuvel <[email protected]>

> ---
> arch/arm/mm/mmu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
> index 051f4f82414b..5220b8147f40 100644
> --- a/arch/arm/mm/mmu.c
> +++ b/arch/arm/mm/mmu.c
> @@ -1246,7 +1246,7 @@ void __init adjust_lowmem_bounds(void)
> memblock_set_current_limit(memblock_limit);
> }
>
> -static inline void prepare_page_table(void)
> +static inline __init void prepare_page_table(void)
> {
> unsigned long addr;
> phys_addr_t end;
> --
> 2.29.2
>

2021-05-11 14:40:23

by Russell King (Oracle)

[permalink] [raw]
Subject: Re: [PATCH] ARM: mark prepare_page_table as __init

On Tue, May 11, 2021 at 11:03:13AM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> In some configurations when building with gcc-11, prepare_page_table
> does not get inline, which causes a build time warning for a section
> mismatch:
>
> WARNING: modpost: vmlinux.o(.text.unlikely+0xce8): Section mismatch in reference from the function prepare_page_table() to the (unknown reference) .init.data:(unknown)
> The function prepare_page_table() references
> the (unknown reference) __initdata (unknown).
> This is often because prepare_page_table lacks a __initdata
> annotation or the annotation of (unknown) is wrong.
>
> Mark the function as __init to avoid the warning regardless of the
> inlining.

I think if we're doing this, it would probably also be a good idea to
drop the "inline" as well, and just let the compiler decide?

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

2021-05-17 10:23:51

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH] ARM: mark prepare_page_table as __init

On Tue, May 11, 2021 at 11:04 AM Arnd Bergmann <[email protected]> wrote:

> From: Arnd Bergmann <[email protected]>
>
> In some configurations when building with gcc-11, prepare_page_table
> does not get inline, which causes a build time warning for a section
> mismatch:
>
> WARNING: modpost: vmlinux.o(.text.unlikely+0xce8): Section mismatch in reference from the function prepare_page_table() to the (unknown reference) .init.data:(unknown)
> The function prepare_page_table() references
> the (unknown reference) __initdata (unknown).
> This is often because prepare_page_table lacks a __initdata
> annotation or the annotation of (unknown) is wrong.
>
> Mark the function as __init to avoid the warning regardless of the
> inlining.
>
> Signed-off-by: Arnd Bergmann <[email protected]>

Like the others say, drop inline, with that:
Reviewed-by: Linus Walleij <[email protected]>

Yours,
Linus Walleij