From patchwork Mon Oct 19 08:05:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1384064 X-Patchwork-Delegate: anthony.l.nguyen@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=gS12ox6t; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CF8r15zMzz9ryj for ; Mon, 19 Oct 2020 19:22:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 77B278751D; Mon, 19 Oct 2020 08:22:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zQUljZAl367T; Mon, 19 Oct 2020 08:22:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C9A5F87509; Mon, 19 Oct 2020 08:22:07 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 408371BF368 for ; Mon, 19 Oct 2020 08:22:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3B9EC871F2 for ; Mon, 19 Oct 2020 08:22:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oiTbQKbTMCDh for ; Mon, 19 Oct 2020 08:22:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80090.outbound.protection.outlook.com [40.107.8.90]) by whitealder.osuosl.org (Postfix) with ESMTPS id 42DA486F87 for ; Mon, 19 Oct 2020 08:22:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RjKfV1G3wLJ59pKWVPhwuCR/o8+5zyfNtK8cW+qWl4Ie989nnrD77Gik9zIgKMjOOCCRbXaGpGKu87mhL67Vhyi0eHMKvpw2o7lbU1yc+ugiDKrz3HcaFFBYDyH+8Qxo+JtvsHNDoxiGdhdqHwGLTEHTXo2lAJVcKyN09trNmt5ITM2TgtRDY5+tpvuqPQ1foSt25XVK2YDiR/MyB3aPKYmk9V4mW28yyib3CGJ28px68PrjFJ3iJSgislfMpqArkM489sItbnGb3KXGkb8T6NzDObG+oqWUQsagWA2Duivst4AYZOeDUpBwNNRomXUcn/yuq4AWgLVEdBzSyQzKkQ== 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=+ML1Jr4rpGhlSJnhscDV85+BFh0iJabHWLoHDPCVXwQ=; b=ANMqR6ufyqZfaMBXR2Qcu8oNL46qUDXGH/8PzcEvknFcq5OmjUncG/y0nJ+HnO+YhdR+vSkAUOFGA7kvLlLEFg3+Ea5AAiX01aSv81NEo9J2Ponmm9/+3ysqYPzKzlXR/6iGzruPlNYnwp/lZp/g1ZpzOKiav6p35NBBsDzzWX/GtEgLnCL6U/NtU6mBIIDglF1Pwx1ZDd58UK3qHuucD4w6vOJaAmJwW2/3oqAY3VhshlouwyoCHWTNxHh1VXKG/g9U9tLaeLclNUBTVW/2gmGUkyIVctlwJws0+3nlMnS/To4seQ085h6nuggV9XCxiycz8RszgwwVK9+2q7tixQ== 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=+ML1Jr4rpGhlSJnhscDV85+BFh0iJabHWLoHDPCVXwQ=; b=gS12ox6tTwUKNTGFWi88fh+HvxaxnZsWmUCLoJd1EcURgIaDqKII7CHO7cCJgk2EEsrCVPuz+A8CyQsE/HgZQn0MjY03rRJomLLbxR+cR+0AqA6W3lTvkX/ZfqK1ABYcPqMm26HNQ1d0UOiVCWPjN12gyzhlNPPwz+4yx/SW4G8= 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 AM0PR05MB4259.eurprd05.prod.outlook.com (2603:10a6:208:66::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.24; Mon, 19 Oct 2020 08:05:58 +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.3477.028; Mon, 19 Oct 2020 08:05:58 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Mon, 19 Oct 2020 10:05:48 +0200 Message-Id: <20201019080553.24353-2-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201019080553.24353-1-sven.auhagen@voleatech.de> References: <20201019080553.24353-1-sven.auhagen@voleatech.de> X-Originating-IP: [37.24.174.41] X-ClientProxiedBy: AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from SvensMacBookAir.hq.voleatech.com (37.24.174.41) by AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.23 via Frontend Transport; Mon, 19 Oct 2020 08:05:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ba4a0a7-4c25-4cdd-2de8-08d87405cfb0 X-MS-TrafficTypeDiagnostic: AM0PR05MB4259: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:431; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IxdPDmFGPNNFemYt5EeysO/gQahWteQoYpEYfGDPmd79AvXqOKENH3TJ5xUwVkWX7I9E/tao+2seXlRn3dMGwP5tgoPMsINtsruste/W1Ha6b46t8tlcGzizYgVt9NYYDEDwKA/kZsQO//PL/4adrSM3ZEIh75P6H9iXbYjcHdZbEj2WcBOsCR3vV3uiGvlpVJLLzRJzhcJNCPUsZAVoxTYi/gx8Hqfa4O06NCAtG2PiRk2ZufGuroU1fKaffQ+XDHsx9DCQxL4ShZ24lfIF6ScTfGcl9Z9pinAd2OBm0tptpkzPnOLOH57FdD3Ouo/F 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)(39830400003)(376002)(136003)(396003)(346002)(366004)(52116002)(956004)(2616005)(16526019)(36756003)(6506007)(186003)(5660300002)(6486002)(4744005)(8936002)(9686003)(316002)(26005)(6512007)(8676002)(7416002)(83380400001)(6666004)(4326008)(1076003)(2906002)(478600001)(66476007)(66946007)(66556008)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: U4VD7dzAZLVH2YJNjfLyq8E9H1j3muX9FQswV3q5Z0eYpt4YxZC98GYV72WO2ueV34kiuKg036tuikUYIhkD00OKBoW9vI9Zk1bPUAA6NwCzzflQlWy1HWkN6bd0sZVw+VvzZPlgpflRshYTvj+iwTT+VpyGlyS/rF5bR6hawacqSHEEkhnmfJWBGW/eCB1ef4tPKsMKI6JtlKwUWEw0UibcSFNBJ1diXHCs79XT9WY84vo464e/VnNx1mWSX+w92LetA7nIFD5MNAuSMdX3V+0nGQaZEW3QE8hXSTgfBH/Nf65e7RIHqGHE4mLZb5fm6WJzmlRIBOO0LoJTRKy2OZUtn2xsgPCcWroFmFhyHwG619R6+8b+i5QXwBANRsIxcve0geuA6ZFOPpP/NzyAZb1BrDYSue/uyYnlV8qFQ/lrwFe3PvByl+7hVcUkLYslBCJgcWfvAHZxDMAaSNbRdLyATV5ZQCdWH/iWJB4l1h0Bz+pS8xh7LASGY8HSeV5c0OJvjo2zMeDo2dHRMwYLFkeej1Hktp8eiCaEZMJCq4wQNqsxS5IhhvUlUN7xFdesq1dsBZd9cEE/OtnHaB9trj0yQ9AlwGoDOIDGsk8EdiVZV6DT6nA/MKmPy74CqgDkgFY3eTZnSBvMmtDEt/Xmaw== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 8ba4a0a7-4c25-4cdd-2de8-08d87405cfb0 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2020 08:05:58.4030 (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: Gdsc2JMUj22NFgZcDiBZbyXcrm8liYJ6NAwK2CW0biX1gjJaT4MtLGf5xVHlRa5/OrnDs1I8j+OkJDne9xDJk+8jvcpW3ehW5kKk0/+L0Ec= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4259 Subject: [Intel-wired-lan] [PATCH net v3 1/6] igb: XDP xmit back fix error code X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nhorman@redhat.com, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, brouer@redhat.com, davem@davemloft.net, sassmann@redhat.com Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Sven Auhagen The igb XDP xmit back function should only return defined error codes. Reported-by: Dan Carpenter Acked-by: Maciej Fijalkowski Signed-off-by: Sven Auhagen --- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 5fc2c381da55..08cc6f59aa2e 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -2910,7 +2910,7 @@ static int igb_xdp_xmit_back(struct igb_adapter *adapter, struct xdp_buff *xdp) */ tx_ring = adapter->xdp_prog ? igb_xdp_tx_queue_mapping(adapter) : NULL; if (unlikely(!tx_ring)) - return -ENXIO; + return IGB_XDP_CONSUMED; nq = txring_txq(tx_ring); __netif_tx_lock(nq, cpu); From patchwork Mon Oct 19 08:05:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1384058 X-Patchwork-Delegate: anthony.l.nguyen@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=JhyQT9DB; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CF8p14rHpz9sRk for ; Mon, 19 Oct 2020 19:20:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7063D86F87; Mon, 19 Oct 2020 08:20:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ggPuNDo1u4mG; Mon, 19 Oct 2020 08:20:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B9098721B; Mon, 19 Oct 2020 08:20:21 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6758A1BF368 for ; Mon, 19 Oct 2020 08:20:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6279E871F2 for ; Mon, 19 Oct 2020 08:20:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AXWpeu8WddP7 for ; Mon, 19 Oct 2020 08:20:18 +0000 (UTC) X-Greylist: delayed 02:36:23 by SQLgrey-1.7.6 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20139.outbound.protection.outlook.com [40.107.2.139]) by whitealder.osuosl.org (Postfix) with ESMTPS id 72E8E86F87 for ; Mon, 19 Oct 2020 08:20:18 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jMvUeXQ8uDO/IvosmPpqojJ9C3DdOdKV+VtMRXEM36M3W7Pxn28MtdvjJO9+zv0Yt7sAc8tus2naRrTm1R7vnuNMzD5t2/6hBcvVX4s+2vf0LUyeasL2NGmybEg5Fdi8v0APyRcu5vk6pYkR0cdff4NbRTIEaLZ3wH0M7zOMYHGpB9M49as5bp0C94VBLimM5q3nFSGrSaLnoU7Wgp9auxhy1aw8Fx2V7dl6NWeDK8TbH8IwnGaLGrsHXfdiA97eYil+ZKznpOhuz3IHx7c7lpMH1qkH682poqXI4VOCIliR/dxwFbyqSKBpC/y/icXXz0R9MgEaEwRBjH8nQsCfBA== 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=o/zjsxodsPWfYciQ7+XzoB5+Pjcy5WwsLEjLEmYqfGQ=; b=m5JDTxHW+GiqudMrIj7rohCKTUITuLSgC4CPf/sJT+cwsBPhBvy5tsRrfOhzHhUpG7Kp66Z9BikMrjlsoq/5PGJPoyLr/JoR1nqJCVp2YIiHeTuNwMbuPNHushouckavdT8IZu5yyzVfnbKqWA+b7D9pt1nd/yvVxb9bb/47JLZnmSZPAxll5xYcsMBwwEuFHjosa0qZQfw9RYQ28esABHSj08dQamIrNxPkJi72Lfivw4T1nMfOBrmvk0Qhb17cAYqsFQBLVrvQvWzYN3uIBmWNWGB5lySk0ShjO2624OQj7Z61Obftszr/eE1iFOWhNunkBcRZ66jcOf5XWr3/0w== 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=o/zjsxodsPWfYciQ7+XzoB5+Pjcy5WwsLEjLEmYqfGQ=; b=JhyQT9DBi/IbxJEv63Egf6I6BQqo+QtKaXcic/bTEDDz68SuwK1DSkbhhQ2p+EIjm2sIiZmA3ilA0bmUs8GwwaRhYudOpbrZeyLzE3Goe4Y1KNfUMFnV3g9rGYOC2bSMC9ddjzwRvPi7JqYQZmzrjtJAi/uGwWgf+i1yqNGCFig= 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 AM0PR05MB4258.eurprd05.prod.outlook.com (2603:10a6:208:64::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Mon, 19 Oct 2020 08:05:59 +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.3477.028; Mon, 19 Oct 2020 08:05:59 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Mon, 19 Oct 2020 10:05:49 +0200 Message-Id: <20201019080553.24353-3-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201019080553.24353-1-sven.auhagen@voleatech.de> References: <20201019080553.24353-1-sven.auhagen@voleatech.de> X-Originating-IP: [37.24.174.41] X-ClientProxiedBy: AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from SvensMacBookAir.hq.voleatech.com (37.24.174.41) by AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.23 via Frontend Transport; Mon, 19 Oct 2020 08:05:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4008e56-3bda-4da6-3688-08d87405d045 X-MS-TrafficTypeDiagnostic: AM0PR05MB4258: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bias4ulpr9/u6ffP8vxlwRprwCCKI2Y9RTi8KZlQjGm0ktqrn5M7jMJZ9Xbkouds6TKut7KgE3VVbjXu54+8iY2lm5e/W0ofgDErIUVPWfXO+DOyct4f75BEet5rLlZPhqFtMpouSBinCpg4fGu+I5BQi4fFgRNn9pcBzxF9izwBwMdlRbSqh+URM5nT2cSfvSXUiOs0QU6crjkBWBhJThJPzo+u7mah7KY8EsvSzcsm8dS4HI5BrIT9QDY9A0Ej2KMme6AA6p2HcqcM7hO7l4PdwSdSDoiszw0lKmW7WMa/NmniL+ezL5+Uta6McZwKgHjlSUKDCTj0OacBNgz6AQ== 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)(376002)(346002)(39830400003)(366004)(396003)(136003)(956004)(2616005)(6512007)(478600001)(52116002)(316002)(86362001)(8936002)(6506007)(5660300002)(9686003)(1076003)(6666004)(2906002)(66476007)(26005)(4326008)(186003)(66556008)(7416002)(16526019)(66946007)(83380400001)(6486002)(8676002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 6esoqGMOis1s9obhSFhm7tFiaRUEMJmB1cF8bpPuy76zVdvPisMCqtMPWs9hFwgYDHd/ZOjte9jjmpjuWCiWTP7ui8DmcKJPb7c861ctLWHuulsWM4cXlME6e2zGKyqjBSBp6URgKHLGOkxy13WLrD2w1/cCov2YBhMfDqJg0D46+tPlIw9UsFCeqKcEMACtciDuxtlBjkw2pHeIwbiBNwMWG23GYmaPLNG+yMV9ymwxfYrlyjVJFzgql0OUAEfEMxNtTF5/DBA+G4qFYAiBT6Swekdnyb0kFNkaWYLa+yittmk+VIS8/1DkBhm5O/6GZFy6K+SPLjPBU8JwOI3KVScp10G3F00j2MC6H0ljevFnfGwI4STAtoRSkUgiQe57s7wvGDQFsZPeZCoWWeqezRrdCn69tcFilzLmgQeaHUkTxUJzg2F8nTaMbSC7YOxyh+sbxO9ddSdll5geJj8zZm0zBLMZCXdTEYYsf4up2dWE6nhed8HovlKTVs6fAfnUyrTqxaeJYiCA/HHqZCSQBr2z6XemZ4zVFE28aMCV/mdqp7UW31cQaEAIT2x3aDoDnOhFaNA3rGT5DGKlGUgfez9lMBdriZ52fRhymGnWcGaa0wy43gtgRy7svsO8XcIZY7Gc3v1zqWEh9/f6kdtMnA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: e4008e56-3bda-4da6-3688-08d87405d045 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2020 08:05:59.2627 (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: 37FhHkXjBa0MHaJmq4T2WA/WVgK2HiGo8DjJaKjnTugHeM8WK4ArYgD+Bf3v+0QiO9+tKO6nbESgqB5YqUTnF3qSbfH89h0YPhKSFaB8x6Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4258 Subject: [Intel-wired-lan] [PATCH net v3 2/6] igb: take vlan double header into account X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nhorman@redhat.com, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, brouer@redhat.com, davem@davemloft.net, sassmann@redhat.com Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Sven Auhagen Increase the packet header padding to include double VLAN tagging. This patch uses a macro for this. Suggested-by: Maciej Fijalkowski Reviewed-by: Maciej Fijalkowski Acked-by: Maciej Fijalkowski Signed-off-by: Sven Auhagen --- drivers/net/ethernet/intel/igb/igb.h | 5 +++++ drivers/net/ethernet/intel/igb/igb_main.c | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h index 0286d2fceee4..aaa954aae574 100644 --- a/drivers/net/ethernet/intel/igb/igb.h +++ b/drivers/net/ethernet/intel/igb/igb.h @@ -138,6 +138,8 @@ struct vf_mac_filter { /* this is the size past which hardware will drop packets when setting LPE=0 */ #define MAXIMUM_ETHERNET_VLAN_SIZE 1522 +#define IGB_ETH_PKT_HDR_PAD (ETH_HLEN + ETH_FCS_LEN + (VLAN_HLEN * 2)) + /* Supported Rx Buffer Sizes */ #define IGB_RXBUFFER_256 256 #define IGB_RXBUFFER_1536 1536 @@ -247,6 +249,9 @@ enum igb_tx_flags { #define IGB_SFF_ADDRESSING_MODE 0x4 #define IGB_SFF_8472_UNSUP 0x00 +/* TX resources are shared between XDP and netstack + * and we need to tag the buffer type to distinguish them + */ enum igb_tx_buf_type { IGB_TYPE_SKB = 0, IGB_TYPE_XDP, diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 08cc6f59aa2e..0a9198037b98 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -2826,7 +2826,7 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type, static int igb_xdp_setup(struct net_device *dev, struct bpf_prog *prog) { - int i, frame_size = dev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN; + int i, frame_size = dev->mtu + IGB_ETH_PKT_HDR_PAD; struct igb_adapter *adapter = netdev_priv(dev); bool running = netif_running(dev); struct bpf_prog *old_prog; @@ -3950,8 +3950,7 @@ static int igb_sw_init(struct igb_adapter *adapter) /* set default work limits */ adapter->tx_work_limit = IGB_DEFAULT_TX_WORK; - adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN + - VLAN_HLEN; + adapter->max_frame_size = netdev->mtu + IGB_ETH_PKT_HDR_PAD; adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN; spin_lock_init(&adapter->nfc_lock); @@ -6491,7 +6490,7 @@ static void igb_get_stats64(struct net_device *netdev, static int igb_change_mtu(struct net_device *netdev, int new_mtu) { struct igb_adapter *adapter = netdev_priv(netdev); - int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN; + int max_frame = new_mtu + IGB_ETH_PKT_HDR_PAD; if (adapter->xdp_prog) { int i; From patchwork Mon Oct 19 08:05:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1384062 X-Patchwork-Delegate: anthony.l.nguyen@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=FPQASAYM; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CF8q511cFz9ryj for ; Mon, 19 Oct 2020 19:21:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BF9DF87509; Mon, 19 Oct 2020 08:21:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YIZzwYE0ksUx; Mon, 19 Oct 2020 08:21:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4E348875FE; Mon, 19 Oct 2020 08:21:17 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 242401BF968 for ; Mon, 19 Oct 2020 08:21:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 20EAE871F2 for ; Mon, 19 Oct 2020 08:21:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RZZSgZzcEMah for ; Mon, 19 Oct 2020 08:21:15 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2109.outbound.protection.outlook.com [40.107.20.109]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3D33786F87 for ; Mon, 19 Oct 2020 08:21:15 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KTYV/6DakuoKdn+9oljS9SAzt3SQdmxCMpK/axzPFOY/jUhkKe1mkb8Hwpvv2rxVb47icICLTkybu85sA8RuJnBQAjfuTest50l6XVIjiTiOJxNn87V2cHE5O829bXn99SZ6mkYStL0XhfSKxO6a2UmBr6k9/k5VBbWH2nWNLjADO9zG2ABJtDk3MxsfKTVWyyTPPlv0gxUcWSG5/DOp8vek/E7esTuxo7DJyjXjNLZ44PX7MwIQ2Vu7G/TQEs2TJlJvbwwcYzjkcVQDbH1Wgx8CXpyEEvFhRDTT0r3Ov5Dw62IK882HDyxBo2R3ccza+qV4gqFYZxSAtSWbwRW1zg== 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=6y4wzDIDQQof8OkQozqxXc4WIuTkpLbgW8xqDDZT+RE=; b=SoqIYO/Dv4zCAzefK4UsSxIEb9EK1hnj3woHD57ZeYf3RUPPKWnHcFBt0vhhHb6zl3yPA9p06xm6jE2+E/IAVCvkgUCkovEWBFHQyo6i6jn6eyp7KAe4aCbz6BGa1jkpPy/6SEv+dgw4q5qb5OhYUQobrXD28EgwsRv5OOEGyJRyf2TQEZm0mkXa1W/U4JNigBuLaCYwI96VJRg8t6Cz4+Kv2PWUhe/E1twoWzs2dwvSyyiBO1j3Dr9dgMf/+WUHFyf+V1yPiC3kUGejMMxL8HpYwjY+Ge7mR7IUk3fvPSCsaQfuXQbu2tx3ZCdYuWIW9XinWNJNHWytGg3hiaQv/A== 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=6y4wzDIDQQof8OkQozqxXc4WIuTkpLbgW8xqDDZT+RE=; b=FPQASAYMHuydtASlT3lVNYiwRrs1lTrvvJsKtM+mbKGPfH6RjQJCq4kXPoturl09Kr1ByihBpW42TSGZ3MeR8OB5crZvipCJD619E6IB4e/PfbNDuQI8vSP87UmCZdyW0fxAkiBEhLwnaFx7Q9i6G0zk3uLOQc2p1z//SvU4HNQ= 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 AM0PR05MB4403.eurprd05.prod.outlook.com (2603:10a6:208:65::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.25; Mon, 19 Oct 2020 08:06:00 +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.3477.028; Mon, 19 Oct 2020 08:06:00 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Mon, 19 Oct 2020 10:05:50 +0200 Message-Id: <20201019080553.24353-4-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201019080553.24353-1-sven.auhagen@voleatech.de> References: <20201019080553.24353-1-sven.auhagen@voleatech.de> X-Originating-IP: [37.24.174.41] X-ClientProxiedBy: AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from SvensMacBookAir.hq.voleatech.com (37.24.174.41) by AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.23 via Frontend Transport; Mon, 19 Oct 2020 08:05:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 43317ad7-9592-48ef-d332-08d87405d0be X-MS-TrafficTypeDiagnostic: AM0PR05MB4403: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QxvYcE2BgXhXoFwR8rMFvbqmYhTpqaN66QX6NC8adwSsT+Vbu/8kiGLczdIMaJ+omsDOfr+hzK8PFf+hSAgJTdCdNvVPAL1RbMGKPrZE+3X4V698BzjoCGIMxV4IHx/sJXcSkOkYZMrTz0MGM0c/snSYIBc7mH9JlxmAqj60db2HhbiTBrN5azlDHTKV9jT6hJ3awIahlmlAQN1DG2QLHwc4GoDISLacU8dpzWMaESE81LzvWlvsvrGkx4rcZ7VsqKXaKUDGxHZIc4KWBwdlVISzEDgUmVURqWbtbn1sPZPmwTdiL9cP3e0nIyiWDuLmEqgmawNGc88010wKNpheBQ== 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)(376002)(39830400003)(366004)(396003)(346002)(36756003)(4326008)(186003)(86362001)(66476007)(66556008)(16526019)(8936002)(66946007)(2906002)(83380400001)(6512007)(8676002)(9686003)(2616005)(956004)(316002)(15650500001)(52116002)(5660300002)(6486002)(26005)(6506007)(478600001)(7416002)(1076003)(6666004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: l9bIIXjqAO9cE0axkW2tBzfwslX0Ui8/YYNp2EBcF4Ll4gOUInrjZcsLU5PvxAdZsfBpBcacoUR/aap7UZvTwPy3En9Kq+Z7R5XeU+O7tXfWnNb2+5OtFdp0UBaP6Ul9ZFyE8vTR4W22qompO8ezNBogtv2ZDsOIDxm8494EYf/bTlcTmlylCC0E8XBsntAcmdfQyNt6GeN8ndnyCin2JV8q+LTDsC4bMPb/tabhsNPGsMXb88qOngvdN4U9Z+Mh1BcmsSV4YULkyCRlSlYek/llnSWdlrrNQA90A5b/ZWzxDJ6DC1iCRdoI9deuXGtvSM9SU6hOVFmQA+k61Ordsf1Z6S+Yd8DNoQdCyO6Pq+vXdKqajU+QSi8OwrIGB6faDKd37B1Bxq9sp+WApap+PQAyl1mzCAI+bdjBLNszxXrnRcRNZWghfpW68fMPeELM+QSpu5BsmF7cMqXGHDG93wFfldBEx4T+zYNhJqWfjx5L3DvWIbImQXk27yj+6CL7hLPrb5cFHc3N4ApLvQRGlxPf8b8NS6cvR6FzSzHDT4oJUKDx5iYb+armPGaygCDdfr4u4Mth+kvr0waZ2lldiSQ2BeHiWJ5Qde3JBs8g5cqKNw+GFm31CM2JqhZeaDCGsNlagRy6eQ6ZlcPzv3bU1g== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 43317ad7-9592-48ef-d332-08d87405d0be X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2020 08:06:00.2165 (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: /9qC0sUMXuR2l3ys2HRK74EB7PnELjGKRPQw81ZSmtr8YJEByXZ8PWhIWrFG17i3ed6tfUmz6Sn3fDVg1yaFp3tCRt2ezWRodbbtsCnnL9k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4403 Subject: [Intel-wired-lan] [PATCH net v3 3/6] igb: XDP extack message on error X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nhorman@redhat.com, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, brouer@redhat.com, davem@davemloft.net, sassmann@redhat.com Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Sven Auhagen Add an extack error message when the RX buffer size is too small for the frame size. Suggested-by: Maciej Fijalkowski Reviewed-by: Maciej Fijalkowski Acked-by: Maciej Fijalkowski Signed-off-by: Sven Auhagen Reviewed-by: Maciej Fijalkowski Acked-by: Maciej Fijalkowski Signed-off-by: Sven Auhagen Tested-by: Sandeep Penigalapati --- drivers/net/ethernet/intel/igb/igb_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 0a9198037b98..088f9ddb0093 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -2824,20 +2824,22 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type, } } -static int igb_xdp_setup(struct net_device *dev, struct bpf_prog *prog) +static int igb_xdp_setup(struct net_device *dev, struct netdev_bpf *bpf) { int i, frame_size = dev->mtu + IGB_ETH_PKT_HDR_PAD; struct igb_adapter *adapter = netdev_priv(dev); + struct bpf_prog *prog = bpf->prog, *old_prog; bool running = netif_running(dev); - struct bpf_prog *old_prog; bool need_reset; /* verify igb ring attributes are sufficient for XDP */ for (i = 0; i < adapter->num_rx_queues; i++) { struct igb_ring *ring = adapter->rx_ring[i]; - if (frame_size > igb_rx_bufsz(ring)) + if (frame_size > igb_rx_bufsz(ring)) { + NL_SET_ERR_MSG_MOD(bpf->extack, "The RX buffer size is too small for the frame size"); return -EINVAL; + } } old_prog = xchg(&adapter->xdp_prog, prog); @@ -2869,7 +2871,7 @@ static int igb_xdp(struct net_device *dev, struct netdev_bpf *xdp) { switch (xdp->command) { case XDP_SETUP_PROG: - return igb_xdp_setup(dev, xdp->prog); + return igb_xdp_setup(dev, xdp); default: return -EINVAL; } @@ -6499,7 +6501,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) struct igb_ring *ring = adapter->rx_ring[i]; if (max_frame > igb_rx_bufsz(ring)) { - netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP\n"); + netdev_warn(adapter->netdev, "Requested MTU size is not supported with XDP. Max frame size is %d\n", max_frame); return -EINVAL; } } From patchwork Mon Oct 19 08:05:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1384061 X-Patchwork-Delegate: anthony.l.nguyen@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=imvtqLmE; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CF8pz3BVcz9ryj for ; Mon, 19 Oct 2020 19:21:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9B977203F8; Mon, 19 Oct 2020 08:21:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ulrj4kDzwejM; Mon, 19 Oct 2020 08:21:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 60DF92038A; Mon, 19 Oct 2020 08:21:10 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E22E11BF368 for ; Mon, 19 Oct 2020 08:21:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DD22286D5B for ; Mon, 19 Oct 2020 08:21:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tDXuDR1KVu1M for ; Mon, 19 Oct 2020 08:21:07 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2106.outbound.protection.outlook.com [40.107.21.106]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 93F3786CE5 for ; Mon, 19 Oct 2020 08:21:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dYMVhmWAyFPSuNCLJI5ojIGcpzzZWmDOH7j8T023IpXMCdF8wWu5/eqEHaWRvOKRoktiWOo2g36W/QRZ/q3Ib2F5b5RIcBks+vL9MAG8CKCX43ov3ANSMqLZZ5rfZdKRDhQNQqlSTEVuJj7mHaXoZwrvtF9VCn5W2r+8q7C9aOMBLlr8fjU2NYMvAC9L0v6+l8XONmQ6Vx67YQRRrzrQpgYGlPTX7Icko/0kxh/zsQAHCHSikmnhELvHCKvr8ZkyJ3wJPvZROiP8Lb1AZOqCiHJKGwFwa7795gEjpGO+xtVqa6KToCeXWVVHZ9yv8KHWt9yAw7yNWozbrBXkKTrHjA== 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=kKsASKRtt4ZRrm6/wCKM85dRjL8wNXrn5nVCKqzI7Es=; b=mvQE0cRxKLN1/335VxyduiRBcELNi25uLlphH9a9CvikUyafjT3i17vtP8sAHCc6qUR2Qx6DwYch7m8yHq4wvlHAKH9FHoP35wlKXGOlrol2p/MrIk5MDmzz/aqlI8/ZZsKX/takS+EXSY9pmOMJBDHAb0IIkzsAzawrunbi9jnOuXn8yaicTHOAU2B32qEQbxgbZ4faEzSNhg9lBp6z1UOd4/sl+9DrGtFeUj973GRuHjWARs1X9D63/ML/7QhryIp9Qu1/pDc4prkY3KSIJ6Ap3RTW6EnHRm2XMlzNMGE2nsKVOgu0aYXhbDgQ+OgII03ECZTLCWi40/I60g5npQ== 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=kKsASKRtt4ZRrm6/wCKM85dRjL8wNXrn5nVCKqzI7Es=; b=imvtqLmE8hpvFTtLhGS5wlnl3CIq4Tg0aYXMN4nBVsj2EmqtB4zWJcQSfqc/+6IbJcE7xV2wGJ9k4wC3H27Rp14F2jpHCJI7dBdtYUZmbpHBhaU2L7rhYJDfyAg94zOx3GtEJjDwOqN2mLSvAiwX31grlv1VMPaBFBZQKTgZAB8= 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 AM0PR05MB4258.eurprd05.prod.outlook.com (2603:10a6:208:64::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Mon, 19 Oct 2020 08:06: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.3477.028; Mon, 19 Oct 2020 08:06:01 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Mon, 19 Oct 2020 10:05:51 +0200 Message-Id: <20201019080553.24353-5-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201019080553.24353-1-sven.auhagen@voleatech.de> References: <20201019080553.24353-1-sven.auhagen@voleatech.de> X-Originating-IP: [37.24.174.41] X-ClientProxiedBy: AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from SvensMacBookAir.hq.voleatech.com (37.24.174.41) by AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.23 via Frontend Transport; Mon, 19 Oct 2020 08:06:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a44c9d23-c4f4-4946-1cf7-08d87405d15e X-MS-TrafficTypeDiagnostic: AM0PR05MB4258: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2201; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OQVXlcBC82F4lW7JZGtcmSAxMfwEVakqBpMOTwftOzk5VMebKZcXuI86JNAXkVI10z7bjiLpa7c5xCMCvQ4mt5vCx+kIaCrSIhBdRMuwk5LBGLfN0zkW6NhgWOJBzclKD6ASRhb5Gmil40UIWdNwV8gUzlyv9EekmUXAwUBjr4JWofN1AqSGSqdFckx0cqfbrechtqYw1g4sDKZ+LWvIR0rqKSkLarabVvRopEMcZyxlwhBEoolkbpTTOu2JcciuzWe+yVfU0whFXB7GI0FyZ7rPBmBLk5SfTyP4REQ+8KNwvZWS0ERN9etu29Vc8aZuM/6/09Fq3ytX+7O5uVEY4g== 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)(376002)(346002)(39830400003)(366004)(396003)(136003)(956004)(2616005)(6512007)(478600001)(52116002)(316002)(86362001)(8936002)(6506007)(5660300002)(9686003)(1076003)(6666004)(2906002)(66476007)(26005)(4326008)(186003)(66556008)(7416002)(16526019)(66946007)(6486002)(8676002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 12dg/ubbhdOIj/FYmek7FoISha+wVPW5WAunoIzPLcc9pX2438EkGZbtiV3Nf94yQ5uFJgR1nIlTHp3/p5AUymJ6wI9HaCM3EOCb6Z6YVjQNlh43To6CIfjXPnE3ClgYBZViji/cGkTyZC4rzEl6gKF/HMbo0mchjoyFVcLuURhHkQVr5BEmbsxCBYBMDQGGS51Nzc/HdxZbpv9bezDUUYj5ebP1nQOXxzzad4sTfifqyMQP7iQSZuatOp6Xxcpg9gacIFGJVsIxuYflWMm7v2sgPDi6xrfixpd3aeIaTTNMZKc4YyTSdq4LKtJYxG8cfT+nkcQlCKKmTyY4UoO6qEN7kql8o33F1zKOU6Cv/nsPbSoxK72rIvW4OH/RRpDR27cuFCWhCKOMss4PqW/ywlbghgSxDWIoJFwES6AAopd09/1qrNnsqLAVFgcpa1tx8vSDAO5qcQSTWIRALDfgaihicdBfkvPfgx454FvwMDHS4EYJPM4SOmjh/oAG3IeCB0wtvvbwcf7X0hHzmY2xyPDQoRev1nkfKK51VZF2nIrAjec/iZLIRly2k09GdMNjPbkC8/RdhkT33MV4pDdlCPdouL//i3xuKCMnOkidmGqx+8qFpE8GAqjQ4xLevaA+Qs+MCMqE4HsbwfqLrLeRKA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: a44c9d23-c4f4-4946-1cf7-08d87405d15e X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2020 08:06:01.0732 (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: TQyj88flFDju+VkSYPcbPp9hAlqtrLPkgxqN9fGNfOLrYTziPq/lViip1v9dBw42T08uBGbxroAvEz1xRKAzzd3A2dNqeVc/VoUwFN6YckE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4258 Subject: [Intel-wired-lan] [PATCH net v3 4/6] igb: skb add metasize for xdp X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nhorman@redhat.com, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, brouer@redhat.com, davem@davemloft.net, sassmann@redhat.com Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Sven Auhagen add metasize if it is set in xdp Suggested-by: Maciej Fijalkowski Reviewed-by: Maciej Fijalkowski Acked-by: Maciej Fijalkowski Signed-off-by: Sven Auhagen --- drivers/net/ethernet/intel/igb/igb_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 088f9ddb0093..36ff8725fdaf 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -8345,6 +8345,7 @@ static struct sk_buff *igb_build_skb(struct igb_ring *rx_ring, struct xdp_buff *xdp, union e1000_adv_rx_desc *rx_desc) { + unsigned int metasize = xdp->data - xdp->data_meta; #if (PAGE_SIZE < 8192) unsigned int truesize = igb_rx_pg_size(rx_ring) / 2; #else @@ -8366,6 +8367,9 @@ static struct sk_buff *igb_build_skb(struct igb_ring *rx_ring, skb_reserve(skb, xdp->data - xdp->data_hard_start); __skb_put(skb, xdp->data_end - xdp->data); + if (metasize) + skb_metadata_set(skb, metasize); + /* pull timestamp out of packet data */ if (igb_test_staterr(rx_desc, E1000_RXDADV_STAT_TSIP)) { igb_ptp_rx_pktstamp(rx_ring->q_vector, skb->data, skb); From patchwork Mon Oct 19 08:05:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Auhagen X-Patchwork-Id: 1384057 X-Patchwork-Delegate: anthony.l.nguyen@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=keBSGDCm; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CF8p14Jmqz9ryj for ; Mon, 19 Oct 2020 19:20:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EACD386CE5; Mon, 19 Oct 2020 08:20:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pUKvBznPHYIh; Mon, 19 Oct 2020 08:20:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0ACDA86C94; Mon, 19 Oct 2020 08:20:22 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4D6F31BF368 for ; Mon, 19 Oct 2020 08:20:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 466EF86F87 for ; Mon, 19 Oct 2020 08:20:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uDQMq9XOMSYA for ; Mon, 19 Oct 2020 08:20:20 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20139.outbound.protection.outlook.com [40.107.2.139]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5868C8721B for ; Mon, 19 Oct 2020 08:20:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ijmlYWvxUHv6bssj/Q64DTZmEg466NROL6Hj4nWlSZPI0XyqmjMjjU6utfntdA7yHJr3ol7h0/XeM6h84P5Hddkr558AnDqYuTg2K4IAG8Qc/TMXRpTWF6KWDPuDpUNbxH+BcOlazjrYaUsqwT56ROln5Y1njVu0EThgHi7DsEbtVzcb2B0iWKmXX+SsAXrnyek5LlYomOihtz3Gyl7BEbl4S0T04qSlazba7uFuvY0uJYZO175JmYa0PxPiavT7IYjwAwdl8AlkjX59yosd58ASWyVPcXZQ7+0T0TYlyoHTsApwlU8/uB/wq/gB9IEWz95VMWyC2RdIbOtR8QgaJw== 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=tDvxKoMOb6EC+yBMHdl/g2gkdbFEmd+gnSjACuJZsLQ=; b=mPOKSK2ja1Nljo0Y6tA6bJ9ByOqyerfxrUyV1mi9TNteRZrFAbgUw0r0BRC3/UllHakm8/F63j5zr1+EqhjBSxe1eQXxPk9l2XpJJ2G3owQbwuTNjfjW+PDIS7QIZmFBBxfRoHnAI+HqYO3H5Xk04zR1O9ljAMqx121ftKoCbFdKY0SYkilh/1U2/+aMqrBsAQQNr1wqeAMPjcKGtbkIcOFitRFnRmdQSXFBW702Ax44Gyq3AlFikmRpOcANYYd2ympFRHBXEuTfiZ2mVOWg0/JjR14o0cs4xdlTpdts44fWU+9elmHCS3/jWHZwK33cDLuktwqN64Dy49Qh7Nmx5w== 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=tDvxKoMOb6EC+yBMHdl/g2gkdbFEmd+gnSjACuJZsLQ=; b=keBSGDCmq+3pw2mYvaUewm39spOJTAGkhbcIa1YsDeErDEIto2+yf6HFtCwcjob2wnAmfMyx7EveI/ELwdeEhlWcLcH4o9Cbxra7Hud8N5ECpZEr/uJSocPZDfIfQFiV/cxFHRqh3FXrGJ9WetGn4U05hQ0uNqfnmqTj8Zoc9KI= 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 AM0PR05MB4258.eurprd05.prod.outlook.com (2603:10a6:208:64::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Mon, 19 Oct 2020 08:06:02 +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.3477.028; Mon, 19 Oct 2020 08:06:02 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Mon, 19 Oct 2020 10:05:52 +0200 Message-Id: <20201019080553.24353-6-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201019080553.24353-1-sven.auhagen@voleatech.de> References: <20201019080553.24353-1-sven.auhagen@voleatech.de> X-Originating-IP: [37.24.174.41] X-ClientProxiedBy: AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from SvensMacBookAir.hq.voleatech.com (37.24.174.41) by AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.23 via Frontend Transport; Mon, 19 Oct 2020 08:06:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b43ba51-8fdb-48db-8253-08d87405d1d0 X-MS-TrafficTypeDiagnostic: AM0PR05MB4258: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:651; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +st5tC9WrOd2QsVDwmRtvzSv0+4fH2o951QuFZCP6m7bAWpACV0e4p4n6vdT56WRJJxsimRsaP0A/JjQHwCFCRZ/Xybu6ivSBT6VN6dlfvL/C1g4XXk/7hVI1kT4v+tMNpXrk8vX26lBTmZTdfCSYo8HbiEtQqOswLVTTojbVdVYCaGl7pISXK7v74XfAvWmurXnqktYwXUBlx9xNgGA2mn2g4z6B95KSbnFTNji8823id13RyxHV/0xkdtg/t0jo4EIqt+HeOLdhzJal8Y+zaTEeLED4ng6mVYRCkhf8KUnIavG45KXND1x36gv31h/ 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)(376002)(346002)(39830400003)(366004)(396003)(136003)(956004)(2616005)(6512007)(478600001)(52116002)(316002)(86362001)(8936002)(6506007)(5660300002)(9686003)(1076003)(6666004)(2906002)(66476007)(26005)(4326008)(186003)(66556008)(4744005)(7416002)(16526019)(66946007)(83380400001)(6486002)(8676002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Dd9gvpkHOfb2UVIdLvw0VonzrFv0g5mmu4IHOB4F4RnzsqjbYIW0kwxWyYqMZ+4+qqoK5IyI2uVLmSQfb2xFb0BC/kQurvo2GP/sXIpo5x6ukGUbcxTrINASP8lqOwiNiORxRau9SV/ANHwqC1iBylMix8fEmXfaPO5jsdGq+svaulLiookbiu6Lj9wr4FubVc3MAX8oR7F1f4Rr7EtLjneCZbVE/+TwI464nc6yH0eAnFVmnK7N3HbQTy7l9px5/q6C+xHK2ss0LEJ7thayGrDx6AQJbmp8R3CGVxA64q1zPedJ69wfkmVZ9yYYkwPlcYzvjA8rivTS8N1Tu9SBNQYcyUASo0l0dfYlTK872fhzq4/ZmmwzUuiskaeCjqNXfiXM+LkVpJ/8evVJRSQ4RFRcGor3Jy0nqK8wlxgoWcWi74SzsVjleFGkeeJncQasysdt3Ar0aEemFO9tGsRZJAZdyS5Ei+lUkWrUBEx00TURaLUQ3Quu/w6txQIaoi+ZiPCJoGhe3oJxfyWB2Y7U37dp+t8Vj+sSXYcbwLWGI78SalWMdN9/NRO1ILaE98lif0OETcfX3I6zlmMlcb8XGdqwkPZXPq3Q9MhfcaeNLQAO7Rb3wKFta91lBNwDRjr0cs30ANB9tJSd2QQiH8P2cQ== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 0b43ba51-8fdb-48db-8253-08d87405d1d0 X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2020 08:06:01.9628 (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: u8KsSBwMzK3IVtH9h/wqTK6723HLduVu0nNlLXWY0N29Qk5i7i41ZLXKEo4UmKVIohBmNWGFvD2rJ1bFDOGnEMa9ljRNRoXMmqkshhISsYg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4258 Subject: [Intel-wired-lan] [PATCH net v3 5/6] igb: use xdp_do_flush X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nhorman@redhat.com, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, brouer@redhat.com, davem@davemloft.net, sassmann@redhat.com Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Sven Auhagen Since it is a new XDP implementation change xdp_do_flush_map to xdp_do_flush. Suggested-by: Maciej Fijalkowski Reviewed-by: Maciej Fijalkowski Acked-by: Maciej Fijalkowski Signed-off-by: Sven Auhagen --- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 36ff8725fdaf..55e708f75187 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -8776,7 +8776,7 @@ static int igb_clean_rx_irq(struct igb_q_vector *q_vector, const int budget) rx_ring->skb = skb; if (xdp_xmit & IGB_XDP_REDIR) - xdp_do_flush_map(); + xdp_do_flush(); if (xdp_xmit & IGB_XDP_TX) { struct igb_ring *tx_ring = igb_xdp_tx_queue_mapping(adapter); From patchwork Mon Oct 19 08:05: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: 1384060 X-Patchwork-Delegate: anthony.l.nguyen@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=voleatech.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=voleatech.de header.i=@voleatech.de header.a=rsa-sha256 header.s=selector2 header.b=O5hCEhcu; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CF8pR00Hhz9ryj for ; Mon, 19 Oct 2020 19:20:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 691BD875FE; Mon, 19 Oct 2020 08:20:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uKhn3ON54fet; Mon, 19 Oct 2020 08:20:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BB05D874FC; Mon, 19 Oct 2020 08:20:44 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 25EEE1BF368 for ; Mon, 19 Oct 2020 08:20:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 229648728E for ; Mon, 19 Oct 2020 08:20:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tvfvJs9YZESr for ; Mon, 19 Oct 2020 08:20:43 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2090.outbound.protection.outlook.com [40.107.20.90]) by whitealder.osuosl.org (Postfix) with ESMTPS id E8B6686F87 for ; Mon, 19 Oct 2020 08:20:42 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=er+fDsWo6/Qu21qBB2OiUGwU9l5UV1uaZGauukgrHhnPhxSJ9h1Pa9GiTJRoeGobV/u8Y1/3i3HZEBzgY6JhZjSQ40QaVrqzwBhtRsoJNL3VXZ66NVuLrBqeLr0FDOEn5aXJsY9BAf4iDeycIITLGpQqeU6lkKCBgOGYVe13Sm8OfdDT+jVCkUlD9XZsG72CrpzuqHkKZB/3ZXki3TYjI1LCMSTDLjQOK1Q2Qxycl2uGnlLSX0QuPLgRvYVFtiUdUWSenMMmSLg9HeotC1maOv7nFIB6M6d8ITeKl0Dm49fMuCnT8yVa4zNYvbpPo6bUNYExD4wfKUtiEwzVM7Z6gQ== 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=6xKBZoE7AJ/CrimoPVLbhWS2WOk2RZbITZ1BIju66eY=; b=jJB2SRhRZtT+pqh/OS8p/hQvON4vX5RunjNP+IbgP/+04eF1YuUsWnnO6e5gmVZPOaBs7t1IohWG3Xnxu7Uy9L54wIcYVsVU1xLXMQ26yrzNFAnXf+Ya6+KnYdhavyY+sDpXYLLUiuqvA1L0Xk/Fnrx07A4811ksSv6+LXyRAzQGx990wgelyNgwVC1ChSKydagaRgo8nczvV9/DDWrhIDgr64PZmAQosg7e4rWFornEoKpgE6OYo8DH+OPwMzinWgvXa3paJ5rKhsEC8Y0CMwi00aRHdTjn1hvhW+jpys64gAs3iO2mXs4OQ2A8yZyNhz38eS/eQK/qhdIhrp0CFA== 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=6xKBZoE7AJ/CrimoPVLbhWS2WOk2RZbITZ1BIju66eY=; b=O5hCEhcuTZq2c5UfKONy830Dxf0/OPidnJcWOKC3rOE3PTSt9kcgx3tVOYBvO00FYT5ombwdC+hqjP9lAJzIWwK6nazPSB839UkZBzoDa/1sI5126dihb/VlHOKyX+WEimhTVo8SUyH4RvUYfRgwTn23M271MIld64VV0B8sU/o= 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 AM0PR05MB4403.eurprd05.prod.outlook.com (2603:10a6:208:65::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.25; Mon, 19 Oct 2020 08:06:02 +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.3477.028; Mon, 19 Oct 2020 08:06:02 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Mon, 19 Oct 2020 10:05:53 +0200 Message-Id: <20201019080553.24353-7-sven.auhagen@voleatech.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20201019080553.24353-1-sven.auhagen@voleatech.de> References: <20201019080553.24353-1-sven.auhagen@voleatech.de> X-Originating-IP: [37.24.174.41] X-ClientProxiedBy: AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) To AM8PR05MB7251.eurprd05.prod.outlook.com (2603:10a6:20b:1d4::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from SvensMacBookAir.hq.voleatech.com (37.24.174.41) by AM0PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:208:ab::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.23 via Frontend Transport; Mon, 19 Oct 2020 08:06:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93534e26-08dd-4383-9459-08d87405d25c X-MS-TrafficTypeDiagnostic: AM0PR05MB4403: 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: mpDw5U/8k/32rW+0N8sG3cD1/MaHuH2UPEY8LYOQOcu5l+jIP7OCVS1N355ailYV3ujAFCVXH40MA5RseZrv5Sm4R/Vsm9HNT4AMVzUDOzvv3Q568EhwlVHupr4NeLYYRM7gnMY1CAHR7BB0Uf37YlwfzUyYCUeOOiVbboLSbkeMDtbg+jc+yaffodcJdM78WmYJRys/5YLP76HMa/aBGtHoN1BHtAC65YdSWUXsWuzeQkKdSDFWpjySmD/ibf95lhx+fFabkelgVvvC7bZ7l5vWlFPYbp9wo0UILYWuPgZfahO+SJi+U+Zc/E29/joa 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)(376002)(39830400003)(366004)(396003)(346002)(36756003)(4326008)(186003)(86362001)(66476007)(66556008)(16526019)(8936002)(66946007)(2906002)(83380400001)(6512007)(8676002)(9686003)(2616005)(956004)(316002)(52116002)(5660300002)(6486002)(26005)(6506007)(478600001)(7416002)(1076003)(6666004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: g2IU9byaDk73Zdm3FYBUkmGHnIDOaRn2rxkomheVBFGfsllgfrE52wcTOMjELS5o8QXfc3+Had8ClutidyoCn7Nq2FYGh2USC+i1oz8YINvZHmd0y2a8QF9lOoCAcaOAAqUn69WJyMCpg+NH5Bb8FWrIQld9RgWDwOLInause37zTLoUt8tJ61vxwVzXYD7dtqXSWajAXZLBFOkFhCEut3c3klhAaPaTfeyF7GVJ5Rcmv/jFHTfvaZ9lagC0PqBrHmxGF6z9+OziWsgLiw6vAFSPP3uxoaEpCeUyD0s5pAG/jrniXnH6K5eUctPj8/z5dCbxl5jKn8CkOZaD92U1iVVwy6Xk3hYc/SKDPPpWCeA/03sYORb4iNLnb7GtsRq9aCbtR7aYZ1JuSuzKkJFF5wexBIW90haLwu4xleELhU9BagvBtdQ3Moxh8f6Umpl4AZyegvDP5gvoNNJXeB2wj9Yjwla0W+upqrl8jjKcGBhhdaCdTchfOhyt4JxWhF5KPzUQ4Z0G8ElZqUakaRGbpj7A7WUnRx/e+ylo0x22HyyTjiuIhgblY8XmkFKhGpOgBVlfeOBJckC0j2wMEUsaNRrwUMti23/0YcyF8jpr4Eqcmd4YKIwc23eetYbhFLuhyHgAe4dYJdFtnhywvdU3nA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 93534e26-08dd-4383-9459-08d87405d25c X-MS-Exchange-CrossTenant-AuthSource: AM8PR05MB7251.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2020 08:06:02.7608 (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: TPfD9v3KBY9ngkXuKaLzLs/XaDeflaGe11/sDy5+vTLirf6+Q9SIqhIfRLJkkinKaU9gLZgXRBAV9uDFHXpCFwGMgTzRFE62A1H1ApUbzj0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4403 Subject: [Intel-wired-lan] [PATCH net v3 6/6] igb: avoid transmit queue timeout in xdp path X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nhorman@redhat.com, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, brouer@redhat.com, davem@davemloft.net, sassmann@redhat.com Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" 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 --- 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 55e708f75187..4a082c06f48d 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -2916,6 +2916,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); @@ -2948,6 +2950,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;