sched/features: Fix !CONFIG_JUMP_LABEL case
Juri Lelli
maintainerPATCH 1/1 sched/features: Fix !CONFIG_JUMP_LABEL case
Commit 765cc3a4b224e ("sched/core: Optimize sched_feat() for !CONFIG_SCHED_DEBUG builds") made sched features static for !CONFIG_SCHED_DEBUG configurations, but overlooked the CONFIG_ SCHED_DEBUG enabled and !HAVE_JUMP_LABEL cases. For the latter, echoing changes to /sys/kernel/debug/sched_features has the nasty effect of effectively changing what sched_features reports, but without actually changing the scheduler behaviour (since different translation units get different sysctl_sched_features).
Fix CONFIG_SCHED_DEBUG and !HAVE_JUMP_LABEL configurations by properly restructuring ifdefs.
--- kernel/sched/core.c | 2 +- kernel/sched/sched.h | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-)
kernel/sched/core.c +1 -1
@@ -44,7 +44,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_update_nr_running_tp); DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); -#if defined(CONFIG_SCHED_DEBUG ) && defined(CONFIG_JUMP_LABEL ) +#ifdef CONFIG_SCHED_DEBUG /* * Debugging: various feature bits *
kernel/sched/sched.h +10 -3
@@ -1629,7 +1629,7 @@ enum {#undef SCHED_FEAT -#if defined(CONFIG_SCHED_DEBUG ) && defined(CONFIG_JUMP_LABEL ) +#ifdef CONFIG_SCHED_DEBUG /* * To support run-time toggling of sched features, all the translation units
@@ -1637,6 +1637,7 @@ enum {*/ extern const_debug unsigned int sysctl_sched_features; +#ifdef HAVE_JUMP_LABEL #define SCHED_FEAT (name, enabled) \ static __always_inline bool static_branch_##name(struct static_key *key) \ { \
@@ -1649,7 +1650,13 @@ static __always_inline bool static_branch_##name(struct static_key *key) \extern struct static_key sched_feat_keys[__SCHED_FEAT_NR];#define sched_feat (x) (static_branch_##x(&sched_feat_keys[__SCHED_FEAT_##x])) -#else /* !(SCHED_DEBUG && CONFIG_JUMP_LABEL) */ +#else /* !HAVE_JUMP_LABEL */ + +#define sched_feat (x) (sysctl_sched_features & (1UL << __SCHED_FEAT_##x)) + +#endif /* HAVE_JUMP_LABEL */ + +#else /* !SCHED_DEBUG */ /* * Each translation unit has its own copy of sysctl_sched_features to allow
@@ -1665,7 +1672,7 @@ static const_debug __maybe_unused unsigned int sysctl_sched_features =#define sched_feat (x) !!(sysctl_sched_features & (1UL << __SCHED_FEAT_##x)) -#endif /* SCHED_DEBUG && CONFIG_JUMP_LABEL */ +#endif /* SCHED_DEBUG */ extern struct static_key_false sched_numa_balancing;extern struct static_key_false sched_schedstats;
Signature · 1 line
2.26.2
Hi,
Quoted 9 lines · Juri Lelli
Commit
765cc3a4b224e("sched/core: Optimizesched_feat()for !CONFIG_SCHED_DEBUG builds") made sched features static for !CONFIG_SCHED_DEBUG configurations, but overlooked theCONFIG_SCHED_DEBUGenabled and !HAVE_JUMP_LABEL cases. For the latter, echoing changes to/sys/kernel/debug/sched_featureshas the nasty effect of effectively changing whatsched_featuresreports, but without actually changing the scheduler behaviour (since different translation units get differentsysctl_sched_features).
Quoted 3 lines
Fix
CONFIG_SCHED_DEBUGand !HAVE_JUMP_LABEL configurations by properly restructuring ifdefs.
That should be CONFIG_JUMP_LABEL, no? The HAVE stuff should've died with
e9666d10a567 ("jump_label: move 'asm goto' support test to Kconfig")
Quoted 4 lines
Fixes 765cc3a4b224e ("sched/core: Optimize sched_feat() for !CONFIG_SCHED_DEBUG builds")Co-developed-by Daniel Bristot de Oliveira <[email protected]>Signed-off-by Daniel Bristot de Oliveira <[email protected]>Signed-off-by Juri Lelli <[email protected]>
With the aforementioned replacement (changelog AND diff):