rcu: RCU CPU stall patches backported to 2.6.33-rc8
RFC PATCH 1/1 rcu: RCU CPU stall patches backported to 2.6.33-rc8
Hello!
This set backports a couple of RCU CPU stall detection patches from the earlier series (http://lkml.org/lkml/2010/2/22/384) to 2.6.33-rc8 to help track down some NMI issues.
These two patches fix an embarrassing deadlock that can affect TREE_PREEMPT_RCU and add additional per-task output when tasks stall the RCU grace period.
b/kernel/rcutree.c | 2 + b/kernel/rcutree.h | 1 b/kernel/rcutree_plugin.h | 4 --- b/lib/Kconfig.debug | 13 ++++++++++- kernel/rcutree.c | 4 +++ kernel/rcutree_plugin.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 71 insertions(+), 5 deletions(-)
RFC PATCH 1/2 rcu: fix deadlock in TREE_PREEMPT_RCU CPU stall detection
Under TREE_PREEMPT_RCU, print_other_cpu_stall() invokes rcu_print_task_stall() with the root rcu_node structure's ->lock held, and rcu_print_task_stall() acquires that same lock for self-deadlock. Fix this by removing the lock acquisition from rcu_print_task_stall(), and making all callers acquire the lock instead.
--- kernel/rcutree.c | 2 ++ kernel/rcutree_plugin.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-)
kernel/rcutree.c +2 -0
@@ -458,7 +458,9 @@ static void print_other_cpu_stall(struct rcu_state *rsp)printk (KERN_ERR "INFO: RCU detected CPU stalls:" );rcu_for_each_leaf_node (rsp, rnp) { +raw_spin_lock_irqsave (&rnp->lock, flags);rcu_print_task_stall (rnp); +raw_spin_unlock_irqrestore (&rnp->lock, flags);if (rnp->qsmask ==0 )continue ;for (cpu =0 ; cpu <= rnp->grphi - rnp->grplo; cpu++)
kernel/rcutree_plugin.h +0 -3
@@ -306,18 +306,15 @@ EXPORT_SYMBOL_GPL(__rcu_read_unlock);*/ static void rcu_print_task_stall (struct rcu_node *rnp) { -unsigned long flags;struct list_head *lp;int phase;struct task_struct *t;if (rcu_preempted_readers (rnp)) { -spin_lock_irqsave (&rnp->lock, flags); phase = rnp->gpnum &0x1 ; lp = &rnp->blocked_tasks[phase];list_for_each_entry (t, lp, rcu_node_entry)printk (" P%d" , t->pid); -spin_unlock_irqrestore (&rnp->lock, flags); } }
Signature · 1 line
1.6.6
RFC PATCH 2/2 rcu: add RCU_CPU_STALL_VERBOSE to dump detailed per-task information
In reply to Paul E. McKenneyWhen RCU detects a grace-period stall, it currently just prints out the PID of any tasks doing the stalling. This patch adds RCU_CPU_STALL_VERBOSE, which enables the more-verbose reporting from sched_show_task().
--- kernel/rcutree.c | 4 +++ kernel/rcutree.h | 1 + kernel/rcutree_plugin.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++ lib/Kconfig.debug | 12 ++++++++++ 4 files changed, 69 insertions(+), 0 deletions(-)
kernel/rcutree.c +4 -0
@@ -471,6 +471,10 @@ static void print_other_cpu_stall(struct rcu_state *rsp) smp_processor_id(), (long)(jiffies - rsp->gp_start));trigger_all_cpu_backtrace (); +/* If so configured, complain about tasks blocking the grace period. */ + +rcu_print_detail_task_stall (rsp); +force_quiescent_state (rsp,0 );/* Kick them all. */ }
kernel/rcutree.h +1 -0
@@ -347,6 +347,7 @@ static void rcu_report_unblock_qs_rnp(struct rcu_node *rnp, unsigned long flags);#endif /* #ifdef CONFIG_HOTPLUG_CPU */ #ifdef CONFIG_RCU_CPU_STALL_DETECTOR +static void rcu_print_detail_task_stall (struct rcu_state *rsp);static void rcu_print_task_stall (struct rcu_node *rnp);#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */ static void rcu_preempt_check_blocked_tasks (struct rcu_node *rnp);
kernel/rcutree_plugin.h +52 -0
64 lines not on this page · raw message
lib/Kconfig.debug +12 -0
@@ -769,6 +769,18 @@ config RCU_CPU_STALL_DETECTOR Say N if you are unsure. +config RCU_CPU_STALL_VERBOSE + bool "Print additional per-task information for RCU_CPU_STALL_DETECTOR" + depends on RCU_CPU_STALL_DETECTOR && TREE_PREEMPT_RCU + default n + help + This option causes RCU to printk detailed per-task information + for any tasks that are stalling the current RCU grace period. + + Say N if you are unsure. + + Say Y if you want to enable such checks. + config KPROBES_SANITY_TEST bool "Kprobes sanity tests" depends on DEBUG_KERNEL
Signature · 1 line
1.6.6