1 files changed, 188 insertions, 74 deletions

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index c1b92cab46c7..3bccdd12a264 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -21,6 +21,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -141,6 +142,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 {
         struct vlan_hdr *vhdr;
         struct vlan_rx_stats *rx_stats;
+        struct net_device *vlan_dev;
         u16 vlan_id;
         u16 vlan_tci;
 
@@ -156,53 +158,71 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
         vlan_id = vlan_tci & VLAN_VID_MASK;
 
         rcu_read_lock();
-        skb->dev = __find_vlan_dev(dev, vlan_id);
-        if (!skb->dev) {
-                pr_debug("%s: ERROR: No net_device for VID: %u on dev: %s\n",
-                         __func__, vlan_id, dev->name);
-                goto err_unlock;
-        }
-
-        rx_stats = per_cpu_ptr(vlan_dev_info(skb->dev)->vlan_rx_stats,
-                               smp_processor_id());
-        rx_stats->rx_packets++;
-        rx_stats->rx_bytes += skb->len;
-
-        skb_pull_rcsum(skb, VLAN_HLEN);
-
-        skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tci);
-
-        pr_debug("%s: priority: %u for TCI: %hu\n",
-                 __func__, skb->priority, vlan_tci);
+        vlan_dev = __find_vlan_dev(dev, vlan_id);
 
-        switch (skb->pkt_type) {
-        case PACKET_BROADCAST: /* Yeah, stats collect these together.. */
-                /* stats->broadcast ++; // no such counter :-( */
-                break;
-
-        case PACKET_MULTICAST:
-                rx_stats->multicast++;
-                break;
+        /* If the VLAN device is defined, we use it.
+         * If not, and the VID is 0, it is a 802.1p packet (not
+         * really a VLAN), so we will just netif_rx it later to the
+         * original interface, but with the skb->proto set to the
+         * wrapped proto: we do nothing here.
+         */
 
-        case PACKET_OTHERHOST:
-                /* Our lower layer thinks this is not local, let's make sure.
-                 * This allows the VLAN to have a different MAC than the
-                 * underlying device, and still route correctly.
-                 */
-                if (!compare_ether_addr(eth_hdr(skb)->h_dest,
-                                        skb->dev->dev_addr))
-                        skb->pkt_type = PACKET_HOST;
-                break;
-        default:
-                break;
+        if (!vlan_dev) {
+                if (vlan_id) {
+                        pr_debug("%s: ERROR: No net_device for VID: %u on dev: %s\n",
+                                 __func__, vlan_id, dev->name);
+                        goto err_unlock;
+                }
+                rx_stats = NULL;
+        } else {
+                skb->dev = vlan_dev;
+
+                rx_stats = per_cpu_ptr(vlan_dev_info(skb->dev)->vlan_rx_stats,
+                                        smp_processor_id());
+                u64_stats_update_begin(&rx_stats->syncp);
+                rx_stats->rx_packets++;
+                rx_stats->rx_bytes += skb->len;
+
+                skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tci);
+
+                pr_debug("%s: priority: %u for TCI: %hu\n",
+                         __func__, skb->priority, vlan_tci);
+
+                switch (skb->pkt_type) {
+                case PACKET_BROADCAST:
+                        /* Yeah, stats collect these together.. */
+                        /* stats->broadcast ++; // no such counter :-( */
+                        break;
+
+                case PACKET_MULTICAST:
+                        rx_stats->rx_multicast++;
+                        break;
+
+                case PACKET_OTHERHOST:
+                        /* Our lower layer thinks this is not local, let's make
+                         * sure.
+                         * This allows the VLAN to have a different MAC than the
+                         * underlying device, and still route correctly.
+                         */
+                        if (!compare_ether_addr(eth_hdr(skb)->h_dest,
+                                                skb->dev->dev_addr))
+                                skb->pkt_type = PACKET_HOST;
+                        break;
+                default:
+                        break;
+                }
+                u64_stats_update_end(&rx_stats->syncp);
         }
 
+        skb_pull_rcsum(skb, VLAN_HLEN);
         vlan_set_encap_proto(skb, vhdr);
 
-        skb = vlan_check_reorder_header(skb);
-        if (!skb) {
-                rx_stats->rx_errors++;
-                goto err_unlock;
+        if (vlan_dev) {
+                skb = vlan_check_reorder_header(skb);
+                if (!skb) {
+                        rx_stats->rx_errors++;
+                        goto err_unlock;
+                }
         }
 
         netif_rx(skb);
@@ -263,11 +283,10 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
                 vhdr->h_vlan_TCI = htons(vlan_tci);
 
                 /*
-                 *  Set the protocol type. For a packet of type ETH_P_802_3 we
-                 *  put the length in here instead. It is up to the 802.2
-                 *  layer to carry protocol information.
+                 *  Set the protocol type. For a packet of type ETH_P_802_3/2 we
+                 *  put the length in here instead.
                  */
-                if (type != ETH_P_802_3)
+                if (type != ETH_P_802_3 && type != ETH_P_802_2)
                         vhdr->h_vlan_encapsulated_proto = htons(type);
                 else
                         vhdr->h_vlan_encapsulated_proto = htons(len);
@@ -323,11 +342,11 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
         }
 
 
-        skb->dev = vlan_dev_info(dev)->real_dev;
+        skb_set_dev(skb, vlan_dev_info(dev)->real_dev);
         len = skb->len;
         ret = dev_queue_xmit(skb);
 
-        if (likely(ret == NET_XMIT_SUCCESS)) {
+        if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {
                 txq->tx_packets++;
                 txq->tx_bytes += len;
         } else
@@ -353,7 +372,7 @@ static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
         len = skb->len;
         ret = dev_queue_xmit(skb);
 
-        if (likely(ret == NET_XMIT_SUCCESS)) {
+        if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {
                 txq->tx_packets++;
                 txq->tx_bytes += len;
         } else
@@ -362,6 +381,14 @@ static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
         return ret;
 }
 
+static u16 vlan_dev_select_queue(struct net_device *dev, struct sk_buff *skb)
+{
+        struct net_device *rdev = vlan_dev_info(dev)->real_dev;
+        const struct net_device_ops *ops = rdev->netdev_ops;
+
+        return ops->ndo_select_queue(rdev, skb);
+}
+
 static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
 {
         /* TODO: gotta make sure the underlying layer can handle it,
@@ -462,7 +489,7 @@ static int vlan_dev_open(struct net_device *dev)
                 return -ENETDOWN;
 
         if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) {
-                err = dev_unicast_add(real_dev, dev->dev_addr);
+                err = dev_uc_add(real_dev, dev->dev_addr);
                 if (err < 0)
                         goto out;
         }
@@ -483,7 +510,8 @@ static int vlan_dev_open(struct net_device *dev)
         if (vlan->flags & VLAN_FLAG_GVRP)
                 vlan_gvrp_request_join(dev);
 
-        netif_carrier_on(dev);
+        if (netif_carrier_ok(real_dev))
+                netif_carrier_on(dev);
         return 0;
 
 clear_allmulti:
@@ -491,7 +519,7 @@ clear_allmulti:
                 dev_set_allmulti(real_dev, -1);
 del_unicast:
         if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
-                dev_unicast_delete(real_dev, dev->dev_addr);
+                dev_uc_del(real_dev, dev->dev_addr);
 out:
         netif_carrier_off(dev);
         return err;
@@ -506,14 +534,14 @@ static int vlan_dev_stop(struct net_device *dev)
                 vlan_gvrp_request_leave(dev);
 
         dev_mc_unsync(real_dev, dev);
-        dev_unicast_unsync(real_dev, dev);
+        dev_uc_unsync(real_dev, dev);
         if (dev->flags & IFF_ALLMULTI)
                 dev_set_allmulti(real_dev, -1);
         if (dev->flags & IFF_PROMISC)
                 dev_set_promiscuity(real_dev, -1);
 
         if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
-                dev_unicast_delete(real_dev, dev->dev_addr);
+                dev_uc_del(real_dev, dev->dev_addr);
 
         netif_carrier_off(dev);
         return 0;
@@ -532,13 +560,13 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p)
                 goto out;
 
         if (compare_ether_addr(addr->sa_data, real_dev->dev_addr)) {
-                err = dev_unicast_add(real_dev, addr->sa_data);
+                err = dev_uc_add(real_dev, addr->sa_data);
                 if (err < 0)
                         return err;
         }
 
         if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
-                dev_unicast_delete(real_dev, dev->dev_addr);
+                dev_uc_del(real_dev, dev->dev_addr);
 
 out:
         memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
@@ -655,7 +683,7 @@ static void vlan_dev_change_rx_flags(struct net_device *dev, int change)
 static void vlan_dev_set_rx_mode(struct net_device *vlan_dev)
 {
         dev_mc_sync(vlan_dev_info(vlan_dev)->real_dev, vlan_dev);
-        dev_unicast_sync(vlan_dev_info(vlan_dev)->real_dev, vlan_dev);
+        dev_uc_sync(vlan_dev_info(vlan_dev)->real_dev, vlan_dev);
 }
 
 /*
@@ -689,7 +717,8 @@ static const struct header_ops vlan_header_ops = {
         .parse   = eth_header_parse,
 };
 
-static const struct net_device_ops vlan_netdev_ops, vlan_netdev_accel_ops;
+static const struct net_device_ops vlan_netdev_ops, vlan_netdev_accel_ops,
+                    vlan_netdev_ops_sq, vlan_netdev_accel_ops_sq;
 
 static int vlan_dev_init(struct net_device *dev)
 {
@@ -699,7 +728,8 @@ static int vlan_dev_init(struct net_device *dev)
         netif_carrier_off(dev);
 
         /* IFF_BROADCAST|IFF_MULTICAST; ??? */
-        dev->flags  = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI);
+        dev->flags  = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI |
+                                          IFF_MASTER | IFF_SLAVE);
         dev->iflink = real_dev->ifindex;
         dev->state  = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) |
                                           (1<<__LINK_STATE_DORMANT))) |
@@ -723,11 +753,17 @@ static int vlan_dev_init(struct net_device *dev)
         if (real_dev->features & NETIF_F_HW_VLAN_TX) {
                 dev->header_ops      = real_dev->header_ops;
                 dev->hard_header_len = real_dev->hard_header_len;
-                dev->netdev_ops         = &vlan_netdev_accel_ops;
+                if (real_dev->netdev_ops->ndo_select_queue)
+                        dev->netdev_ops = &vlan_netdev_accel_ops_sq;
+                else
+                        dev->netdev_ops = &vlan_netdev_accel_ops;
         } else {
                 dev->header_ops      = &vlan_header_ops;
                 dev->hard_header_len = real_dev->hard_header_len + VLAN_HLEN;
-                dev->netdev_ops         = &vlan_netdev_ops;
+                if (real_dev->netdev_ops->ndo_select_queue)
+                        dev->netdev_ops = &vlan_netdev_ops_sq;
+                else
+                        dev->netdev_ops = &vlan_netdev_ops;
         }
 
         if (is_vlan_dev(real_dev))
@@ -785,37 +821,65 @@ static u32 vlan_ethtool_get_flags(struct net_device *dev)
         return dev_ethtool_get_flags(vlan->real_dev);
 }
 
-static struct net_device_stats *vlan_dev_get_stats(struct net_device *dev)
+static struct rtnl_link_stats64 *vlan_dev_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
 {
-        struct net_device_stats *stats = &dev->stats;
-
         dev_txq_stats_fold(dev, stats);
 
         if (vlan_dev_info(dev)->vlan_rx_stats) {
-                struct vlan_rx_stats *p, rx = {0};
+                struct vlan_rx_stats *p, accum = {0};
                 int i;
 
                 for_each_possible_cpu(i) {
+                        u64 rxpackets, rxbytes, rxmulticast;
+                        unsigned int start;
+
                         p = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats, i);
-                        rx.rx_packets += p->rx_packets;
-                        rx.rx_bytes   += p->rx_bytes;
-                        rx.rx_errors  += p->rx_errors;
-                        rx.multicast  += p->multicast;
+                        do {
+                                start = u64_stats_fetch_begin_bh(&p->syncp);
+                                rxpackets       = p->rx_packets;
+                                rxbytes         = p->rx_bytes;
+                                rxmulticast     = p->rx_multicast;
+                        } while (u64_stats_fetch_retry_bh(&p->syncp, start));
+                        accum.rx_packets += rxpackets;
+                        accum.rx_bytes   += rxbytes;
+                        accum.rx_multicast += rxmulticast;
+                        /* rx_errors is an ulong, not protected by syncp */
+                        accum.rx_errors  += p->rx_errors;
                 }
-                stats->rx_packets = rx.rx_packets;
-                stats->rx_bytes   = rx.rx_bytes;
-                stats->rx_errors  = rx.rx_errors;
-                stats->multicast  = rx.multicast;
+                stats->rx_packets = accum.rx_packets;
+                stats->rx_bytes   = accum.rx_bytes;
+                stats->rx_errors  = accum.rx_errors;
+                stats->multicast  = accum.rx_multicast;
         }
         return stats;
 }
 
+static int vlan_ethtool_set_tso(struct net_device *dev, u32 data)
+{
+       if (data) {
+                struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+
+                /* Underlying device must support TSO for VLAN-tagged packets
+                 * and must have TSO enabled now.
+                 */
+                if (!(real_dev->vlan_features & NETIF_F_TSO))
+                        return -EOPNOTSUPP;
+                if (!(real_dev->features & NETIF_F_TSO))
+                        return -EINVAL;
+                dev->features |= NETIF_F_TSO;
+        } else {
+                dev->features &= ~NETIF_F_TSO;
+        }
+        return 0;
+}
+
 static const struct ethtool_ops vlan_ethtool_ops = {
         .get_settings           = vlan_ethtool_get_settings,
         .get_drvinfo            = vlan_ethtool_get_drvinfo,
         .get_link               = ethtool_op_get_link,
         .get_rx_csum            = vlan_ethtool_get_rx_csum,
         .get_flags              = vlan_ethtool_get_flags,
+        .set_tso                = vlan_ethtool_set_tso,
 };
 
 static const struct net_device_ops vlan_netdev_ops = {
@@ -832,7 +896,7 @@ static const struct net_device_ops vlan_netdev_ops = {
         .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
         .ndo_do_ioctl           = vlan_dev_ioctl,
         .ndo_neigh_setup        = vlan_dev_neigh_setup,
-        .ndo_get_stats          = vlan_dev_get_stats,
+        .ndo_get_stats64        = vlan_dev_get_stats64,
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
         .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
         .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
@@ -856,7 +920,57 @@ static const struct net_device_ops vlan_netdev_accel_ops = {
         .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
         .ndo_do_ioctl           = vlan_dev_ioctl,
         .ndo_neigh_setup        = vlan_dev_neigh_setup,
-        .ndo_get_stats          = vlan_dev_get_stats,
+        .ndo_get_stats64        = vlan_dev_get_stats64,
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+        .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
+        .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
+        .ndo_fcoe_enable        = vlan_dev_fcoe_enable,
+        .ndo_fcoe_disable       = vlan_dev_fcoe_disable,
+        .ndo_fcoe_get_wwn       = vlan_dev_fcoe_get_wwn,
+#endif
+};
+
+static const struct net_device_ops vlan_netdev_ops_sq = {
+        .ndo_select_queue       = vlan_dev_select_queue,
+        .ndo_change_mtu         = vlan_dev_change_mtu,
+        .ndo_init               = vlan_dev_init,
+        .ndo_uninit             = vlan_dev_uninit,
+        .ndo_open               = vlan_dev_open,
+        .ndo_stop               = vlan_dev_stop,
+        .ndo_start_xmit =  vlan_dev_hard_start_xmit,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_set_mac_address    = vlan_dev_set_mac_address,
+        .ndo_set_rx_mode        = vlan_dev_set_rx_mode,
+        .ndo_set_multicast_list = vlan_dev_set_rx_mode,
+        .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
+        .ndo_do_ioctl           = vlan_dev_ioctl,
+        .ndo_neigh_setup        = vlan_dev_neigh_setup,
+        .ndo_get_stats64        = vlan_dev_get_stats64,
+#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+        .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
+        .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
+        .ndo_fcoe_enable        = vlan_dev_fcoe_enable,
+        .ndo_fcoe_disable       = vlan_dev_fcoe_disable,
+        .ndo_fcoe_get_wwn       = vlan_dev_fcoe_get_wwn,
+#endif
+};
+
+static const struct net_device_ops vlan_netdev_accel_ops_sq = {
+        .ndo_select_queue       = vlan_dev_select_queue,
+        .ndo_change_mtu         = vlan_dev_change_mtu,
+        .ndo_init               = vlan_dev_init,
+        .ndo_uninit             = vlan_dev_uninit,
+        .ndo_open               = vlan_dev_open,
+        .ndo_stop               = vlan_dev_stop,
+        .ndo_start_xmit =  vlan_dev_hwaccel_hard_start_xmit,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_set_mac_address    = vlan_dev_set_mac_address,
+        .ndo_set_rx_mode        = vlan_dev_set_rx_mode,
+        .ndo_set_multicast_list = vlan_dev_set_rx_mode,
+        .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
+        .ndo_do_ioctl           = vlan_dev_ioctl,
+        .ndo_neigh_setup        = vlan_dev_neigh_setup,
+        .ndo_get_stats64        = vlan_dev_get_stats64,
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
         .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
         .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,