]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
e1000e: Disable TSO for buffer overrun workaround
authorKai-Heng Feng <kai.heng.feng@canonical.com>
Thu, 7 May 2020 14:21:07 +0000 (22:21 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:31:17 +0000 (09:31 +0200)
commit f29801030ac67bf98b7a65d3aea67b30769d4f7c upstream.

Commit b10effb92e27 ("e1000e: fix buffer overrun while the I219 is
processing DMA transactions") imposes roughly 30% performance penalty.

The commit log states that "Disabling TSO eliminates performance loss
for TCP traffic without a noticeable impact on CPU performance", so
let's disable TSO by default to regain the loss.

CC: stable <stable@vger.kernel.org>
Fixes: b10effb92e27 ("e1000e: fix buffer overrun while the I219 is processing DMA transactions")
BugLink: https://bugs.launchpad.net/bugs/1802691
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.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

index 8c4507838325b081b5b35f1b34f8df5d706707f9..9ae256e98663a68fb2f973808730478d6df880a2 100644 (file)
@@ -5289,6 +5289,10 @@ static void e1000_watchdog_task(struct work_struct *work)
                                        /* oops */
                                        break;
                                }
+                               if (hw->mac.type == e1000_pch_spt) {
+                                       netdev->features &= ~NETIF_F_TSO;
+                                       netdev->features &= ~NETIF_F_TSO6;
+                               }
                        }
 
                        /* enable transmits in the hardware, need to do this