Skip to contentSkip to conversation

mm/shuffle: fix section mismatch warning

PATCH In review Arnd Bergmann 3 participants 3 messages May 14, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 mm/shuffle.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/shuffle.h +2 -2
index 71b784f0b7c3..cec62984f7d3 100644
@@ -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;
Signature · 1 line
2.29.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 35 lines · Arnd Bergmann

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.

---
  mm/shuffle.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
mm/shuffle.h +1 -1
index 71b784f0b7c3..cec62984f7d3 100644
@@ -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;

mm/shuffle.h static inline void shuffle_free_memory(pg_data_t *pgdat) · line 24

Quoted 8 lines
mm/shuffle.h +1 -1
@@ -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;
Signature · 3 lines
Thanks,

David / dhildenb
Reviewed-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 12 lines · Arnd Bergmann

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.

Quoted 4 lines

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.

Quoted 27 lines
---
  mm/shuffle.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
mm/shuffle.h +2 -2
index 71b784f0b7c3..cec62984f7d3 100644
@@ -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;