diff options
| author | Paul E. McKenney <paulmck@linux.ibm.com> | 2019-03-21 18:26:41 +0100 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.ibm.com> | 2019-03-26 22:42:53 +0100 |
| commit | ad092c027713a68a34168942a5ef422e42e039f4 (patch) | |
| tree | 71d8b103ef6d6463b0a2225d1b34f97b67bfaded /kernel/rcu | |
| parent | rcutorture: Fix cleanup path for invalid torture_type strings (diff) | |
| download | linux-ad092c027713a68a34168942a5ef422e42e039f4.tar.xz linux-ad092c027713a68a34168942a5ef422e42e039f4.zip | |
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: Paul E. McKenney <paulmck@linux.ibm.com>
Diffstat (limited to 'kernel/rcu')
| -rw-r--r-- | kernel/rcu/rcuperf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c index c29761152874..7a6890b23c5f 100644 --- a/kernel/rcu/rcuperf.c +++ b/kernel/rcu/rcuperf.c @@ -494,6 +494,10 @@ rcu_perf_cleanup(void) if (torture_cleanup_begin()) return; + if (!cur_ops) { + torture_cleanup_end(); + return; + } if (reader_tasks) { for (i = 0; i < nrealreaders; i++) @@ -614,6 +618,7 @@ rcu_perf_init(void) pr_cont("\n"); WARN_ON(!IS_MODULE(CONFIG_RCU_PERF_TEST)); firsterr = -EINVAL; + cur_ops = NULL; goto unwind; } if (cur_ops->init) |