Commit 0c4b2d37 authored by Michał Mirosław's avatar Michał Mirosław Committed by David S. Miller
Browse files

net: remove VLAN_TAG_PRESENT 



Replace VLAN_TAG_PRESENT with single bit flag and free up
VLAN.CFI overload. Now VLAN.CFI is visible in networking stack
and can be passed around intact.

Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b50d231

arch/mips/net/bpf_jit.c

+0 −3
Original line number Diff line number Diff line
@@ -1164,9 +1164,6 @@ static int build_body(struct jit_ctx *ctx) 
						  vlan_tci) != 2);

			off = offsetof(struct sk_buff, vlan_tci);

			emit_half_load_unsigned(r_A, r_skb, off, ctx);

#ifdef VLAN_TAG_PRESENT

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

#endif

			break;

		case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:

			ctx->flags |= SEEN_SKB | SEEN_A;

arch/powerpc/net/bpf_jit_comp.c

+0 −3
Original line number Diff line number Diff line
@@ -383,9 +383,6 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, 


			PPC_LHZ_OFFS(r_A, r_skb, offsetof(struct sk_buff,

							  vlan_tci));

#ifdef VLAN_TAG_PRESENT

			PPC_ANDI(r_A, r_A, ~VLAN_TAG_PRESENT);

#endif

			break;

		case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:

			PPC_LBZ_OFFS(r_A, r_skb, PKT_VLAN_PRESENT_OFFSET());

arch/sparc/net/bpf_jit_comp_32.c

+0 −4
Original line number Diff line number Diff line
@@ -553,10 +553,6 @@ void bpf_jit_compile(struct bpf_prog *fp) 
				break;

			case BPF_ANC | SKF_AD_VLAN_TAG:

				emit_skb_load16(vlan_tci, r_A);

#ifdef VLAN_TAG_PRESENT

				emit_loadimm(~VLAN_TAG_PRESENT, r_TMP);

				emit_and(r_A, r_TMP, r_A);

#endif

				break;

			case BPF_ANC | SKF_AD_VLAN_TAG_PRESENT:

				__emit_skb_load8(__pkt_vlan_present_offset, 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 −7
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
@@ -816,12 +824,6 @@ struct sk_buff { 
	__u32			priority;

	int			skb_iif;

	__u32			hash;

#define PKT_VLAN_PRESENT_BIT	4	// CFI (12-th bit) in TCI

#ifdef __BIG_ENDIAN

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

#else

#define PKT_VLAN_PRESENT_OFFSET()	(offsetof(struct sk_buff, vlan_tci) + 1)

#endif

	__be16			vlan_proto;

	__u16			vlan_tci;

#if defined(CONFIG_NET_RX_BUSY_POLL) || defined(CONFIG_XPS)