Skip to contentSkip to conversation

config-param reduction and blocked-task warning

PATCH In review Paul E. McKenney 2 participants 5 messages Jan 13, 2011

lore
Share & tools
lore

Paul E. McKenney

author
#0 lore raw

cover config-param reduction and blocked-task warning

Hello!

A couple of fixes:

1. Revert the ill-considered addition of a configuration parameter.
2. Avoid a pointless blocked-task warning.

After a bit more testing and review, I believe that these should go into 2.6.38, as they both represent regressions.

Thanx, Paul

author
#1 lore raw

RFC PATCH 1/2 rcu: demote SRCU_SYNCHRONIZE_DELAY from kernel-parameter status

Because the adaptive synchronize_srcu_expedited() approach has worked very well in testing, remove the kernel parameter and replace it by a C-preprocessor macro. If someone finds problems with this approach, a more complex and aggressively adaptive approach might be required.

Signed-off-by Paul E. McKenney <[email protected]>
---
 init/Kconfig  |   15 ---------------
 kernel/srcu.c |   15 +++++++++++++--
 2 files changed, 13 insertions(+), 17 deletions(-)
init/Kconfig +0 -15
index 526ec1c..e11bc79 100644
@@ -497,21 +497,6 @@ config RCU_BOOST_DELAY
 
 	  Accept the default if unsure.
 
-config SRCU_SYNCHRONIZE_DELAY
-	int "Microseconds to delay before waiting for readers"
-	range 0 20
-	default 10
-	help
-	  This option controls how long SRCU delays before entering its
-	  loop waiting on SRCU readers.  The purpose of this loop is
-	  to avoid the unconditional context-switch penalty that would
-	  otherwise be incurred if there was an active SRCU reader,
-	  in a manner similar to adaptive locking schemes.  This should
-	  be set to be a bit longer than the common-case SRCU read-side
-	  critical-section overhead.
-
-	  Accept the default if unsure.
-
 endmenu # "RCU Subsystem"
 
 config IKCONFIG
kernel/srcu.c +13 -2
index 98d8c1e..73ce23f 100644
@@ -156,6 +156,16 @@ void __srcu_read_unlock(struct srcu_struct *sp, int idx)
 EXPORT_SYMBOL_GPL(__srcu_read_unlock);
 
 /*
+ * We use an adaptive strategy for synchronize_srcu() and especially for
+ * synchronize_srcu_expedited().  We spin for a fixed time period
+ * (defined below) to allow SRCU readers to exit their read-side critical
+ * sections.  If there are still some readers after 10 microseconds,
+ * we repeatedly block for 1-millisecond time periods.  This approach
+ * has done well in testing, so there is no need for a config parameter.
+ */
+#define SYNCHRONIZE_SRCU_READER_DELAY 10
+
+/*
  * Helper function for synchronize_srcu() and synchronize_srcu_expedited().
  */
 static void __synchronize_srcu(struct srcu_struct *sp, void (*sync_func)(void))

@@ -207,11 +217,12 @@ static void __synchronize_srcu(struct srcu_struct *sp, void (*sync_func)(void))
 	 * will have finished executing.  We initially give readers
 	 * an arbitrarily chosen 10 microseconds to get out of their
 	 * SRCU read-side critical sections, then loop waiting 1/HZ
-	 * seconds per iteration.
+	 * seconds per iteration.  The 10-microsecond value has done
+	 * very well in testing.
 	 */
 
 	if (srcu_readers_active_idx(sp, idx))
-		udelay(CONFIG_SRCU_SYNCHRONIZE_DELAY);
+		udelay(SYNCHRONIZE_SRCU_READER_DELAY);
 	while (srcu_readers_active_idx(sp, idx))
 		schedule_timeout_interruptible(1);
Signature · 1 line
1.7.3.2
author
#2 lore raw

RFC PATCH 2/2 rcu: avoid pointless blocked-task warnings

In reply to Paul E. McKenney

From: Paul E. McKenney <[email protected]>

If the RCU callback-processing kthread has nothing to do, it parks in a wait_event(). If RCU remains idle for more than two minutes, the kernel complains about this. This commit changes from wait_event() to wait_event_interruptible() to prevent the kernel from complaining just because RCU is idle.

Reported-by Russell King <[email protected]>
Signed-off-by Paul E. McKenney <[email protected]>
Signed-off-by Paul E. McKenney <[email protected]>
Tested-by Thomas Weber <[email protected]>
---
 kernel/rcutiny.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
kernel/rcutiny.c +2 -1
index 0344937..0c343b9 100644
@@ -189,7 +189,8 @@ static int rcu_kthread(void *arg)
 	unsigned long flags;
 
 	for (;;) {
-		wait_event(rcu_kthread_wq, have_rcu_kthread_work != 0);
+		wait_event_interruptible(rcu_kthread_wq,
+					 have_rcu_kthread_work != 0);
 		morework = rcu_boost();
 		local_irq_save(flags);
 		work = have_rcu_kthread_work;
Signature · 1 line
1.7.3.2