diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-24 09:50:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-24 09:50:53 -0700 |
| commit | c2602a7ce0fc66318325df170a9ee275d7df5c2e (patch) | |
| tree | 7bec568ed5a511f826e6674fcd07ebdcc9843d2c | |
| parent | 05017fed92de32c167bbd21a5ee9ad0e489e19d4 (diff) | |
| parent | ddfc710395cccc61247348df9eb18ea50321cbed (diff) | |
| download | linux-c2602a7ce0fc66318325df170a9ee275d7df5c2e.tar.bz2 | |
Merge tag 'sched_urgent_for_v5.19_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Borislav Petkov:
"A single fix to correct a wrong BUG_ON() condition for deboosted
tasks"
* tag 'sched_urgent_for_v5.19_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/deadline: Fix BUG_ON condition for deboosted tasks
| -rw-r--r-- | kernel/sched/deadline.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index b5152961b743..7bf561262cb8 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -1701,7 +1701,10 @@ static void enqueue_task_dl(struct rq *rq, struct task_struct *p, int flags) * the throttle. */ p->dl.dl_throttled = 0; - BUG_ON(!is_dl_boosted(&p->dl) || flags != ENQUEUE_REPLENISH); + if (!(flags & ENQUEUE_REPLENISH)) + printk_deferred_once("sched: DL de-boosted task PID %d: REPLENISH flag missing\n", + task_pid_nr(p)); + return; } |