Commit 6a64037d authored by Björn Töpel's avatar Björn Töpel Committed by Alexei Starovoitov
Browse files

bpf: Add bpf_trampoline_ name prefix for DECLARE_BPF_DISPATCHER 



Adding bpf_trampoline_ name prefix for DECLARE_BPF_DISPATCHER,
so all the dispatchers have the common name prefix.

And also a small '_' cleanup for bpf_dispatcher_nopfunc function
name.

Signed-off-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20200312195610.346362-3-jolsa@kernel.org


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent b56cd05c

include/linux/bpf.h

+11 −10
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ struct bpf_dispatcher { 
	u32 image_off;

};



static __always_inline unsigned int bpf_dispatcher_nopfunc(

static __always_inline unsigned int bpf_dispatcher_nop_func(

	const void *ctx,

	const struct bpf_insn *insnsi,

	unsigned int (*bpf_func)(const void *,
@@ -537,7 +537,7 @@ int bpf_trampoline_unlink_prog(struct bpf_prog *prog); 
void bpf_trampoline_put(struct bpf_trampoline *tr);

#define BPF_DISPATCHER_INIT(name) {			\

	.mutex = __MUTEX_INITIALIZER(name.mutex),	\

	.func = &name##func,				\

	.func = &name##_func,				\

	.progs = {},					\

	.num_progs = 0,					\

	.image = NULL,					\
@@ -545,7 +545,7 @@ void bpf_trampoline_put(struct bpf_trampoline *tr); 
}



#define DEFINE_BPF_DISPATCHER(name)					\

	noinline unsigned int name##func(				\

	noinline unsigned int bpf_dispatcher_##name##_func(		\

		const void *ctx,					\

		const struct bpf_insn *insnsi,				\

		unsigned int (*bpf_func)(const void *,			\
@@ -553,17 +553,18 @@ void bpf_trampoline_put(struct bpf_trampoline *tr); 
	{								\

		return bpf_func(ctx, insnsi);				\

	}								\

	EXPORT_SYMBOL(name##func);			\

	struct bpf_dispatcher name = BPF_DISPATCHER_INIT(name);

	EXPORT_SYMBOL(bpf_dispatcher_##name##_func);			\

	struct bpf_dispatcher bpf_dispatcher_##name =			\

		BPF_DISPATCHER_INIT(bpf_dispatcher_##name);

#define DECLARE_BPF_DISPATCHER(name)					\

	unsigned int name##func(					\

	unsigned int bpf_dispatcher_##name##_func(			\

		const void *ctx,					\

		const struct bpf_insn *insnsi,				\

		unsigned int (*bpf_func)(const void *,			\

					 const struct bpf_insn *));	\

	extern struct bpf_dispatcher name;

#define BPF_DISPATCHER_FUNC(name) name##func

#define BPF_DISPATCHER_PTR(name) (&name)

	extern struct bpf_dispatcher bpf_dispatcher_##name;

#define BPF_DISPATCHER_FUNC(name) bpf_dispatcher_##name##_func

#define BPF_DISPATCHER_PTR(name) (&bpf_dispatcher_##name)

void bpf_dispatcher_change_prog(struct bpf_dispatcher *d, struct bpf_prog *from,

				struct bpf_prog *to);

struct bpf_image {
@@ -589,7 +590,7 @@ static inline int bpf_trampoline_unlink_prog(struct bpf_prog *prog) 
static inline void bpf_trampoline_put(struct bpf_trampoline *tr) {}

#define DEFINE_BPF_DISPATCHER(name)

#define DECLARE_BPF_DISPATCHER(name)

#define BPF_DISPATCHER_FUNC(name) bpf_dispatcher_nopfunc

#define BPF_DISPATCHER_FUNC(name) bpf_dispatcher_nop_func

#define BPF_DISPATCHER_PTR(name) NULL

static inline void bpf_dispatcher_change_prog(struct bpf_dispatcher *d,

					      struct bpf_prog *from,

include/linux/filter.h

+4 −5
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ DECLARE_STATIC_KEY_FALSE(bpf_stats_enabled_key); 
	ret; })



#define BPF_PROG_RUN(prog, ctx)						\

	__BPF_PROG_RUN(prog, ctx, bpf_dispatcher_nopfunc)

	__BPF_PROG_RUN(prog, ctx, bpf_dispatcher_nop_func)



/*

 * Use in preemptible and therefore migratable context to make sure that
@@ -596,7 +596,7 @@ static inline u32 bpf_prog_run_pin_on_cpu(const struct bpf_prog *prog, 
	u32 ret;



	migrate_disable();

	ret = __BPF_PROG_RUN(prog, ctx, bpf_dispatcher_nopfunc);

	ret = __BPF_PROG_RUN(prog, ctx, bpf_dispatcher_nop_func);

	migrate_enable();

	return ret;

}
@@ -722,7 +722,7 @@ static inline u32 bpf_prog_run_clear_cb(const struct bpf_prog *prog, 
	return res;

}



DECLARE_BPF_DISPATCHER(bpf_dispatcher_xdp)

DECLARE_BPF_DISPATCHER(xdp)



static __always_inline u32 bpf_prog_run_xdp(const struct bpf_prog *prog,

					    struct xdp_buff *xdp)
@@ -733,8 +733,7 @@ static __always_inline u32 bpf_prog_run_xdp(const struct bpf_prog *prog, 
	 * already takes rcu_read_lock() when fetching the program, so

	 * it's not necessary here anymore.

	 */

	return __BPF_PROG_RUN(prog, xdp,

			      BPF_DISPATCHER_FUNC(bpf_dispatcher_xdp));

	return __BPF_PROG_RUN(prog, xdp, BPF_DISPATCHER_FUNC(xdp));

}



void bpf_prog_change_xdp(struct bpf_prog *prev_prog, struct bpf_prog *prog);

net/core/filter.c

+2 −3
Original line number Diff line number Diff line
@@ -8859,10 +8859,9 @@ const struct bpf_prog_ops sk_reuseport_prog_ops = { 
};

#endif /* CONFIG_INET */



DEFINE_BPF_DISPATCHER(bpf_dispatcher_xdp)

DEFINE_BPF_DISPATCHER(xdp)



void bpf_prog_change_xdp(struct bpf_prog *prev_prog, struct bpf_prog *prog)

{

	bpf_dispatcher_change_prog(BPF_DISPATCHER_PTR(bpf_dispatcher_xdp),

				   prev_prog, prog);

	bpf_dispatcher_change_prog(BPF_DISPATCHER_PTR(xdp), prev_prog, prog);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE