diff options
| author |   Paul E. McKenney <paulmck@kernel.org> | 2019-11-06 07:49:31 -0800 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@kernel.org> | 2019-12-09 13:00:28 -0800 |
| commit | 7beba0c06b588c725962bcc0273a489d46e81ccf (patch) | |
| tree | c7823e00ed0926b51a4c1a37dfbe33e4fc4af665 | |
| parent | rcutorture: Thread rcu_fwd pointer through forward-progress functions (diff) | |
| download | linux-dev-7beba0c06b588c725962bcc0273a489d46e81ccf.tar.xz linux-dev-7beba0c06b588c725962bcc0273a489d46e81ccf.zip | |
rcutorture: Move to dynamic initialization of rcu_fwds
In order to add multiple call_rcu() forward-progress kthreads, it will
be necessary to dynamically allocate and initialize. This commit
therefore moves the initialization from compile time to instead
immediately precede thread-creation time.
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
| -rw-r--r-- | kernel/rcu/rcutorture.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index cc88ce910a6d..6f540fed942c 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -1686,11 +1686,7 @@ struct rcu_fwd { unsigned long rcu_launder_gp_seq_start; }; -struct rcu_fwd rcu_fwds = { - .rcu_fwd_lock = __SPIN_LOCK_UNLOCKED(rcu_fwds.rcu_fwd_lock), - .rcu_fwd_cb_tail = &rcu_fwds.rcu_fwd_cb_head, -}; - +struct rcu_fwd rcu_fwds; bool rcu_fwd_emergency_stop; static void rcu_torture_fwd_cb_hist(struct rcu_fwd *rfp) @@ -2026,6 +2022,8 @@ static int __init rcu_torture_fwd_prog_init(void) WARN_ON(1); /* Make sure rcutorture notices conflict. */ return 0; } + spin_lock_init(&rcu_fwds.rcu_fwd_lock); + rcu_fwds.rcu_fwd_cb_tail = &rcu_fwds.rcu_fwd_cb_head; if (fwd_progress_holdoff <= 0) fwd_progress_holdoff = 1; if (fwd_progress_div <= 0) |