Commit 04aae213 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Martin KaFai Lau
Browse files

net: skbuff: rename __pkt_vlan_present_offset to __mono_tc_offset 



vlan_present is gone since
commit 354259fa ("net: remove skb->vlan_present")
rename the offset field to what BPF is currently looking
for in this byte - mono_delivery_time and tc_at_ingress.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20230321014115.997841-2-kuba@kernel.org


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent 01dc26c9

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ struct sk_buff { 
	__u8			csum_valid:1;



	/* private: */

	__u8			__pkt_vlan_present_offset[0];

	__u8			__mono_tc_offset[0];

	/* public: */

	__u8			remcsum_offload:1;

	__u8			csum_complete_sw:1;
@@ -1078,7 +1078,7 @@ struct sk_buff { 
#define TC_AT_INGRESS_MASK		(1 << 7)

#define SKB_MONO_DELIVERY_TIME_MASK	(1 << 5)

#endif

#define PKT_VLAN_PRESENT_OFFSET	offsetof(struct sk_buff, __pkt_vlan_present_offset)

#define SKB_BF_MONO_TC_OFFSET		offsetof(struct sk_buff, __mono_tc_offset)



#ifdef __KERNEL__

/*

net/core/filter.c

+4 −4
Original line number Diff line number Diff line
@@ -9185,7 +9185,7 @@ static struct bpf_insn *bpf_convert_tstamp_type_read(const struct bpf_insn *si, 
	__u8 tmp_reg = BPF_REG_AX;



	*insn++ = BPF_LDX_MEM(BPF_B, tmp_reg, skb_reg,

			      PKT_VLAN_PRESENT_OFFSET);

			      SKB_BF_MONO_TC_OFFSET);

	*insn++ = BPF_JMP32_IMM(BPF_JSET, tmp_reg,

				SKB_MONO_DELIVERY_TIME_MASK, 2);

	*insn++ = BPF_MOV32_IMM(value_reg, BPF_SKB_TSTAMP_UNSPEC);
@@ -9232,7 +9232,7 @@ static struct bpf_insn *bpf_convert_tstamp_read(const struct bpf_prog *prog, 
		/* AX is needed because src_reg and dst_reg could be the same */

		__u8 tmp_reg = BPF_REG_AX;



		*insn++ = BPF_LDX_MEM(BPF_B, tmp_reg, skb_reg, PKT_VLAN_PRESENT_OFFSET);

		*insn++ = BPF_LDX_MEM(BPF_B, tmp_reg, skb_reg, SKB_BF_MONO_TC_OFFSET);

		*insn++ = BPF_ALU32_IMM(BPF_AND, tmp_reg,

					TC_AT_INGRESS_MASK | SKB_MONO_DELIVERY_TIME_MASK);

		*insn++ = BPF_JMP32_IMM(BPF_JNE, tmp_reg,
@@ -9267,14 +9267,14 @@ static struct bpf_insn *bpf_convert_tstamp_write(const struct bpf_prog *prog, 
	if (!prog->tstamp_type_access) {

		__u8 tmp_reg = BPF_REG_AX;



		*insn++ = BPF_LDX_MEM(BPF_B, tmp_reg, skb_reg, PKT_VLAN_PRESENT_OFFSET);

		*insn++ = BPF_LDX_MEM(BPF_B, tmp_reg, skb_reg, SKB_BF_MONO_TC_OFFSET);

		/* Writing __sk_buff->tstamp as ingress, goto <clear> */

		*insn++ = BPF_JMP32_IMM(BPF_JSET, tmp_reg, TC_AT_INGRESS_MASK, 1);

		/* goto <store> */

		*insn++ = BPF_JMP_A(2);

		/* <clear>: mono_delivery_time */

		*insn++ = BPF_ALU32_IMM(BPF_AND, tmp_reg, ~SKB_MONO_DELIVERY_TIME_MASK);

		*insn++ = BPF_STX_MEM(BPF_B, skb_reg, tmp_reg, PKT_VLAN_PRESENT_OFFSET);

		*insn++ = BPF_STX_MEM(BPF_B, skb_reg, tmp_reg, SKB_BF_MONO_TC_OFFSET);

	}

#endif

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

+3 −3
Original line number Diff line number Diff line
@@ -68,17 +68,17 @@ static struct test_case test_cases[] = { 
#if defined(__x86_64__) || defined(__aarch64__)

	{

		N(SCHED_CLS, struct __sk_buff, tstamp),

		.read  = "r11 = *(u8 *)($ctx + sk_buff::__pkt_vlan_present_offset);"

		.read  = "r11 = *(u8 *)($ctx + sk_buff::__mono_tc_offset);"

			 "w11 &= 160;"

			 "if w11 != 0xa0 goto pc+2;"

			 "$dst = 0;"

			 "goto pc+1;"

			 "$dst = *(u64 *)($ctx + sk_buff::tstamp);",

		.write = "r11 = *(u8 *)($ctx + sk_buff::__pkt_vlan_present_offset);"

		.write = "r11 = *(u8 *)($ctx + sk_buff::__mono_tc_offset);"

			 "if w11 & 0x80 goto pc+1;"

			 "goto pc+2;"

			 "w11 &= -33;"

			 "*(u8 *)($ctx + sk_buff::__pkt_vlan_present_offset) = r11;"

			 "*(u8 *)($ctx + sk_buff::__mono_tc_offset) = r11;"

			 "*(u64 *)($ctx + sk_buff::tstamp) = $src;",

	},

#endif