Commit e3c8d51e authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Move torture-related functions out of rcutiny.h and rcutree.h 



The various functions similar to rcu_batches_started(), the
function show_rcu_gp_kthreads(), the various functions similar to
rcu_force_quiescent_state(), and the variables rcutorture_testseq and
rcutorture_vernum are used only within RCU.  There is therefore no point
in exporting them to the kernel at large from include/linux/rcutiny.h
and include/linux/rcutree.h.  This commit therefore moves all of these
to kernel/rcu/rcu.h.

Reported-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 17a8c187

include/linux/rcutiny.h

+0 −80
Original line number Diff line number Diff line
@@ -106,86 +106,6 @@ static inline void rcu_virt_note_context_switch(int cpu) 
{

}



/*

 * Return the number of grace periods started.

 */

static inline unsigned long rcu_batches_started(void)

{

	return 0;

}



/*

 * Return the number of bottom-half grace periods started.

 */

static inline unsigned long rcu_batches_started_bh(void)

{

	return 0;

}



/*

 * Return the number of sched grace periods started.

 */

static inline unsigned long rcu_batches_started_sched(void)

{

	return 0;

}



/*

 * Return the number of grace periods completed.

 */

static inline unsigned long rcu_batches_completed(void)

{

	return 0;

}



/*

 * Return the number of bottom-half grace periods completed.

 */

static inline unsigned long rcu_batches_completed_bh(void)

{

	return 0;

}



/*

 * Return the number of sched grace periods completed.

 */

static inline unsigned long rcu_batches_completed_sched(void)

{

	return 0;

}



/*

 * Return the number of expedited grace periods completed.

 */

static inline unsigned long rcu_exp_batches_completed(void)

{

	return 0;

}



/*

 * Return the number of expedited sched grace periods completed.

 */

static inline unsigned long rcu_exp_batches_completed_sched(void)

{

	return 0;

}



static inline void rcu_force_quiescent_state(void)

{

}



static inline void rcu_bh_force_quiescent_state(void)

{

}



static inline void rcu_sched_force_quiescent_state(void)

{

}



static inline void show_rcu_gp_kthreads(void)

{

}



static inline void rcu_cpu_stall_reset(void)

{

}

include/linux/rcutree.h

+0 −16
Original line number Diff line number Diff line
@@ -79,22 +79,6 @@ void cond_synchronize_rcu(unsigned long oldstate); 
unsigned long get_state_synchronize_sched(void);

void cond_synchronize_sched(unsigned long oldstate);



extern unsigned long rcutorture_testseq;

extern unsigned long rcutorture_vernum;

unsigned long rcu_batches_started(void);

unsigned long rcu_batches_started_bh(void);

unsigned long rcu_batches_started_sched(void);

unsigned long rcu_batches_completed(void);

unsigned long rcu_batches_completed_bh(void);

unsigned long rcu_batches_completed_sched(void);

unsigned long rcu_exp_batches_completed(void);

unsigned long rcu_exp_batches_completed_sched(void);

void show_rcu_gp_kthreads(void);



void rcu_force_quiescent_state(void);

void rcu_bh_force_quiescent_state(void);

void rcu_sched_force_quiescent_state(void);



void rcu_idle_enter(void);

void rcu_idle_exit(void);

void rcu_irq_enter(void);

kernel/rcu/rcu.h

+99 −0
Original line number Diff line number Diff line
@@ -420,6 +420,105 @@ static inline void srcutorture_get_gp_data(enum rcutorture_type test_type, 


#endif



#ifdef CONFIG_TINY_RCU



/*

 * Return the number of grace periods started.

 */

static inline unsigned long rcu_batches_started(void)

{

	return 0;

}



/*

 * Return the number of bottom-half grace periods started.

 */

static inline unsigned long rcu_batches_started_bh(void)

{

	return 0;

}



/*

 * Return the number of sched grace periods started.

 */

static inline unsigned long rcu_batches_started_sched(void)

{

	return 0;

}



/*

 * Return the number of grace periods completed.

 */

static inline unsigned long rcu_batches_completed(void)

{

	return 0;

}



/*

 * Return the number of bottom-half grace periods completed.

 */

static inline unsigned long rcu_batches_completed_bh(void)

{

	return 0;

}



/*

 * Return the number of sched grace periods completed.

 */

static inline unsigned long rcu_batches_completed_sched(void)

{

	return 0;

}



/*

 * Return the number of expedited grace periods completed.

 */

static inline unsigned long rcu_exp_batches_completed(void)

{

	return 0;

}



/*

 * Return the number of expedited sched grace periods completed.

 */

static inline unsigned long rcu_exp_batches_completed_sched(void)

{

	return 0;

}



static inline void rcu_force_quiescent_state(void)

{

}



static inline void rcu_bh_force_quiescent_state(void)

{

}



static inline void rcu_sched_force_quiescent_state(void)

{

}



static inline void show_rcu_gp_kthreads(void)

{

}



#else /* #ifdef CONFIG_TINY_RCU */

extern unsigned long rcutorture_testseq;

extern unsigned long rcutorture_vernum;

unsigned long rcu_batches_started(void);

unsigned long rcu_batches_started_bh(void);

unsigned long rcu_batches_started_sched(void);

unsigned long rcu_batches_completed(void);

unsigned long rcu_batches_completed_bh(void);

unsigned long rcu_batches_completed_sched(void);

unsigned long rcu_exp_batches_completed(void);

unsigned long rcu_exp_batches_completed_sched(void);

void show_rcu_gp_kthreads(void);

void rcu_force_quiescent_state(void);

void rcu_bh_force_quiescent_state(void);

void rcu_sched_force_quiescent_state(void);

#endif /* #else #ifdef CONFIG_TINY_RCU */



#if defined(CONFIG_RCU_NOCB_CPU_ALL)

static inline bool rcu_is_nocb_cpu(int cpu) { return true; }

#elif defined(CONFIG_RCU_NOCB_CPU)

CRA Git | Maintained and supported by SUSTech CRA and CCSE