Commit 6551971e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Remove-VLAN-CFI-overload' 



Michał Mirosław says:

====================
Remove VLAN.CFI overload

Fix BPF code/JITs to allow for separate VLAN_PRESENT flag
storage and finally move the flag to separate storage in skbuff.

This is final step to make CLAN.CFI transparent to core Linux
networking stack.

An #ifdef is introduced temporarily to mark fragments masking
VLAN_TAG_PRESENT. This is removed altogether in the final patch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5aa25c05 0c4b2d37

arch/mips/net/bpf_jit.c

+9 −9
Original line number Diff line number Diff line
@@ -1159,19 +1159,19 @@ jmp_cmp: 
			emit_load(r_A, r_skb, off, ctx);

			break;

		case BPF_ANC | SKF_AD_VLAN_TAG:

		case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:

			ctx->flags |= SEEN_SKB | SEEN_A;

			BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,

						  vlan_tci) != 2);

			off = offsetof(struct sk_buff, vlan_tci);

			emit_half_load_unsigned(r_s0, r_skb, off, ctx);

			if (code == (BPF_ANC | SKF_AD_VLAN_TAG)) {

				emit_andi(r_A, r_s0, (u16)~VLAN_TAG_PRESENT, ctx);

			} else {

				emit_andi(r_A, r_s0, VLAN_TAG_PRESENT, ctx);

				/* return 1 if present */

				emit_sltu(r_A, r_zero, r_A, ctx);

			}

			emit_half_load_unsigned(r_A, r_skb, off, ctx);

			break;

		case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:

			ctx->flags |= SEEN_SKB | SEEN_A;

			emit_load_byte(r_A, r_skb, PKT_VLAN_PRESENT_OFFSET(), ctx);

			if (PKT_VLAN_PRESENT_BIT)

				emit_srl(r_A, r_A, PKT_VLAN_PRESENT_BIT, ctx);

			if (PKT_VLAN_PRESENT_BIT < 7)

				emit_andi(r_A, r_A, 1, ctx);

			break;

		case BPF_ANC | SKF_AD_PKTTYPE:

			ctx->flags |= SEEN_SKB;

arch/powerpc/net/bpf_jit_comp.c

+7 −8
Original line number Diff line number Diff line
@@ -379,18 +379,17 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, 
							  hash));

			break;

		case BPF_ANC | SKF_AD_VLAN_TAG:

		case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:

			BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, vlan_tci) != 2);

			BUILD_BUG_ON(VLAN_TAG_PRESENT != 0x1000);



			PPC_LHZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,

							  vlan_tci));

			if (code == (BPF_ANC | SKF_AD_VLAN_TAG)) {

				PPC_ANDI(r_A, r_A, ~VLAN_TAG_PRESENT);

			} else {

				PPC_ANDI(r_A, r_A, VLAN_TAG_PRESENT);

				PPC_SRWI(r_A, r_A, 12);

			}

			break;

		case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:

			PPC_LBZ_OFFS(r_A, r_skb, PKT_VLAN_PRESENT_OFFSET());

			if (PKT_VLAN_PRESENT_BIT)

				PPC_SRWI(r_A, r_A, PKT_VLAN_PRESENT_BIT);

			if (PKT_VLAN_PRESENT_BIT < 7)

				PPC_ANDI(r_A, r_A, 1);

			break;

		case BPF_ANC | SKF_AD_QUEUE:

			BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff,

arch/sparc/net/bpf_jit_comp_32.c

+6 −7
Original line number Diff line number Diff line
@@ -552,15 +552,14 @@ void bpf_jit_compile(struct bpf_prog *fp) 
				emit_skb_load32(hash, r_A);

				break;

			case BPF_ANC | SKF_AD_VLAN_TAG:

			case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:

				emit_skb_load16(vlan_tci, r_A);

				if (code != (BPF_ANC | SKF_AD_VLAN_TAG)) {

					emit_alu_K(SRL, 12);

				break;

			case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:

				__emit_skb_load8(__pkt_vlan_present_offset, r_A);

				if (PKT_VLAN_PRESENT_BIT)

					emit_alu_K(SRL, PKT_VLAN_PRESENT_BIT);

				if (PKT_VLAN_PRESENT_BIT < 7)

					emit_andi(r_A, 1, r_A);

				} else {

					emit_loadimm(~VLAN_TAG_PRESENT, r_TMP);

					emit_and(r_A, r_TMP, r_A);

				}

				break;

			case BPF_LD | BPF_W | BPF_LEN:

				emit_skb_load32(len, r_A);

include/linux/if_vlan.h

+6 −5
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb) 
#define VLAN_PRIO_MASK		0xe000 /* Priority Code Point */

#define VLAN_PRIO_SHIFT		13

#define VLAN_CFI_MASK		0x1000 /* Canonical Format Indicator */

#define VLAN_TAG_PRESENT	VLAN_CFI_MASK

#define VLAN_VID_MASK		0x0fff /* VLAN Identifier */

#define VLAN_N_VID		4096
@@ -78,8 +77,8 @@ static inline bool is_vlan_dev(const struct net_device *dev) 
        return dev->priv_flags & IFF_802_1Q_VLAN;

}



#define skb_vlan_tag_present(__skb)	((__skb)->vlan_tci & VLAN_TAG_PRESENT)

#define skb_vlan_tag_get(__skb)		((__skb)->vlan_tci & ~VLAN_TAG_PRESENT)

#define skb_vlan_tag_present(__skb)	((__skb)->vlan_present)

#define skb_vlan_tag_get(__skb)		((__skb)->vlan_tci)

#define skb_vlan_tag_get_id(__skb)	((__skb)->vlan_tci & VLAN_VID_MASK)

#define skb_vlan_tag_get_prio(__skb)	(((__skb)->vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT)
@@ -480,7 +479,7 @@ static inline struct sk_buff *vlan_insert_tag_set_proto(struct sk_buff *skb, 
 */

static inline void __vlan_hwaccel_clear_tag(struct sk_buff *skb)

{

	skb->vlan_tci = 0;

	skb->vlan_present = 0;

}



/**
@@ -492,6 +491,7 @@ static inline void __vlan_hwaccel_clear_tag(struct sk_buff *skb) 
 */

static inline void __vlan_hwaccel_copy_tag(struct sk_buff *dst, const struct sk_buff *src)

{

	dst->vlan_present = src->vlan_present;

	dst->vlan_proto = src->vlan_proto;

	dst->vlan_tci = src->vlan_tci;

}
@@ -526,7 +526,8 @@ static inline void __vlan_hwaccel_put_tag(struct sk_buff *skb, 
					  __be16 vlan_proto, u16 vlan_tci)

{

	skb->vlan_proto = vlan_proto;

	skb->vlan_tci = VLAN_TAG_PRESENT | vlan_tci;

	skb->vlan_tci = vlan_tci;

	skb->vlan_present = 1;

}



/**

include/linux/skbuff.h

+9 −1
Original line number Diff line number Diff line
@@ -777,6 +777,14 @@ struct sk_buff { 
	__u8			encap_hdr_csum:1;

	__u8			csum_valid:1;



#ifdef __BIG_ENDIAN_BITFIELD

#define PKT_VLAN_PRESENT_BIT	7

#else

#define PKT_VLAN_PRESENT_BIT	0

#endif

#define PKT_VLAN_PRESENT_OFFSET()	offsetof(struct sk_buff, __pkt_vlan_present_offset)

	__u8			__pkt_vlan_present_offset[0];

	__u8			vlan_present:1;

	__u8			csum_complete_sw:1;

	__u8			csum_level:2;

	__u8			csum_not_inet:1;
@@ -784,8 +792,8 @@ struct sk_buff { 
#ifdef CONFIG_IPV6_NDISC_NODETYPE

	__u8			ndisc_nodetype:2;

#endif

	__u8			ipvs_property:1;



	__u8			ipvs_property:1;

	__u8			inner_protocol_type:1;

	__u8			remcsum_offload:1;

#ifdef CONFIG_NET_SWITCHDEV

CRA Git | Maintained and supported by SUSTech CRA and CCSE