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

rcutorture: Prepare for ->start_gp_poll and ->poll_gp_state 

The new get_state_synchronize_srcu(), start_poll_synchronize_srcu() and
poll_state_synchronize_srcu() functions need to be tested, and so this
commit prepares by renaming the rcu_torture_ops field ->get_state to
->get_gp_state in order to be consistent with the upcoming ->start_gp_poll
and ->poll_gp_state fields.

Link: https://lore.kernel.org/rcu/20201112201547.GF3365678@moria.home.lan/


Reported-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 4e7ccfae

kernel/rcu/rcutorture.c

+5 −5
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ struct rcu_torture_ops { 
	void (*deferred_free)(struct rcu_torture *p);

	void (*sync)(void);

	void (*exp_sync)(void);

	unsigned long (*get_state)(void);

	unsigned long (*get_gp_state)(void);

	void (*cond_sync)(unsigned long oldstate);

	call_rcu_func_t call;

	void (*cb_barrier)(void);
@@ -461,7 +461,7 @@ static struct rcu_torture_ops rcu_ops = { 
	.deferred_free	= rcu_torture_deferred_free,

	.sync		= synchronize_rcu,

	.exp_sync	= synchronize_rcu_expedited,

	.get_state	= get_state_synchronize_rcu,

	.get_gp_state	= get_state_synchronize_rcu,

	.cond_sync	= cond_synchronize_rcu,

	.call		= call_rcu,

	.cb_barrier	= rcu_barrier,
@@ -1050,10 +1050,10 @@ rcu_torture_writer(void *arg) 
	/* Initialize synctype[] array.  If none set, take default. */

	if (!gp_cond1 && !gp_exp1 && !gp_normal1 && !gp_sync1)

		gp_cond1 = gp_exp1 = gp_normal1 = gp_sync1 = true;

	if (gp_cond1 && cur_ops->get_state && cur_ops->cond_sync) {

	if (gp_cond1 && cur_ops->get_gp_state && cur_ops->cond_sync) {

		synctype[nsynctypes++] = RTWS_COND_GET;

		pr_info("%s: Testing conditional GPs.\n", __func__);

	} else if (gp_cond && (!cur_ops->get_state || !cur_ops->cond_sync)) {

	} else if (gp_cond && (!cur_ops->get_gp_state || !cur_ops->cond_sync)) {

		pr_alert("%s: gp_cond without primitives.\n", __func__);

	}

	if (gp_exp1 && cur_ops->exp_sync) {
@@ -1119,7 +1119,7 @@ rcu_torture_writer(void *arg) 
				break;

			case RTWS_COND_GET:

				rcu_torture_writer_state = RTWS_COND_GET;

				gp_snap = cur_ops->get_state();

				gp_snap = cur_ops->get_gp_state();

				i = torture_random(&rand) % 16;

				if (i != 0)

					schedule_timeout_interruptible(i);