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

Commit 4e10df9a authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by David S. Miller
Browse files

bpf: introduce bpf_skb_vlan_push/pop() helpers 



Allow eBPF programs attached to TC qdiscs call skb_vlan_push/pop via
helper functions. These functions may change skb->data/hlen which are
cached by some JITs to improve performance of ld_abs/ld_ind instructions.
Therefore JITs need to recognize bpf_skb_vlan_push/pop() calls,
re-compute header len and re-cache skb->data/hlen back into cpu registers.
Note, skb->data/hlen are not directly accessible from the programs,
so any changes to skb->data done either by these helpers or by other
TC actions are safe.

eBPF JIT supported by three architectures:
- arm64 JIT is using bpf_load_pointer() without caching, so it's ok as-is.
- x64 JIT re-caches skb->data/hlen unconditionally after vlan_push/pop calls
  (experiments showed that conditional re-caching is slower).
- s390 JIT falls back to interpreter for now when bpf_skb_vlan_push() is present
  in the program (re-caching is tbd).

These helpers allow more scalable handling of vlan from the programs.
Instead of creating thousands of vlan netdevs on top of eth0 and attaching
TC+ingress+bpf to all of them, the program can be attached to eth0 directly
and manipulate vlans as necessary.

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

arch/s390/net/bpf_jit_comp.c

+4 −0
Original line number Diff line number Diff line
@@ -973,6 +973,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
		 */

		const u64 func = (u64)__bpf_call_base + imm;



		if (bpf_helper_changes_skb_data((void *)func))

			/* TODO reload skb->data, hlen */

			return -1;



		REG_SET_SEEN(BPF_REG_5);

		jit->seen |= SEEN_FUNC;

		/* lg %w1,<d(imm)>(%l) */

arch/x86/net/bpf_jit_comp.c

+42 −38
Original line number Diff line number Diff line
@@ -315,6 +315,26 @@ static void emit_bpf_tail_call(u8 **pprog) 
	*pprog = prog;

}





static void emit_load_skb_data_hlen(u8 **pprog)

{

	u8 *prog = *pprog;

	int cnt = 0;



	/* r9d = skb->len - skb->data_len (headlen)

	 * r10 = skb->data

	 */

	/* mov %r9d, off32(%rdi) */

	EMIT3_off32(0x44, 0x8b, 0x8f, offsetof(struct sk_buff, len));



	/* sub %r9d, off32(%rdi) */

	EMIT3_off32(0x44, 0x2b, 0x8f, offsetof(struct sk_buff, data_len));



	/* mov %r10, off32(%rdi) */

	EMIT3_off32(0x4c, 0x8b, 0x97, offsetof(struct sk_buff, data));

	*pprog = prog;

}



static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,

		  int oldproglen, struct jit_context *ctx)

{
@@ -329,36 +349,8 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, 


	emit_prologue(&prog);



	if (seen_ld_abs) {

		/* r9d : skb->len - skb->data_len (headlen)

		 * r10 : skb->data

		 */

		if (is_imm8(offsetof(struct sk_buff, len)))

			/* mov %r9d, off8(%rdi) */

			EMIT4(0x44, 0x8b, 0x4f,

			      offsetof(struct sk_buff, len));

		else

			/* mov %r9d, off32(%rdi) */

			EMIT3_off32(0x44, 0x8b, 0x8f,

				    offsetof(struct sk_buff, len));



		if (is_imm8(offsetof(struct sk_buff, data_len)))

			/* sub %r9d, off8(%rdi) */

			EMIT4(0x44, 0x2b, 0x4f,

			      offsetof(struct sk_buff, data_len));

		else

			EMIT3_off32(0x44, 0x2b, 0x8f,

				    offsetof(struct sk_buff, data_len));



		if (is_imm8(offsetof(struct sk_buff, data)))

			/* mov %r10, off8(%rdi) */

			EMIT4(0x4c, 0x8b, 0x57,

			      offsetof(struct sk_buff, data));

		else

			/* mov %r10, off32(%rdi) */

			EMIT3_off32(0x4c, 0x8b, 0x97,

				    offsetof(struct sk_buff, data));

	}

	if (seen_ld_abs)

		emit_load_skb_data_hlen(&prog);



	for (i = 0; i < insn_cnt; i++, insn++) {

		const s32 imm32 = insn->imm;
@@ -367,6 +359,7 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, 
		u8 b1 = 0, b2 = 0, b3 = 0;

		s64 jmp_offset;

		u8 jmp_cond;

		bool reload_skb_data;

		int ilen;

		u8 *func;
@@ -818,6 +811,11 @@ xadd: if (is_imm8(insn->off)) 
			func = (u8 *) __bpf_call_base + imm32;

			jmp_offset = func - (image + addrs[i]);

			if (seen_ld_abs) {

				reload_skb_data = bpf_helper_changes_skb_data(func);

				if (reload_skb_data) {

					EMIT1(0x57); /* push %rdi */

					jmp_offset += 22; /* pop, mov, sub, mov */

				} else {

					EMIT2(0x41, 0x52); /* push %r10 */

					EMIT2(0x41, 0x51); /* push %r9 */

					/* need to adjust jmp offset, since
@@ -825,6 +823,7 @@ xadd: if (is_imm8(insn->off)) 
					 */

					jmp_offset += 4;

				}

			}

			if (!imm32 || !is_simm32(jmp_offset)) {

				pr_err("unsupported bpf func %d addr %p image %p\n",

				       imm32, func, image);
@@ -832,9 +831,14 @@ xadd: if (is_imm8(insn->off)) 
			}

			EMIT1_off32(0xE8, jmp_offset);

			if (seen_ld_abs) {

				if (reload_skb_data) {

					EMIT1(0x5F); /* pop %rdi */

					emit_load_skb_data_hlen(&prog);

				} else {

					EMIT2(0x41, 0x59); /* pop %r9 */

					EMIT2(0x41, 0x5A); /* pop %r10 */

				}

			}

			break;



		case BPF_JMP | BPF_CALL | BPF_X:

include/linux/bpf.h

+2 −0
Original line number Diff line number Diff line
@@ -192,5 +192,7 @@ extern const struct bpf_func_proto bpf_ktime_get_ns_proto; 
extern const struct bpf_func_proto bpf_get_current_pid_tgid_proto;

extern const struct bpf_func_proto bpf_get_current_uid_gid_proto;

extern const struct bpf_func_proto bpf_get_current_comm_proto;

extern const struct bpf_func_proto bpf_skb_vlan_push_proto;

extern const struct bpf_func_proto bpf_skb_vlan_pop_proto;



#endif /* _LINUX_BPF_H */

include/linux/filter.h

+1 −0
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp); 


u64 __bpf_call_base(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5);

void bpf_int_jit_compile(struct bpf_prog *fp);

bool bpf_helper_changes_skb_data(void *func);



#ifdef CONFIG_BPF_JIT

typedef void (*bpf_jit_fill_hole_t)(void *area, unsigned int size);

include/uapi/linux/bpf.h

+2 −0
Original line number Diff line number Diff line
@@ -256,6 +256,8 @@ enum bpf_func_id { 
	 * Return: classid if != 0

	 */

	BPF_FUNC_get_cgroup_classid,

	BPF_FUNC_skb_vlan_push, /* bpf_skb_vlan_push(skb, vlan_proto, vlan_tci) */

	BPF_FUNC_skb_vlan_pop,  /* bpf_skb_vlan_pop(skb) */

	__BPF_FUNC_MAX_ID,

};