Skip to content

Commit 619bd4a

Browse files
Sebastian Andrzej SiewiorIngo Molnar
authored andcommitted
sched/rt: Add a missing rescheduling point
Since the change in commit: fd7a4be ("sched, rt: Convert switched_{from, to}_rt() / prio_changed_rt() to balance callbacks") ... we don't reschedule a task under certain circumstances: Lets say task-A, SCHED_OTHER, is running on CPU0 (and it may run only on CPU0) and holds a PI lock. This task is removed from the CPU because it used up its time slice and another SCHED_OTHER task is running. Task-B on CPU1 runs at RT priority and asks for the lock owned by task-A. This results in a priority boost for task-A. Task-B goes to sleep until the lock has been made available. Task-A is already runnable (but not active), so it receives no wake up. The reality now is that task-A gets on the CPU once the scheduler decides to remove the current task despite the fact that a high priority task is enqueued and waiting. This may take a long time. The desired behaviour is that CPU0 immediately reschedules after the priority boost which made task-A the task with the lowest priority. Suggested-by: Peter Zijlstra <[email protected]> Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Thomas Gleixner <[email protected]> Fixes: fd7a4be ("sched, rt: Convert switched_{from, to}_rt() prio_changed_rt() to balance callbacks") Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 4b12db9 commit 619bd4a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

kernel/sched/deadline.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,12 +1729,11 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)
17291729
#ifdef CONFIG_SMP
17301730
if (tsk_nr_cpus_allowed(p) > 1 && rq->dl.overloaded)
17311731
queue_push_tasks(rq);
1732-
#else
1732+
#endif
17331733
if (dl_task(rq->curr))
17341734
check_preempt_curr_dl(rq, p, 0);
17351735
else
17361736
resched_curr(rq);
1737-
#endif
17381737
}
17391738
}
17401739

kernel/sched/rt.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2198,10 +2198,9 @@ static void switched_to_rt(struct rq *rq, struct task_struct *p)
21982198
#ifdef CONFIG_SMP
21992199
if (tsk_nr_cpus_allowed(p) > 1 && rq->rt.overloaded)
22002200
queue_push_tasks(rq);
2201-
#else
2201+
#endif /* CONFIG_SMP */
22022202
if (p->prio < rq->curr->prio)
22032203
resched_curr(rq);
2204-
#endif /* CONFIG_SMP */
22052204
}
22062205
}
22072206

0 commit comments

Comments
 (0)