Commit 760c6805 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller

vxlan: move ECN decapsulation to a separate function

It simplifies the vxlan_rcv function.
Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ab016e2
...@@ -1205,7 +1205,7 @@ static bool vxlan_set_mac(struct vxlan_dev *vxlan, ...@@ -1205,7 +1205,7 @@ static bool vxlan_set_mac(struct vxlan_dev *vxlan,
if (ether_addr_equal(eth_hdr(skb)->h_source, vxlan->dev->dev_addr)) if (ether_addr_equal(eth_hdr(skb)->h_source, vxlan->dev->dev_addr))
return false; return false;
/* Get data from the outer IP header */ /* Get address from the outer IP header */
if (vxlan_get_sk_family(vs) == AF_INET) { if (vxlan_get_sk_family(vs) == AF_INET) {
saddr.sin.sin_addr.s_addr = ip_hdr(skb)->saddr; saddr.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
saddr.sa.sa_family = AF_INET; saddr.sa.sa_family = AF_INET;
...@@ -1223,52 +1223,52 @@ static bool vxlan_set_mac(struct vxlan_dev *vxlan, ...@@ -1223,52 +1223,52 @@ static bool vxlan_set_mac(struct vxlan_dev *vxlan,
return true; return true;
} }
static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph,
struct sk_buff *skb)
{
int err = 0;
if (vxlan_get_sk_family(vs) == AF_INET)
err = IP_ECN_decapsulate(oiph, skb);
#if IS_ENABLED(CONFIG_IPV6)
else
err = IP6_ECN_decapsulate(oiph, skb);
#endif
if (unlikely(err) && log_ecn_error) {
if (vxlan_get_sk_family(vs) == AF_INET)
net_info_ratelimited("non-ECT from %pI4 with TOS=%#x\n",
&((struct iphdr *)oiph)->saddr,
((struct iphdr *)oiph)->tos);
else
net_info_ratelimited("non-ECT from %pI6\n",
&((struct ipv6hdr *)oiph)->saddr);
}
return err <= 1;
}
static void vxlan_rcv(struct vxlan_dev *vxlan, struct vxlan_sock *vs, static void vxlan_rcv(struct vxlan_dev *vxlan, struct vxlan_sock *vs,
struct sk_buff *skb, struct vxlan_metadata *md, struct sk_buff *skb, struct vxlan_metadata *md,
struct metadata_dst *tun_dst) struct metadata_dst *tun_dst)
{ {
struct iphdr *oip = NULL;
struct ipv6hdr *oip6 = NULL;
struct pcpu_sw_netstats *stats; struct pcpu_sw_netstats *stats;
int err = 0; void *oiph;
if (!vxlan_set_mac(vxlan, vs, skb)) if (!vxlan_set_mac(vxlan, vs, skb))
goto drop; goto drop;
/* Get data from the outer IP header */
if (vxlan_get_sk_family(vs) == AF_INET)
oip = ip_hdr(skb);
#if IS_ENABLED(CONFIG_IPV6)
else
oip6 = ipv6_hdr(skb);
#endif
if (tun_dst) { if (tun_dst) {
skb_dst_set(skb, (struct dst_entry *)tun_dst); skb_dst_set(skb, (struct dst_entry *)tun_dst);
tun_dst = NULL; tun_dst = NULL;
} }
oiph = skb_network_header(skb);
skb_reset_network_header(skb); skb_reset_network_header(skb);
if (oip6) if (!vxlan_ecn_decapsulate(vs, oiph, skb)) {
err = IP6_ECN_decapsulate(oip6, skb); ++vxlan->dev->stats.rx_frame_errors;
if (oip) ++vxlan->dev->stats.rx_errors;
err = IP_ECN_decapsulate(oip, skb); goto drop;
if (unlikely(err)) {
if (log_ecn_error) {
if (oip6)
net_info_ratelimited("non-ECT from %pI6\n",
&oip6->saddr);
if (oip)
net_info_ratelimited("non-ECT from %pI4 with TOS=%#x\n",
&oip->saddr, oip->tos);
}
if (err > 1) {
++vxlan->dev->stats.rx_frame_errors;
++vxlan->dev->stats.rx_errors;
goto drop;
}
} }
stats = this_cpu_ptr(vxlan->dev->tstats); stats = this_cpu_ptr(vxlan->dev->tstats);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment