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

rcu: Move torture-related definitions from rcupdate.h to rcu.h 



The include/linux/rcupdate.h file contains a number of definitions that
are used only to communicate between rcutorture, rcuperf, and the RCU code
itself.  There is no point in having these definitions exposed globally
throughout the kernel, so this commit moves them to kernel/rcu/rcu.h.
This change has the added benefit of shrinking rcupdate.h.

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

include/linux/rcupdate.h

+0 −52
Original line number Diff line number Diff line
@@ -46,58 +46,6 @@ 
#include <linux/ktime.h>

#include <linux/irqflags.h>



enum rcutorture_type {

	RCU_FLAVOR,

	RCU_BH_FLAVOR,

	RCU_SCHED_FLAVOR,

	RCU_TASKS_FLAVOR,

	SRCU_FLAVOR,

	INVALID_RCU_FLAVOR

};



#if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU)

void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,

			    unsigned long *gpnum, unsigned long *completed);

void rcutorture_record_test_transition(void);

void rcutorture_record_progress(unsigned long vernum);

void do_trace_rcu_torture_read(const char *rcutorturename,

			       struct rcu_head *rhp,

			       unsigned long secs,

			       unsigned long c_old,

			       unsigned long c);

bool rcu_irq_enter_disabled(void);

#else

static inline void rcutorture_get_gp_data(enum rcutorture_type test_type,

					  int *flags,

					  unsigned long *gpnum,

					  unsigned long *completed)

{

	*flags = 0;

	*gpnum = 0;

	*completed = 0;

}

static inline void rcutorture_record_test_transition(void)

{

}

static inline void rcutorture_record_progress(unsigned long vernum)

{

}

static inline bool rcu_irq_enter_disabled(void)

{

	return false;

}

#ifdef CONFIG_RCU_TRACE

void do_trace_rcu_torture_read(const char *rcutorturename,

			       struct rcu_head *rhp,

			       unsigned long secs,

			       unsigned long c_old,

			       unsigned long c);

#else

#define do_trace_rcu_torture_read(rcutorturename, rhp, secs, c_old, c) \

	do { } while (0)

#endif

#endif



#define UINT_CMP_GE(a, b)	(UINT_MAX / 2 >= (a) - (b))

#define UINT_CMP_LT(a, b)	(UINT_MAX / 2 < (a) - (b))

#define ULONG_CMP_GE(a, b)	(ULONG_MAX / 2 >= (a) - (b))

include/linux/rcutiny.h

+5 −0
Original line number Diff line number Diff line
@@ -202,6 +202,11 @@ static inline void rcu_irq_enter(void) 
{

}



static inline bool rcu_irq_enter_disabled(void)

{

	return false;

}



static inline void rcu_irq_exit_irqson(void)

{

}

include/linux/rcutree.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ void rcu_irq_enter(void); 
void rcu_irq_exit(void);

void rcu_irq_enter_irqson(void);

void rcu_irq_exit_irqson(void);

bool rcu_irq_enter_disabled(void);



void exit_rcu(void);

include/linux/srcuclassic.h

+0 −14
Original line number Diff line number Diff line
@@ -98,18 +98,4 @@ void synchronize_srcu_expedited(struct srcu_struct *sp); 
void srcu_barrier(struct srcu_struct *sp);

unsigned long srcu_batches_completed(struct srcu_struct *sp);



static inline void srcutorture_get_gp_data(enum rcutorture_type test_type,

					   struct srcu_struct *sp, int *flags,

					   unsigned long *gpnum,

					   unsigned long *completed)

{

	if (test_type != SRCU_FLAVOR)

		return;

	*flags = 0;

	*completed = sp->completed;

	*gpnum = *completed;

	if (sp->batch_queue.head || sp->batch_check0.head || sp->batch_check0.head)

		(*gpnum)++;

}



#endif

include/linux/srcutiny.h

+0 −12
Original line number Diff line number Diff line
@@ -93,16 +93,4 @@ static inline unsigned long srcu_batches_completed(struct srcu_struct *sp) 
	return 0;

}



static inline void srcutorture_get_gp_data(enum rcutorture_type test_type,

					   struct srcu_struct *sp, int *flags,

					   unsigned long *gpnum,

					   unsigned long *completed)

{

	if (test_type != SRCU_FLAVOR)

		return;

	*flags = 0;

	*completed = sp->srcu_gp_seq;

	*gpnum = *completed;

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE