12 files changed, 83 insertions, 33 deletions

diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 31fb76ee9d82..a1246e89aad4 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -159,7 +159,7 @@ config IXGBE
         tristate "Intel(R) 10GbE PCI Express adapters support"
         depends on PCI
         select MDIO
-        select MDIO_DEVICE
+        select PHYLIB
         imply PTP_1588_CLOCK
         ---help---
           This driver supports Intel(R) 10GbE PCI Express family of
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index 2569a168334c..a41008523c98 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -993,8 +993,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
 
         txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
         txdr->size = ALIGN(txdr->size, 4096);
-        txdr->desc = dma_zalloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
-                                         GFP_KERNEL);
+        txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
+                                        GFP_KERNEL);
         if (!txdr->desc) {
                 ret_val = 2;
                 goto err_nomem;
@@ -1051,8 +1051,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
         }
 
         rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
-        rxdr->desc = dma_zalloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
-                                         GFP_KERNEL);
+        rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
+                                        GFP_KERNEL);
         if (!rxdr->desc) {
                 ret_val = 6;
                 goto err_nomem;
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 308c006cb41d..189f231075c2 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2305,8 +2305,8 @@ static int e1000_alloc_ring_dma(struct e1000_adapter *adapter,
 {
         struct pci_dev *pdev = adapter->pdev;
 
-        ring->desc = dma_zalloc_coherent(&pdev->dev, ring->size, &ring->dma,
-                                         GFP_KERNEL);
+        ring->desc = dma_alloc_coherent(&pdev->dev, ring->size, &ring->dma,
+                                        GFP_KERNEL);
         if (!ring->desc)
                 return -ENOMEM;
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 4d40878e395a..e4ff531db14a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -109,8 +109,8 @@ int i40e_allocate_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem,
         struct i40e_pf *pf = (struct i40e_pf *)hw->back;
 
         mem->size = ALIGN(size, alignment);
-        mem->va = dma_zalloc_coherent(&pf->pdev->dev, mem->size,
-                                      &mem->pa, GFP_KERNEL);
+        mem->va = dma_alloc_coherent(&pf->pdev->dev, mem->size, &mem->pa,
+                                     GFP_KERNEL);
         if (!mem->va)
                 return -ENOMEM;
 
@@ -3289,8 +3289,11 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)
              i40e_alloc_rx_buffers_zc(ring, I40E_DESC_UNUSED(ring)) :
              !i40e_alloc_rx_buffers(ring, I40E_DESC_UNUSED(ring));
         if (!ok) {
+                /* Log this in case the user has forgotten to give the kernel
+                 * any buffers, even later in the application.
+                 */
                 dev_info(&vsi->back->pdev->dev,
-                         "Failed allocate some buffers on %sRx ring %d (pf_q %d)\n",
+                         "Failed to allocate some buffers on %sRx ring %d (pf_q %d)\n",
                          ring->xsk_umem ? "UMEM enabled " : "",
                          ring->queue_index, pf_q);
         }
@@ -6725,8 +6728,13 @@ void i40e_down(struct i40e_vsi *vsi)
 
         for (i = 0; i < vsi->num_queue_pairs; i++) {
                 i40e_clean_tx_ring(vsi->tx_rings[i]);
-                if (i40e_enabled_xdp_vsi(vsi))
+                if (i40e_enabled_xdp_vsi(vsi)) {
+                        /* Make sure that in-progress ndo_xdp_xmit
+                         * calls are completed.
+                         */
+                        synchronize_rcu();
                         i40e_clean_tx_ring(vsi->xdp_rings[i]);
+                }
                 i40e_clean_rx_ring(vsi->rx_rings[i]);
         }
 
@@ -11895,6 +11903,14 @@ static int i40e_xdp_setup(struct i40e_vsi *vsi,
         if (old_prog)
                 bpf_prog_put(old_prog);
 
+        /* Kick start the NAPI context if there is an AF_XDP socket open
+         * on that queue id. This so that receiving will start.
+         */
+        if (need_reset && prog)
+                for (i = 0; i < vsi->num_queue_pairs; i++)
+                        if (vsi->xdp_rings[i]->xsk_umem)
+                                (void)i40e_xsk_async_xmit(vsi->netdev, i);
+
         return 0;
 }
 
@@ -11955,8 +11971,13 @@ static void i40e_queue_pair_reset_stats(struct i40e_vsi *vsi, int queue_pair)
 static void i40e_queue_pair_clean_rings(struct i40e_vsi *vsi, int queue_pair)
 {
         i40e_clean_tx_ring(vsi->tx_rings[queue_pair]);
-        if (i40e_enabled_xdp_vsi(vsi))
+        if (i40e_enabled_xdp_vsi(vsi)) {
+                /* Make sure that in-progress ndo_xdp_xmit calls are
+                 * completed.
+                 */
+                synchronize_rcu();
                 i40e_clean_tx_ring(vsi->xdp_rings[queue_pair]);
+        }
         i40e_clean_rx_ring(vsi->rx_rings[queue_pair]);
 }
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index a7e14e98889f..6c97667d20ef 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -3709,6 +3709,7 @@ int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,
         struct i40e_netdev_priv *np = netdev_priv(dev);
         unsigned int queue_index = smp_processor_id();
         struct i40e_vsi *vsi = np->vsi;
+        struct i40e_pf *pf = vsi->back;
         struct i40e_ring *xdp_ring;
         int drops = 0;
         int i;
@@ -3716,7 +3717,8 @@ int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,
         if (test_bit(__I40E_VSI_DOWN, vsi->state))
                 return -ENETDOWN;
 
-        if (!i40e_enabled_xdp_vsi(vsi) || queue_index >= vsi->num_queue_pairs)
+        if (!i40e_enabled_xdp_vsi(vsi) || queue_index >= vsi->num_queue_pairs ||
+            test_bit(__I40E_CONFIG_BUSY, pf->state))
                 return -ENXIO;
 
         if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))
diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index 870cf654e436..3827f16e6923 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -183,6 +183,11 @@ static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem,
                 err = i40e_queue_pair_enable(vsi, qid);
                 if (err)
                         return err;
+
+                /* Kick start the NAPI context so that receiving will start */
+                err = i40e_xsk_async_xmit(vsi->netdev, qid);
+                if (err)
+                        return err;
         }
 
         return 0;
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h
index fe1592ae8769..ca54e268d157 100644
--- a/drivers/net/ethernet/intel/igb/igb.h
+++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -515,7 +515,7 @@ struct igb_adapter {
         /* OS defined structs */
         struct pci_dev *pdev;
 
-        struct mutex stats64_lock;
+        spinlock_t stats64_lock;
         struct rtnl_link_stats64 stats64;
 
         /* structs defined in e1000_hw.h */
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 7426060b678f..c57671068245 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -2295,7 +2295,7 @@ static void igb_get_ethtool_stats(struct net_device *netdev,
         int i, j;
         char *p;
 
-        mutex_lock(&adapter->stats64_lock);
+        spin_lock(&adapter->stats64_lock);
         igb_update_stats(adapter);
 
         for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) {
@@ -2338,7 +2338,7 @@ static void igb_get_ethtool_stats(struct net_device *netdev,
                 } while (u64_stats_fetch_retry_irq(&ring->rx_syncp, start));
                 i += IGB_RX_QUEUE_STATS_LEN;
         }
-        mutex_unlock(&adapter->stats64_lock);
+        spin_unlock(&adapter->stats64_lock);
 }
 
 static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 87bdf1604ae2..7137e7f9c7f3 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2203,9 +2203,9 @@ void igb_down(struct igb_adapter *adapter)
         del_timer_sync(&adapter->phy_info_timer);
 
         /* record the stats before reset*/
-        mutex_lock(&adapter->stats64_lock);
+        spin_lock(&adapter->stats64_lock);
         igb_update_stats(adapter);
-        mutex_unlock(&adapter->stats64_lock);
+        spin_unlock(&adapter->stats64_lock);
 
         adapter->link_speed = 0;
         adapter->link_duplex = 0;
@@ -3840,7 +3840,7 @@ static int igb_sw_init(struct igb_adapter *adapter)
         adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
 
         spin_lock_init(&adapter->nfc_lock);
-        mutex_init(&adapter->stats64_lock);
+        spin_lock_init(&adapter->stats64_lock);
 #ifdef CONFIG_PCI_IOV
         switch (hw->mac.type) {
         case e1000_82576:
@@ -5406,9 +5406,9 @@ no_wait:
                 }
         }
 
-        mutex_lock(&adapter->stats64_lock);
+        spin_lock(&adapter->stats64_lock);
         igb_update_stats(adapter);
-        mutex_unlock(&adapter->stats64_lock);
+        spin_unlock(&adapter->stats64_lock);
 
         for (i = 0; i < adapter->num_tx_queues; i++) {
                 struct igb_ring *tx_ring = adapter->tx_ring[i];
@@ -6235,10 +6235,10 @@ static void igb_get_stats64(struct net_device *netdev,
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
 
-        mutex_lock(&adapter->stats64_lock);
+        spin_lock(&adapter->stats64_lock);
         igb_update_stats(adapter);
         memcpy(stats, &adapter->stats64, sizeof(*stats));
-        mutex_unlock(&adapter->stats64_lock);
+        spin_unlock(&adapter->stats64_lock);
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 1d4d1686909a..e5ac2d3fd816 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -680,8 +680,8 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
         txdr->size = txdr->count * sizeof(struct ixgb_tx_desc);
         txdr->size = ALIGN(txdr->size, 4096);
 
-        txdr->desc = dma_zalloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
-                                         GFP_KERNEL);
+        txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
+                                        GFP_KERNEL);
         if (!txdr->desc) {
                 vfree(txdr->buffer_info);
                 return -ENOMEM;
@@ -763,8 +763,8 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
         rxdr->size = rxdr->count * sizeof(struct ixgb_rx_desc);
         rxdr->size = ALIGN(rxdr->size, 4096);
 
-        rxdr->desc = dma_zalloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
-                                         GFP_KERNEL);
+        rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
+                                        GFP_KERNEL);
 
         if (!rxdr->desc) {
                 vfree(rxdr->buffer_info);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index daff8183534b..cb35d8202572 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3953,8 +3953,11 @@ static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter)
                         else
                                 mrqc = IXGBE_MRQC_VMDQRSS64EN;
 
-                        /* Enable L3/L4 for Tx Switched packets */
-                        mrqc |= IXGBE_MRQC_L3L4TXSWEN;
+                        /* Enable L3/L4 for Tx Switched packets only for X550,
+                         * older devices do not support this feature
+                         */
+                        if (hw->mac.type >= ixgbe_mac_X550)
+                                mrqc |= IXGBE_MRQC_L3L4TXSWEN;
                 } else {
                         if (tcs > 4)
                                 mrqc = IXGBE_MRQC_RTRSS8TCEN;
@@ -10225,6 +10228,7 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog)
         int i, frame_size = dev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
         struct ixgbe_adapter *adapter = netdev_priv(dev);
         struct bpf_prog *old_prog;
+        bool need_reset;
 
         if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
                 return -EINVAL;
@@ -10247,9 +10251,10 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog)
                 return -ENOMEM;
 
         old_prog = xchg(&adapter->xdp_prog, prog);
+        need_reset = (!!prog != !!old_prog);
 
         /* If transitioning XDP modes reconfigure rings */
-        if (!!prog != !!old_prog) {
+        if (need_reset) {
                 int err = ixgbe_setup_tc(dev, adapter->hw_tcs);
 
                 if (err) {
@@ -10265,6 +10270,14 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog)
         if (old_prog)
                 bpf_prog_put(old_prog);
 
+        /* Kick start the NAPI context if there is an AF_XDP socket open
+         * on that queue id. This so that receiving will start.
+         */
+        if (need_reset && prog)
+                for (i = 0; i < adapter->num_rx_queues; i++)
+                        if (adapter->xdp_ring[i]->xsk_umem)
+                                (void)ixgbe_xsk_async_xmit(adapter->netdev, i);
+
         return 0;
 }
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
index 65c3e2c979d4..36a8879536a4 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
@@ -144,11 +144,19 @@ static int ixgbe_xsk_umem_enable(struct ixgbe_adapter *adapter,
                 ixgbe_txrx_ring_disable(adapter, qid);
 
         err = ixgbe_add_xsk_umem(adapter, umem, qid);
+        if (err)
+                return err;
 
-        if (if_running)
+        if (if_running) {
                 ixgbe_txrx_ring_enable(adapter, qid);
 
-        return err;
+                /* Kick start the NAPI context so that receiving will start */
+                err = ixgbe_xsk_async_xmit(adapter->netdev, qid);
+                if (err)
+                        return err;
+        }
+
+        return 0;
 }
 
 static int ixgbe_xsk_umem_disable(struct ixgbe_adapter *adapter, u16 qid)
@@ -634,7 +642,8 @@ static bool ixgbe_xmit_zc(struct ixgbe_ring *xdp_ring, unsigned int budget)
         dma_addr_t dma;
 
         while (budget-- > 0) {
-                if (unlikely(!ixgbe_desc_unused(xdp_ring))) {
+                if (unlikely(!ixgbe_desc_unused(xdp_ring)) ||
+                    !netif_carrier_ok(xdp_ring->netdev)) {
                         work_done = false;
                         break;
                 }