From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Mike Galbraith <efault@gmx.de>,
Matt Fleming <matt@codeblueprint.co.uk>,
Ingo Molnar <mingo@kernel.org>,
linux-kernel@vger.kernel.org, Michal Hocko <mhocko@suse.com>
Subject: Re: cpu stopper threads and load balancing leads to deadlock
Date: Thu, 17 May 2018 07:56:14 -0700 [thread overview]
Message-ID: <20180517145614.GK3803@linux.vnet.ibm.com> (raw)
In-Reply-To: <20180517142322.GU12217@hirez.programming.kicks-ass.net>
On Thu, May 17, 2018 at 04:23:22PM +0200, Peter Zijlstra wrote:
> On Thu, May 17, 2018 at 07:03:45AM -0700, Paul E. McKenney wrote:
> > On Tue, May 15, 2018 at 06:30:26AM +0200, Mike Galbraith wrote:
> > I have not queued it, but given Peter's Signed-off-by and your Tested-by
> > I would be happy to do so.
>
> And a Changelog of course :-)
Thank you both!
Is this OK for 4.19, or do we need it for 4.18? I am guessing 4.18,
but figured I should ask before wildly rebasing the 82 commits destined
for 4.19. ;-)
Thanx, Paul
> ---
> From: Peter Zijlstra <peterz@infradead.org>
> Subject: rcu/x86: Provide early rcu_cpu_starting() callback
>
> The x86/mtrr code does horrific things because hardware. It uses
> stop_machine_from_inactive_cpu(), which does a wakeup (of the stopper
> thread on another CPU), which uses RCU, all before the CPU is onlined.
>
> RCU complains about this, because wakeups use RCU and RCU does
> (rightfully) not consider offline CPUs for grace-periods.
>
> Fix this by initializing RCU way early in the MTRR case.
>
> Tested-by: Mike Galbraith <efault@gmx.de>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
>
> > > > diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
> > > > index 7468de429087..07360523c3ce 100644
> > > > --- a/arch/x86/kernel/cpu/mtrr/main.c
> > > > +++ b/arch/x86/kernel/cpu/mtrr/main.c
> > > > @@ -793,6 +793,9 @@ void mtrr_ap_init(void)
> > > >
> > > > if (!use_intel() || mtrr_aps_delayed_init)
> > > > return;
> > > > +
> > > > + rcu_cpu_starting(smp_processor_id());
> > > > +
> > > > /*
> > > > * Ideally we should hold mtrr_mutex here to avoid mtrr entries
> > > > * changed, but this routine will be called in cpu boot time,
> > > > diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
> > > > index 2a734692a581..4dab46950fdb 100644
> > > > --- a/kernel/rcu/tree.c
> > > > +++ b/kernel/rcu/tree.c
> > > > @@ -3775,6 +3775,8 @@ int rcutree_dead_cpu(unsigned int cpu)
> > > > return 0;
> > > > }
> > > >
> > > > +static DEFINE_PER_CPU(int, rcu_cpu_started);
> > > > +
> > > > /*
> > > > * Mark the specified CPU as being online so that subsequent grace periods
> > > > * (both expedited and normal) will wait on it. Note that this means that
> > > > @@ -3796,6 +3798,11 @@ void rcu_cpu_starting(unsigned int cpu)
> > > > struct rcu_node *rnp;
> > > > struct rcu_state *rsp;
> > > >
> > > > + if (per_cpu(rcu_cpu_started, cpu))
> > > > + return;
> > > > +
> > > > + per_cpu(rcu_cpu_started, cpu) = 1;
> > > > +
> > > > for_each_rcu_flavor(rsp) {
> > > > rdp = per_cpu_ptr(rsp->rda, cpu);
> > > > rnp = rdp->mynode;
> > > > @@ -3852,6 +3859,8 @@ void rcu_report_dead(unsigned int cpu)
> > > > preempt_enable();
> > > > for_each_rcu_flavor(rsp)
> > > > rcu_cleanup_dying_idle_cpu(cpu, rsp);
> > > > +
> > > > + per_cpu(rcu_cpu_started, cpu) = 0;
> > > > }
> > > >
> > > > /* Migrate the dead CPU's callbacks to the current CPU. */
> > >
> >
>
next prev parent reply other threads:[~2018-05-17 14:54 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-17 14:21 Matt Fleming
2018-04-18 5:47 ` Mike Galbraith
2018-04-19 5:38 ` Mike Galbraith
2018-04-20 9:50 ` Peter Zijlstra
2018-04-24 13:33 ` Matt Fleming
2018-05-03 12:12 ` Mike Galbraith
2018-05-03 12:28 ` Peter Zijlstra
2018-05-03 12:40 ` Mike Galbraith
2018-05-03 12:49 ` Peter Zijlstra
2018-05-03 13:32 ` Mike Galbraith
2018-05-03 13:56 ` Peter Zijlstra
2018-05-03 14:16 ` Mike Galbraith
2018-05-03 14:44 ` Peter Zijlstra
2018-05-03 16:12 ` Paul E. McKenney
2018-05-03 16:45 ` Peter Zijlstra
2018-05-03 17:18 ` Paul E. McKenney
2018-05-03 17:54 ` Peter Zijlstra
2018-05-03 18:24 ` Paul E. McKenney
2018-05-04 3:38 ` Mike Galbraith
2018-05-15 4:30 ` Mike Galbraith
2018-05-17 14:03 ` Paul E. McKenney
2018-05-17 14:10 ` Mike Galbraith
2018-05-17 14:23 ` Peter Zijlstra
2018-05-17 14:56 ` Paul E. McKenney [this message]
2018-05-22 17:05 ` Paul E. McKenney
2018-05-03 14:39 ` Paul E. McKenney
2018-05-03 14:52 ` Peter Zijlstra
2018-05-03 9:24 ` [tip:sched/urgent] stop_machine, sched: Fix migrate_swap() vs. active_balance() deadlock tip-bot for 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=20180517145614.GK3803@linux.vnet.ibm.com \
--to=paulmck@linux.vnet.ibm.com \
--cc=efault@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mhocko@suse.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.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
Powered by JetHome