Commit 4994684c authored Sep 18, 2020 by Paul E. McKenney

rcutorture: Prevent hangs for invalid arguments

If an rcutorture torture-test run is given a bad kvm.sh argument, the
test will complain to the console, which is good. What is bad is that
from the user's perspective, it will just hang for the time specified
by the --duration argument. This commit therefore forces an immediate
kernel shutdown if a rcu_torture_init()-time error occurs, thus avoiding
the appearance of a hang. It also forces a console splat in this case
to clearly indicate the presence of an error.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

parent c64659ef

kernel/rcu/rcutorture.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2647,7 +2647,6 @@ rcu_torture_init(void)
		for (i = 0; i < ARRAY_SIZE(torture_ops); i++)
		pr_cont(" %s", torture_ops[i]->name);
		pr_cont("\n");
		WARN_ON(!IS_MODULE(CONFIG_RCU_TORTURE_TEST));
		firsterr = -EINVAL;
		cur_ops = NULL;
		goto unwind;
		@@ -2815,6 +2814,10 @@ rcu_torture_init(void)
		unwind:
		torture_init_end();
		rcu_torture_cleanup();
		if (shutdown_secs) {
		WARN_ON(!IS_MODULE(CONFIG_RCU_TORTURE_TEST));
		kernel_power_off();
		}
		return firsterr;
		}

Admin message