mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: mingo@kernel.org, laijs@cn.fujitsu.com, dipankar@in.ibm.com,
	akpm@linux-foundation.org, mathieu.desnoyers@efficios.com,
	josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org,
	rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com,
	dvhart@linux.intel.com, fweisbec@gmail.com, oleg@redhat.com,
	bobby.prani@gmail.com,
	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Subject: [PATCH tip/core/rcu 24/24] rcu: Conditionally compile RCU's eqs warnings
Date: Tue, 12 May 2015 15:30:54 -0700	[thread overview]
Message-ID: <1431469854-3826-24-git-send-email-paulmck@linux.vnet.ibm.com> (raw)
In-Reply-To: <1431469854-3826-1-git-send-email-paulmck@linux.vnet.ibm.com>

From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

This commit applies some warning-omission micro-optimizations to RCU's
various extended-quiescent-state functions, which are on the kernel/user
hotpath for CONFIG_NO_HZ_FULL=y.

Reported-by: Rik van Riel <riel@redhat.com>
Reported by: Mike Galbraith <umgwanakikbuti@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---
 kernel/rcu/tree.c | 23 +++++++++++++++--------
 lib/Kconfig.debug | 11 +++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 0ab9e711a649..01a4d2a0046e 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -615,7 +615,8 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
 	struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
 
 	trace_rcu_dyntick(TPS("Start"), oldval, rdtp->dynticks_nesting);
-	if (!user && !is_idle_task(current)) {
+	if (IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
+	    !user && !is_idle_task(current)) {
 		struct task_struct *idle __maybe_unused =
 			idle_task(smp_processor_id());
 
@@ -634,7 +635,8 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
 	smp_mb__before_atomic();  /* See above. */
 	atomic_inc(&rdtp->dynticks);
 	smp_mb__after_atomic();  /* Force ordering with next sojourn. */
-	WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
+	WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
+		     atomic_read(&rdtp->dynticks) & 0x1);
 	rcu_dynticks_task_enter();
 
 	/*
@@ -660,7 +662,8 @@ static void rcu_eqs_enter(bool user)
 
 	rdtp = this_cpu_ptr(&rcu_dynticks);
 	oldval = rdtp->dynticks_nesting;
-	WARN_ON_ONCE((oldval & DYNTICK_TASK_NEST_MASK) == 0);
+	WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
+		     (oldval & DYNTICK_TASK_NEST_MASK) == 0);
 	if ((oldval & DYNTICK_TASK_NEST_MASK) == DYNTICK_TASK_NEST_VALUE) {
 		rdtp->dynticks_nesting = 0;
 		rcu_eqs_enter_common(oldval, user);
@@ -733,7 +736,8 @@ void rcu_irq_exit(void)
 	rdtp = this_cpu_ptr(&rcu_dynticks);
 	oldval = rdtp->dynticks_nesting;
 	rdtp->dynticks_nesting--;
-	WARN_ON_ONCE(rdtp->dynticks_nesting < 0);
+	WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
+		     rdtp->dynticks_nesting < 0);
 	if (rdtp->dynticks_nesting)
 		trace_rcu_dyntick(TPS("--="), oldval, rdtp->dynticks_nesting);
 	else
@@ -758,10 +762,12 @@ static void rcu_eqs_exit_common(long long oldval, int user)
 	atomic_inc(&rdtp->dynticks);
 	/* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
 	smp_mb__after_atomic();  /* See above. */
-	WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
+	WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
+		     !(atomic_read(&rdtp->dynticks) & 0x1));
 	rcu_cleanup_after_idle();
 	trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
-	if (!user && !is_idle_task(current)) {
+	if (IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
+	    !user && !is_idle_task(current)) {
 		struct task_struct *idle __maybe_unused =
 			idle_task(smp_processor_id());
 
@@ -785,7 +791,7 @@ static void rcu_eqs_exit(bool user)
 
 	rdtp = this_cpu_ptr(&rcu_dynticks);
 	oldval = rdtp->dynticks_nesting;
-	WARN_ON_ONCE(oldval < 0);
+	WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && oldval < 0);
 	if (oldval & DYNTICK_TASK_NEST_MASK) {
 		rdtp->dynticks_nesting += DYNTICK_TASK_NEST_VALUE;
 	} else {
@@ -858,7 +864,8 @@ void rcu_irq_enter(void)
 	rdtp = this_cpu_ptr(&rcu_dynticks);
 	oldval = rdtp->dynticks_nesting;
 	rdtp->dynticks_nesting++;
-	WARN_ON_ONCE(rdtp->dynticks_nesting == 0);
+	WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
+		     rdtp->dynticks_nesting == 0);
 	if (oldval)
 		trace_rcu_dyntick(TPS("++="), oldval, rdtp->dynticks_nesting);
 	else
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c4e1cf04cf57..b908048f8d6a 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1373,6 +1373,17 @@ config RCU_TRACE
 	  Say Y here if you want to enable RCU tracing
 	  Say N if you are unsure.
 
+config RCU_EQS_DEBUG
+	bool "Use this when adding any sort of NO_HZ support to your arch"
+	depends on DEBUG_KERNEL
+	help
+	  This option provides consistency checks in RCU's handling of
+	  NO_HZ.  These checks have proven quite helpful in detecting
+	  bugs in arch-specific NO_HZ code.
+
+	  Say N here if you need ultimate kernel/user switch latencies
+	  Say Y if you are unsure
+
 endmenu # "RCU Debugging"
 
 config DEBUG_BLOCK_EXT_DEVT
-- 
1.8.1.5


  parent reply	other threads:[~2015-05-12 22:35 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-12 22:30 [PATCH tip/core/rcu 0/24] Initialization/Kconfig updates for 4.2 Paul E. McKenney
2015-05-12 22:30 ` [PATCH tip/core/rcu 01/24] rcu: Control grace-period delays directly from value Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 02/24] rcu: Modulate grace-period slow init to normalize delay Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 03/24] rcu: Shut up spurious gcc uninitialized-variable warning Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 04/24] rcu: Panic if RCU tree can not accommodate all CPUs Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 05/24] rcu: Remove superfluous local variable in rcu_init_geometry() Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 06/24] rcu: Cleanup rcu_init_geometry() code and arithmetics Paul E. McKenney
2015-05-13  3:22     ` Steven Rostedt
2015-05-13 13:20       ` Paul E. McKenney
2015-05-14 21:15       ` Alexander Gordeev
2015-05-12 22:30   ` [PATCH tip/core/rcu 07/24] rcu: Simplify rcu_init_geometry() capacity arithmetics Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 08/24] rcu: Limit rcu_state::levelcnt[] to RCU_NUM_LVLS items Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 09/24] rcu: Limit rcu_capacity[] size " Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 10/24] rcu: Remove unnecessary fields from rcu_state structure Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 11/24] rcu: Limit count of static data to the number of RCU levels Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 12/24] rcu: Simplify arithmetic to calculate number of RCU nodes Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 13/24] rcu: Provide diagnostic option to slow down grace-period scans Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 14/24] rcu: Directly drive TASKS_RCU from Kconfig Paul E. McKenney
2015-05-13 13:31     ` Steven Rostedt
2015-05-13 17:14       ` Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 15/24] rcu: Directly drive RCU_USER_QS " Paul E. McKenney
2015-05-13  0:37     ` Frederic Weisbecker
2015-05-13 17:45       ` Paul E. McKenney
2015-05-14  0:27         ` Frederic Weisbecker
2015-05-14 21:12           ` Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 16/24] rcu: Convert CONFIG_RCU_FANOUT_EXACT to boot parameter Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 17/24] rcu: Enable diagnostic dump of rcu_node combining tree Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 18/24] rcu: Create RCU_EXPERT Kconfig and hide booleans behind it Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 19/24] rcu: Break dependency of RCU_FANOUT_LEAF on RCU_FANOUT Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 20/24] rcu: Make RCU able to tolerate undefined CONFIG_RCU_FANOUT Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 21/24] rcu: Make RCU able to tolerate undefined CONFIG_RCU_FANOUT_LEAF Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 22/24] rcu: Make RCU able to tolerate undefined CONFIG_RCU_KTHREAD_PRIO Paul E. McKenney
2015-05-12 22:30   ` [PATCH tip/core/rcu 23/24] rcu: Remove prompt for RCU implementation Paul E. McKenney
2015-05-12 22:30   ` Paul E. McKenney [this message]
2015-05-13 13:46     ` [PATCH tip/core/rcu 24/24] rcu: Conditionally compile RCU's eqs warnings Steven Rostedt
2015-05-13 15:06       ` Paul E. McKenney
2015-06-29  9:39     ` Geert Uytterhoeven
2015-06-29 20:55       ` Paul E. McKenney
2015-06-29 20:58         ` Geert Uytterhoeven
2015-06-30 16:57           ` Paul E. McKenney
2015-05-13  2:59   ` [PATCH tip/core/rcu 01/24] rcu: Control grace-period delays directly from value Steven Rostedt
2015-05-13 17:15     ` 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=1431469854-3826-24-git-send-email-paulmck@linux.vnet.ibm.com \
    --to=paulmck@linux.vnet.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=bobby.prani@gmail.com \
    --cc=dhowells@redhat.com \
    --cc=dipankar@in.ibm.com \
    --cc=dvhart@linux.intel.com \
    --cc=edumazet@google.com \
    --cc=fweisbec@gmail.com \
    --cc=josh@joshtriplett.org \
    --cc=laijs@cn.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=mingo@kernel.org \
    --cc=oleg@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    /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