From: "Paul E. McKenney" <paulmck@kernel.org>
To: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Will Deacon <will@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
Lai Jiangshan <jiangshanlai@gmail.com>,
Josh Triplett <josh@joshtriplett.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
rcu@vger.kernel.org
Subject: Re: [PATCH] srcu: Avoid local_irq_save() before acquiring spinlock_t
Date: Tue, 26 May 2020 09:16:09 -0700 [thread overview]
Message-ID: <20200526161609.GJ2869@paulmck-ThinkPad-P72> (raw)
In-Reply-To: <20200526134134.5uq62linhbog43q3@linutronix.de>
On Tue, May 26, 2020 at 03:41:34PM +0200, Sebastian Andrzej Siewior wrote:
> SRCU disables interrupts to get a stable per-CPU pointer and then
> acquires the spinlock which is in the per-CPU data structure. The
> release uses spin_unlock_irqrestore(). While this is correct on a non-RT
> kernel, this conflicts with the RT semantics because the spinlock is
> converted to a 'sleeping' spinlock. Sleeping locks can obviously not be
> acquired with interrupts disabled.
>
> Acquire the per-CPU pointer `ssp->sda' without disabling preemption and
> then acquire the spinlock_t of the per-CPU data structure. The lock
> will ensure that the data is consistent.
> The added check_init_srcu_struct() is now needed because a statically
> defined srcu_struct may remain uninitialized until this point and the
> newly introduced locking operation requires an initialized spinlock_t.
>
> This change was tested for four hours with 8*SRCU-N and 8*SRCU-P without
> causing any warnings.
Queued, thank you!!!
Thanx, Paul
> Cc: Lai Jiangshan <jiangshanlai@gmail.com>
> Cc: "Paul E. McKenney" <paulmck@kernel.org>
> Cc: Josh Triplett <josh@joshtriplett.org>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
> Cc: rcu@vger.kernel.org
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> ---
> kernel/rcu/srcutree.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
> index 0c71505f0e19c..9459bca58c380 100644
> --- a/kernel/rcu/srcutree.c
> +++ b/kernel/rcu/srcutree.c
> @@ -764,14 +764,15 @@ static bool srcu_might_be_idle(struct srcu_struct *ssp)
> unsigned long t;
> unsigned long tlast;
>
> + check_init_srcu_struct(ssp);
> /* If the local srcu_data structure has callbacks, not idle. */
> - local_irq_save(flags);
> - sdp = this_cpu_ptr(ssp->sda);
> + sdp = raw_cpu_ptr(ssp->sda);
> + spin_lock_irqsave_rcu_node(sdp, flags);
> if (rcu_segcblist_pend_cbs(&sdp->srcu_cblist)) {
> - local_irq_restore(flags);
> + spin_unlock_irqrestore_rcu_node(sdp, flags);
> return false; /* Callbacks already present, so not idle. */
> }
> - local_irq_restore(flags);
> + spin_unlock_irqrestore_rcu_node(sdp, flags);
>
> /*
> * No local callbacks, so probabalistically probe global state.
> @@ -851,9 +852,8 @@ static void __call_srcu(struct srcu_struct *ssp, struct rcu_head *rhp,
> }
> rhp->func = func;
> idx = srcu_read_lock(ssp);
> - local_irq_save(flags);
> - sdp = this_cpu_ptr(ssp->sda);
> - spin_lock_rcu_node(sdp);
> + sdp = raw_cpu_ptr(ssp->sda);
> + spin_lock_irqsave_rcu_node(sdp, flags);
> rcu_segcblist_enqueue(&sdp->srcu_cblist, rhp);
> rcu_segcblist_advance(&sdp->srcu_cblist,
> rcu_seq_current(&ssp->srcu_gp_seq));
> --
> 2.27.0.rc0
>
next prev parent reply other threads:[~2020-05-26 16:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200519201912.1564477-1-bigeasy@linutronix.de>
2020-05-19 20:19 ` [PATCH 3/8] srcu: Use local_lock() for per-CPU struct srcu_data access Sebastian Andrzej Siewior
2020-05-20 10:24 ` Peter Zijlstra
2020-05-20 12:06 ` Sebastian Andrzej Siewior
2020-05-20 13:27 ` Peter Zijlstra
2020-05-20 17:42 ` Joel Fernandes
2020-05-20 18:28 ` Sebastian Andrzej Siewior
2020-05-20 18:35 ` Peter Zijlstra
2020-05-20 18:44 ` Joel Fernandes
2020-05-20 18:50 ` Uladzislau Rezki
2020-05-20 18:59 ` Joel Fernandes
2020-05-20 18:43 ` Paul E. McKenney
2020-05-22 15:12 ` Sebastian Andrzej Siewior
2020-05-22 17:39 ` Paul E. McKenney
2020-05-23 15:08 ` Sebastian Andrzej Siewior
2020-05-23 16:59 ` Paul E. McKenney
2020-05-24 19:03 ` Sebastian Andrzej Siewior
2020-05-25 3:27 ` Paul E. McKenney
2020-05-26 13:41 ` [PATCH] srcu: Avoid local_irq_save() before acquiring spinlock_t Sebastian Andrzej Siewior
2020-05-26 16:16 ` Paul E. McKenney [this message]
2020-05-26 16:31 ` Sebastian Andrzej Siewior
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=20200526161609.GJ2869@paulmck-ThinkPad-P72 \
--to=paulmck@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=jiangshanlai@gmail.com \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=will@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;
as well as URLs for NNTP newsgroup(s).