1 files changed, 63 insertions, 37 deletions

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index ed384fee76ac..481f85d604a4 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -916,17 +916,32 @@ static bool vxlan_snoop(struct net_device *dev,
 }
 
 /* See if multicast group is already in use by other ID */
-static bool vxlan_group_used(struct vxlan_net *vn, union vxlan_addr *remote_ip)
+static bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev)
 {
         struct vxlan_dev *vxlan;
 
+        /* The vxlan_sock is only used by dev, leaving group has
+         * no effect on other vxlan devices.
+         */
+        if (atomic_read(&dev->vn_sock->refcnt) == 1)
+                return false;
+
         list_for_each_entry(vxlan, &vn->vxlan_list, next) {
-                if (!netif_running(vxlan->dev))
+                if (!netif_running(vxlan->dev) || vxlan == dev)
                         continue;
 
-                if (vxlan_addr_equal(&vxlan->default_dst.remote_ip,
-                                     remote_ip))
-                        return true;
+                if (vxlan->vn_sock != dev->vn_sock)
+                        continue;
+
+                if (!vxlan_addr_equal(&vxlan->default_dst.remote_ip,
+                                      &dev->default_dst.remote_ip))
+                        continue;
+
+                if (vxlan->default_dst.remote_ifindex !=
+                    dev->default_dst.remote_ifindex)
+                        continue;
+
+                return true;
         }
 
         return false;
@@ -1066,7 +1081,7 @@ static void vxlan_rcv(struct vxlan_sock *vs,
         struct iphdr *oip = NULL;
         struct ipv6hdr *oip6 = NULL;
         struct vxlan_dev *vxlan;
-        struct pcpu_tstats *stats;
+        struct pcpu_sw_netstats *stats;
         union vxlan_addr saddr;
         __u32 vni;
         int err = 0;
@@ -1366,20 +1381,6 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
         return false;
 }
 
-static void vxlan_sock_put(struct sk_buff *skb)
-{
-        sock_put(skb->sk);
-}
-
-/* On transmit, associate with the tunnel socket */
-static void vxlan_set_owner(struct sock *sk, struct sk_buff *skb)
-{
-        skb_orphan(skb);
-        sock_hold(sk);
-        skb->sk = sk;
-        skb->destructor = vxlan_sock_put;
-}
-
 /* Compute source port for outgoing packet
  *   first choice to use L4 flow hash since it will spread
  *     better and maybe available from hardware
@@ -1390,7 +1391,7 @@ __be16 vxlan_src_port(__u16 port_min, __u16 port_max, struct sk_buff *skb)
         unsigned int range = (port_max - port_min) + 1;
         u32 hash;
 
-        hash = skb_get_rxhash(skb);
+        hash = skb_get_hash(skb);
         if (!hash)
                 hash = jhash(skb->data, 2 * ETH_ALEN,
                              (__force u32) skb->protocol);
@@ -1499,8 +1500,6 @@ static int vxlan6_xmit_skb(struct vxlan_sock *vs,
         ip6h->daddr       = *daddr;
         ip6h->saddr       = *saddr;
 
-        vxlan_set_owner(vs->sock->sk, skb);
-
         err = handle_offloads(skb);
         if (err)
                 return err;
@@ -1557,8 +1556,6 @@ int vxlan_xmit_skb(struct vxlan_sock *vs,
         uh->len = htons(skb->len);
         uh->check = 0;
 
-        vxlan_set_owner(vs->sock->sk, skb);
-
         err = handle_offloads(skb);
         if (err)
                 return err;
@@ -1572,11 +1569,12 @@ EXPORT_SYMBOL_GPL(vxlan_xmit_skb);
 static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
                                struct vxlan_dev *dst_vxlan)
 {
-        struct pcpu_tstats *tx_stats = this_cpu_ptr(src_vxlan->dev->tstats);
-        struct pcpu_tstats *rx_stats = this_cpu_ptr(dst_vxlan->dev->tstats);
+        struct pcpu_sw_netstats *tx_stats, *rx_stats;
         union vxlan_addr loopback;
         union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip;
 
+        tx_stats = this_cpu_ptr(src_vxlan->dev->tstats);
+        rx_stats = this_cpu_ptr(dst_vxlan->dev->tstats);
         skb->pkt_type = PACKET_HOST;
         skb->encapsulation = 0;
         skb->dev = dst_vxlan->dev;
@@ -1770,7 +1768,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
         struct vxlan_dev *vxlan = netdev_priv(dev);
         struct ethhdr *eth;
         bool did_rsc = false;
-        struct vxlan_rdst *rdst;
+        struct vxlan_rdst *rdst, *fdst = NULL;
         struct vxlan_fdb *f;
 
         skb_reset_mac_header(skb);
@@ -1812,7 +1810,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
                                 vxlan_fdb_miss(vxlan, eth->h_dest);
 
                         dev->stats.tx_dropped++;
-                        dev_kfree_skb(skb);
+                        kfree_skb(skb);
                         return NETDEV_TX_OK;
                 }
         }
@@ -1820,12 +1818,19 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
         list_for_each_entry_rcu(rdst, &f->remotes, list) {
                 struct sk_buff *skb1;
 
+                if (!fdst) {
+                        fdst = rdst;
+                        continue;
+                }
                 skb1 = skb_clone(skb, GFP_ATOMIC);
                 if (skb1)
                         vxlan_xmit_one(skb1, dev, rdst, did_rsc);
         }
 
-        dev_kfree_skb(skb);
+        if (fdst)
+                vxlan_xmit_one(skb, dev, fdst, did_rsc);
+        else
+                kfree_skb(skb);
         return NETDEV_TX_OK;
 }
 
@@ -1882,12 +1887,12 @@ static int vxlan_init(struct net_device *dev)
         struct vxlan_sock *vs;
         int i;
 
-        dev->tstats = alloc_percpu(struct pcpu_tstats);
+        dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
         if (!dev->tstats)
                 return -ENOMEM;
 
         for_each_possible_cpu(i) {
-                struct pcpu_tstats *vxlan_stats;
+                struct pcpu_sw_netstats *vxlan_stats;
                 vxlan_stats = per_cpu_ptr(dev->tstats, i);
                 u64_stats_init(&vxlan_stats->syncp);
         }
@@ -1935,7 +1940,6 @@ static void vxlan_uninit(struct net_device *dev)
 /* Start ageing timer and join group when device is brought up */
 static int vxlan_open(struct net_device *dev)
 {
-        struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);
         struct vxlan_dev *vxlan = netdev_priv(dev);
         struct vxlan_sock *vs = vxlan->vn_sock;
 
@@ -1943,8 +1947,7 @@ static int vxlan_open(struct net_device *dev)
         if (!vs)
                 return -ENOTCONN;
 
-        if (vxlan_addr_multicast(&vxlan->default_dst.remote_ip) &&
-            vxlan_group_used(vn, &vxlan->default_dst.remote_ip)) {
+        if (vxlan_addr_multicast(&vxlan->default_dst.remote_ip)) {
                 vxlan_sock_hold(vs);
                 dev_hold(dev);
                 queue_work(vxlan_wq, &vxlan->igmp_join);
@@ -1983,7 +1986,7 @@ static int vxlan_stop(struct net_device *dev)
         struct vxlan_sock *vs = vxlan->vn_sock;
 
         if (vs && vxlan_addr_multicast(&vxlan->default_dst.remote_ip) &&
-            ! vxlan_group_used(vn, &vxlan->default_dst.remote_ip)) {
+            !vxlan_group_used(vn, vxlan)) {
                 vxlan_sock_hold(vs);
                 dev_hold(dev);
                 queue_work(vxlan_wq, &vxlan->igmp_leave);
@@ -2001,6 +2004,29 @@ static void vxlan_set_multicast_list(struct net_device *dev)
 {
 }
 
+static int vxlan_change_mtu(struct net_device *dev, int new_mtu)
+{
+        struct vxlan_dev *vxlan = netdev_priv(dev);
+        struct vxlan_rdst *dst = &vxlan->default_dst;
+        struct net_device *lowerdev;
+        int max_mtu;
+
+        lowerdev = __dev_get_by_index(dev_net(dev), dst->remote_ifindex);
+        if (lowerdev == NULL)
+                return eth_change_mtu(dev, new_mtu);
+
+        if (dst->remote_ip.sa.sa_family == AF_INET6)
+                max_mtu = lowerdev->mtu - VXLAN6_HEADROOM;
+        else
+                max_mtu = lowerdev->mtu - VXLAN_HEADROOM;
+
+        if (new_mtu < 68 || new_mtu > max_mtu)
+                return -EINVAL;
+
+        dev->mtu = new_mtu;
+        return 0;
+}
+
 static const struct net_device_ops vxlan_netdev_ops = {
         .ndo_init               = vxlan_init,
         .ndo_uninit             = vxlan_uninit,
@@ -2009,7 +2035,7 @@ static const struct net_device_ops vxlan_netdev_ops = {
         .ndo_start_xmit         = vxlan_xmit,
         .ndo_get_stats64        = ip_tunnel_get_stats64,
         .ndo_set_rx_mode        = vxlan_set_multicast_list,
-        .ndo_change_mtu         = eth_change_mtu,
+        .ndo_change_mtu         = vxlan_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_mac_address    = eth_mac_addr,
         .ndo_fdb_add            = vxlan_fdb_add,