Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2695fb55 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by David S. Miller
Browse files

net: filter: rename 'struct sock_filter_int' into 'struct bpf_insn' 



eBPF is used by socket filtering, seccomp and soon by tracing and
exposed to userspace, therefore 'sock_filter_int' name is not accurate.
Rename it to 'bpf_insn'

Signed-off-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd66d386

arch/x86/net/bpf_jit_comp.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ struct jit_context { 
static int do_jit(struct sk_filter *bpf_prog, int *addrs, u8 *image,

		  int oldproglen, struct jit_context *ctx)

{

	struct sock_filter_int *insn = bpf_prog->insnsi;

	struct bpf_insn *insn = bpf_prog->insnsi;

	int insn_cnt = bpf_prog->len;

	u8 temp[64];

	int i;

include/linux/filter.h

+25 −25
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ enum { 
/* ALU ops on registers, bpf_add|sub|...: dst_reg += src_reg */



#define BPF_ALU64_REG(OP, DST, SRC)				\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU64 | BPF_OP(OP) | BPF_X,	\

		.dst_reg = DST,					\

		.src_reg = SRC,					\
@@ -90,7 +90,7 @@ enum { 
		.imm   = 0 })



#define BPF_ALU32_REG(OP, DST, SRC)				\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU | BPF_OP(OP) | BPF_X,		\

		.dst_reg = DST,					\

		.src_reg = SRC,					\
@@ -100,7 +100,7 @@ enum { 
/* ALU ops on immediates, bpf_add|sub|...: dst_reg += imm32 */



#define BPF_ALU64_IMM(OP, DST, IMM)				\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU64 | BPF_OP(OP) | BPF_K,	\

		.dst_reg = DST,					\

		.src_reg = 0,					\
@@ -108,7 +108,7 @@ enum { 
		.imm   = IMM })



#define BPF_ALU32_IMM(OP, DST, IMM)				\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU | BPF_OP(OP) | BPF_K,		\

		.dst_reg = DST,					\

		.src_reg = 0,					\
@@ -118,7 +118,7 @@ enum { 
/* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */



#define BPF_ENDIAN(TYPE, DST, LEN)				\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU | BPF_END | BPF_SRC(TYPE),	\

		.dst_reg = DST,					\

		.src_reg = 0,					\
@@ -128,7 +128,7 @@ enum { 
/* Short form of mov, dst_reg = src_reg */



#define BPF_MOV64_REG(DST, SRC)					\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU64 | BPF_MOV | BPF_X,		\

		.dst_reg = DST,					\

		.src_reg = SRC,					\
@@ -136,7 +136,7 @@ enum { 
		.imm   = 0 })



#define BPF_MOV32_REG(DST, SRC)					\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU | BPF_MOV | BPF_X,		\

		.dst_reg = DST,					\

		.src_reg = SRC,					\
@@ -146,7 +146,7 @@ enum { 
/* Short form of mov, dst_reg = imm32 */



#define BPF_MOV64_IMM(DST, IMM)					\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU64 | BPF_MOV | BPF_K,		\

		.dst_reg = DST,					\

		.src_reg = 0,					\
@@ -154,7 +154,7 @@ enum { 
		.imm   = IMM })



#define BPF_MOV32_IMM(DST, IMM)					\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU | BPF_MOV | BPF_K,		\

		.dst_reg = DST,					\

		.src_reg = 0,					\
@@ -164,7 +164,7 @@ enum { 
/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */



#define BPF_MOV64_RAW(TYPE, DST, SRC, IMM)			\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU64 | BPF_MOV | BPF_SRC(TYPE),	\

		.dst_reg = DST,					\

		.src_reg = SRC,					\
@@ -172,7 +172,7 @@ enum { 
		.imm   = IMM })



#define BPF_MOV32_RAW(TYPE, DST, SRC, IMM)			\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ALU | BPF_MOV | BPF_SRC(TYPE),	\

		.dst_reg = DST,					\

		.src_reg = SRC,					\
@@ -182,7 +182,7 @@ enum { 
/* Direct packet access, R0 = *(uint *) (skb->data + imm32) */



#define BPF_LD_ABS(SIZE, IMM)					\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_LD | BPF_SIZE(SIZE) | BPF_ABS,	\

		.dst_reg = 0,					\

		.src_reg = 0,					\
@@ -192,7 +192,7 @@ enum { 
/* Indirect packet access, R0 = *(uint *) (skb->data + src_reg + imm32) */



#define BPF_LD_IND(SIZE, SRC, IMM)				\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_LD | BPF_SIZE(SIZE) | BPF_IND,	\

		.dst_reg = 0,					\

		.src_reg = SRC,					\
@@ -202,7 +202,7 @@ enum { 
/* Memory load, dst_reg = *(uint *) (src_reg + off16) */



#define BPF_LDX_MEM(SIZE, DST, SRC, OFF)			\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_LDX | BPF_SIZE(SIZE) | BPF_MEM,	\

		.dst_reg = DST,					\

		.src_reg = SRC,					\
@@ -212,7 +212,7 @@ enum { 
/* Memory store, *(uint *) (dst_reg + off16) = src_reg */



#define BPF_STX_MEM(SIZE, DST, SRC, OFF)			\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_STX | BPF_SIZE(SIZE) | BPF_MEM,	\

		.dst_reg = DST,					\

		.src_reg = SRC,					\
@@ -222,7 +222,7 @@ enum { 
/* Memory store, *(uint *) (dst_reg + off16) = imm32 */



#define BPF_ST_MEM(SIZE, DST, OFF, IMM)				\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_ST | BPF_SIZE(SIZE) | BPF_MEM,	\

		.dst_reg = DST,					\

		.src_reg = 0,					\
@@ -232,7 +232,7 @@ enum { 
/* Conditional jumps against registers, if (dst_reg 'op' src_reg) goto pc + off16 */



#define BPF_JMP_REG(OP, DST, SRC, OFF)				\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_JMP | BPF_OP(OP) | BPF_X,		\

		.dst_reg = DST,					\

		.src_reg = SRC,					\
@@ -242,7 +242,7 @@ enum { 
/* Conditional jumps against immediates, if (dst_reg 'op' imm32) goto pc + off16 */



#define BPF_JMP_IMM(OP, DST, IMM, OFF)				\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_JMP | BPF_OP(OP) | BPF_K,		\

		.dst_reg = DST,					\

		.src_reg = 0,					\
@@ -252,7 +252,7 @@ enum { 
/* Function call */



#define BPF_EMIT_CALL(FUNC)					\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_JMP | BPF_CALL,			\

		.dst_reg = 0,					\

		.src_reg = 0,					\
@@ -262,7 +262,7 @@ enum { 
/* Raw code statement block */



#define BPF_RAW_INSN(CODE, DST, SRC, OFF, IMM)			\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = CODE,					\

		.dst_reg = DST,					\

		.src_reg = SRC,					\
@@ -272,7 +272,7 @@ enum { 
/* Program exit */



#define BPF_EXIT_INSN()						\

	((struct sock_filter_int) {				\

	((struct bpf_insn) {					\

		.code  = BPF_JMP | BPF_EXIT,			\

		.dst_reg = 0,					\

		.src_reg = 0,					\
@@ -298,7 +298,7 @@ enum { 
/* Macro to invoke filter function. */

#define SK_RUN_FILTER(filter, ctx)  (*filter->bpf_func)(ctx, filter->insnsi)



struct sock_filter_int {

struct bpf_insn {

	__u8	code;		/* opcode */

	__u8	dst_reg:4;	/* dest register */

	__u8	src_reg:4;	/* source register */
@@ -330,10 +330,10 @@ struct sk_filter { 
	struct sock_fprog_kern	*orig_prog;	/* Original BPF program */

	struct rcu_head		rcu;

	unsigned int		(*bpf_func)(const struct sk_buff *skb,

					    const struct sock_filter_int *filter);

					    const struct bpf_insn *filter);

	union {

		struct sock_filter	insns[0];

		struct sock_filter_int	insnsi[0];

		struct bpf_insn		insnsi[0];

		struct work_struct	work;

	};

};
@@ -353,7 +353,7 @@ void sk_filter_select_runtime(struct sk_filter *fp); 
void sk_filter_free(struct sk_filter *fp);



int sk_convert_filter(struct sock_filter *prog, int len,

		      struct sock_filter_int *new_prog, int *new_len);

		      struct bpf_insn *new_prog, int *new_len);



int sk_unattached_filter_create(struct sk_filter **pfp,

				struct sock_fprog_kern *fprog);

kernel/bpf/core.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ noinline u64 __bpf_call_base(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5) 
 * keep, 0 for none. @ctx is the data we are operating on, @insn is the

 * array of filter instructions.

 */

static unsigned int __sk_run_filter(void *ctx, const struct sock_filter_int *insn)

static unsigned int __sk_run_filter(void *ctx, const struct bpf_insn *insn)

{

	u64 stack[MAX_BPF_STACK / sizeof(u64)];

	u64 regs[MAX_BPF_REG], tmp;

kernel/seccomp.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static long seccomp_attach_filter(struct sock_fprog *fprog) 
	if (ret)

		goto free_prog;



	/* Convert 'sock_filter' insns to 'sock_filter_int' insns */

	/* Convert 'sock_filter' insns to 'bpf_insn' insns */

	ret = sk_convert_filter(fp, fprog->len, NULL, &new_len);

	if (ret)

		goto free_prog;

lib/test_bpf.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct bpf_test { 
	const char *descr;

	union {

		struct sock_filter insns[MAX_INSNS];

		struct sock_filter_int insns_int[MAX_INSNS];

		struct bpf_insn insns_int[MAX_INSNS];

	} u;

	__u8 aux;

	__u8 data[MAX_DATA];
@@ -1807,7 +1807,7 @@ static struct sk_filter *generate_filter(int which, int *err) 


		fp->len = flen;

		memcpy(fp->insnsi, tests[which].u.insns_int,

		       fp->len * sizeof(struct sock_filter_int));

		       fp->len * sizeof(struct bpf_insn));



		sk_filter_select_runtime(fp);

		break;