Commit 8d2aaa9b authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Paul E. McKenney
Browse files

rcu/nocb: Move rcu_nocb_is_setup to rcu_state 



This commit moves the RCU nocb initialization witness within rcu_state
to consolidate RCU's global state.

Reported-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Cc: Neeraj Upadhyay <quic_neeraju@quicinc.com>
Cc: Uladzislau Rezki <uladzislau.rezki@sony.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent beb84099

kernel/rcu/tree.h

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ struct rcu_state { 
	arch_spinlock_t ofl_lock ____cacheline_internodealigned_in_smp;

						/* Synchronize offline with */

						/*  GP pre-initialization. */

	int nocb_is_setup;			/* nocb is setup from boot */

};



/* Values for rcu_state structure's gp_flags field. */

kernel/rcu/tree_nocb.h

+5 −8
Original line number Diff line number Diff line
@@ -60,9 +60,6 @@ static inline bool rcu_current_is_nocb_kthread(struct rcu_data *rdp) 
 * Parse the boot-time rcu_nocb_mask CPU list from the kernel parameters.

 * If the list is invalid, a warning is emitted and all CPUs are offloaded.

 */



static bool rcu_nocb_is_setup;



static int __init rcu_nocb_setup(char *str)

{

	alloc_bootmem_cpumask_var(&rcu_nocb_mask);
@@ -72,7 +69,7 @@ static int __init rcu_nocb_setup(char *str) 
			cpumask_setall(rcu_nocb_mask);

		}

	}

	rcu_nocb_is_setup = true;

	rcu_state.nocb_is_setup = true;

	return 1;

}

__setup("rcu_nocbs", rcu_nocb_setup);
@@ -1172,10 +1169,10 @@ void __init rcu_init_nohz(void) 
				return;

			}

		}

		rcu_nocb_is_setup = true;

		rcu_state.nocb_is_setup = true;

	}



	if (!rcu_nocb_is_setup)

	if (!rcu_state.nocb_is_setup)

		return;



#if defined(CONFIG_NO_HZ_FULL)
@@ -1233,7 +1230,7 @@ static void rcu_spawn_cpu_nocb_kthread(int cpu) 
	struct task_struct *t;

	struct sched_param sp;



	if (!rcu_scheduler_fully_active || !rcu_nocb_is_setup)

	if (!rcu_scheduler_fully_active || !rcu_state.nocb_is_setup)

		return;



	/* If there already is an rcuo kthread, then nothing to do. */
@@ -1279,7 +1276,7 @@ static void __init rcu_spawn_nocb_kthreads(void) 
{

	int cpu;



	if (rcu_nocb_is_setup) {

	if (rcu_state.nocb_is_setup) {

		for_each_online_cpu(cpu)

			rcu_spawn_cpu_nocb_kthread(cpu);

	}