From: Greg Kroah-Hartman Date: Tue, 28 Nov 2017 09:27:43 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v3.18.85~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e81727ffca608c748ebd6371b0d3911f8584029;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: e1000e-avoid-receiver-overrun-interrupt-bursts.patch e1000e-fix-buffer-overrun-while-the-i219-is-processing-dma-transactions.patch e1000e-fix-error-path-in-link-detection.patch e1000e-fix-return-value-test.patch e1000e-separate-signaling-for-link-check-link-up.patch --- diff --git a/queue-4.14/e1000e-avoid-receiver-overrun-interrupt-bursts.patch b/queue-4.14/e1000e-avoid-receiver-overrun-interrupt-bursts.patch new file mode 100644 index 00000000000..56cc92a1b39 --- /dev/null +++ b/queue-4.14/e1000e-avoid-receiver-overrun-interrupt-bursts.patch @@ -0,0 +1,110 @@ +From 4aea7a5c5e940c1723add439f4088844cd26196d Mon Sep 17 00:00:00 2001 +From: Benjamin Poirier +Date: Fri, 21 Jul 2017 11:36:27 -0700 +Subject: e1000e: Avoid receiver overrun interrupt bursts + +From: Benjamin Poirier + +commit 4aea7a5c5e940c1723add439f4088844cd26196d upstream. + +When e1000e_poll() is not fast enough to keep up with incoming traffic, the +adapter (when operating in msix mode) raises the Other interrupt to signal +Receiver Overrun. + +This is a double problem because 1) at the moment e1000_msix_other() +assumes that it is only called in case of Link Status Change and 2) if the +condition persists, the interrupt is repeatedly raised again in quick +succession. + +Ideally we would configure the Other interrupt to not be raised in case of +receiver overrun but this doesn't seem possible on this adapter. Instead, +we handle the first part of the problem by reverting to the practice of +reading ICR in the other interrupt handler, like before commit 16ecba59bc33 +("e1000e: Do not read ICR in Other interrupt"). Thanks to commit +0a8047ac68e5 ("e1000e: Fix msi-x interrupt automask") which cleared IAME +from CTRL_EXT, reading ICR doesn't interfere with RxQ0, TxQ0 interrupts +anymore. We handle the second part of the problem by not re-enabling the +Other interrupt right away when there is overrun. Instead, we wait until +traffic subsides, napi polling mode is exited and interrupts are +re-enabled. + +Reported-by: Lennart Sorensen +Fixes: 16ecba59bc33 ("e1000e: Do not read ICR in Other interrupt") +Signed-off-by: Benjamin Poirier +Tested-by: Aaron Brown +Signed-off-by: Jeff Kirsher +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/intel/e1000e/defines.h | 1 + drivers/net/ethernet/intel/e1000e/netdev.c | 31 +++++++++++++++++++++------- + 2 files changed, 25 insertions(+), 7 deletions(-) + +--- a/drivers/net/ethernet/intel/e1000e/defines.h ++++ b/drivers/net/ethernet/intel/e1000e/defines.h +@@ -398,6 +398,7 @@ + #define E1000_ICR_LSC 0x00000004 /* Link Status Change */ + #define E1000_ICR_RXSEQ 0x00000008 /* Rx sequence error */ + #define E1000_ICR_RXDMT0 0x00000010 /* Rx desc min. threshold (0) */ ++#define E1000_ICR_RXO 0x00000040 /* Receiver Overrun */ + #define E1000_ICR_RXT0 0x00000080 /* Rx timer intr (ring 0) */ + #define E1000_ICR_ECCER 0x00400000 /* Uncorrectable ECC Error */ + /* If this bit asserted, the driver should claim the interrupt */ +--- a/drivers/net/ethernet/intel/e1000e/netdev.c ++++ b/drivers/net/ethernet/intel/e1000e/netdev.c +@@ -1910,14 +1910,30 @@ static irqreturn_t e1000_msix_other(int + struct net_device *netdev = data; + struct e1000_adapter *adapter = netdev_priv(netdev); + struct e1000_hw *hw = &adapter->hw; ++ u32 icr; ++ bool enable = true; + +- hw->mac.get_link_status = true; ++ icr = er32(ICR); ++ if (icr & E1000_ICR_RXO) { ++ ew32(ICR, E1000_ICR_RXO); ++ enable = false; ++ /* napi poll will re-enable Other, make sure it runs */ ++ if (napi_schedule_prep(&adapter->napi)) { ++ adapter->total_rx_bytes = 0; ++ adapter->total_rx_packets = 0; ++ __napi_schedule(&adapter->napi); ++ } ++ } ++ if (icr & E1000_ICR_LSC) { ++ ew32(ICR, E1000_ICR_LSC); ++ hw->mac.get_link_status = true; ++ /* guard against interrupt when we're going down */ ++ if (!test_bit(__E1000_DOWN, &adapter->state)) ++ mod_timer(&adapter->watchdog_timer, jiffies + 1); ++ } + +- /* guard against interrupt when we're going down */ +- if (!test_bit(__E1000_DOWN, &adapter->state)) { +- mod_timer(&adapter->watchdog_timer, jiffies + 1); ++ if (enable && !test_bit(__E1000_DOWN, &adapter->state)) + ew32(IMS, E1000_IMS_OTHER); +- } + + return IRQ_HANDLED; + } +@@ -2687,7 +2703,8 @@ static int e1000e_poll(struct napi_struc + napi_complete_done(napi, work_done); + if (!test_bit(__E1000_DOWN, &adapter->state)) { + if (adapter->msix_entries) +- ew32(IMS, adapter->rx_ring->ims_val); ++ ew32(IMS, adapter->rx_ring->ims_val | ++ E1000_IMS_OTHER); + else + e1000_irq_enable(adapter); + } +@@ -4204,7 +4221,7 @@ static void e1000e_trigger_lsc(struct e1 + struct e1000_hw *hw = &adapter->hw; + + if (adapter->msix_entries) +- ew32(ICS, E1000_ICS_OTHER); ++ ew32(ICS, E1000_ICS_LSC | E1000_ICS_OTHER); + else + ew32(ICS, E1000_ICS_LSC); + } diff --git a/queue-4.14/e1000e-fix-buffer-overrun-while-the-i219-is-processing-dma-transactions.patch b/queue-4.14/e1000e-fix-buffer-overrun-while-the-i219-is-processing-dma-transactions.patch new file mode 100644 index 00000000000..9862e37e299 --- /dev/null +++ b/queue-4.14/e1000e-fix-buffer-overrun-while-the-i219-is-processing-dma-transactions.patch @@ -0,0 +1,64 @@ +From b10effb92e272051dd1ec0d7be56bf9ca85ab927 Mon Sep 17 00:00:00 2001 +From: Sasha Neftin +Date: Sun, 6 Aug 2017 16:49:18 +0300 +Subject: e1000e: fix buffer overrun while the I219 is processing DMA transactions +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Sasha Neftin + +commit b10effb92e272051dd1ec0d7be56bf9ca85ab927 upstream. + +Intel® 100/200 Series Chipset platforms reduced the round-trip +latency for the LAN Controller DMA accesses, causing in some high +performance cases a buffer overrun while the I219 LAN Connected +Device is processing the DMA transactions. I219LM and I219V devices +can fall into unrecovered Tx hang under very stressfully UDP traffic +and multiple reconnection of Ethernet cable. This Tx hang of the LAN +Controller is only recovered if the system is rebooted. Slightly slow +down DMA access by reducing the number of outstanding requests. +This workaround could have an impact on TCP traffic performance +on the platform. Disabling TSO eliminates performance loss for TCP +traffic without a noticeable impact on CPU performance. + +Please, refer to I218/I219 specification update: +https://www.intel.com/content/www/us/en/embedded/products/networking/ +ethernet-connection-i218-family-documentation.html + +Signed-off-by: Sasha Neftin +Reviewed-by: Dima Ruinskiy +Reviewed-by: Raanan Avargil +Tested-by: Aaron Brown +Signed-off-by: Jeff Kirsher +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/intel/e1000e/netdev.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/drivers/net/ethernet/intel/e1000e/netdev.c ++++ b/drivers/net/ethernet/intel/e1000e/netdev.c +@@ -3021,8 +3021,8 @@ static void e1000_configure_tx(struct e1 + + hw->mac.ops.config_collision_dist(hw); + +- /* SPT and CNP Si errata workaround to avoid data corruption */ +- if (hw->mac.type >= e1000_pch_spt) { ++ /* SPT and KBL Si errata workaround to avoid data corruption */ ++ if (hw->mac.type == e1000_pch_spt) { + u32 reg_val; + + reg_val = er32(IOSFPC); +@@ -3030,7 +3030,9 @@ static void e1000_configure_tx(struct e1 + ew32(IOSFPC, reg_val); + + reg_val = er32(TARC(0)); +- reg_val |= E1000_TARC0_CB_MULTIQ_3_REQ; ++ /* SPT and KBL Si errata workaround to avoid Tx hang */ ++ reg_val &= ~BIT(28); ++ reg_val |= BIT(29); + ew32(TARC(0), reg_val); + } + } diff --git a/queue-4.14/e1000e-fix-error-path-in-link-detection.patch b/queue-4.14/e1000e-fix-error-path-in-link-detection.patch new file mode 100644 index 00000000000..153f762c8fa --- /dev/null +++ b/queue-4.14/e1000e-fix-error-path-in-link-detection.patch @@ -0,0 +1,52 @@ +From c4c40e51f9c32c6dd8adf606624c930a1c4d9bbb Mon Sep 17 00:00:00 2001 +From: Benjamin Poirier +Date: Fri, 21 Jul 2017 11:36:23 -0700 +Subject: e1000e: Fix error path in link detection + +From: Benjamin Poirier + +commit c4c40e51f9c32c6dd8adf606624c930a1c4d9bbb upstream. + +In case of error from e1e_rphy(), the loop will exit early and "success" +will be set to true erroneously. + +Signed-off-by: Benjamin Poirier +Tested-by: Aaron Brown +Signed-off-by: Jeff Kirsher +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/intel/e1000e/phy.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/net/ethernet/intel/e1000e/phy.c ++++ b/drivers/net/ethernet/intel/e1000e/phy.c +@@ -1744,6 +1744,7 @@ s32 e1000e_phy_has_link_generic(struct e + s32 ret_val = 0; + u16 i, phy_status; + ++ *success = false; + for (i = 0; i < iterations; i++) { + /* Some PHYs require the MII_BMSR register to be read + * twice due to the link bit being sticky. No harm doing +@@ -1763,16 +1764,16 @@ s32 e1000e_phy_has_link_generic(struct e + ret_val = e1e_rphy(hw, MII_BMSR, &phy_status); + if (ret_val) + break; +- if (phy_status & BMSR_LSTATUS) ++ if (phy_status & BMSR_LSTATUS) { ++ *success = true; + break; ++ } + if (usec_interval >= 1000) + msleep(usec_interval / 1000); + else + udelay(usec_interval); + } + +- *success = (i < iterations); +- + return ret_val; + } + diff --git a/queue-4.14/e1000e-fix-return-value-test.patch b/queue-4.14/e1000e-fix-return-value-test.patch new file mode 100644 index 00000000000..1f7ff0a8d12 --- /dev/null +++ b/queue-4.14/e1000e-fix-return-value-test.patch @@ -0,0 +1,32 @@ +From d3509f8bc7b0560044c15f0e3ecfde1d9af757a6 Mon Sep 17 00:00:00 2001 +From: Benjamin Poirier +Date: Fri, 21 Jul 2017 11:36:25 -0700 +Subject: e1000e: Fix return value test + +From: Benjamin Poirier + +commit d3509f8bc7b0560044c15f0e3ecfde1d9af757a6 upstream. + +All the helpers return -E1000_ERR_PHY. + +Signed-off-by: Benjamin Poirier +Tested-by: Aaron Brown +Signed-off-by: Jeff Kirsher +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/intel/e1000e/netdev.c ++++ b/drivers/net/ethernet/intel/e1000e/netdev.c +@@ -5099,7 +5099,7 @@ static bool e1000e_has_link(struct e1000 + break; + } + +- if ((ret_val == E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) && ++ if ((ret_val == -E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) && + (er32(CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) { + /* See e1000_kmrn_lock_loss_workaround_ich8lan() */ + e_info("Gigabit has been disabled, downgrading speed\n"); diff --git a/queue-4.14/e1000e-separate-signaling-for-link-check-link-up.patch b/queue-4.14/e1000e-separate-signaling-for-link-check-link-up.patch new file mode 100644 index 00000000000..8060152b824 --- /dev/null +++ b/queue-4.14/e1000e-separate-signaling-for-link-check-link-up.patch @@ -0,0 +1,90 @@ +From 19110cfbb34d4af0cdfe14cd243f3b09dc95b013 Mon Sep 17 00:00:00 2001 +From: Benjamin Poirier +Date: Fri, 21 Jul 2017 11:36:26 -0700 +Subject: e1000e: Separate signaling for link check/link up + +From: Benjamin Poirier + +commit 19110cfbb34d4af0cdfe14cd243f3b09dc95b013 upstream. + +Lennart reported the following race condition: + +\ e1000_watchdog_task + \ e1000e_has_link + \ hw->mac.ops.check_for_link() === e1000e_check_for_copper_link + /* link is up */ + mac->get_link_status = false; + + /* interrupt */ + \ e1000_msix_other + hw->mac.get_link_status = true; + + link_active = !hw->mac.get_link_status + /* link_active is false, wrongly */ + +This problem arises because the single flag get_link_status is used to +signal two different states: link status needs checking and link status is +down. + +Avoid the problem by using the return value of .check_for_link to signal +the link status to e1000e_has_link(). + +Reported-by: Lennart Sorensen +Signed-off-by: Benjamin Poirier +Tested-by: Aaron Brown +Signed-off-by: Jeff Kirsher +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/intel/e1000e/mac.c | 11 ++++++++--- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + 2 files changed, 9 insertions(+), 4 deletions(-) + +--- a/drivers/net/ethernet/intel/e1000e/mac.c ++++ b/drivers/net/ethernet/intel/e1000e/mac.c +@@ -410,6 +410,9 @@ void e1000e_clear_hw_cntrs_base(struct e + * Checks to see of the link status of the hardware has changed. If a + * change in link status has been detected, then we read the PHY registers + * to get the current speed/duplex if link exists. ++ * ++ * Returns a negative error code (-E1000_ERR_*) or 0 (link down) or 1 (link ++ * up). + **/ + s32 e1000e_check_for_copper_link(struct e1000_hw *hw) + { +@@ -423,7 +426,7 @@ s32 e1000e_check_for_copper_link(struct + * Change or Rx Sequence Error interrupt. + */ + if (!mac->get_link_status) +- return 0; ++ return 1; + + /* First we want to see if the MII Status Register reports + * link. If so, then we want to get the current speed/duplex +@@ -461,10 +464,12 @@ s32 e1000e_check_for_copper_link(struct + * different link partner. + */ + ret_val = e1000e_config_fc_after_link_up(hw); +- if (ret_val) ++ if (ret_val) { + e_dbg("Error configuring flow control\n"); ++ return ret_val; ++ } + +- return ret_val; ++ return 1; + } + + /** +--- a/drivers/net/ethernet/intel/e1000e/netdev.c ++++ b/drivers/net/ethernet/intel/e1000e/netdev.c +@@ -5081,7 +5081,7 @@ static bool e1000e_has_link(struct e1000 + case e1000_media_type_copper: + if (hw->mac.get_link_status) { + ret_val = hw->mac.ops.check_for_link(hw); +- link_active = !hw->mac.get_link_status; ++ link_active = ret_val > 0; + } else { + link_active = true; + } diff --git a/queue-4.14/series b/queue-4.14/series index d8c401f02b1..81437a83257 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -186,3 +186,8 @@ iwlwifi-add-new-cards-for-8265-series.patch iwlwifi-add-new-cards-for-8260-series.patch iwlwifi-fix-pci-ids-and-configuration-mapping-for-9000-series.patch iwlwifi-mvm-support-version-7-of-the-scan_req_umac-fw-command.patch +e1000e-fix-error-path-in-link-detection.patch +e1000e-fix-return-value-test.patch +e1000e-separate-signaling-for-link-check-link-up.patch +e1000e-avoid-receiver-overrun-interrupt-bursts.patch +e1000e-fix-buffer-overrun-while-the-i219-is-processing-dma-transactions.patch