5.1-stable patches

added patches:
	e1000e-start-network-tx-queue-only-when-link-is-up.patch
	revert-e1000e-fix-cyclic-resets-at-link-up-with-active-tx.patch

diff --git a/queue-5.1/e1000e-start-network-tx-queue-only-when-link-is-up.patch b/queue-5.1/e1000e-start-network-tx-queue-only-when-link-is-up.patch
new file mode 100644 (file)
index 0000000..3811311
--- /dev/null
+++ b/queue-5.1/e1000e-start-network-tx-queue-only-when-link-is-up.patch
@@ -0,0 +1,74 @@
+From d17ba0f616a08f597d9348c372d89b8c0405ccf3 Mon Sep 17 00:00:00 2001
+From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+Date: Wed, 17 Apr 2019 11:13:20 +0300
+Subject: e1000e: start network tx queue only when link is up
+
+From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+
+commit d17ba0f616a08f597d9348c372d89b8c0405ccf3 upstream.
+
+Driver does not want to keep packets in Tx queue when link is lost.
+But present code only reset NIC to flush them, but does not prevent
+queuing new packets. Moreover reset sequence itself could generate
+new packets via netconsole and NIC falls into endless reset loop.
+
+This patch wakes Tx queue only when NIC is ready to send packets.
+
+This is proper fix for problem addressed by commit 0f9e980bf5ee
+("e1000e: fix cyclic resets at link up with active tx").
+
+Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+Suggested-by: Alexander Duyck <alexander.duyck@gmail.com>
+Tested-by: Joseph Yasi <joe.yasi@gmail.com>
+Tested-by: Aaron Brown <aaron.f.brown@intel.com>
+Tested-by: Oleksandr Natalenko <oleksandr@redhat.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/intel/e1000e/netdev.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -4209,7 +4209,7 @@ void e1000e_up(struct e1000_adapter *ada
+               e1000_configure_msix(adapter);
+       e1000_irq_enable(adapter);
+ 
+-      netif_start_queue(adapter->netdev);
++      /* Tx queue started by watchdog timer when link is up */
+ 
+       e1000e_trigger_lsc(adapter);
+ }
+@@ -4607,6 +4607,7 @@ int e1000e_open(struct net_device *netde
+       pm_runtime_get_sync(&pdev->dev);
+ 
+       netif_carrier_off(netdev);
++      netif_stop_queue(netdev);
+ 
+       /* allocate transmit descriptors */
+       err = e1000e_setup_tx_resources(adapter->tx_ring);
+@@ -4667,7 +4668,6 @@ int e1000e_open(struct net_device *netde
+       e1000_irq_enable(adapter);
+ 
+       adapter->tx_hang_recheck = false;
+-      netif_start_queue(netdev);
+ 
+       hw->mac.get_link_status = true;
+       pm_runtime_put(&pdev->dev);
+@@ -5289,6 +5289,7 @@ static void e1000_watchdog_task(struct w
+                       if (phy->ops.cfg_on_link_up)
+                               phy->ops.cfg_on_link_up(hw);
+ 
++                      netif_wake_queue(netdev);
+                       netif_carrier_on(netdev);
+ 
+                       if (!test_bit(__E1000_DOWN, &adapter->state))
+@@ -5302,6 +5303,7 @@ static void e1000_watchdog_task(struct w
+                       /* Link status message must follow this format */
+                       pr_info("%s NIC Link is Down\n", adapter->netdev->name);
+                       netif_carrier_off(netdev);
++                      netif_stop_queue(netdev);
+                       if (!test_bit(__E1000_DOWN, &adapter->state))
+                               mod_timer(&adapter->phy_info_timer,
+                                         round_jiffies(jiffies + 2 * HZ));

diff --git a/queue-5.1/revert-e1000e-fix-cyclic-resets-at-link-up-with-active-tx.patch b/queue-5.1/revert-e1000e-fix-cyclic-resets-at-link-up-with-active-tx.patch
new file mode 100644 (file)
index 0000000..6384ee8
--- /dev/null
+++ b/queue-5.1/revert-e1000e-fix-cyclic-resets-at-link-up-with-active-tx.patch
@@ -0,0 +1,80 @@
+From caff422ea81e144842bc44bab408d85ac449377b Mon Sep 17 00:00:00 2001
+From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+Date: Wed, 17 Apr 2019 11:13:16 +0300
+Subject: Revert "e1000e: fix cyclic resets at link up with active tx"
+
+From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+
+commit caff422ea81e144842bc44bab408d85ac449377b upstream.
+
+This reverts commit 0f9e980bf5ee1a97e2e401c846b2af989eb21c61.
+
+That change cased false-positive warning about hardware hang:
+
+e1000e: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx
+IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
+e1000e 0000:00:1f.6 eth0: Detected Hardware Unit Hang:
+   TDH                  <0>
+   TDT                  <1>
+   next_to_use          <1>
+   next_to_clean        <0>
+buffer_info[next_to_clean]:
+   time_stamp           <fffba7a7>
+   next_to_watch        <0>
+   jiffies              <fffbb140>
+   next_to_watch.status <0>
+MAC Status             <40080080>
+PHY Status             <7949>
+PHY 1000BASE-T Status  <0>
+PHY Extended Status    <3000>
+PCI Status             <10>
+e1000e: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx
+
+Besides warning everything works fine.
+Original issue will be fixed property in following patch.
+
+Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+Reported-by: Joseph Yasi <joe.yasi@gmail.com>
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=203175
+Tested-by: Joseph Yasi <joe.yasi@gmail.com>
+Tested-by: Aaron Brown <aaron.f.brown@intel.com>
+Tested-by: Oleksandr Natalenko <oleksandr@redhat.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/intel/e1000e/netdev.c |   15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -5309,13 +5309,8 @@ static void e1000_watchdog_task(struct w
+                       /* 8000ES2LAN requires a Rx packet buffer work-around
+                        * on link down event; reset the controller to flush
+                        * the Rx packet buffer.
+-                       *
+-                       * If the link is lost the controller stops DMA, but
+-                       * if there is queued Tx work it cannot be done.  So
+-                       * reset the controller to flush the Tx packet buffers.
+                        */
+-                      if ((adapter->flags & FLAG_RX_NEEDS_RESTART) ||
+-                          e1000_desc_unused(tx_ring) + 1 < tx_ring->count)
++                      if (adapter->flags & FLAG_RX_NEEDS_RESTART)
+                               adapter->flags |= FLAG_RESTART_NOW;
+                       else
+                               pm_schedule_suspend(netdev->dev.parent,
+@@ -5338,6 +5333,14 @@ link_up:
+       adapter->gotc_old = adapter->stats.gotc;
+       spin_unlock(&adapter->stats64_lock);
+ 
++      /* If the link is lost the controller stops DMA, but
++       * if there is queued Tx work it cannot be done.  So
++       * reset the controller to flush the Tx packet buffers.
++       */
++      if (!netif_carrier_ok(netdev) &&
++          (e1000_desc_unused(tx_ring) + 1 < tx_ring->count))
++              adapter->flags |= FLAG_RESTART_NOW;
++
+       /* If reset is necessary, do it outside of interrupt context. */
+       if (adapter->flags & FLAG_RESTART_NOW) {
+               schedule_work(&adapter->reset_task);