Commit 5fc40f37 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'bpf_gso_size' 



Willem de Bruijn says:

====================
See first patch for details.

Patch split across three parts { kernel feature, uapi header, tools }
following the custom for such __sk_buff changes.
====================

Acked-by: default avatarPetar Penkov <ppenkov@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents abbc61a5 62511cea

include/uapi/linux/bpf.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -3176,6 +3176,7 @@ struct __sk_buff { 
	__u32 wire_len;

	__u32 wire_len;

	__u32 gso_segs;

	__u32 gso_segs;

	__bpf_md_ptr(struct bpf_sock *, sk);

	__bpf_md_ptr(struct bpf_sock *, sk);

	__u32 gso_size;

};

};





struct bpf_tunnel_key {

struct bpf_tunnel_key {

net/bpf/test_run.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -277,6 +277,12 @@ static int convert___skb_to_skb(struct sk_buff *skb, struct __sk_buff *__skb) 
	/* gso_segs is allowed */

	/* gso_segs is allowed */





	if (!range_is_zero(__skb, offsetofend(struct __sk_buff, gso_segs),

	if (!range_is_zero(__skb, offsetofend(struct __sk_buff, gso_segs),

			   offsetof(struct __sk_buff, gso_size)))

		return -EINVAL;



	/* gso_size is allowed */



	if (!range_is_zero(__skb, offsetofend(struct __sk_buff, gso_size),

			   sizeof(struct __sk_buff)))

			   sizeof(struct __sk_buff)))

		return -EINVAL;

		return -EINVAL;
@@ -297,6 +303,7 @@ static int convert___skb_to_skb(struct sk_buff *skb, struct __sk_buff *__skb) 
	if (__skb->gso_segs > GSO_MAX_SEGS)

	if (__skb->gso_segs > GSO_MAX_SEGS)

		return -EINVAL;

		return -EINVAL;

	skb_shinfo(skb)->gso_segs = __skb->gso_segs;

	skb_shinfo(skb)->gso_segs = __skb->gso_segs;

	skb_shinfo(skb)->gso_size = __skb->gso_size;





	return 0;

	return 0;

}

}

net/core/filter.c

+30 −14
Original line number Original line Diff line number Diff line
@@ -7139,6 +7139,27 @@ static u32 flow_dissector_convert_ctx_access(enum bpf_access_type type, 
	return insn - insn_buf;

	return insn - insn_buf;

}

}





static struct bpf_insn *bpf_convert_shinfo_access(const struct bpf_insn *si,

						  struct bpf_insn *insn)

{

	/* si->dst_reg = skb_shinfo(SKB); */

#ifdef NET_SKBUFF_DATA_USES_OFFSET

	*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, end),

			      BPF_REG_AX, si->src_reg,

			      offsetof(struct sk_buff, end));

	*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, head),

			      si->dst_reg, si->src_reg,

			      offsetof(struct sk_buff, head));

	*insn++ = BPF_ALU64_REG(BPF_ADD, si->dst_reg, BPF_REG_AX);

#else

	*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, end),

			      si->dst_reg, si->src_reg,

			      offsetof(struct sk_buff, end));

#endif



	return insn;

}



static u32 bpf_convert_ctx_access(enum bpf_access_type type,

static u32 bpf_convert_ctx_access(enum bpf_access_type type,

				  const struct bpf_insn *si,

				  const struct bpf_insn *si,

				  struct bpf_insn *insn_buf,

				  struct bpf_insn *insn_buf,
@@ -7461,26 +7482,21 @@ static u32 bpf_convert_ctx_access(enum bpf_access_type type, 
		break;

		break;





	case offsetof(struct __sk_buff, gso_segs):

	case offsetof(struct __sk_buff, gso_segs):

		/* si->dst_reg = skb_shinfo(SKB); */

		insn = bpf_convert_shinfo_access(si, insn);

#ifdef NET_SKBUFF_DATA_USES_OFFSET

		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, end),

				      BPF_REG_AX, si->src_reg,

				      offsetof(struct sk_buff, end));

		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, head),

				      si->dst_reg, si->src_reg,

				      offsetof(struct sk_buff, head));

		*insn++ = BPF_ALU64_REG(BPF_ADD, si->dst_reg, BPF_REG_AX);

#else

		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct sk_buff, end),

				      si->dst_reg, si->src_reg,

				      offsetof(struct sk_buff, end));

#endif

		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct skb_shared_info, gso_segs),

		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct skb_shared_info, gso_segs),

				      si->dst_reg, si->dst_reg,

				      si->dst_reg, si->dst_reg,

				      bpf_target_off(struct skb_shared_info,

				      bpf_target_off(struct skb_shared_info,

						     gso_segs, 2,

						     gso_segs, 2,

						     target_size));

						     target_size));

		break;

		break;

	case offsetof(struct __sk_buff, gso_size):

		insn = bpf_convert_shinfo_access(si, insn);

		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct skb_shared_info, gso_size),

				      si->dst_reg, si->dst_reg,

				      bpf_target_off(struct skb_shared_info,

						     gso_size, 2,

						     target_size));

		break;

	case offsetof(struct __sk_buff, wire_len):

	case offsetof(struct __sk_buff, wire_len):

		BUILD_BUG_ON(sizeof_field(struct qdisc_skb_cb, pkt_len) != 4);

		BUILD_BUG_ON(sizeof_field(struct qdisc_skb_cb, pkt_len) != 4);

tools/include/uapi/linux/bpf.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -3176,6 +3176,7 @@ struct __sk_buff { 
	__u32 wire_len;

	__u32 wire_len;

	__u32 gso_segs;

	__u32 gso_segs;

	__bpf_md_ptr(struct bpf_sock *, sk);

	__bpf_md_ptr(struct bpf_sock *, sk);

	__u32 gso_size;

};

};





struct bpf_tunnel_key {

struct bpf_tunnel_key {

tools/testing/selftests/bpf/prog_tests/skb_ctx.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ void test_skb_ctx(void) 
		.wire_len = 100,

		.wire_len = 100,

		.gso_segs = 8,

		.gso_segs = 8,

		.mark = 9,

		.mark = 9,

		.gso_size = 10,

	};

	};

	struct bpf_prog_test_run_attr tattr = {

	struct bpf_prog_test_run_attr tattr = {

		.data_in = &pkt_v4,

		.data_in = &pkt_v4,

CRA Git | Maintained and supported by SUSTech CRA and CCSE