Commit ad092c02 authored by Paul E. McKenney's avatar Paul E. McKenney

rcuperf: Fix cleanup path for invalid perf_type strings

If the specified rcuperf.perf_type is not in the rcu_perf_init()
function's perf_ops[] array, rcuperf prints some console messages and
then invokes rcu_perf_cleanup() to set state so that a future torture
test can run.  However, rcu_perf_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_perf_cleanup(), thus avoiding
relying on an irrelevant cur_ops value.
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.ibm.com>
parent b813afae
...@@ -494,6 +494,10 @@ rcu_perf_cleanup(void) ...@@ -494,6 +494,10 @@ rcu_perf_cleanup(void)
if (torture_cleanup_begin()) if (torture_cleanup_begin())
return; return;
if (!cur_ops) {
torture_cleanup_end();
return;
}
if (reader_tasks) { if (reader_tasks) {
for (i = 0; i < nrealreaders; i++) for (i = 0; i < nrealreaders; i++)
...@@ -614,6 +618,7 @@ rcu_perf_init(void) ...@@ -614,6 +618,7 @@ rcu_perf_init(void)
pr_cont("\n"); pr_cont("\n");
WARN_ON(!IS_MODULE(CONFIG_RCU_PERF_TEST)); WARN_ON(!IS_MODULE(CONFIG_RCU_PERF_TEST));
firsterr = -EINVAL; firsterr = -EINVAL;
cur_ops = NULL;
goto unwind; goto unwind;
} }
if (cur_ops->init) if (cur_ops->init)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment