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

rcu: Remove rsp parameter from dump_blkd_tasks() and friend 



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
dump_blkd_tasks() and rcu_preempt_blocked_readers_cgp().

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

kernel/rcu/tree.c

+2 −2
Original line number Diff line number Diff line
@@ -1937,7 +1937,7 @@ static bool rcu_gp_init(void) 
		rcu_gp_slow(gp_init_delay);

		raw_spin_lock_irqsave_rcu_node(rnp, flags);

		rdp = this_cpu_ptr(&rcu_data);

		rcu_preempt_check_blocked_tasks(rsp, rnp);

		rcu_preempt_check_blocked_tasks(rnp);

		rnp->qsmask = rnp->qsmaskinit;

		WRITE_ONCE(rnp->gp_seq, rsp->gp_seq);

		if (rnp == rdp->mynode)
@@ -2049,7 +2049,7 @@ static void rcu_gp_cleanup(void) 
	rcu_for_each_node_breadth_first(rsp, rnp) {

		raw_spin_lock_irq_rcu_node(rnp);

		if (WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp)))

			dump_blkd_tasks(rsp, rnp, 10);

			dump_blkd_tasks(rnp, 10);

		WARN_ON_ONCE(rnp->qsmask);

		WRITE_ONCE(rnp->gp_seq, new_gp_seq);

		rdp = this_cpu_ptr(&rcu_data);

kernel/rcu/tree.h

+2 −4
Original line number Diff line number Diff line
@@ -455,12 +455,10 @@ static bool rcu_preempt_has_tasks(struct rcu_node *rnp); 
static void rcu_print_detail_task_stall(void);

static int rcu_print_task_stall(struct rcu_node *rnp);

static int rcu_print_task_exp_stall(struct rcu_node *rnp);

static void rcu_preempt_check_blocked_tasks(struct rcu_state *rsp,

					    struct rcu_node *rnp);

static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp);

static void rcu_flavor_check_callbacks(int user);

void call_rcu(struct rcu_head *head, rcu_callback_t func);

static void dump_blkd_tasks(struct rcu_state *rsp, struct rcu_node *rnp,

			    int ncheck);

static void dump_blkd_tasks(struct rcu_node *rnp, int ncheck);

static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags);

static void rcu_preempt_boost_start_gp(struct rcu_node *rnp);

static void invoke_rcu_callbacks_kthread(void);

kernel/rcu/tree_plugin.h

+5 −7
Original line number Diff line number Diff line
@@ -756,14 +756,13 @@ static int rcu_print_task_exp_stall(struct rcu_node *rnp) 
 * Also, if there are blocked tasks on the list, they automatically

 * block the newly created grace period, so set up ->gp_tasks accordingly.

 */

static void

rcu_preempt_check_blocked_tasks(struct rcu_state *rsp, struct rcu_node *rnp)

static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp)

{

	struct task_struct *t;



	RCU_LOCKDEP_WARN(preemptible(), "rcu_preempt_check_blocked_tasks() invoked with preemption enabled!!!\n");

	if (WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp)))

		dump_blkd_tasks(rsp, rnp, 10);

		dump_blkd_tasks(rnp, 10);

	if (rcu_preempt_has_tasks(rnp) &&

	    (rnp->qsmaskinit || rnp->wait_blkd_tasks)) {

		rnp->gp_tasks = rnp->blkd_tasks.next;
@@ -884,7 +883,7 @@ void exit_rcu(void) 
 * specified number of elements.

 */

static void

dump_blkd_tasks(struct rcu_state *rsp, struct rcu_node *rnp, int ncheck)

dump_blkd_tasks(struct rcu_node *rnp, int ncheck)

{

	int cpu;

	int i;
@@ -1033,8 +1032,7 @@ static int rcu_print_task_exp_stall(struct rcu_node *rnp) 
 * so there is no need to check for blocked tasks.  So check only for

 * bogus qsmask values.

 */

static void

rcu_preempt_check_blocked_tasks(struct rcu_state *rsp, struct rcu_node *rnp)

static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp)

{

	WARN_ON_ONCE(rnp->qsmask);

}
@@ -1095,7 +1093,7 @@ void exit_rcu(void) 
 * Dump the guaranteed-empty blocked-tasks state.  Trust but verify.

 */

static void

dump_blkd_tasks(struct rcu_state *rsp, struct rcu_node *rnp, int ncheck)

dump_blkd_tasks(struct rcu_node *rnp, int ncheck)

{

	WARN_ON_ONCE(!list_empty(&rnp->blkd_tasks));

}