Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0acc512c authored by Paul E. McKenney's avatar Paul E. McKenney Committed by Ingo Molnar
Browse files

rcu: Add synchronize_sched_expedited() torture tests 



This patch adds rcutorture tests for the new
synchronize_sched_expedited() primitive, and also does some
whitespace cleanups in kernel/rcutorture.c as well.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: akpm@linux-foundation.org
Cc: torvalds@linux-foundation.org
Cc: davem@davemloft.net
Cc: dada1@cosmosbay.com
Cc: zbr@ioremap.net
Cc: jeff.chua.linux@gmail.com
Cc: paulus@samba.org
Cc: laijs@cn.fujitsu.com
Cc: jengelh@medozas.de
Cc: r000n@r000n.net
Cc: benh@kernel.crashing.org
Cc: mathieu.desnoyers@polymtl.ca
LKML-Reference: <12459460981342-git-send-email->
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 03b042bf

kernel/rcutorture.c

+110 −92
Original line number Diff line number Diff line
@@ -257,14 +257,14 @@ struct rcu_torture_ops { 
	void (*init)(void);

	void (*cleanup)(void);

	int (*readlock)(void);

	void (*readdelay)(struct rcu_random_state *rrsp);

	void (*read_delay)(struct rcu_random_state *rrsp);

	void (*readunlock)(int idx);

	int (*completed)(void);

	void (*deferredfree)(struct rcu_torture *p);

	void (*deferred_free)(struct rcu_torture *p);

	void (*sync)(void);

	void (*cb_barrier)(void);

	int (*stats)(char *page);

	int irqcapable;

	int irq_capable;

	char *name;

};

static struct rcu_torture_ops *cur_ops = NULL;
@@ -320,7 +320,7 @@ rcu_torture_cb(struct rcu_head *p) 
		rp->rtort_mbtest = 0;

		rcu_torture_free(rp);

	} else

		cur_ops->deferredfree(rp);

		cur_ops->deferred_free(rp);

}



static void rcu_torture_deferred_free(struct rcu_torture *p)
@@ -332,14 +332,14 @@ static struct rcu_torture_ops rcu_ops = { 
	.init		= NULL,

	.cleanup	= NULL,

	.readlock	= rcu_torture_read_lock,

	.readdelay = rcu_read_delay,

	.read_delay	= rcu_read_delay,

	.readunlock	= rcu_torture_read_unlock,

	.completed	= rcu_torture_completed,

	.deferredfree = rcu_torture_deferred_free,

	.deferred_free	= rcu_torture_deferred_free,

	.sync		= synchronize_rcu,

	.cb_barrier	= rcu_barrier,

	.stats		= NULL,

	.irqcapable = 1,

	.irq_capable 	= 1,

	.name 		= "rcu"

};
@@ -373,14 +373,14 @@ static struct rcu_torture_ops rcu_sync_ops = { 
	.init		= rcu_sync_torture_init,

	.cleanup	= NULL,

	.readlock	= rcu_torture_read_lock,

	.readdelay = rcu_read_delay,

	.read_delay	= rcu_read_delay,

	.readunlock	= rcu_torture_read_unlock,

	.completed	= rcu_torture_completed,

	.deferredfree = rcu_sync_torture_deferred_free,

	.deferred_free	= rcu_sync_torture_deferred_free,

	.sync		= synchronize_rcu,

	.cb_barrier	= NULL,

	.stats		= NULL,

	.irqcapable = 1,

	.irq_capable	= 1,

	.name		= "rcu_sync"

};
@@ -435,14 +435,14 @@ static struct rcu_torture_ops rcu_bh_ops = { 
	.init		= NULL,

	.cleanup	= NULL,

	.readlock	= rcu_bh_torture_read_lock,

	.readdelay = rcu_read_delay,  /* just reuse rcu's version. */

	.read_delay	= rcu_read_delay,  /* just reuse rcu's version. */

	.readunlock	= rcu_bh_torture_read_unlock,

	.completed	= rcu_bh_torture_completed,

	.deferredfree = rcu_bh_torture_deferred_free,

	.deferred_free	= rcu_bh_torture_deferred_free,

	.sync		= rcu_bh_torture_synchronize,

	.cb_barrier	= rcu_barrier_bh,

	.stats		= NULL,

	.irqcapable = 1,

	.irq_capable	= 1,

	.name		= "rcu_bh"

};
@@ -450,14 +450,14 @@ static struct rcu_torture_ops rcu_bh_sync_ops = { 
	.init		= rcu_sync_torture_init,

	.cleanup	= NULL,

	.readlock	= rcu_bh_torture_read_lock,

	.readdelay = rcu_read_delay,  /* just reuse rcu's version. */

	.read_delay	= rcu_read_delay,  /* just reuse rcu's version. */

	.readunlock	= rcu_bh_torture_read_unlock,

	.completed	= rcu_bh_torture_completed,

	.deferredfree = rcu_sync_torture_deferred_free,

	.deferred_free	= rcu_sync_torture_deferred_free,

	.sync		= rcu_bh_torture_synchronize,

	.cb_barrier	= NULL,

	.stats		= NULL,

	.irqcapable = 1,

	.irq_capable	= 1,

	.name		= "rcu_bh_sync"

};
@@ -533,10 +533,10 @@ static struct rcu_torture_ops srcu_ops = { 
	.init		= srcu_torture_init,

	.cleanup	= srcu_torture_cleanup,

	.readlock	= srcu_torture_read_lock,

	.readdelay = srcu_read_delay,

	.read_delay	= srcu_read_delay,

	.readunlock	= srcu_torture_read_unlock,

	.completed	= srcu_torture_completed,

	.deferredfree = rcu_sync_torture_deferred_free,

	.deferred_free	= rcu_sync_torture_deferred_free,

	.sync		= srcu_torture_synchronize,

	.cb_barrier	= NULL,

	.stats		= srcu_torture_stats,
@@ -577,14 +577,14 @@ static struct rcu_torture_ops sched_ops = { 
	.init		= rcu_sync_torture_init,

	.cleanup	= NULL,

	.readlock	= sched_torture_read_lock,

	.readdelay = rcu_read_delay,  /* just reuse rcu's version. */

	.read_delay	= rcu_read_delay,  /* just reuse rcu's version. */

	.readunlock	= sched_torture_read_unlock,

	.completed	= sched_torture_completed,

	.deferredfree = rcu_sched_torture_deferred_free,

	.deferred_free	= rcu_sched_torture_deferred_free,

	.sync		= sched_torture_synchronize,

	.cb_barrier	= rcu_barrier_sched,

	.stats		= NULL,

	.irqcapable = 1,

	.irq_capable	= 1,

	.name		= "sched"

};
@@ -592,16 +592,33 @@ static struct rcu_torture_ops sched_ops_sync = { 
	.init		= rcu_sync_torture_init,

	.cleanup	= NULL,

	.readlock	= sched_torture_read_lock,

	.readdelay = rcu_read_delay,  /* just reuse rcu's version. */

	.read_delay	= rcu_read_delay,  /* just reuse rcu's version. */

	.readunlock	= sched_torture_read_unlock,

	.completed	= sched_torture_completed,

	.deferredfree = rcu_sync_torture_deferred_free,

	.deferred_free	= rcu_sync_torture_deferred_free,

	.sync		= sched_torture_synchronize,

	.cb_barrier	= NULL,

	.stats		= NULL,

	.name		= "sched_sync"

};



extern int rcu_expedited_torture_stats(char *page);



static struct rcu_torture_ops sched_expedited_ops = {

	.init		= rcu_sync_torture_init,

	.cleanup	= NULL,

	.readlock	= sched_torture_read_lock,

	.read_delay	= rcu_read_delay,  /* just reuse rcu's version. */

	.readunlock	= sched_torture_read_unlock,

	.completed	= sched_torture_completed,

	.deferred_free	= rcu_sync_torture_deferred_free,

	.sync		= synchronize_sched_expedited,

	.cb_barrier	= NULL,

	.stats		= rcu_expedited_torture_stats,

	.irq_capable	= 1,

	.name		= "sched_expedited"

};



/*

 * RCU torture writer kthread.  Repeatedly substitutes a new structure

 * for that pointed to by rcu_torture_current, freeing the old structure
@@ -635,7 +652,7 @@ rcu_torture_writer(void *arg) 
				i = RCU_TORTURE_PIPE_LEN;

			atomic_inc(&rcu_torture_wcount[i]);

			old_rp->rtort_pipe_count++;

			cur_ops->deferredfree(old_rp);

			cur_ops->deferred_free(old_rp);

		}

		rcu_torture_current_version++;

		oldbatch = cur_ops->completed();
@@ -700,7 +717,7 @@ static void rcu_torture_timer(unsigned long unused) 
	if (p->rtort_mbtest == 0)

		atomic_inc(&n_rcu_torture_mberror);

	spin_lock(&rand_lock);

	cur_ops->readdelay(&rand);

	cur_ops->read_delay(&rand);

	n_rcu_torture_timers++;

	spin_unlock(&rand_lock);

	preempt_disable();
@@ -738,11 +755,11 @@ rcu_torture_reader(void *arg) 


	VERBOSE_PRINTK_STRING("rcu_torture_reader task started");

	set_user_nice(current, 19);

	if (irqreader && cur_ops->irqcapable)

	if (irqreader && cur_ops->irq_capable)

		setup_timer_on_stack(&t, rcu_torture_timer, 0);



	do {

		if (irqreader && cur_ops->irqcapable) {

		if (irqreader && cur_ops->irq_capable) {

			if (!timer_pending(&t))

				mod_timer(&t, 1);

		}
@@ -757,7 +774,7 @@ rcu_torture_reader(void *arg) 
		}

		if (p->rtort_mbtest == 0)

			atomic_inc(&n_rcu_torture_mberror);

		cur_ops->readdelay(&rand);

		cur_ops->read_delay(&rand);

		preempt_disable();

		pipe_count = p->rtort_pipe_count;

		if (pipe_count > RCU_TORTURE_PIPE_LEN) {
@@ -778,7 +795,7 @@ rcu_torture_reader(void *arg) 
	} while (!kthread_should_stop() && fullstop == FULLSTOP_DONTSTOP);

	VERBOSE_PRINTK_STRING("rcu_torture_reader task stopping");

	rcutorture_shutdown_absorb("rcu_torture_reader");

	if (irqreader && cur_ops->irqcapable)

	if (irqreader && cur_ops->irq_capable)

		del_timer_sync(&t);

	while (!kthread_should_stop())

		schedule_timeout_uninterruptible(1);
@@ -1078,6 +1095,7 @@ rcu_torture_init(void) 
	int firsterr = 0;

	static struct rcu_torture_ops *torture_ops[] =

		{ &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops,

		  &sched_expedited_ops,

		  &srcu_ops, &sched_ops, &sched_ops_sync, };



	mutex_lock(&fullstop_mutex);