Commit 44397115 authored by Paul E. McKenney's avatar Paul E. McKenney Committed by Boqun Feng
Browse files

srcu: Move SRCU Tree/Tiny definitions from srcu.h 



There are a couple of definitions under "#ifdef CONFIG_TINY_SRCU"
in include/linux/srcu.h.  There is no point in them being there,
so this commit moves them to include/linux/srcutiny.h and
include/linux/srcutree.c, thus eliminating that #ifdef.

Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: <bpf@vger.kernel.org>
Signed-off-by: default avatarBoqun Feng <boqun.feng@gmail.com>
parent 4937096b

include/linux/srcu.h

+1 −9
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ int init_srcu_struct(struct srcu_struct *ssp); 
#define SRCU_READ_FLAVOR_SLOWGP	SRCU_READ_FLAVOR_LITE

						// Flavors requiring synchronize_rcu()

						// instead of smp_mb().

void __srcu_read_unlock(struct srcu_struct *ssp, int idx) __releases(ssp);



#ifdef CONFIG_TINY_SRCU

#include <linux/srcutiny.h>
@@ -64,15 +65,6 @@ int init_srcu_struct(struct srcu_struct *ssp); 
void call_srcu(struct srcu_struct *ssp, struct rcu_head *head,

		void (*func)(struct rcu_head *head));

void cleanup_srcu_struct(struct srcu_struct *ssp);

int __srcu_read_lock(struct srcu_struct *ssp) __acquires(ssp);

void __srcu_read_unlock(struct srcu_struct *ssp, int idx) __releases(ssp);

#ifdef CONFIG_TINY_SRCU

#define __srcu_read_lock_lite __srcu_read_lock

#define __srcu_read_unlock_lite __srcu_read_unlock

#else // #ifdef CONFIG_TINY_SRCU

int __srcu_read_lock_lite(struct srcu_struct *ssp) __acquires(ssp);

void __srcu_read_unlock_lite(struct srcu_struct *ssp, int idx) __releases(ssp);

#endif // #else // #ifdef CONFIG_TINY_SRCU

void synchronize_srcu(struct srcu_struct *ssp);



#define SRCU_GET_STATE_COMPLETED 0x1

include/linux/srcutiny.h

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ static inline int __srcu_read_lock(struct srcu_struct *ssp) 
	return idx;

}



#define __srcu_read_lock_lite __srcu_read_lock

#define __srcu_read_unlock_lite __srcu_read_unlock



static inline void synchronize_srcu_expedited(struct srcu_struct *ssp)

{

	synchronize_srcu(ssp);

include/linux/srcutree.h

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ struct srcu_struct { 
#define DEFINE_SRCU(name)		__DEFINE_SRCU(name, /* not static */)

#define DEFINE_STATIC_SRCU(name)	__DEFINE_SRCU(name, static)



int __srcu_read_lock(struct srcu_struct *ssp) __acquires(ssp);

void synchronize_srcu_expedited(struct srcu_struct *ssp);

void srcu_barrier(struct srcu_struct *ssp);

void srcu_torture_stats_print(struct srcu_struct *ssp, char *tt, char *tf);