[PATCH sched_ext/for-7.1-fixes] sched_ext: Fix !CONFIG_EXT_SUB_SCHED build warnings

[PATCH sched_ext/for-7.1-fixes] sched_ext: Fix !CONFIG_EXT_SUB_SCHED build warnings

[Tejun Heo]

W=1 with CONFIG_EXT_SUB_SCHED=n flags 'err_msg' uninitialized and
'err_free_lb_resched' unused. Initialize err_msg and gate the label.

Signed-off-by: Tejun Heo <tj@kernel.org>
---
 kernel/sched/ext.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
index 48b4834c7027..f4e2db8e56be 100644
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@ -5584,7 +5584,7 @@ static void refresh_watchdog(void)

 static s32 scx_link_sched(struct scx_sched *sch)
 {
-	const char *err_msg;
+	const char *err_msg = "";
 	s32 ret = 0;

 	scoped_guard(raw_spinlock_irq, &scx_sched_lock) {
@@ -6652,8 +6652,10 @@ static struct scx_sched *scx_alloc_and_add_sched(struct sched_ext_ops *ops,
 #endif	/* CONFIG_EXT_SUB_SCHED */
 	return sch;

+#ifdef CONFIG_EXT_SUB_SCHED
 err_free_lb_resched:
 	free_cpumask_var(sch->bypass_lb_resched_cpumask);
+#endif
 err_free_lb_cpumask:
 	free_cpumask_var(sch->bypass_lb_donee_cpumask);
 err_stop_helper:

Re: [PATCH sched_ext/for-7.1-fixes] sched_ext: Fix !CONFIG_EXT_SUB_SCHED build warnings

[Tejun Heo]

Hello,

Applied to sched_ext/for-7.1-fixes.

Thanks.

--
tejun

Re: [PATCH sched_ext/for-7.1-fixes] sched_ext: Fix !CONFIG_EXT_SUB_SCHED build warnings

[Andrea Righi]

Hi Tejun,

On Thu, May 07, 2026 at 02:16:52PM -1000, Tejun Heo wrote:
> W=1 with CONFIG_EXT_SUB_SCHED=n flags 'err_msg' uninitialized and
> 'err_free_lb_resched' unused. Initialize err_msg and gate the label.
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>

Reviewed-by: Andrea Righi <arighi@nvidia.com>

Maybe add also:

Fixes: d292aa00de1a ("sched_ext: Make bypass LB cpumasks per-scheduler")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202605080821.ftqLNrXX-lkp@intel.com/

Thanks,
-Andrea

> ---
>  kernel/sched/ext.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
> index 48b4834c7027..f4e2db8e56be 100644
> --- a/kernel/sched/ext.c
> +++ b/kernel/sched/ext.c
> @@ -5584,7 +5584,7 @@ static void refresh_watchdog(void)
> 
>  static s32 scx_link_sched(struct scx_sched *sch)
>  {
> -	const char *err_msg;
> +	const char *err_msg = "";
>  	s32 ret = 0;
> 
>  	scoped_guard(raw_spinlock_irq, &scx_sched_lock) {
> @@ -6652,8 +6652,10 @@ static struct scx_sched *scx_alloc_and_add_sched(struct sched_ext_ops *ops,
>  #endif	/* CONFIG_EXT_SUB_SCHED */
>  	return sch;
> 
> +#ifdef CONFIG_EXT_SUB_SCHED
>  err_free_lb_resched:
>  	free_cpumask_var(sch->bypass_lb_resched_cpumask);
> +#endif
>  err_free_lb_cpumask:
>  	free_cpumask_var(sch->bypass_lb_donee_cpumask);
>  err_stop_helper: