2021-05-14 18:54:26

by Arnd Bergmann

Subject: [PATCH] mm/shuffle: fix section mismatch warning

From: Arnd Bergmann <[email protected]>

clang sometimes decides not to inline shuffle_zone(), but it calls
a __meminit function. Without the extra __meminit annotation we get
this warning:

WARNING: modpost: vmlinux.o(.text+0x2a86d4): Section mismatch in reference from the function shuffle_zone() to the function .meminit.text:__shuffle_zone()
The function shuffle_zone() references
the function __meminit __shuffle_zone().
This is often because shuffle_zone lacks a __meminit
annotation or the annotation of __shuffle_zone is wrong.

shuffle_free_memory() did not show the same problem in my tests, but
it could happen in theory as well, so mark both as __meminit.

Signed-off-by: Arnd Bergmann <[email protected]>
---
mm/shuffle.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/shuffle.h b/mm/shuffle.h
index 71b784f0b7c3..cec62984f7d3 100644
--- a/mm/shuffle.h
+++ b/mm/shuffle.h
@@ -10,7 +10,7 @@
DECLARE_STATIC_KEY_FALSE(page_alloc_shuffle_key);
extern void __shuffle_free_memory(pg_data_t *pgdat);
extern bool shuffle_pick_tail(void);
-static inline void shuffle_free_memory(pg_data_t *pgdat)
+static inline void __meminit shuffle_free_memory(pg_data_t *pgdat)
{
if (!static_branch_unlikely(&page_alloc_shuffle_key))
return;
@@ -18,7 +18,7 @@ static inline void shuffle_free_memory(pg_data_t *pgdat)
}

extern void __shuffle_zone(struct zone *z);
-static inline void shuffle_zone(struct zone *z)
+static inline void __meminit shuffle_zone(struct zone *z)
{
if (!static_branch_unlikely(&page_alloc_shuffle_key))
return;
--
2.29.2

2021-05-14 18:55:05

by David Hildenbrand

Subject: Re: [PATCH] mm/shuffle: fix section mismatch warning

On 14.05.21 15:59, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> clang sometimes decides not to inline shuffle_zone(), but it calls
> a __meminit function. Without the extra __meminit annotation we get
> this warning:
>
> WARNING: modpost: vmlinux.o(.text+0x2a86d4): Section mismatch in reference from the function shuffle_zone() to the function .meminit.text:__shuffle_zone()
> The function shuffle_zone() references
> the function __meminit __shuffle_zone().
> This is often because shuffle_zone lacks a __meminit
> annotation or the annotation of __shuffle_zone is wrong.
>
> shuffle_free_memory() did not show the same problem in my tests, but
> it could happen in theory as well, so mark both as __meminit.
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> mm/shuffle.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mm/shuffle.h b/mm/shuffle.h
> index 71b784f0b7c3..cec62984f7d3 100644
> --- a/mm/shuffle.h
> +++ b/mm/shuffle.h
> @@ -10,7 +10,7 @@
> DECLARE_STATIC_KEY_FALSE(page_alloc_shuffle_key);
> extern void __shuffle_free_memory(pg_data_t *pgdat);
> extern bool shuffle_pick_tail(void);
> -static inline void shuffle_free_memory(pg_data_t *pgdat)
> +static inline void __meminit shuffle_free_memory(pg_data_t *pgdat)
> {
> if (!static_branch_unlikely(&page_alloc_shuffle_key))
> return;
> @@ -18,7 +18,7 @@ static inline void shuffle_free_memory(pg_data_t *pgdat)
> }
>
> extern void __shuffle_zone(struct zone *z);
> -static inline void shuffle_zone(struct zone *z)
> +static inline void __meminit shuffle_zone(struct zone *z)
> {
> if (!static_branch_unlikely(&page_alloc_shuffle_key))
> return;
>

Reviewed-by: David Hildenbrand <[email protected]>

--
Thanks,

David / dhildenb

2021-05-14 20:10:26

by Nathan Chancellor

Subject: Re: [PATCH] mm/shuffle: fix section mismatch warning

On 5/14/2021 6:59 AM, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> clang sometimes decides not to inline shuffle_zone(), but it calls
> a __meminit function. Without the extra __meminit annotation we get
> this warning:
>
> WARNING: modpost: vmlinux.o(.text+0x2a86d4): Section mismatch in reference from the function shuffle_zone() to the function .meminit.text:__shuffle_zone()
> The function shuffle_zone() references
> the function __meminit __shuffle_zone().
> This is often because shuffle_zone lacks a __meminit
> annotation or the annotation of __shuffle_zone is wrong.
>
> shuffle_free_memory() did not show the same problem in my tests, but
> it could happen in theory as well, so mark both as __meminit.
>
> Signed-off-by: Arnd Bergmann <[email protected]>

Reviewed-by: Nathan Chancellor <[email protected]>

> ---
> mm/shuffle.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mm/shuffle.h b/mm/shuffle.h
> index 71b784f0b7c3..cec62984f7d3 100644
> --- a/mm/shuffle.h
> +++ b/mm/shuffle.h
> @@ -10,7 +10,7 @@
> DECLARE_STATIC_KEY_FALSE(page_alloc_shuffle_key);
> extern void __shuffle_free_memory(pg_data_t *pgdat);
> extern bool shuffle_pick_tail(void);
> -static inline void shuffle_free_memory(pg_data_t *pgdat)
> +static inline void __meminit shuffle_free_memory(pg_data_t *pgdat)
> {
> if (!static_branch_unlikely(&page_alloc_shuffle_key))
> return;
> @@ -18,7 +18,7 @@ static inline void shuffle_free_memory(pg_data_t *pgdat)
> }
>
> extern void __shuffle_zone(struct zone *z);
> -static inline void shuffle_zone(struct zone *z)
> +static inline void __meminit shuffle_zone(struct zone *z)
> {
> if (!static_branch_unlikely(&page_alloc_shuffle_key))
> return;
>