All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] sched/core: Fix a TOCTOU bug in sched_non_preferred_cpu_push_stop()
@ 2026-11-18  6:59 Fushuai Wang
  2026-11-18  9:06 ` Shrikanth Hegde
  0 siblings, 1 reply; 2+ messages in thread
From: Fushuai Wang @ 2026-11-18  6:59 UTC (permalink / raw)
  To: mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann,
	rostedt, bsegall, mgorman, vschneid, kprateek.nayak, sshegde
  Cc: linux-kernel, wangfushuai

From: Fushuai Wang <wangfushuai@baidu.com>

sched_push_current_non_preferred_cpu() is called in irq context. It
checks is_migration_disabled() before queuing the stopper.

migrate_disable() sets p->migration_disabled in preempt_disable() section.
An irq can hit after preempt_disable() but before p->migration_disabled=1.
After the irq returns, the task cannot be preempted by stopper becuase
preemption is disabled, so it finishes setting p->migration_disabled=1
before the stopper runs.

It may be like:
    task context:                       irq context:
    migrate_disable()
        preempt_disable()
                                        is_migration_disabled()
        migration_disabled = 1
        preempt_enable()

So recheck is_migration_disabled() in sched_non_preferred_cpu_push_stop()
before calling __migrate_task().

The stack may be like:
   WARNING: kernel/sched/core.c:3432 at set_task_cpu+0x1b8/0xdf0, CPU#21: migration/21/152
   CPU: 21 UID: 0 PID: 152 Comm: migration/21 Tainted: G        W  O        7.4.0-rc1 #3 PREEMPT(lazy)
   Stopper: sched_non_preferred_cpu_push_stop+0x0/0xb10 <- sched_push_current_non_preferred_cpu+0x6a6/0x9a0
   RIP: 0010:set_task_cpu+0x1b8/0xdf0
   Call Trace:
    <TASK>
    ? set_task_cpu+0x5/0xdf0
    move_queued_task+0xfc/0x650
    ? is_cpu_allowed+0x341/0x820
    ? __this_cpu_preempt_check+0x13/0x20
    sched_non_preferred_cpu_push_stop+0x7b7/0xb10
    ? __this_cpu_preempt_check+0x13/0x20
    ? __pfx_sched_non_preferred_cpu_push_stop+0x10/0x10
    ? __pfx_sched_non_preferred_cpu_push_stop+0x10/0x10
    ? sched_non_preferred_cpu_push_stop+0x5/0xb10
    ? __pfx_sched_non_preferred_cpu_push_stop+0x10/0x10
    cpu_stopper_thread+0x205/0x410
    ? smpboot_thread_fn+0x307/0xa60
    ? __pfx_cpu_stopper_thread+0x10/0x10
    smpboot_thread_fn+0x352/0xa60
    ? __pfx_smpboot_thread_fn+0x10/0x10
    kthread+0x3a6/0x4d0
    ? __pfx_kthread+0x10/0x10
    ret_from_fork+0x68e/0xb40
    ? __pfx_ret_from_fork+0x10/0x10
    ? __kasan_check_read+0x11/0x20
    ? __switch_to+0x592/0x1210
    ? __pfx_kthread+0x10/0x10
    ret_from_fork_asm+0x1a/0x30
    </TASK>

Fixes: 74699f56ebcf ("sched/core: Push current task from non preferred CPU")
Signed-off-by: Fushuai Wang <wangfushuai@baidu.com>
---
v1->v2: No code changes, just improve the commit message.

 kernel/sched/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 5ed660f099a5..6f9374aa3f19 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -11314,7 +11314,8 @@ static int sched_non_preferred_cpu_push_stop(void *arg)
 		rq->npc_push_work_pending = false;
 		update_rq_clock(rq);
 
-		if (task_rq(p) == rq && task_on_rq_queued(p)) {
+		if (task_rq(p) == rq && task_on_rq_queued(p) &&
+		    !is_migration_disabled(p)) {
 			struct rq *dest_rq = __migrate_task(rq, &rf, p, cpu);
 
 			if (rq != dest_rq)
-- 
2.36.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] sched/core: Fix a TOCTOU bug in sched_non_preferred_cpu_push_stop()
  2026-11-18  6:59 [PATCH v2] sched/core: Fix a TOCTOU bug in sched_non_preferred_cpu_push_stop() Fushuai Wang
@ 2026-11-18  9:06 ` Shrikanth Hegde
  0 siblings, 0 replies; 2+ messages in thread
From: Shrikanth Hegde @ 2026-11-18  9:06 UTC (permalink / raw)
  To: Fushuai Wang
  Cc: linux-kernel, wangfushuai, mingo, peterz, juri.lelli,
	vincent.guittot, dietmar.eggemann, rostedt, bsegall, mgorman,
	vschneid, kprateek.nayak

Hi Fushuai. Thanks for the fix.

On 11/18/26 12:29 PM, Fushuai Wang wrote:
> From: Fushuai Wang <wangfushuai@baidu.com>
> 
> sched_push_current_non_preferred_cpu() is called in irq context. It
> checks is_migration_disabled() before queuing the stopper.
> 
> migrate_disable() sets p->migration_disabled in preempt_disable() section.
> An irq can hit after preempt_disable() but before p->migration_disabled=1.
> After the irq returns, the task cannot be preempted by stopper becuase
> preemption is disabled, so it finishes setting p->migration_disabled=1
> before the stopper runs.
> 
> It may be like:
>      task context:                       irq context:
>      migrate_disable()
>          preempt_disable()
>                                          is_migration_disabled()
>          migration_disabled = 1
>          preempt_enable()
> 
> So recheck is_migration_disabled() in sched_non_preferred_cpu_push_stop()
> before calling __migrate_task().
> 
> The stack may be like:
>     WARNING: kernel/sched/core.c:3432 at set_task_cpu+0x1b8/0xdf0, CPU#21: migration/21/152
>     CPU: 21 UID: 0 PID: 152 Comm: migration/21 Tainted: G        W  O        7.4.0-rc1 #3 PREEMPT(lazy)
>     Stopper: sched_non_preferred_cpu_push_stop+0x0/0xb10 <- sched_push_current_non_preferred_cpu+0x6a6/0x9a0
>     RIP: 0010:set_task_cpu+0x1b8/0xdf0
>     Call Trace:
>      <TASK>
>      ? set_task_cpu+0x5/0xdf0
>      move_queued_task+0xfc/0x650
>      ? is_cpu_allowed+0x341/0x820
>      ? __this_cpu_preempt_check+0x13/0x20
>      sched_non_preferred_cpu_push_stop+0x7b7/0xb10
>      ? __this_cpu_preempt_check+0x13/0x20
>      ? __pfx_sched_non_preferred_cpu_push_stop+0x10/0x10
>      ? __pfx_sched_non_preferred_cpu_push_stop+0x10/0x10
>      ? sched_non_preferred_cpu_push_stop+0x5/0xb10
>      ? __pfx_sched_non_preferred_cpu_push_stop+0x10/0x10
>      cpu_stopper_thread+0x205/0x410
>      ? smpboot_thread_fn+0x307/0xa60
>      ? __pfx_cpu_stopper_thread+0x10/0x10
>      smpboot_thread_fn+0x352/0xa60
>      ? __pfx_smpboot_thread_fn+0x10/0x10
>      kthread+0x3a6/0x4d0
>      ? __pfx_kthread+0x10/0x10
>      ret_from_fork+0x68e/0xb40
>      ? __pfx_ret_from_fork+0x10/0x10
>      ? __kasan_check_read+0x11/0x20
>      ? __switch_to+0x592/0x1210
>      ? __pfx_kthread+0x10/0x10
>      ret_from_fork_asm+0x1a/0x30
>      </TASK>
> 
> Fixes: 74699f56ebcf ("sched/core: Push current task from non preferred CPU")
> Signed-off-by: Fushuai Wang <wangfushuai@baidu.com>

Reviewed-by: Shrikanth Hegde <sshegde@linux.ibm.com>

> ---
> v1->v2: No code changes, just improve the commit message.
> 
>   kernel/sched/core.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 5ed660f099a5..6f9374aa3f19 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -11314,7 +11314,8 @@ static int sched_non_preferred_cpu_push_stop(void *arg)
>   		rq->npc_push_work_pending = false;
>   		update_rq_clock(rq);
>   
> -		if (task_rq(p) == rq && task_on_rq_queued(p)) {
> +		if (task_rq(p) == rq && task_on_rq_queued(p) &&
> +		    !is_migration_disabled(p)) {
>   			struct rq *dest_rq = __migrate_task(rq, &rf, p, cpu);
>   
>   			if (rq != dest_rq)


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-18  9:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-18  6:59 [PATCH v2] sched/core: Fix a TOCTOU bug in sched_non_preferred_cpu_push_stop() Fushuai Wang
2026-11-18  9:06 ` Shrikanth Hegde

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.