From patchwork Wed Nov 11 17:04:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 11898215 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 479F2C5517A for ; Wed, 11 Nov 2020 17:05:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E50C82074B for ; Wed, 11 Nov 2020 17:05:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=voleatech.de header.i=@voleatech.de header.b="gBWSqlEE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726620AbgKKRFW (ORCPT ); Wed, 11 Nov 2020 12:05:22 -0500 Received: from mail-eopbgr00112.outbound.protection.outlook.com ([40.107.0.112]:45497 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727513AbgKKRFS (ORCPT ); Wed, 11 Nov 2020 12:05:18 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZY7g/wXc5WtgG55Np47alQgbnMmeOQA1jXDJUv6vzyFvE7x7PU1t/IrY/IuYKuiW6pIYl4Uy5U2wDC5dLEqS6F773dI1La7mCw9213bb3984QoVN4V88m9w+vLhKlYXYqZyeBHM44bPcKy2qFGQjVdZQ6U8BlEHU4RAK+/xpvdaked76yjHSvg/nXSNwXxu0m3IwinDqVq9SVCqK3E/0QtkEMU/HrJsPMhg0Gg3yRLr+sNr6KN/zcF64Gv5NvVWwjRzNG5DZd35hICVMVrwbhaMOn5YY72JoS7faxBm66C2BDU+Deo/tA/kDQFTFvYBviyqVCHpMCL8LMTrmhrHKoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ASVDWPz8RaTBk+vB7+8fCVTfRs2E3tTi8roz6xqgeI8=; b=RxfadpcVr7yCmYg8paAyY7WDOsbkghwobrpCLjtSRW1g25KoYARsa582mldNXwNbooVL5uu2ByzmPuKxV2sUE6TTlzIXs/THnK36A54Nb5DZY65B2DtzPoq/VNn7wimFQ7Kv08u00Nuqr5Pja1aP0dXLnbok2+wJpomqPAZlu2BuOFJdOiMMC/ByZsueuPtmrcljpVb7gpN2HYGnOEsuCy2lTlaudA5Y4VrtHDfw89KYdyS/w9/4auRhIcJV3aXlRLtEO9A3INIklwD0rveY6Kcov9ymTCwP04Rdwi62mb+7ou9/CVq4tcfb7fjenPCmR5QAc/tDi6ZcczxtlkC1oQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=voleatech.de; dmarc=pass action=none header.from=voleatech.de; dkim=pass header.d=voleatech.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=voleatech.de; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ASVDWPz8RaTBk+vB7+8fCVTfRs2E3tTi8roz6xqgeI8=; b=gBWSqlEEME5bKVEYGXbLYw4/1f+GYP72mbixrqyJc/XQn2th7Y5KRyKHQ923zK3US7ib/yXFvzEUM/kLgxfoRXQbUDzKXGxRpbTEMP3S/Lv+l8oKlbjjjmbrwqZYCjFNFiE3tqltEgMpoYDiUb7n8eIKiOmvA+AjNkFWSSbVo4A= Authentication-Results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=voleatech.de; Received: from AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) by AM0PR0502MB3921.eurprd05.prod.outlook.com (2603:10a6:208:17::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.30; Wed, 11 Nov 2020 17:05:01 +0000 Received: from AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4]) by AM8PR05MB7251.eurprd05.prod.outlook.com ([fe80::f132:2cc:34f2:5e4%7]) with mapi id 15.20.3541.025; Wed, 11 Nov 2020 17:05:01 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Cc: davem@davemloft.net, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com, sandeep.penigalapati@intel.com, brouer@redhat.com, pmenzel@molgen.mpg.de Subject: [PATCH v4 6/6] igb: avoid transmit queue timeout in xdp path Date: Wed, 11 Nov 2020 18:04:53 +0100 Message-Id: <20201111170453.32693-7-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201111170453.32693-1-sven.auhagen@voleatech.de> References: <20201111170453.32693-1-sven.auhagen@voleatech.de> X-Originating-IP: [37.209.79.82] X-ClientProxiedBy: FR2P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a::23) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (37.209.79.82) by FR2P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.21 via Frontend Transport; Wed, 11 Nov 2020 17:05:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4cf2ab15-feb3-4e64-32d0-08d88663ed17 X-MS-TrafficTypeDiagnostic: AM0PR0502MB3921: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5CpW6J6A3xp1nouX7YzDoKKAuI3EvbZKm+Pm6rceiMfiRcY1q2wEshuO2nlbyvv16y64uq7cdrj1qEjrkMvhaKlvtZtYT6rSFyOiUAfjOvA0QQ9OuIRldn22Zb2ucbTuqThbPSB39onH5CzsQaJF2c/AxCgxMc/eDCZGEYAvnrZuZeog/ArWw7cd5uGAnJ3sohal2vbD37opTdmjDsxuV0M/l3qghfuOnGXkDIm9IzZqEDWFHkhl9jLMFFHLQasSUIWU6G+IZ8Jao4bGJ2glIy9MgiB5X4n0s1ceUnltk8b3hrmDXgcSin71ULIMJ6sNuaMCOR9IiVzTrt00/m3Ci13GFJ3YY44efPMsYRoqoCWNkZoleEn2RVGfz303FDVR X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM8PR05MB7251.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(346002)(396003)(366004)(39830400003)(376002)(16526019)(186003)(5660300002)(52116002)(69590400008)(316002)(8676002)(4326008)(66556008)(7416002)(86362001)(66476007)(66946007)(478600001)(83380400001)(9686003)(1076003)(6666004)(8936002)(26005)(956004)(6506007)(2906002)(2616005)(36756003)(6512007)(6486002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: TrFf9LEZp05mrnMfCYczrd7adv1PyWU8M5ZrXK6Ipr4ip5HcksfPzYL3J1aj8hq6JkKUDAgq2IU4qvmR+hxzFkFk/983UleGZN6kAcRg/bXDb4f5u8PLVuC0oa7WrLOEBF0YCt8FKpf8pyI7fIRYdDRXuI1EwsxuNwR0mAdr2yHBdLKbONV6ZHeeGrzdMdzH4qHcxWNn9vMeXEF9yQ4OgYEM/bjUNO8oWz+ETnSOqOOY2GobwrPc4nafNohqYTgQnHg0EQp6xJsMSJGOzuAPr9iiFx5ph2gbumoMkdI3qdjLBKaJngay+trV52bAPZZ74M0LUsG3KbFJixhzNcOG7+FLKoEZ5L6H66Oqc6D2cdPIT9/zcrs6cu/htKHOVnbNF/QtyiD23KTiqZjnmO3MKs2XnOgKZyVo44b6xVyA+yjyMTMs0n32uY17y48hbJUtRQNdWRdOsl3M7JGK0/dcxFyzV+qLiqrGsFQzraHOn1cdPi+BngyCc3iWY0TZx1LRL7z4Dt1kykRr8Rfq0ldp9yfc6KMKw6eKmjW4DbvtpIAG5tAffbdfqWI3UpgsQ8M1EauUtcjI+yAOTWD0edDeuah2Dyvnh2AOaH0NzvE0dAQO4vHV+NZa43pEx5SX9R9GH5Yu5aeK28kteiK+Tb+FiQ== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 4cf2ab15-feb3-4e64-32d0-08d88663ed17 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2020 17:05:01.3337 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b82a99f6-7981-4a72-9534-4d35298f847b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ICRdfNfN//IvxPmMyQlobgO+AAjI932oeYBbDmQwUGHxGIrC05g89AG3hLTLXlVW7HQX/3kk/TQi8hRpLr1b6rfVMGWDoKkL5cMuQtCK17g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3921 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Sven Auhagen Since we share the transmit queue with the network stack, it is possible that we run into a transmit queue timeout. This will reset the queue. This happens under high load when XDP is using the transmit queue pretty much exclusively. netdev_start_xmit() sets the trans_start variable of the transmit queue to jiffies which is later utilized by dev_watchdog(), so to avoid timeout, let stack know that XDP xmit happened by bumping the trans_start within XDP Tx routines to jiffies. Acked-by: Maciej Fijalkowski Signed-off-by: Sven Auhagen Acked-by: Maciej Fijalkowski Signed-off-by: Sven Auhagen Tested-by: Sandeep Penigalapati --- drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index b6c793441585..74f0f06bedff 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -2919,6 +2919,8 @@ static int igb_xdp_xmit_back(struct igb_adapter *adapter, struct xdp_buff *xdp) nq = txring_txq(tx_ring); __netif_tx_lock(nq, cpu); + /* Avoid transmit queue timeout since we share it with the slow path */ + nq->trans_start = jiffies; ret = igb_xmit_xdp_ring(adapter, tx_ring, xdpf); __netif_tx_unlock(nq); @@ -2951,6 +2953,9 @@ static int igb_xdp_xmit(struct net_device *dev, int n, nq = txring_txq(tx_ring); __netif_tx_lock(nq, cpu); + /* Avoid transmit queue timeout since we share it with the slow path */ + nq->trans_start = jiffies; + for (i = 0; i < n; i++) { struct xdp_frame *xdpf = frames[i]; int err;