Skip to contentSkip to conversation

sched.h: always_inline alloc_tag_{save|restore} to fix modpost warnings

PATCH Applied Suren Baghdasaryan 1 participant 2 messages Jul 4, 2024

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

PATCH v2 1/2 sched.h: always_inline alloc_tag_{save|restore} to fix modpost warnings

Mark alloc_tag_{save|restore} as always_inline to fix the following modpost warnings:

WARNING: modpost: vmlinux: section mismatch in reference: alloc_tag_save+0x1c (section: .text.unlikely) -> initcall_level_names (section: .init.data)
WARNING: modpost: vmlinux: section mismatch in reference: alloc_tag_restore+0x3c (section: .text.unlikely) -> initcall_level_names (section: .init.data)

The warnings happen when these functions are called from an __init function and they don't get inlined (remain in the .text section) while the value returned by get_current() points into .init.data section. Assuming get_current() always returns a valid address, this situation can happen only during init stage and accessing .init.data from .text section during that stage should pose no issues.

Fixes 22d407b164ff ("lib: add allocation tagging support for memory allocation profiling")
Cc Kent Overstreet <[email protected]>

---

Changes since v1 [1]:
- Added the second patch to resolve follow-up warnings
- Expanded changelog description, per Andrew Morton
- CC'ed stable, per Andrew Morton
- Added Fixes tag, per Andrew Morton

[1] https://lore.kernel.org/all/[email protected]/

 include/linux/sched.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/sched.h +2 -2
index 61591ac6eab6..a5f4b48fca18 100644
@@ -2192,13 +2192,13 @@ static inline int sched_core_idle_cpu(int cpu) { return idle_cpu(cpu); }
 extern void sched_set_stop_task(int cpu, struct task_struct *stop);
 
 #ifdef CONFIG_MEM_ALLOC_PROFILING
-static inline struct alloc_tag *alloc_tag_save(struct alloc_tag *tag)
+static __always_inline struct alloc_tag *alloc_tag_save(struct alloc_tag *tag)
 {
 	swap(current->alloc_tag, tag);
 	return tag;
 }
 
-static inline void alloc_tag_restore(struct alloc_tag *tag, struct alloc_tag *old)
+static __always_inline void alloc_tag_restore(struct alloc_tag *tag, struct alloc_tag *old)
 {
 #ifdef CONFIG_MEM_ALLOC_PROFILING_DEBUG
 	WARN(current->alloc_tag != tag, "current->alloc_tag was changed:\n");

base-commit: 795c58e4c7fc6163d8fb9f2baa86cfe898fa4b19

Signature · 1 line
2.45.2.803.g4e1b14247a-goog
#1 lore raw

PATCH v2 2/2 arch/xtensa: always_inline get_current() and current_thread_info()

Mark get_current() and current_thread_info() functions as always_inline to fix the following modpost warning:

WARNING: modpost: vmlinux: section mismatch in reference: get_current+0xc (section: .text.unlikely) -> initcall_level_names (section: .init.data)

The warning happens when these functions are called from an __init function and they don't get inlined (remain in the .text section) while the value they return points into .init.data section. Assuming get_current() always returns a valid address, this situation can happen only during init stage and accessing .init.data from .text section during that stage should pose no issues.

Fixes 22d407b164ff ("lib: add allocation tagging support for memory allocation profiling")
Cc Kent Overstreet <[email protected]>
---
 arch/xtensa/include/asm/current.h     | 2 +-
 arch/xtensa/include/asm/thread_info.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/xtensa/include/asm/current.h +1 -1
index 08010dbf5e09..df275d554788 100644
@@ -19,7 +19,7 @@
 
 struct task_struct;
 
-static inline struct task_struct *get_current(void)
+static __always_inline struct task_struct *get_current(void)
 {
 	return current_thread_info()->task;
 }
arch/xtensa/include/asm/thread_info.h +1 -1
index 326db1c1d5d8..e0dffcc43b9e 100644
@@ -91,7 +91,7 @@ struct thread_info {
 }
 
 /* how to get the thread information struct from C */
-static inline struct thread_info *current_thread_info(void)
+static __always_inline struct thread_info *current_thread_info(void)
 {
 	struct thread_info *ti;
 	 __asm__("extui %0, a1, 0, "__stringify(CURRENT_SHIFT)"\n\t"
Signature · 1 line
2.45.2.803.g4e1b14247a-goog