From patchwork Wed May 13 08:58:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1289106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=V7RxT33u; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49MT9j5V5Kz9sSk; Wed, 13 May 2020 18:58:49 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jYnDx-00085W-MH; Wed, 13 May 2020 08:58:45 +0000 Received: from mail-pj1-f67.google.com ([209.85.216.67]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jYnDu-00084k-5P for kernel-team@lists.ubuntu.com; Wed, 13 May 2020 08:58:42 +0000 Received: by mail-pj1-f67.google.com with SMTP id s69so2523369pjb.4 for ; Wed, 13 May 2020 01:58:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0uRIo3zWXUAzGTN4XvdDhv2kEbMg6ry3Z06ciRu1ntk=; b=V7RxT33u1R37X1EQT9oLVe45Y8EQQXvo+Md+4JhN5/XyHxFkGxJ5r0SNkylC6T95YM 6d3nec5gl5FKxa2DZieBN0j5TwMYIzTI76+S1eeQp810+sK2fOYE0o27EgHiIFHv3p3x cIFAPrtyH4SQtIQ74yCGhbEzkLQMKawGPD/q5RBmDkzszTqXwBF+MM2TV/tQFidgpM5W cc4BIZLNtMTl3mvyLxepNbAH8PoFNLPU5//lFd7o+RSzHdCYTN2J5CBD6inowb4c92a5 9QFKQTs+zBcWmjal+hOO75LKs/fXEswAhX+lJLYLPfb7W89YmQzmII+vpO+9kxPDxUqv Ip7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0uRIo3zWXUAzGTN4XvdDhv2kEbMg6ry3Z06ciRu1ntk=; b=Tev1LGNvrKCTCyXSJR8J8qkKntCrql06eBqRbH92ElidXH9DOe9ExO/wT0DE+m4Lw0 qUWTBveH8XevkqpIPBzlgKlzFJXsPmVjfAjnJSpWhwsidyIVw3Vi29luFCMopSpCFPIi QZgsTCgkRJnocuGifIiE6YUMYmmz62zM1FVe48z4SL+Z4dtma5ZoA8XCqWquGtpJ5Uo3 svSlR5cFpWVsEI90qv2eISPVy911YurBVJXxRjt6VskRMzt963rTy9p1mxXQj4NCMSRB OMa+qckLSiCLLKOHfIEPeEhmYPFxHQhUen9DQO7bKVcH3DVgblyYnfJxyfFm0Tn81vij 9uUA== X-Gm-Message-State: AGi0PuYuhQ2kuy9ACMK+NNOda9BSvg1nmL3j7ekdgGJkvVAJQ7TsiOCe Br4IPf+APfbCatfjnAhKcrKRtRT0 X-Google-Smtp-Source: APiQypIdTVfHBdPCxum9XFW+xuMY7kE6T9UoNRBe/Jdf3uzaM8FqgMuHOmqYHpotuWmY+p8con1z2A== X-Received: by 2002:a17:90a:68cb:: with SMTP id q11mr32874430pjj.15.1589360320427; Wed, 13 May 2020 01:58:40 -0700 (PDT) Received: from localhost (220-135-95-34.HINET-IP.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id k5sm14953884pjl.32.2020.05.13.01.58.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 01:58:39 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][B][E][F][G][Unstable] UBUNTU: SAUCE: e1000e: Disable TSO for buffer overrun workaround Date: Wed, 13 May 2020 16:58:36 +0800 Message-Id: <20200513085836.862964-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200513085836.862964-1-acelan.kao@canonical.com> References: <20200513085836.862964-1-acelan.kao@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kai-Heng Feng BugLink: https://bugs.launchpad.net/bugs/1802691 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. Fixes: b10effb92e27 ("e1000e: fix buffer overrun while the I219 is processing DMA transactions") Signed-off-by: Kai-Heng Feng (cherry picked from commit https://lkml.org/lkml/2020/5/7/676) Signed-off-by: AceLan Kao --- drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index cfbdcf4838a7..6e85032d8916 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -5293,6 +5293,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