From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
Biju Das <biju.das.jz@bp.renesas.com>,
Mike Galbraith <efault@gmx.de>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/urgent] sched/eevdf: Fix min_deadline heap integrity
Date: Mon, 09 Oct 2023 07:53:23 -0000 [thread overview]
Message-ID: <169683800306.3135.4450756007825411493.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20231006192445.GE743@noisy.programming.kicks-ass.net>
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 8dafa9d0eb1a1550a0f4d462db9354161bc51e0c
Gitweb: https://git.kernel.org/tip/8dafa9d0eb1a1550a0f4d462db9354161bc51e0c
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Fri, 06 Oct 2023 21:24:45 +02:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Mon, 09 Oct 2023 09:48:32 +02:00
sched/eevdf: Fix min_deadline heap integrity
Marek and Biju reported instances of:
"EEVDF scheduling fail, picking leftmost"
which Mike correlated with cgroup scheduling and the min_deadline heap
getting corrupted; some trace output confirms:
> And yeah, min_deadline is hosed somehow:
>
> validate_cfs_rq: --- /
> __print_se: ffff88845cf48080 w: 1024 ve: -58857638 lag: 870381 vd: -55861854 vmd: -66302085 E (11372/tr)
> __print_se: ffff88810d165800 w: 25 ve: -80323686 lag: 22336429 vd: -41496434 vmd: -66302085 E (-1//autogroup-31)
> __print_se: ffff888108379000 w: 25 ve: 0 lag: -57987257 vd: 114632828 vmd: 114632828 N (-1//autogroup-33)
> validate_cfs_rq: min_deadline: -55861854 avg_vruntime: -62278313462 / 1074 = -57987256
Turns out that reweight_entity(), which tries really hard to be fast,
does not do the normal dequeue+update+enqueue pattern but *does* scale
the deadline.
However, it then fails to propagate the updated deadline value up the
heap.
Fixes: 147f3efaa241 ("sched/fair: Implement an EEVDF-like scheduling policy")
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reported-by: Biju Das <biju.das.jz@bp.renesas.com>
Reported-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Biju Das <biju.das.jz@bp.renesas.com>
Tested-by: Mike Galbraith <efault@gmx.de>
Link: https://lkml.kernel.org/r/20231006192445.GE743@noisy.programming.kicks-ass.net
---
kernel/sched/fair.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index ef7490c..a4b904a 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3613,6 +3613,7 @@ static void reweight_entity(struct cfs_rq *cfs_rq, struct sched_entity *se,
*/
deadline = div_s64(deadline * old_weight, weight);
se->deadline = se->vruntime + deadline;
+ min_deadline_cb_propagate(&se->run_node, NULL);
}
#ifdef CONFIG_SMP
next prev parent reply other threads:[~2023-10-09 7:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-05 7:31 [PATCH] sched/fair: fix pick_eevdf to always find the correct se Biju Das
2023-10-05 7:58 ` Biju Das
2023-10-05 15:02 ` Peter Zijlstra
2023-10-05 15:08 ` Biju Das
2023-10-06 8:36 ` Marek Szyprowski
2023-10-06 9:38 ` Biju Das
[not found] ` <553e2ee4-ab3a-4635-a74f-0ba4cc03f3f9@samsung.com>
2023-10-06 10:31 ` Mike Galbraith
2023-10-06 14:00 ` Peter Zijlstra
2023-10-06 14:39 ` Mike Galbraith
2023-10-06 15:55 ` Peter Zijlstra
2023-10-06 16:54 ` Mike Galbraith
2023-10-06 19:24 ` Peter Zijlstra
2023-10-06 20:15 ` Marek Szyprowski
2023-10-06 23:27 ` Mike Galbraith
2023-10-07 0:37 ` Chen Yu
2023-10-07 6:26 ` Biju Das
2023-10-07 6:42 ` Chen Yu
2023-10-09 14:27 ` Phil Auld
2023-10-10 2:08 ` Chen Yu
2023-10-07 6:24 ` Biju Das
2023-10-09 7:53 ` tip-bot2 for Peter Zijlstra [this message]
2023-10-05 15:11 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=169683800306.3135.4450756007825411493.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=biju.das.jz@bp.renesas.com \
--cc=efault@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®