On Fri, Aug 23, 2024 at 09:47:05AM +0200, Peter Zijlstra wrote:
> On Wed, Aug 21, 2024 at 02:57:16PM -0700, Paul E. McKenney wrote:
>
> > 2e0199df252a ("sched/fair: Prepare exit/cleanup paths for delayed_dequeue")
> >
> > The preceding commit is very reliable.
> >
> > Only instead of (or maybe as well as?) introducing the dequeue_rt_stack()
> > bug, the 2e0199df252a commit introduced a build bug:
> >
> > ------------------------------------------------------------------------
> >
> > In file included from kernel/sched/fair.c:54:
> > kernel/sched/fair.c: In function ‘switched_from_fair’:
> > kernel/sched/sched.h:2154:58: error: ‘__SCHED_FEAT_DELAY_ZERO’ undeclared (first use in this function); did you mean ‘__SCHED_FEAT_LATENCY_WARN’?
> > 2154 | #define sched_feat(x) !!(sysctl_sched_features & (1UL << __SCHED_FEAT_##x))
> > | ^~~~~~~~~~~~~
> > kernel/sched/fair.c:12878:21: note: in expansion of macro ‘sched_feat’
> > 12878 | if (sched_feat(DELAY_ZERO) && p->se.vlag > 0)
> > | ^~~~~~~~~~
> > kernel/sched/sched.h:2154:58: note: each undeclared identifier is reported only once for each function it appears in
> > 2154 | #define sched_feat(x) !!(sysctl_sched_features & (1UL << __SCHED_FEAT_##x))
> > | ^~~~~~~~~~~~~
> > kernel/sched/fair.c:12878:21: note: in expansion of macro ‘sched_feat’
> > 12878 | if (sched_feat(DELAY_ZERO) && p->se.vlag > 0)
> > | ^~~~~~~~~~
> >
>
> Oh gawd, last minute back-merges :/
I know that feeling! ;-)
> Does the below help any? That's more or less what it was before Valentin
> asked me why it was weird like that :-)
>
> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> index 6be618110885..5757dd50b02f 100644
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -13107,7 +13107,6 @@ static void switched_from_fair(struct rq *rq, struct task_struct *p)
> * and we cannot use DEQUEUE_DELAYED.
> */
> if (p->se.sched_delayed) {
> - dequeue_task(rq, p, DEQUEUE_NOCLOCK | DEQUEUE_SLEEP);
> p->se.sched_delayed = 0;
> p->se.rel_deadline = 0;
> if (sched_feat(DELAY_ZERO) && p->se.vlag > 0)
Removing that line from 2e0199df252a still gets me the complaint about
__SCHED_FEAT_DELAY_ZERO being undefined. To my naive eyes, it appears
that this commit:
54a58a787791 ("sched/fair: Implement DELAY_ZERO")
Need to be placed before 2e0199df252a. Of course, when I try it, I
get conflicts. So I took just this hunk:
------------------------------------------------------------------------
diff --git a/kernel/sched/features.h b/kernel/sched/features.h
index 97fb2d4920898..6c5f5424614d4 100644
--- a/kernel/sched/features.h
+++ b/kernel/sched/features.h
@@ -28,6 +28,11 @@ SCHED_FEAT(NEXT_BUDDY, false)
*/
SCHED_FEAT(CACHE_HOT_BUDDY, true)
+/*
+ * DELAY_ZERO clips the lag on dequeue (or wakeup) to 0.
+ */
+SCHED_FEAT(DELAY_ZERO, true)
+
/*
* Allow wakeup-time preemption of the current task:
*/
------------------------------------------------------------------------
That makes the build error go away. Maybe even legitimately?
Just to pick on the easy one, I took a look at the complaint about
cfs_rq being unused and the complaint about __SCHED_FEAT_DELAY_ZERO
being undefined. This variable was added here:
781773e3b680 ("sched/fair: Implement ENQUEUE_DELAYED")
And its first use was added here:
54a58a787791 ("sched/fair: Implement DELAY_ZERO")
Which matches my experience.
So left to myself, I would run on these commits with the above hunk:
54a58a7877916 sched/fair: Implement DELAY_ZERO
152e11f6df293 sched/fair: Implement delayed dequeue
e1459a50ba318 sched: Teach dequeue_task() about special task states
a1c446611e31c sched,freezer: Mark TASK_FROZEN special
781773e3b6803 sched/fair: Implement ENQUEUE_DELAYED
f12e148892ede sched/fair: Prepare pick_next_task() for delayed dequeue
2e0199df252a5 sched/fair: Prepare exit/cleanup paths for delayed_dequeue
e28b5f8bda017 sched/fair: Assert {set_next,put_prev}_entity() are properly balanced
And where needed, remove the unused cfs_rq local variable.
Would that likely work?
In the meantime, SIGFOOD!
Thanx, Paul
