[tip: sched/core] sched/deadline: Fix replenish_dl_new_period dl_server condition

From: tip-bot2 for Juri Lelli
Date: Mon Dec 02 2024 - 06:43:34 EST


The following commit has been merged into the sched/core branch of tip:

Commit-ID: 22368fe1f9bbf39db2b5b52859589883273e80ce
Gitweb: https://git.kernel.org/tip/22368fe1f9bbf39db2b5b52859589883273e80ce
Author: Juri Lelli <juri.lelli@xxxxxxxxxx>
AuthorDate: Wed, 27 Nov 2024 07:37:40 +01:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Mon, 02 Dec 2024 12:01:27 +01:00

sched/deadline: Fix replenish_dl_new_period dl_server condition

The condition in replenish_dl_new_period() that checks if a reservation
(dl_server) is deferred and is not handling a starvation case is
obviously wrong.

Fix it.

Fixes: a110a81c52a9 ("sched/deadline: Deferrable dl server")
Signed-off-by: Juri Lelli <juri.lelli@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lkml.kernel.org/r/20241127063740.8278-1-juri.lelli@xxxxxxxxxx
---
kernel/sched/deadline.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index d9d5a70..206691d 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -781,7 +781,7 @@ static inline void replenish_dl_new_period(struct sched_dl_entity *dl_se,
* If it is a deferred reservation, and the server
* is not handling an starvation case, defer it.
*/
- if (dl_se->dl_defer & !dl_se->dl_defer_running) {
+ if (dl_se->dl_defer && !dl_se->dl_defer_running) {
dl_se->dl_throttled = 1;
dl_se->dl_defer_armed = 1;
}