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

Commit 3836f533 authored Aug 30, 2015 by Paul E. McKenney

torture: Consolidate cond_resched_rcu_qs() into stutter_wait()



This commit moves cond_resched_rcu_qs() into stutter_wait(), saving
a line and also avoiding RCU CPU stall warnings from all torture
loops containing a stutter_wait().

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>

parent 617783dd

kernel/rcu/rcutorture.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -768,7 +768,6 @@ static int rcu_torture_boost(void *arg)
	}		}
	call_rcu_time = jiffies;		call_rcu_time = jiffies;
	}		}
	cond_resched_rcu_qs();
	stutter_wait("rcu_torture_boost");		stutter_wait("rcu_torture_boost");
	if (torture_must_stop())		if (torture_must_stop())
	goto checkwait;		goto checkwait;
	@@ -1208,7 +1207,6 @@ rcu_torture_reader(void *arg)
	__this_cpu_inc(rcu_torture_batch[completed]);		__this_cpu_inc(rcu_torture_batch[completed]);
	preempt_enable();		preempt_enable();
	cur_ops->readunlock(idx);		cur_ops->readunlock(idx);
	cond_resched_rcu_qs();
	stutter_wait("rcu_torture_reader");		stutter_wait("rcu_torture_reader");
	} while (!torture_must_stop());		} while (!torture_must_stop());
	if (irqreader && cur_ops->irq_capable) {		if (irqreader && cur_ops->irq_capable) {

kernel/torture.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -523,6 +523,7 @@ static int stutter;
	*/		*/
	void stutter_wait(const char *title)		void stutter_wait(const char *title)
	{		{
			cond_resched_rcu_qs();
	while (READ_ONCE(stutter_pause_test) \|\|		while (READ_ONCE(stutter_pause_test) \|\|
	(torture_runnable && !READ_ONCE(*torture_runnable))) {		(torture_runnable && !READ_ONCE(*torture_runnable))) {
	if (stutter_pause_test)		if (stutter_pause_test)