From: "Paul E. McKenney" <paulmck@kernel.org>
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com,
rostedt@goodmis.org, Frederic Weisbecker <frederic@kernel.org>,
"Paul E . McKenney" <paulmck@kernel.org>,
Uladzislau Rezki <uladzislau.rezki@sony.com>,
Joel Fernandes <joel@joelfernandes.org>,
Boqun Feng <boqun.feng@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Neeraj Upadhyay <quic_neeraju@quicinc.com>,
Valentin Schneider <valentin.schneider@arm.com>
Subject: [PATCH rcu 07/11] rcu: Fix preemption mode check on synchronize_rcu[_expedited]()
Date: Mon, 18 Apr 2022 15:53:55 -0700 [thread overview]
Message-ID: <20220418225359.3945217-7-paulmck@kernel.org> (raw)
In-Reply-To: <20220418225345.GA3945110@paulmck-ThinkPad-P17-Gen-1>
From: Frederic Weisbecker <frederic@kernel.org>
An early check on synchronize_rcu[_expedited]() tries to determine if
the current CPU is in UP mode on an SMP no-preempt kernel, in which case
there is no need to start a grace period since the current assumed
quiescent state is all we need.
However the preemption mode doesn't take into account the boot selected
preemption mode under CONFIG_PREEMPT_DYNAMIC=y, missing a possible
early return if the running flavour is "none" or "voluntary".
Use the shiny new preempt mode accessors to fix this. However,
avoid invoking them during early boot because doing so triggers a
WARN_ON_ONCE().
[ paulmck: Update for mainlined API. ]
Reported-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Uladzislau Rezki <uladzislau.rezki@sony.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Neeraj Upadhyay <quic_neeraju@quicinc.com>
Cc: Valentin Schneider <valentin.schneider@arm.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
kernel/rcu/tree.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 29669070348e..d3caa82b9954 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -3741,7 +3741,9 @@ static int rcu_blocking_is_gp(void)
{
int ret;
- if (IS_ENABLED(CONFIG_PREEMPTION))
+ // Invoking preempt_model_*() too early gets a splat.
+ if (rcu_scheduler_active == RCU_SCHEDULER_INACTIVE ||
+ preempt_model_full() || preempt_model_rt())
return rcu_scheduler_active == RCU_SCHEDULER_INACTIVE;
might_sleep(); /* Check for RCU read-side critical section. */
preempt_disable();
--
2.31.1.189.g2e36527f23
next prev parent reply other threads:[~2022-04-18 22:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-18 22:53 [PATCH rcu 0/11] Miscellaneous fixes for v5.19 Paul E. McKenney
2022-04-18 22:53 ` [PATCH rcu 01/11] rcu: Clarify fill-the-gap comment in rcu_segcblist_advance() Paul E. McKenney
2022-04-18 22:53 ` [PATCH rcu 02/11] rcu: Fix rcu_preempt_deferred_qs_irqrestore() strict QS reporting Paul E. McKenney
2022-04-18 22:53 ` [PATCH rcu 03/11] rcu: Check for jiffies going backwards Paul E. McKenney
2022-04-18 22:53 ` [PATCH rcu 04/11] kernel/smp: Provide boot-time timeout for CSD lock diagnostics Paul E. McKenney
2022-04-19 7:11 ` Juergen Gross
2022-04-19 16:44 ` Paul E. McKenney
2022-04-18 22:53 ` [PATCH rcu 05/11] rcu: Add comments to final rcu_gp_cleanup() "if" statement Paul E. McKenney
2022-04-18 22:53 ` [PATCH rcu 06/11] rcu: Print number of online CPUs in RCU CPU stall-warning messages Paul E. McKenney
2022-04-18 22:53 ` Paul E. McKenney [this message]
2022-04-18 22:53 ` [PATCH rcu 08/11] srcu: Drop needless initialization of sdp in srcu_gp_start() Paul E. McKenney
2022-04-18 22:53 ` [PATCH rcu 09/11] rcu: Check for successful spawn of ->boost_kthread_task Paul E. McKenney
2022-04-18 22:53 ` [PATCH rcu 10/11] rcu_sync: Fix comment to properly reflect rcu_sync_exit() behavior Paul E. McKenney
2022-04-18 22:53 ` [PATCH rcu 11/11] rcu: Use IRQ_WORK_INIT_HARD() to avoid rcu_read_unlock() hangs Paul E. McKenney
[not found] ` <20220419085607.2014-1-hdanton@sina.com>
2022-04-19 13:46 ` [PATCH rcu 04/11] kernel/smp: Provide boot-time timeout for CSD lock diagnostics Paul E. McKenney
2022-04-19 14:11 ` Dmitry Vyukov
2022-04-19 16:49 ` Paul E. McKenney
[not found] ` <20220419231820.2089-1-hdanton@sina.com>
2022-04-20 12:17 ` Dmitry Vyukov
2022-04-20 13:41 ` Paul E. McKenney
2022-04-20 14:00 ` Dmitry Vyukov
2022-04-20 14:12 ` Paul E. McKenney
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=20220418225359.3945217-7-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=boqun.feng@gmail.com \
--cc=frederic@kernel.org \
--cc=joel@joelfernandes.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=quic_neeraju@quicinc.com \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=uladzislau.rezki@sony.com \
--cc=valentin.schneider@arm.com \
/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
all inboxes | Powered by JetHome®