leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vxlan: clean up extension handling on rx

Browse Source 
Bring the extension handling to a single place and move the actual handling
logic out of vxlan_udp_encap_recv as much as possible.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Benc 2016-02-16 21:59:01 +01:00 committed by David S. Miller
parent 3288af0892
commit f14ecebb3a
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/net/vxlan.c
View File

@ -1135,15 +1135,16 @@ static int vxlan_igmp_leave(struct vxlan_dev *vxlan)
return ret; return ret;
} }
static bool vxlan_remcsum(struct sk_buff *skb, u32 vxflags, __be32 vni_field) static bool vxlan_remcsum(struct vxlanhdr *unparsed,
struct sk_buff *skb, u32 vxflags)
{ {
size_t start, offset, plen; size_t start, offset, plen;
if (skb->remcsum_offload) if (!(unparsed->vx_flags & VXLAN_HF_RCO) || skb->remcsum_offload)
return true; goto out;
start = vxlan_rco_start(vni_field); start = vxlan_rco_start(unparsed->vx_vni);
offset = start + vxlan_rco_offset(vni_field); offset = start + vxlan_rco_offset(unparsed->vx_vni);
plen = sizeof(struct vxlanhdr) + offset + sizeof(u16); plen = sizeof(struct vxlanhdr) + offset + sizeof(u16);
@ -1152,16 +1153,21 @@ static bool vxlan_remcsum(struct sk_buff *skb, u32 vxflags, __be32 vni_field)
skb_remcsum_process(skb, (void *)(vxlan_hdr(skb) + 1), start, offset, skb_remcsum_process(skb, (void *)(vxlan_hdr(skb) + 1), start, offset,
!!(vxflags & VXLAN_F_REMCSUM_NOPARTIAL)); !!(vxflags & VXLAN_F_REMCSUM_NOPARTIAL));
out:
unparsed->vx_flags &= ~VXLAN_HF_RCO;
unparsed->vx_vni &= VXLAN_VNI_MASK;
return true; return true;
} }
static void vxlan_parse_gbp_hdr(struct sk_buff *skb, struct vxlan_metadata *md, static void vxlan_parse_gbp_hdr(struct vxlanhdr *unparsed,
struct vxlan_metadata *md,
struct metadata_dst *tun_dst) struct metadata_dst *tun_dst)
{ {
struct vxlanhdr_gbp *gbp; struct vxlanhdr_gbp *gbp = (struct vxlanhdr_gbp *)unparsed;
if (!(unparsed->vx_flags & VXLAN_HF_GBP))
goto out;
gbp = (struct vxlanhdr_gbp *)vxlan_hdr(skb);
md->gbp = ntohs(gbp->policy_id); md->gbp = ntohs(gbp->policy_id);
if (tun_dst) if (tun_dst)
@ -1172,6 +1178,9 @@ static void vxlan_parse_gbp_hdr(struct sk_buff *skb, struct vxlan_metadata *md,
if (gbp->policy_applied) if (gbp->policy_applied)
md->gbp |= VXLAN_GBP_POLICY_APPLIED; md->gbp |= VXLAN_GBP_POLICY_APPLIED;
out:
unparsed->vx_flags &= ~VXLAN_GBP_USED_BITS;
} }
static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb, static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb,
@ -1273,7 +1282,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
{ {
struct metadata_dst *tun_dst = NULL; struct metadata_dst *tun_dst = NULL;
struct vxlan_sock *vs; struct vxlan_sock *vs;
__be32 flags, vni_field; struct vxlanhdr unparsed;
struct vxlan_metadata _md; struct vxlan_metadata _md;
struct vxlan_metadata *md = &_md; struct vxlan_metadata *md = &_md;
@ -1281,11 +1290,10 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
if (!pskb_may_pull(skb, VXLAN_HLEN)) if (!pskb_may_pull(skb, VXLAN_HLEN))
goto error; goto error;
flags = vxlan_hdr(skb)->vx_flags; unparsed = *vxlan_hdr(skb);
vni_field = vxlan_hdr(skb)->vx_vni; if (unparsed.vx_flags & VXLAN_HF_VNI) {
unparsed.vx_flags &= ~VXLAN_HF_VNI;
if (flags & VXLAN_HF_VNI) { unparsed.vx_vni &= ~VXLAN_VNI_MASK;
flags &= ~VXLAN_HF_VNI;
} else { } else {
/* VNI flag always required to be set */ /* VNI flag always required to be set */
goto bad_flags; goto bad_flags;
@ -1298,17 +1306,10 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
if (!vs) if (!vs)
goto drop; goto drop;
if ((flags & VXLAN_HF_RCO) && (vs->flags & VXLAN_F_REMCSUM_RX)) {
if (!vxlan_remcsum(skb, vs->flags, vni_field))
goto drop;
flags &= ~VXLAN_HF_RCO;
vni_field &= VXLAN_VNI_MASK;
}
if (vxlan_collect_metadata(vs)) { if (vxlan_collect_metadata(vs)) {
tun_dst = udp_tun_rx_dst(skb, vxlan_get_sk_family(vs), TUNNEL_KEY, tun_dst = udp_tun_rx_dst(skb, vxlan_get_sk_family(vs), TUNNEL_KEY,
vxlan_vni(vni_field), sizeof(*md)); vxlan_vni(vxlan_hdr(skb)->vx_vni),
sizeof(*md));
if (!tun_dst) if (!tun_dst)
goto drop; goto drop;
@ -1321,12 +1322,13 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
/* For backwards compatibility, only allow reserved fields to be /* For backwards compatibility, only allow reserved fields to be
* used by VXLAN extensions if explicitly requested. * used by VXLAN extensions if explicitly requested.
*/ */
if ((flags & VXLAN_HF_GBP) && (vs->flags & VXLAN_F_GBP)) { if (vs->flags & VXLAN_F_REMCSUM_RX)
vxlan_parse_gbp_hdr(skb, md, tun_dst); if (!vxlan_remcsum(&unparsed, skb, vs->flags))
flags &= ~VXLAN_GBP_USED_BITS; goto drop;
} if (vs->flags & VXLAN_F_GBP)
vxlan_parse_gbp_hdr(&unparsed, md, tun_dst);
if (flags || vni_field & ~VXLAN_VNI_MASK) { if (unparsed.vx_flags || unparsed.vx_vni) {
/* If there are any unprocessed flags remaining treat /* If there are any unprocessed flags remaining treat
* this as a malformed packet. This behavior diverges from * this as a malformed packet. This behavior diverges from
* VXLAN RFC (RFC7348) which stipulates that bits in reserved * VXLAN RFC (RFC7348) which stipulates that bits in reserved
@ -1339,7 +1341,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
goto bad_flags; goto bad_flags;
} }
vxlan_rcv(vs, skb, md, vxlan_vni(vni_field), tun_dst); vxlan_rcv(vs, skb, md, vxlan_vni(vxlan_hdr(skb)->vx_vni), tun_dst);
return 0; return 0;
drop: drop: