[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <87eeae11cr.ffs@tglx>
Date: Sat, 28 Aug 2021 09:21:08 +0200
From: Thomas Gleixner <tglx@...utronix.de>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Peter Zijlstra <peterz@...radead.org>,
Valentin Schneider <valentin.schneider@....com>,
Daniel Bristot de Oliveira <bristot@...hat.com>,
Juri Lelli <juri.lelli@...hat.com>,
Vincent Guittot <vincent.guittot@...aro.org>,
Steven Rostedt <rostedt@...dmis.org>,
Ben Segall <bsegall@...gle.com>,
Ingo Molnar <mingo@...nel.org>, Mel Gorman <mgorman@...e.de>,
Dietmar Eggemann <dietmar.eggemann@....com>
Subject: Re: [PATCH] sched: Prevent balance_push() on remote runqueues
On Fri, Aug 27 2021 at 16:07, Thomas Gleixner wrote:
> sched_setscheduler() and rt_mutex_setprio() invoke the run-queue balance
> callback after changing priorities or the scheduling class of a task. The
> run-queue for which the callback is invoked can be local or remote.
>
> That's not a problem for the regular rq::push_work which is serialized with
> a busy flag in the run-queue struct, but for the balance_push() work which
> is only valid to be invoked on the outgoing CPU that's wrong. It not only
> triggers the debug warning, but also leaves the per CPU variable push_work
> unprotected, which can result in double enqueues on the stop machine list.
>
> Remove the warning and check that the function is invoked on the
> outgoing CPU. If not, just return and do nothing.
>
> Fixes: ae7927023243 ("sched: Optimize finish_lock_switch()")
> Reported-by: Sebastian Siewior <bigeasy@...utronix.de>
> Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
> Cc: stable@...r.kernel.org
> ---
> kernel/sched/core.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -8523,7 +8523,6 @@ static void balance_push(struct rq *rq)
> struct task_struct *push_task = rq->curr;
>
> lockdep_assert_rq_held(rq);
> - SCHED_WARN_ON(rq->cpu != smp_processor_id());
>
> /*
> * Ensure the thing is persistent until balance_push_set(.on = false);
> @@ -8531,9 +8530,10 @@ static void balance_push(struct rq *rq)
> rq->balance_callback = &balance_push_callback;
>
> /*
> - * Only active while going offline.
> + * Only active while going offline and when invoked on the outgoing
> + * CPU.
> */
> - if (!cpu_dying(rq->cpu))
> + if (!cpu_dying(rq->cpu) && rq == this_rq())
> return;
Stupid me. The last minute change of moving the condition into the same
line fatfingered != to ==. Will resend ...
Powered by blists - more mailing lists