mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
vxlan: simplify metadata_dst usage in vxlan_rcv
Now when the packet is scrubbed early, the metadata_dst can be assigned to the skb as soon as it is allocated. This simplifies the error cleanup path, as the dst will be freed by kfree_skb. It is also not necessary to pass it as a parameter to functions anymore. Signed-off-by: Jiri Benc <jbenc@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f2d1968ec8
commit
10a5af238c
1 changed files with 7 additions and 12 deletions
|
@ -1165,16 +1165,17 @@ static bool vxlan_remcsum(struct vxlanhdr *unparsed,
|
||||||
|
|
||||||
static void vxlan_parse_gbp_hdr(struct vxlanhdr *unparsed,
|
static void vxlan_parse_gbp_hdr(struct vxlanhdr *unparsed,
|
||||||
struct sk_buff *skb, u32 vxflags,
|
struct sk_buff *skb, u32 vxflags,
|
||||||
struct vxlan_metadata *md,
|
struct vxlan_metadata *md)
|
||||||
struct metadata_dst *tun_dst)
|
|
||||||
{
|
{
|
||||||
struct vxlanhdr_gbp *gbp = (struct vxlanhdr_gbp *)unparsed;
|
struct vxlanhdr_gbp *gbp = (struct vxlanhdr_gbp *)unparsed;
|
||||||
|
struct metadata_dst *tun_dst;
|
||||||
|
|
||||||
if (!(unparsed->vx_flags & VXLAN_HF_GBP))
|
if (!(unparsed->vx_flags & VXLAN_HF_GBP))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
md->gbp = ntohs(gbp->policy_id);
|
md->gbp = ntohs(gbp->policy_id);
|
||||||
|
|
||||||
|
tun_dst = (struct metadata_dst *)skb_dst(skb);
|
||||||
if (tun_dst)
|
if (tun_dst)
|
||||||
tun_dst->u.tun_info.key.tun_flags |= TUNNEL_VXLAN_OPT;
|
tun_dst->u.tun_info.key.tun_flags |= TUNNEL_VXLAN_OPT;
|
||||||
|
|
||||||
|
@ -1250,7 +1251,6 @@ static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph,
|
||||||
/* Callback from net/ipv4/udp.c to receive packets */
|
/* Callback from net/ipv4/udp.c to receive packets */
|
||||||
static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
|
static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
struct metadata_dst *tun_dst = NULL;
|
|
||||||
struct pcpu_sw_netstats *stats;
|
struct pcpu_sw_netstats *stats;
|
||||||
struct vxlan_dev *vxlan;
|
struct vxlan_dev *vxlan;
|
||||||
struct vxlan_sock *vs;
|
struct vxlan_sock *vs;
|
||||||
|
@ -1289,6 +1289,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
|
||||||
|
|
||||||
if (vxlan_collect_metadata(vs)) {
|
if (vxlan_collect_metadata(vs)) {
|
||||||
__be32 vni = vxlan_vni(vxlan_hdr(skb)->vx_vni);
|
__be32 vni = vxlan_vni(vxlan_hdr(skb)->vx_vni);
|
||||||
|
struct metadata_dst *tun_dst;
|
||||||
|
|
||||||
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_to_tun_id(vni), sizeof(*md));
|
vxlan_vni_to_tun_id(vni), sizeof(*md));
|
||||||
|
@ -1297,6 +1298,8 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
|
||||||
goto drop;
|
goto drop;
|
||||||
|
|
||||||
md = ip_tunnel_info_opts(&tun_dst->u.tun_info);
|
md = ip_tunnel_info_opts(&tun_dst->u.tun_info);
|
||||||
|
|
||||||
|
skb_dst_set(skb, (struct dst_entry *)tun_dst);
|
||||||
} else {
|
} else {
|
||||||
memset(md, 0, sizeof(*md));
|
memset(md, 0, sizeof(*md));
|
||||||
}
|
}
|
||||||
|
@ -1308,7 +1311,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
|
||||||
if (!vxlan_remcsum(&unparsed, skb, vs->flags))
|
if (!vxlan_remcsum(&unparsed, skb, vs->flags))
|
||||||
goto drop;
|
goto drop;
|
||||||
if (vs->flags & VXLAN_F_GBP)
|
if (vs->flags & VXLAN_F_GBP)
|
||||||
vxlan_parse_gbp_hdr(&unparsed, skb, vs->flags, md, tun_dst);
|
vxlan_parse_gbp_hdr(&unparsed, skb, vs->flags, md);
|
||||||
|
|
||||||
if (unparsed.vx_flags || unparsed.vx_vni) {
|
if (unparsed.vx_flags || unparsed.vx_vni) {
|
||||||
/* If there are any unprocessed flags remaining treat
|
/* If there are any unprocessed flags remaining treat
|
||||||
|
@ -1325,11 +1328,6 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
|
||||||
if (!vxlan_set_mac(vxlan, vs, skb))
|
if (!vxlan_set_mac(vxlan, vs, skb))
|
||||||
goto drop;
|
goto drop;
|
||||||
|
|
||||||
if (tun_dst) {
|
|
||||||
skb_dst_set(skb, (struct dst_entry *)tun_dst);
|
|
||||||
tun_dst = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
oiph = skb_network_header(skb);
|
oiph = skb_network_header(skb);
|
||||||
skb_reset_network_header(skb);
|
skb_reset_network_header(skb);
|
||||||
|
|
||||||
|
@ -1349,9 +1347,6 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
drop:
|
drop:
|
||||||
if (tun_dst)
|
|
||||||
dst_release((struct dst_entry *)tun_dst);
|
|
||||||
|
|
||||||
/* Consume bad packet */
|
/* Consume bad packet */
|
||||||
kfree_skb(skb);
|
kfree_skb(skb);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue