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

Commit 64f87d36 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

vxlan: consolidate GBP handling even more 



Now when the packet is scrubbed early, skb->mark can be set in the GBP
handling code.

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39661e2c

drivers/net/vxlan.c

+5 −4
Original line number Diff line number Diff line
@@ -1164,6 +1164,7 @@ static bool vxlan_remcsum(struct vxlanhdr *unparsed, 
}



static void vxlan_parse_gbp_hdr(struct vxlanhdr *unparsed,

				struct sk_buff *skb, u32 vxflags,

				struct vxlan_metadata *md,

				struct metadata_dst *tun_dst)

{
@@ -1183,6 +1184,9 @@ static void vxlan_parse_gbp_hdr(struct vxlanhdr *unparsed, 
	if (gbp->policy_applied)

		md->gbp |= VXLAN_GBP_POLICY_APPLIED;



	/* In flow-based mode, GBP is carried in dst_metadata */

	if (!(vxflags & VXLAN_F_COLLECT_METADATA))

		skb->mark = md->gbp;

out:

	unparsed->vx_flags &= ~VXLAN_GBP_USED_BITS;

}
@@ -1228,9 +1232,6 @@ static void vxlan_rcv(struct vxlan_dev *vxlan, struct vxlan_sock *vs, 
		goto drop;



	skb_reset_network_header(skb);

	/* In flow-based mode, GBP is carried in dst_metadata */

	if (!(vs->flags & VXLAN_F_COLLECT_METADATA))

		skb->mark = md->gbp;



	if (oip6)

		err = IP6_ECN_decapsulate(oip6, skb);
@@ -1329,7 +1330,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb) 
		if (!vxlan_remcsum(&unparsed, skb, vs->flags))

			goto drop;

	if (vs->flags & VXLAN_F_GBP)

		vxlan_parse_gbp_hdr(&unparsed, md, tun_dst);

		vxlan_parse_gbp_hdr(&unparsed, skb, vs->flags, md, tun_dst);



	if (unparsed.vx_flags || unparsed.vx_vni) {

		/* If there are any unprocessed flags remaining treat