Commit 40e69ac7 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Inline RCU stall-warning info helper functions 



The print_cpu_stall_info_begin() and print_cpu_stall_info_end() print a
single character each onto the console, and are a holdover from a time
when RCU CPU stall warning messages could be abbreviated using a long-gone
Kconfig option.  This commit therefore adds these single characters to
already-printed strings in the calling functions, and then eliminates
both print_cpu_stall_info_begin() and print_cpu_stall_info_end().

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.ibm.com>
parent d87cda50

kernel/rcu/tree.h

+0 −2
Original line number Diff line number Diff line
@@ -416,9 +416,7 @@ static void rcu_prepare_for_idle(void); 
static bool rcu_preempt_has_tasks(struct rcu_node *rnp);

static bool rcu_preempt_need_deferred_qs(struct task_struct *t);

static void rcu_preempt_deferred_qs(struct task_struct *t);

static void print_cpu_stall_info_begin(void);

static void print_cpu_stall_info(int cpu);

static void print_cpu_stall_info_end(void);

static void zero_cpu_stall_ticks(struct rcu_data *rdp);

static bool rcu_nocb_cpu_needs_barrier(int cpu);

static struct swait_queue_head *rcu_nocb_gp_get(struct rcu_node *rnp);

kernel/rcu/tree_plugin.h

+0 −12
Original line number Diff line number Diff line
@@ -1550,12 +1550,6 @@ static void print_cpu_stall_fast_no_hz(char *cp, int cpu) 


#endif /* #else #ifdef CONFIG_RCU_FAST_NO_HZ */



/* Initiate the stall-info list. */

static void print_cpu_stall_info_begin(void)

{

	pr_cont("\n");

}



/*

 * Print out diagnostic information for the specified stalled CPU.

 *
@@ -1606,12 +1600,6 @@ static void print_cpu_stall_info(int cpu) 
	       fast_no_hz);

}



/* Terminate the stall-info list. */

static void print_cpu_stall_info_end(void)

{

	pr_err("\t");

}



/* Zero ->ticks_this_gp and snapshot the number of RCU softirq handlers. */

static void zero_cpu_stall_ticks(struct rcu_data *rdp)

{

kernel/rcu/tree_stall.h

+4 −8
Original line number Diff line number Diff line
@@ -243,8 +243,7 @@ static void print_other_cpu_stall(unsigned long gp_seq) 
	 * See Documentation/RCU/stallwarn.txt for info on how to debug

	 * RCU CPU stall warnings.

	 */

	pr_err("INFO: %s detected stalls on CPUs/tasks:", rcu_state.name);

	print_cpu_stall_info_begin();

	pr_err("INFO: %s detected stalls on CPUs/tasks:\n", rcu_state.name);

	rcu_for_each_leaf_node(rnp) {

		raw_spin_lock_irqsave_rcu_node(rnp, flags);

		ndetected += rcu_print_task_stall(rnp);
@@ -258,10 +257,9 @@ static void print_other_cpu_stall(unsigned long gp_seq) 
		raw_spin_unlock_irqrestore_rcu_node(rnp, flags);

	}



	print_cpu_stall_info_end();

	for_each_possible_cpu(cpu)

		totqlen += rcu_get_n_cbs_cpu(cpu);

	pr_cont("(detected by %d, t=%ld jiffies, g=%ld, q=%lu)\n",

	pr_cont("\t(detected by %d, t=%ld jiffies, g=%ld, q=%lu)\n",

	       smp_processor_id(), (long)(jiffies - rcu_state.gp_start),

	       (long)rcu_seq_current(&rcu_state.gp_seq), totqlen);

	if (ndetected) {
@@ -314,15 +312,13 @@ static void print_cpu_stall(void) 
	 * See Documentation/RCU/stallwarn.txt for info on how to debug

	 * RCU CPU stall warnings.

	 */

	pr_err("INFO: %s self-detected stall on CPU", rcu_state.name);

	print_cpu_stall_info_begin();

	pr_err("INFO: %s self-detected stall on CPU\n", rcu_state.name);

	raw_spin_lock_irqsave_rcu_node(rdp->mynode, flags);

	print_cpu_stall_info(smp_processor_id());

	raw_spin_unlock_irqrestore_rcu_node(rdp->mynode, flags);

	print_cpu_stall_info_end();

	for_each_possible_cpu(cpu)

		totqlen += rcu_get_n_cbs_cpu(cpu);

	pr_cont(" (t=%lu jiffies g=%ld q=%lu)\n",

	pr_cont("\t(t=%lu jiffies g=%ld q=%lu)\n",

		jiffies - rcu_state.gp_start,

		(long)rcu_seq_current(&rcu_state.gp_seq), totqlen);

CRA Git | Maintained and supported by SUSTech CRA and CCSE