]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
sched/smt: Always inline sched_smt_active()
authorJosh Poimboeuf <jpoimboe@kernel.org>
Tue, 1 Apr 2025 04:26:44 +0000 (21:26 -0700)
committerIngo Molnar <mingo@kernel.org>
Tue, 1 Apr 2025 07:07:13 +0000 (09:07 +0200)
sched_smt_active() can be called from noinstr code, so it should always
be inlined.  The CONFIG_SCHED_SMT version already has __always_inline.
Do the same for its !CONFIG_SCHED_SMT counterpart.

Fixes the following warning:

  vmlinux.o: error: objtool: intel_idle_ibrs+0x13: call to sched_smt_active() leaves .noinstr.text section

Fixes: 321a874a7ef8 ("sched/smt: Expose sched_smt_present static key")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/1d03907b0a247cf7fb5c1d518de378864f603060.1743481539.git.jpoimboe@kernel.org
Closes: https://lore.kernel.org/r/202503311434.lyw2Tveh-lkp@intel.com/
include/linux/sched/smt.h

index fb1e295e7e63e20e3bb4aebdd2d05507cbc84d06..166b19af956f8b922007428b06b10f4e0d023542 100644 (file)
@@ -12,7 +12,7 @@ static __always_inline bool sched_smt_active(void)
        return static_branch_likely(&sched_smt_present);
 }
 #else
-static inline bool sched_smt_active(void) { return false; }
+static __always_inline bool sched_smt_active(void) { return false; }
 #endif
 
 void arch_smt_update(void);