Commit b813afae authored Mar 21, 2019 by Paul E. McKenney

rcutorture: Fix cleanup path for invalid torture_type strings

If the specified rcutorture.torture_type is not in the rcu_torture_init()
function's torture_ops[] array, rcutorture prints some console messages
and then invokes rcu_torture_cleanup() to set state so that a future
torture test can run. However, rcu_torture_cleanup() also attempts to
end the test that didn't actually start, and in doing so relies on the
value of cur_ops, a value that is not particularly relevant in this case.
This can result in confusing output or even follow-on failures due to
attempts to use facilities that have not been properly initialized.

This commit therefore sets the value of cur_ops to NULL in this case
and inserts a check near the beginning of rcu_torture_cleanup(),
thus avoiding relying on an irrelevant cur_ops value.

Reported-by: kernel test robot <rong.a.chen@intel.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>

parent d44ac1be

kernel/rcu/rcutorture.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -2089,6 +2089,10 @@ rcu_torture_cleanup(void)
		cur_ops->cb_barrier();
		return;
		}
		if (!cur_ops) {
		torture_cleanup_end();
		return;
		}

		rcu_torture_barrier_cleanup();
		torture_stop_kthread(rcu_torture_fwd_prog, fwd_prog_task);
		@@ -2262,6 +2266,7 @@ rcu_torture_init(void)
		pr_cont("\n");
		WARN_ON(!IS_MODULE(CONFIG_RCU_TORTURE_TEST));
		firsterr = -EINVAL;
		cur_ops = NULL;
		goto unwind;
		}
		if (cur_ops->fqs == NULL && fqs_duration != 0) {

Admin message