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

rcu: Remove rsp parameter from print_cpu_stall_info() 



There now is only one rcu_state structure in a given build of the
Linux kernel, so there is no need to pass it as a parameter to RCU's
functions.  This commit therefore removes the rsp parameter from
print_cpu_stall_info().

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

kernel/rcu/tree.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1342,7 +1342,7 @@ static void print_other_cpu_stall(unsigned long gp_seq) 
		if (rnp->qsmask != 0) {

		if (rnp->qsmask != 0) {

			for_each_leaf_node_possible_cpu(rnp, cpu)

			for_each_leaf_node_possible_cpu(rnp, cpu)

				if (rnp->qsmask & leaf_node_cpu_bit(rnp, cpu)) {

				if (rnp->qsmask & leaf_node_cpu_bit(rnp, cpu)) {

					print_cpu_stall_info(rsp, cpu);

					print_cpu_stall_info(cpu);

					ndetected++;

					ndetected++;

				}

				}

		}

		}
@@ -1409,7 +1409,7 @@ static void print_cpu_stall(void) 
	pr_err("INFO: %s self-detected stall on CPU", rsp->name);

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

	print_cpu_stall_info_begin();

	print_cpu_stall_info_begin();

	raw_spin_lock_irqsave_rcu_node(rdp->mynode, flags);

	raw_spin_lock_irqsave_rcu_node(rdp->mynode, flags);

	print_cpu_stall_info(rsp, smp_processor_id());

	print_cpu_stall_info(smp_processor_id());

	raw_spin_unlock_irqrestore_rcu_node(rdp->mynode, flags);

	raw_spin_unlock_irqrestore_rcu_node(rdp->mynode, flags);

	print_cpu_stall_info_end();

	print_cpu_stall_info_end();

	for_each_possible_cpu(cpu)

	for_each_possible_cpu(cpu)

kernel/rcu/tree.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -472,7 +472,7 @@ static bool rcu_preempt_has_tasks(struct rcu_node *rnp); 
static bool rcu_preempt_need_deferred_qs(struct task_struct *t);

static bool rcu_preempt_need_deferred_qs(struct task_struct *t);

static void rcu_preempt_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_begin(void);

static void print_cpu_stall_info(struct rcu_state *rsp, int cpu);

static void print_cpu_stall_info(int cpu);

static void print_cpu_stall_info_end(void);

static void print_cpu_stall_info_end(void);

static void zero_cpu_stall_ticks(struct rcu_data *rdp);

static void zero_cpu_stall_ticks(struct rcu_data *rdp);

static void increment_cpu_stall_ticks(void);

static void increment_cpu_stall_ticks(void);

kernel/rcu/tree_plugin.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -1771,7 +1771,7 @@ static void print_cpu_stall_info_begin(void) 
 *

 *

 * Also print out idle and (if CONFIG_RCU_FAST_NO_HZ) idle-entry info.

 * Also print out idle and (if CONFIG_RCU_FAST_NO_HZ) idle-entry info.

 */

 */

static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)

static void print_cpu_stall_info(int cpu)

{

{

	unsigned long delta;

	unsigned long delta;

	char fast_no_hz[72];

	char fast_no_hz[72];
@@ -1786,7 +1786,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu) 
	 */

	 */

	touch_nmi_watchdog();

	touch_nmi_watchdog();





	ticks_value = rcu_seq_ctr(rsp->gp_seq - rdp->gp_seq);

	ticks_value = rcu_seq_ctr(rcu_state.gp_seq - rdp->gp_seq);

	if (ticks_value) {

	if (ticks_value) {

		ticks_title = "GPs behind";

		ticks_title = "GPs behind";

	} else {

	} else {
@@ -1807,7 +1807,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu) 
	       rcu_dynticks_snap(rdtp) & 0xfff,

	       rcu_dynticks_snap(rdtp) & 0xfff,

	       rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,

	       rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,

	       rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),

	       rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),

	       READ_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,

	       READ_ONCE(rcu_state.n_force_qs) - rcu_state.n_force_qs_gpstart,

	       fast_no_hz);

	       fast_no_hz);

}

}