sched/deadline: Fix BUG_ON condition for deboosted tasks
commitddfc710395
upstream. Tasks the are being deboosted from SCHED_DEADLINE might enter enqueue_task_dl() one last time and hit an erroneous BUG_ON condition: since they are not boosted anymore, the if (is_dl_boosted()) branch is not taken, but the else if (!dl_prio) is and inside this one we BUG_ON(!is_dl_boosted), which is of course false (BUG_ON triggered) otherwise we had entered the if branch above. Long story short, the current condition doesn't make sense and always leads to triggering of a BUG. Fix this by only checking enqueue flags, properly: ENQUEUE_REPLENISH has to be present, but additional flags are not a problem. Fixes:64be6f1f5f
("sched/deadline: Don't replenish from a !SCHED_DEADLINE entity") Signed-off-by: Juri Lelli <juri.lelli@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20220714151908.533052-1-juri.lelli@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
bc1fb3c53a
Коммит
46d5575df8
|
@ -1561,7 +1561,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;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче