| From 655fefe56f007c5d79bb2e2cf389f6111291289a Mon Sep 17 00:00:00 2001 |
| From: "Paul E. McKenney" <paulmck@linux.ibm.com> |
| Date: Thu, 21 Mar 2019 09:27:28 -0700 |
| Subject: rcutorture: Fix cleanup path for invalid torture_type strings |
| |
| [ Upstream commit b813afae7ab6a5e91b4e16cc567331d9c2ae1f04 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| kernel/rcu/rcutorture.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c |
| index f14d1b18a74fc..a2efe27317bef 100644 |
| --- a/kernel/rcu/rcutorture.c |
| +++ b/kernel/rcu/rcutorture.c |
| @@ -2094,6 +2094,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); |
| @@ -2267,6 +2271,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) { |
| -- |
| 2.20.1 |
| |