From: Qais Yousef <qais.yousef@arm.com>
To: Valentin Schneider <valentin.schneider@arm.com>
Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de,
mingo@kernel.org, bigeasy@linutronix.de, swood@redhat.com,
peterz@infradead.org, juri.lelli@redhat.com,
vincent.guittot@linaro.org, dietmar.eggemann@arm.com,
rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de,
bristot@redhat.com, vincent.donnefort@arm.com, tj@kernel.org
Subject: Re: [RFC PATCH] sched/core: Fix premature p->migration_pending completion
Date: Wed, 3 Feb 2021 17:23:44 +0000 [thread overview]
Message-ID: <20210203172344.uzq2iod4g46ffame@e107158-lin> (raw)
In-Reply-To: <20210127193035.13789-1-valentin.schneider@arm.com>
On 01/27/21 19:30, Valentin Schneider wrote:
> Fiddling some more with a TLA+ model of set_cpus_allowed_ptr() & friends
> unearthed one more outstanding issue. This doesn't even involve
> migrate_disable(), but rather affinity changes and execution of the stopper
> racing with each other.
>
> My own interpretation of the (lengthy) TLA+ splat (note the potential for
> errors at each level) is:
>
> Initial conditions:
> victim.cpus_mask = {CPU0, CPU1}
>
> CPU0 CPU1 CPU<don't care>
>
> switch_to(victim)
> set_cpus_allowed(victim, {CPU1})
> kick CPU0 migration_cpu_stop({.dest_cpu = CPU1})
> switch_to(stopper/0)
> // e.g. CFS load balance
> move_queued_task(CPU0, victim, CPU1);
> switch_to(victim)
> set_cpus_allowed(victim, {CPU0});
> task_rq_unlock();
> migration_cpu_stop(dest_cpu=CPU1)
This migration stop is due to set_cpus_allowed(victim, {CPU1}), right?
> task_rq(p) != rq && pending
> kick CPU1 migration_cpu_stop({.dest_cpu = CPU1})
>
> switch_to(stopper/1)
> migration_cpu_stop(dest_cpu=CPU1)
And this migration stop is due to set_cpus_allowed(victim, {CPU0}), right?
If I didn't miss something, then dest_cpu should be CPU0 too, not CPU1 and the
task should be moved back to CPU0 as expected?
Thanks
--
Qais Yousef
> task_rq(p) == rq && pending
> __migrate_task(dest_cpu) // no-op
> complete_all() <-- !!! affinity is {CPU0} !!!
>
> I believe there are two issues there:
> - retriggering of migration_cpu_stop() from within migration_cpu_stop()
> itself doesn't change arg.dest_cpu
> - we'll issue a complete_all() in the task_rq(p) == rq path of
> migration_cpu_stop() even if the dest_cpu has been superseded by a
> further affinity change.
>
> Something similar could happen with NUMA's migrate_task_to(), and arguably
> any other user of migration_cpu_stop() with a .dest_cpu >= 0.
> Consider:
>
> CPU0 CPUX
>
> switch_to(victim)
> migrate_task_to(victim, CPU1)
> kick CPU0 migration_cpu_stop({.dest_cpu = CPU1})
>
> set_cpus_allowed(victim, {CPU42})
> task_rq_unlock();
> switch_to(stopper/0)
> migration_cpu_stop(dest_cpu=CPU1)
> task_rq(p) == rq && pending
> __migrate_task(dest_cpu)
> complete_all() <-- !!! affinity is {CPU42} !!!
>
> Prevent such premature completions by ensuring the dest_cpu in
> migration_cpu_stop() is in the task's allowed cpumask.
>
> Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
> ---
> kernel/sched/core.c | 32 ++++++++++++++++++++------------
> 1 file changed, 20 insertions(+), 12 deletions(-)
>
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index 06b449942adf..b57326b0a742 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -1923,20 +1923,28 @@ static int migration_cpu_stop(void *data)
> complete = true;
> }
>
> - /* migrate_enable() -- we must not race against SCA */
> - if (dest_cpu < 0) {
> - /*
> - * When this was migrate_enable() but we no longer
> - * have a @pending, a concurrent SCA 'fixed' things
> - * and we should be valid again. Nothing to do.
> - */
> - if (!pending) {
> - WARN_ON_ONCE(!cpumask_test_cpu(task_cpu(p), &p->cpus_mask));
> - goto out;
> - }
> + /*
> + * When this was migrate_enable() but we no longer
> + * have a @pending, a concurrent SCA 'fixed' things
> + * and we should be valid again.
> + *
> + * This can also be a stopper invocation that was 'fixed' by an
> + * earlier one.
> + *
> + * Nothing to do.
> + */
> + if ((dest_cpu < 0 || dest_cpu == cpu_of(rq)) && !pending) {
> + WARN_ON_ONCE(!cpumask_test_cpu(task_cpu(p), &p->cpus_mask));
> + goto out;
> + }
>
> + /*
> + * Catch any affinity change between the stop_cpu() call and us
> + * getting here.
> + * For migrate_enable(), we just want to pick an allowed one.
> + */
> + if (dest_cpu < 0 || !cpumask_test_cpu(dest_cpu, &p->cpus_mask))
> dest_cpu = cpumask_any_distribute(&p->cpus_mask);
> - }
>
> if (task_on_rq_queued(p))
> rq = __migrate_task(rq, &rf, p, dest_cpu);
> --
> 2.27.0
>
next prev parent reply other threads:[~2021-02-03 17:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-27 19:30 [RFC PATCH] sched/core: Fix premature p->migration_pending completion Valentin Schneider
[not found] ` <BN8PR12MB2978A9A4435A01EDC97D27E89ABA9@BN8PR12MB2978.namprd12.prod.outlook.com>
2021-01-28 18:56 ` Valentin Schneider
2021-02-03 17:23 ` Qais Yousef [this message]
2021-02-03 18:59 ` Valentin Schneider
2021-02-04 15:30 ` Qais Yousef
2021-02-05 11:02 ` Valentin Schneider
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=20210203172344.uzq2iod4g46ffame@e107158-lin \
--to=qais.yousef@arm.com \
--cc=bigeasy@linutronix.de \
--cc=bristot@redhat.com \
--cc=bsegall@google.com \
--cc=dietmar.eggemann@arm.com \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=swood@redhat.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=valentin.schneider@arm.com \
--cc=vincent.donnefort@arm.com \
--cc=vincent.guittot@linaro.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;
as well as URLs for NNTP newsgroup(s).