From patchwork Wed Nov 11 17:04: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: 1398433 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=NyOEnRm9; 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 4CWWLz23Skz9sRK for ; Thu, 12 Nov 2020 04:05:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CA8F7867CF; Wed, 11 Nov 2020 17:05:13 +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 iM-MJIZBVycS; Wed, 11 Nov 2020 17:05:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C8C5A867A4; Wed, 11 Nov 2020 17:05:11 +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 ADC1C1BF593 for ; Wed, 11 Nov 2020 17:05:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A8A40867A4 for ; Wed, 11 Nov 2020 17:05:10 +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 BPVZ0CmHDS2U for ; Wed, 11 Nov 2020 17:05:03 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2093.outbound.protection.outlook.com [40.107.21.93]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6BF9286791 for ; Wed, 11 Nov 2020 17:05:03 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CImt+fNEvScOEw3SMk0wZCKXAA10rVudttrz2NNxQUcSp6eA+TmazBXmebaPemKmuNSH0r5oT3x0JQt0RpYSg2tNThUJZxmrcQdrXU2QeW0NxYx/O3rKzzL06zcnQkHDuOq054sz+I6OzXmNdCkGW8gHuoJRBLp+xqngQO38zAq+hl4ZlVf8T267k5wS6NMiJpO+8Gagv22PJgad1DuHYfVA4FSRIBTuu/+roehJB0WI/buFFbZJ0mPwFIh8m49Uw7NPim7K+7LgwSdjrDFlfaTkclpNrE2wrZXbvJ1Pma4982lDVh6Ij12mvMNOav6c/xs4/ALMnzp1Gf9tQfs2/w== 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=fmJ5i3M73UqopIAFHamW7FOMU1tz/A2Q6bTiX7bli/xQlpayOZfzeHrdpgcne5TiKOua0VNJNYPLv40qIZWT52EWoQ4K5r8v77quKPyjO71McjWz+DZ+e4n7zyFqV5a2pjL8B1QouzVvE3JLCs0FFEAOQbB7UMV697OJNTOXGk26PiJXR7zg8qVyjuZ1+uFuCS9t/GMnYDTjNc7C0dqCH4/CUum8I16vCnQb+nl6NzcBvA9223vQWTbaws1ajdhpHAmmcen6THKgOUN+wswkCkgFUJtkoRd0u/LqpRdpPh22XAouOcT31nAKD/MP2mgWF5Tz8EfIz32qr9KzYrhvDg== 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=NyOEnRm9IklNiNk9p/RtKFbnLEt6AeY2k9Gkvn1yM/eNTPjnEG5JG9PM046nQsMGgkTrOt13I/2dw8xIcgMIA4cBRWltUiorfYfFfbzzefxdXkTP7Gi2hfBBBojKmrFsKZ9bgyWGx7xY5OsQjJySXKvEfDPUHqhUC+tBaisy7zQ= 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 AM8PR05MB7524.eurprd05.prod.outlook.com (2603:10a6:20b:1d3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Wed, 11 Nov 2020 17:04:57 +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:04:57 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Wed, 11 Nov 2020 18:04:48 +0100 Message-Id: <20201111170453.32693-2-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:04:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cbc60987-e140-4da8-82c7-08d88663eaee X-MS-TrafficTypeDiagnostic: AM8PR05MB7524: 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: +2rHLhijPYHaHSmC3xLO1q9G5oNOuAFUJHsKsbvk98wPQ4sB1l0Upfi7FU/HbyRyrGu++uqAdpvmq4Atwp0e+DhHhJ9QaktcF8GnLaFAvRi57eFUOhWUFpFn4i6SmH69ifwBf25VT6rwTX5FYaJGMBwA8P5zEc+CHPBslmOeOiQ/ZstT1CSJbLGlwuMxDaORyoDr+/Tb1Tbb6nFqANLvJS5cROkudZJfDq6N5m0DUQmlzFSIcKu3P0ygw8io+JUzbrxZ0lN9nOZdGJy69dZc4mKwyH2mXQXCIw4AT6rswR7ciFMp6o/iI1/TTL5SdEbBmohou1xsTuXy9kMqwn8D7z+lujmyV9g0xMHw6fAN3REvv2u+chA4ylaPCqw7a3Fj 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)(39830400003)(346002)(366004)(136003)(396003)(6506007)(5660300002)(69590400008)(66476007)(66556008)(1076003)(66946007)(86362001)(8676002)(8936002)(9686003)(7416002)(26005)(52116002)(316002)(956004)(4326008)(6666004)(2616005)(6512007)(16526019)(186003)(2906002)(6486002)(36756003)(478600001)(83380400001)(4744005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 8nqMr3WHPUMtK/nx6UOr8MdMRe2DBwj4iDgK2OYmhHZI6oVv60WyThDiDOo8CUuPR0d6Y3yGqTtuU7/wbFgfuKKgL2XG0xkdTvtxQfY8ETAJA681sds82a483za20XYdPSEMjANL8PzR8/7k1wsMZbs5BbsLYn9SNs5gLz6JgqSrj4FJjaEC7aKjn64gqHc8rmOlH2ixvd2FfRysWIWYW6zXBKrpaBryGrjKhcvc1jW50JFulCirxwkD0d8PgSQrM8cdSWqTJmvB28LBPmOH+mV/tV+xLUEO3LyDr8N43X0OJyJIiFUkCRXVPWMkB8vb5mYs5AxHKVu0fvCXUUQndiCavfilof0JVTD8D74MoHezUXw8BJHPUqhZfJOxC0bFx8W6DwRd9jHJgyJ2iPkKisyKvfWaBPJWaF1L5r5vkKkDVUhIZEWx1FppvlhnHVpSO0SFgiFZH1/1g1vcJGdrqlqWIJ2c3bDn9QgIA6hAIxRXhY9btjshSK2KJNt5memLSZ+71BK5jyq98YUS1M02C5LyYBI88Mv/SFW5MyUfh9NBMMX9h5sgu6GqOHpCdM5Rf+n7XpE0xRhtMU1047hATCdBc+cjbIPD1vSyzWPmEzw3ygh/uzr3/90UCJiuBLAylh9hC4pU4Zf1hEqEe4uotA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: cbc60987-e140-4da8-82c7-08d88663eaee 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:04:57.6768 (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: zGHWdg7dG5GIfZVTiwYunt7wGYGf2Gzf22vb+ew2aNpH0tzAjHzO6cuFsJ6ZH6YHA4x1Y0UYPEQvig7cTQgnDwbmPF7nTczLVYgQ53Ty6Y4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR05MB7524 Subject: [Intel-wired-lan] [PATCH v4 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: pmenzel@molgen.mpg.de, 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 Tested-by: Sandeep Penigalapati --- 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 Wed Nov 11 17:04: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: 1398434 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=GkznpIjG; 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 4CWWLz5ZhMz9sRR for ; Thu, 12 Nov 2020 04:05:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A13852E0DF; Wed, 11 Nov 2020 17:05:12 +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 7cNwmmqCgmEz; Wed, 11 Nov 2020 17:05:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 6D2B92CD96; Wed, 11 Nov 2020 17:05:10 +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 27BCB1BF593 for ; Wed, 11 Nov 2020 17:05:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2441C8681D for ; Wed, 11 Nov 2020 17:05:09 +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 uakNUHBSdYPy for ; Wed, 11 Nov 2020 17:05:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2093.outbound.protection.outlook.com [40.107.21.93]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0C19E867B2 for ; Wed, 11 Nov 2020 17:05:04 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lcfVFXiGtmLyUjEEvaR6BNPjFnqiRufxLcSDSrkGw0ra8GC1e1Guo8TQ7OyGm2goNWGOqY19XEI3cSlEu7w5vcKAsErUmpf0bQSbZSiXE3fcoAP9HQbihsSSE4//fLutKQgBep/Va0Rl9lptYkXQC8HCcIziNwS4FivYRnU6aMZJ9JjgofVSeKdoLH29M29dr5YgqYL4qoSkAxD1o1C+FYctGrIdzznW1vuqA5GblBjXbwWrwedjfF7X/JJSZBIlCeAhjhI74xnYRTOQqYiS0c/MWkfdvFTxnCkPcn/vxAoPfukaeQrZB5Q737m3RVwYbhp+cPuFmIqTnh91X2YbiA== 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=gdRaOF4wSw1HgsbjnSvtroIkYMJIZeCgIolVH/oi9yYQk0DFqJhdwzYH3w0l9WIEfUkKWo5yG0zmd17v1mO96Z+ZSevfvXKQv8kTsgM+Y9sJnKIXr1TokbGmh9kYDRz9w3ojO3u+0XjR9zc4ED28q+V1ypyCrsLGsKVvI+YZ3x1sbPrd1hFUgn1AgivgbT3NwTBCX58OrKm04g279poQ9XKx6l3/FcAteCdIZePjhD6scvntG24LJHcx2h1SDovxNpy5GcQRvfljCistCfT8E8O5eawC4zAT94JhhTpneRbzbn0mnYIjkiKJlUOfguKN1zb3h8/D94O6HHE68Fa52w== 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=GkznpIjGoF3Krjj+JfrspaJhQq0rhC7uDs/8EL5eNU3AlaxXyrPLJwDhq+BOHDyPOpSGRVfZH17r72VMDASSnJskp7EalDZ0/Tq366SalDPAEeSC9r43g0P4RcOUI85pl21lArrHH5KbLXhZc2aBJM9hxJ8bpseynu+Fl0iCQ8I= 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 AM8PR05MB7524.eurprd05.prod.outlook.com (2603:10a6:20b:1d3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Wed, 11 Nov 2020 17:04: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.3541.025; Wed, 11 Nov 2020 17:04:58 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Wed, 11 Nov 2020 18:04:49 +0100 Message-Id: <20201111170453.32693-3-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:04:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca683a6b-4afd-4190-8da1-08d88663eb64 X-MS-TrafficTypeDiagnostic: AM8PR05MB7524: 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: v/vW7VJIMhT3i6aTlAV/ndaGFrx7+i1JFGltSU/U3cedbUfy4s25uWJl/kiZtr4J0mCej3U4rb8QSvJvr4e01bZ99L+KAX23pcDduz6/nuW9rlgrgnK/bY7cNJ0iqySWrqVt4uS96Ggwi9NCPblvj3eeYynITqsESl8a+G+U8gs7w7F1YA2sECQzNqbUzFimFiVWtxPBOm2Ljc/MVTNFa4tEs6zqex2iw8NAbLoqq3I4k9RZ8HcDN+XyKHKIBLTwxR1HtWDfWj3e0b6SwItHsVIKEt84PdxMnCqB/RmSFvQZZpCLtMYJ0Z9YKZG9iSg/gWu87oDO6N6f4+YFC3rj/cOtuYw8s/2Hn4RzzsIu4mQpquUa4A78diceP4d5rjF/ 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)(39830400003)(346002)(366004)(136003)(396003)(6506007)(5660300002)(69590400008)(66476007)(66556008)(1076003)(66946007)(86362001)(8676002)(8936002)(9686003)(7416002)(26005)(52116002)(316002)(956004)(4326008)(6666004)(2616005)(6512007)(16526019)(186003)(2906002)(6486002)(36756003)(478600001)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: phRX/fe6gASOxTSWZCwHYBTxB8aRM56D4takULjulLZUHn/gGYFUH9bUAcrK2v0hf8yIhreImWsSsBttoXZfq3SjgAuJWtIR3NDFezGyCfxKuk6VT1YPMdSC7iOz5KknXO5ZmgK3z12RYQ62+8aUSc2k2mTcr1Ib1ea/7lABAikXo/rRYNHfsEg4bvnYFQ8faXL2JcH1dz/VjvanimqWqq/IlfUYwfE5RKjWuGNeMiWUSVjyesA9b8NagGUgjI4O0QLzLTes5AeQuf1j/f1EnBVZ7s6wvHPS+ZG6DhI/+RmdzVyyp49o4gsG2ou4+AMOXZ/tvr3gBM8XljBvvUSt5vJoA4lFKgpNcwR1a2kqJYkjNxWKTX51VR3kttgs+R9RciZKzgdkKjnM9dh/bCLKA4dltLnA0ejMMmJeO05Juq22WSLK1CBbuKgnd1+Ls6Piu8loM+jRHkMhwKuxLGYPSuou6uLbIDIChCrdR5l1dfiH75ZsPUEdNyufEdKJe4czk5EKUXRqO8gbi0qZuF0clE3Qjn6PrcZurr9MQeAs3CjCJB8tttr9uaVmDchvu3lYdds9DFcmA9AVY9JBJKdZ2wIXoEnP/tN11F76haKUIuOw6xSgrLaF+dbiTkKz3e56sN0sv7sAKZwTUY+a+LDkCw== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: ca683a6b-4afd-4190-8da1-08d88663eb64 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:04:58.3837 (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: mNnwRQQ8eVQPBeEsy2XgAh+OD6opa29D7px4We7ZrTQjykB9QSxgPB256EhH+8RLJS/tS46mMPb2vyBdlfaMDp96jygfx966yDyqdrc+jZ0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR05MB7524 Subject: [Intel-wired-lan] [PATCH v4 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: pmenzel@molgen.mpg.de, 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 Tested-by: Sandeep Penigalapati --- 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 Wed Nov 11 17:04: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: 1398441 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=fMWmgyPH; 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 4CWX450y6pz9s1l for ; Thu, 12 Nov 2020 04:37:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B588D2E0D9; Wed, 11 Nov 2020 17:37:22 +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 EMECSsPhi29A; Wed, 11 Nov 2020 17:37:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 07AA027A6E; Wed, 11 Nov 2020 17:37:21 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 360571BF322 for ; Wed, 11 Nov 2020 17:37:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3164287180 for ; Wed, 11 Nov 2020 17:37:20 +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 nj2PmRrvcfJh for ; Wed, 11 Nov 2020 17:37:18 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2098.outbound.protection.outlook.com [40.107.20.98]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7748487176 for ; Wed, 11 Nov 2020 17:37:18 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gURE+wU3D324vRDLsOj22kblQ52WaOYpwNI43C5ChtS9DDgiOe7KSQ14sJAuuFI33wO1Be3ZCQ29Rr/rXJHOoUvx5RNC6aKJDxoXWorkSxH3VDT8dc8KAvT8TTXoYFRPIkTx5rARW5TyWLW4k7DvHpFR87eZzfAAHjg4CJc0XpW5nCl7T+/Cj9LuH0HjjOm9SeiAB8LExZu6pniaCxqUzG94N0a8OzG53cKiS/WZn71dbYLJt14jEUKQ4bnOoSSfW++JAIS5ccN0WmIcPUlHZA79rpodb0vjbcXs5TwEU1TRoM+4SDnjHhgdxyoQd28JHFq8DnLNvycYUO45gRmYWw== 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=Q1PKkugmkABSUzEON3r6GNorCQcjvzYoOPThCR7aXno=; b=RTGA0lkyR7GLwM33oUvd0VXp/LxIM6BmUKn6WCs3Dh4v1dq0T1Dgr/FU2LyuIN2A03JYmg30P5CSQCj/Dnrgvc9jAw9xjxDo8yrW6LVDfCoUjTWambA78c7Ij4VcXxyHtBemz2Ct8Zg7MbXyFBT5m0b/05XC8gFhZaqDOjn+5XEEgfTXee+HqWOVPdPQUxpsNpTfyO4VFMGGY3fqFi/+WyMn/WjuMLl36ug9QGS6nmzVdeTxL0jiu/fJwx7wCASLpLLTDPVpHyEQD6umKkDE53HIa4u7dSBOWBbTaVN6Cbt4PO6v1S6RwTAUpB2UvfO/5c0q5TbzePIRXnNnH09fkQ== 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=Q1PKkugmkABSUzEON3r6GNorCQcjvzYoOPThCR7aXno=; b=fMWmgyPHDSKMtbZWxnNXnsH2d1/2ENLGjfZdk/wU3S2+3pnFNPW7HQ2TVA2APR1pdZlo7YH9xiRxoQ5LZG5a9eY9c7Y6+mS93uk3xp5R6MOdqSAhbuHAdjzYcDQNPXpVHxN8uS/OZhpCV0d0SkoVH125jnOddfW7Y9Y33R4ehYA= 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:04: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.3541.025; Wed, 11 Nov 2020 17:04:59 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Wed, 11 Nov 2020 18:04:50 +0100 Message-Id: <20201111170453.32693-4-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:04:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 119eb542-ffb6-4b5e-1090-08d88663ebe0 X-MS-TrafficTypeDiagnostic: AM0PR0502MB3921: 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: yHeXuLC5vDyS6xu0HZiVT1qKOZRALgEP8S5sRb6WOG6EC/KqMOZM29OHQFLF3m0URquLW4R6KdbFwAFUoxojhVAw5iuDkwLIpgiUNZFo4v5fKyRyT/7Q8gcPz51BTBqivtjc8kCiHSD89mvI+tO+G6aNqkgs5jQIF/6NYhIw25Ugk7Hasar3zZMYLhGSL4dW9liAee0w8Q/2Vd6dhd9qY6kDQOOwGRbr8qBEAEIqbmNf16UbrUJDuhP8OGh1V0kwPjlPSRS4Lv4lOcTu8gJEisHULSCy7MFq8uFlf/cNKvjwK3NVcOTlP0i5dd6Pogu8B4/wRQIyJXLRN1FmNgubGCwQuYPnPHpDR+7CcbdjvToNrqm67o4eH7tbcR5na8T/ 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)(15650500001)(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: SSvPVH/VaMSAgcXJNqgLthHTWn+Fj1ZSV7mhADGIgxvIGeUPSRbOHXJag1Q6SP/ogoYF67EYCWkPk06erQREtIff2TKqg3uf1gnOCBZpv5gWFlrk15DtnPBAhCwE2v7+ZqgREVkjxrGsslPI8KkdxDx9MzoiPCElQ8hoaDcwESDxImSkSHpF0AFpapNhysEXgHbazlsj17wjSOeRuR2EdTIPEXQVFfDH10iPCvWFQtslKb2aeI3KjdYka17R0HVVIk3UrRydS7cV9w1WWYYhXktRJNAmkuyQezoEyOc3dZjbTx7HVY0QQtu4h3ncyhBjezepRp8q7bp3mSrp7WWjWkHvRcN500pbP4uQ5TB6YUb7N0zdoOaKfaYehPHFlWFIEmt0E7DEL/aPV10EfATXpHziDI9rT3VJVU5Rw9mUqnQ2Aa+m/tL93ky49QAZhD7rYXhDbe95VH7uPIOVn2yKb/ro3coFuISbq1FCZJHi5oPYSq0n64Lb9r4i/tgI2eQkVXE8O7wKl2Y45KYXzgOa6YfHsZ7yQnFubpg7JQ0GNxkfpX9QP04/TPys2BXjS/mm2D0kgqpb84CHuAdcaPsSTIQW5YIHwDJwzJ7UtVITkZcen912PrEczD0pR80X/iLd5kxdXFKr2CepAtl2ZMeQOg== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 119eb542-ffb6-4b5e-1090-08d88663ebe0 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:04:59.1364 (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: HX/rhfyhjBY6k4Dv9RRLd4sANoCTzUtu/MBgTNvQznghzOlfxWhmbl/wsSF1YJ8tqedoJLEJhfar3GSNsjml+3CVvsE+YuO6M5iSkswf9Co= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3921 Subject: [Intel-wired-lan] [PATCH v4 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: pmenzel@molgen.mpg.de, 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. Tested-by: Sandeep Penigalapati 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 | 17 ++++++++++++----- 1 file changed, 12 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..a0a310a75cc5 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -2824,20 +2824,25 @@ 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"); + netdev_warn(dev, "XDP RX buffer size %d is too small for the frame size %d\n", + igb_rx_bufsz(ring), frame_size); return -EINVAL; + } } old_prog = xchg(&adapter->xdp_prog, prog); @@ -2869,7 +2874,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 +6504,9 @@ 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 Wed Nov 11 17:04: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: 1398442 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=SdNYWtk2; 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 4CWX4p12gWz9s1l for ; Thu, 12 Nov 2020 04:38:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C376A86121; Wed, 11 Nov 2020 17:38:00 +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 jt2jut69WxV5; Wed, 11 Nov 2020 17:38:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 20F0C85FA8; Wed, 11 Nov 2020 17:38:00 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id F2F171BF322 for ; Wed, 11 Nov 2020 17:37:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E85932042E for ; Wed, 11 Nov 2020 17:37:58 +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 zidBj3VjeOF8 for ; Wed, 11 Nov 2020 17:37:57 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2114.outbound.protection.outlook.com [40.107.20.114]) by silver.osuosl.org (Postfix) with ESMTPS id 47E8927A6E for ; Wed, 11 Nov 2020 17:37:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VN54YIXR4eMFksiGEFniAOLm/e/FpGTPX52KbKlolW0aNvSHvqhFHb1uMPUCBV7xHeZzhc6mScleK65CnC10jBZS4QIHkYjoR4mmzttDH3vTZeIn+M0+nFzi2boMY+x0bOJE6Jnp1LSP2Z/dLkr+2Kub2qK83YZnVpdqucIjcuGT9dg/G1L115UQoG3W3b0eIGpABkY/ggwPBcVjYcbnNm1w2bztSlVXEzYbcvMzufPndaiOVxUZVI41WWAmAL33C9W5v7btTZfWjK3YmacMz7JfmEGSqFzj9bsU+UDbLgeCIUUFEnurmq8O6IlhwPztEDIoCErlsIA6BeC/12EBdw== 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=Ykcnu/lZP2hQbZer2sAAFOrx5kpJGXJqrdCK9Uwb2w4=; b=Lokyk3op+0DiKtvqs0qRE44jEGX2l/Q+odrOMtp1hnMq0MD36UXOqDGc7ztnJjbwlXJvdzUX4drus1iJRJqWduLIzrsNhyASlk+hMuIKyAWvOrOowttdMFelMN6nN10+BryHO4QdmrfbUSCTvTxyHx0OdwNYfOQLJFZu24bAHzvgQ2wcbW+zx/Wg1HEMghZ/nQPMHq3jH5ZP23gsSovmRz5qw3feoNe2cCLCQa+gCuPUJFhuxV3rcXipkMN3amqpHv52DiEZL9sGf2yJFBtn/GkfunkxdDO5T+nq526UdVp4apqOL9H/mOxJG4vB5CLGx5fCJAKWwzDLPJe/Bf+Pug== 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=Ykcnu/lZP2hQbZer2sAAFOrx5kpJGXJqrdCK9Uwb2w4=; b=SdNYWtk2adf+EY21rs/2DmvmNObZGrPwTfOzzfMCz2aq7nx/8l8+e/CXc/rU1oOUOqJPdPRF5psP+BRnhYMomKVeDlUXTx3/mWEVn3vHxGrPmIpnMN2OoQHwcfJuH0WYzHLi4WVBgjb5QX8t8PYPsfBeDEJS+lssmKBbtHsI0Ag= 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:04: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.3541.025; Wed, 11 Nov 2020 17:04:59 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Wed, 11 Nov 2020 18:04:51 +0100 Message-Id: <20201111170453.32693-5-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:04:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ecce5d58-d9d0-4ac0-4176-08d88663ec3e X-MS-TrafficTypeDiagnostic: AM0PR0502MB3921: 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: ePotm8joYR1EII26D94qO31P+88UWkbk13092i5v1Lkpn6h/yGvybr8ezWGKz2XTdrXSFqGHbfja+spKQzxCXoLaiGuKovP/t17Vc11jmHmyqm0jMcIfAMwEmra8abWK0K6+ykXI+879Tzg4rCVi58azI8EnJrcgKeifyi/mC57vbdGYWQNUm8Oz1DFoIN7ltEiTmG/1sn1oUovQmbS2pBf9kI6oHlT+nlCwdTFpSAA08j6PHjK1Ir5RUOhOD5OIahtSnBoixePp8tsKcmZd3W6tmFDBl/mjJLmtzDf5fL3P/7Y4TPtQZxqC9AhvGsytkSwSRkaFBXyqYHTXz1r8/NovOJAjnWOAFkFkBQv9+X+ATsSp5itHxLScjP+70upS 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)(9686003)(1076003)(6666004)(8936002)(26005)(956004)(6506007)(2906002)(2616005)(36756003)(6512007)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: D1xtuImoi66M0ZeJfYY/LCMPwO1QgbEDfbQYQEIYY8w9AVT7KXKArmjjfncTEdDXz50BcT+VInEioHUUleNX/sEEVjBLNVOhaq1cXo9LWGI6QDSdfFbUsmIw3N7UIAXOGHrxczaeuSOUZ44SAfBSrgcVuxE77QVssyEoHlBPY4qVa5iE5EQZbblO+ckHWNVLP6o8qDoTQ+6aALRTqX65V51u57ysEOusPmo/gS1AbJI4TB+T7BvZi3FesajWXeMILkoR7HN+YP7Ih46QwY3Ui16EgSdRudbFnSuOAtPYG6X34KzcMxQ5wFIIHvcbOqacnsFKW1yxohQeIIpnyaCh2OUD3JUlA9F5ypo5DKe1dyDmSzl/5dgBqaCvhEf3KGaUcGmqQPl2Xykfzw4vtC8SYBw6f0uauW6P0ggUWTdxp+ystVzySi/CKsaZqFZUpYfijB7SSdMcw7HNaWe0ktggnhaBoPt/8V1AbTLowAQ4CK/R8rKPfQRPL8q0WGizkIhMP7s9R04kEcABmYQaJmr0FSbdIIwoB9A9KC6am7iUfaw/voDNRjl3zsI21VmaG2lIIjt/m9nNFTZGYA8YqR/mcl6S4PZQxZ2oQL9yQkZkteAOnYaVJdu3ysso7XlSdI6OLjDaxYNIFCngJo5Gjh0zbA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: ecce5d58-d9d0-4ac0-4176-08d88663ec3e 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:04:59.7636 (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: GHcrv+RW4NgBoTrMT7OVUObdLd1FBh+j4esenw6ONw1EarWNwxQbbefhoM7AlkR32+jRnl56yC8fwbL39/47bIMBCngvm8Mvf3klkjXPHqE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3921 Subject: [Intel-wired-lan] [PATCH v4 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: pmenzel@molgen.mpg.de, 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 Tested-by: Sandeep Penigalapati --- 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 a0a310a75cc5..fa93aec0ba04 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -8350,6 +8350,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 @@ -8371,6 +8372,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 Wed Nov 11 17:04: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: 1398444 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=bjjJPVBX; 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 4CWX4z64Vtz9s1l for ; Thu, 12 Nov 2020 04:38:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A685A86731; Wed, 11 Nov 2020 17:38:09 +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 2st+NjY78qLZ; Wed, 11 Nov 2020 17:38:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7638D865E2; Wed, 11 Nov 2020 17:38:08 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 932E11BF322 for ; Wed, 11 Nov 2020 17:38:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8B4E927A6E for ; Wed, 11 Nov 2020 17:38:06 +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 Nx5ymtKRNJMk for ; Wed, 11 Nov 2020 17:38:06 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2098.outbound.protection.outlook.com [40.107.20.98]) by silver.osuosl.org (Postfix) with ESMTPS id B9D052042E for ; Wed, 11 Nov 2020 17:38:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j6iruuT9kJhQFG2Ee6NQZ5dBwHxVHmuYl/jp9FvUmhcPnHH3YKlJdP3GZGGLRt/pnRYvKvzD3yaaJ0wpAglLEnjZStp2yow+ioISD0eQQ6806y8htdaQpNEIq13ZRi4bA1QB2RilIFx9DHsDtWFWg5+lzFCjldsmz+PwhrHlVkkeWqQ1dFBXQZ9mmXGZKPU8JBTRpZ9mqkjlfdssLIpmdH+y3eL2wloJ/F0GnxyvSdad5yfB7Cp54Cdb+fjnMCh9wuBRKt4ZWEMS62SvGxsNCohpm2Fy5tKuHSzPpWsN/ly5w+oMbuBdkHPLz5NyHm/doP4UIQzcPpuYJ8czHWItmQ== 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=k+b+4mAnFIEgYwOlWv/ajnYJ5BrOQ8QvbiDRlPgH2iI=; b=T0FVtMoxYX8rvIQkPrsXHEfhkzs+Ysxxz8Qvq/Xig7cqaLQZN+cVmfNatzc3JaMjbqua783nI+hJB44nuMEuECRtenNaQkOqwjLH/Ws+N4f6W5CHyEF6Y4+54sM50mOpnl/NNcB13Bb5RSPM12cj5EkV+49LR6gOtxsVZrtlYwr/8/1sLJUZLMb0BMVvUfkfpc5lt5vDbCCG4oXQYEHHoreDWb0rezlpjgPHDbSCO44tVZbZjvBjhsL6n1q/kv2Z27PHy/drdpPm2af4z4mgv/MZOEkFCp8Yx8eyMT8XG/1h4F+8GStr8I0lney53RppD8aSs+CrUlhJAq0t203c0A== 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=k+b+4mAnFIEgYwOlWv/ajnYJ5BrOQ8QvbiDRlPgH2iI=; b=bjjJPVBXe1i8Zl7pG1vvqsPe1KeCVbyu3q3bepk1JczO9rHjNLiQ4/EHX6pngM2nZxKNH2Y3Vkjs2M0h2W3HaPlt5gpEBaxpkPSXE/OhfSHiTDixruWnNIGNOTYjmG1wQWb39VjhdROlZUVnawVYiHJHwswehS/0JYNdq4pJVCs= 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: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.3541.025; Wed, 11 Nov 2020 17:05:00 +0000 From: sven.auhagen@voleatech.de To: anthony.l.nguyen@intel.com, maciej.fijalkowski@intel.com, kuba@kernel.org Date: Wed, 11 Nov 2020 18:04:52 +0100 Message-Id: <20201111170453.32693-6-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:04:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4d6ee22c-b07f-454e-6f50-08d88663eca3 X-MS-TrafficTypeDiagnostic: AM0PR0502MB3921: 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: WrASiu+qEpmLJwsvzg4Zz2SLdccEDzoHOeS1uIC80PFySNEp56ISBb3au2fXvS4ovkguaAx7XBl1HO5tits64eZUqTcDQVDka/m6ceFdNh7NOaWy7dTHq5lIHqJYf1xoADVvl30PyBZDSUWPUHRhURURXrXRUh9ImnBqxVYTb0ybjPlbOzeZBBSoeXKlY49lifmXFxy/a1Z8uQJAETzX01cSCx6a9CYtW4tqeH4E9i35rlZz0Ifnl9fmSbqP0MEHtsLlIFK79ZOsE0Fsek+Tq0kBCVfRgY+INtRsrBJbxYCjCnStezJ0fSR9nlO/R3yZRXJ9zhQB3PNaJ+6vTxaShIRoikXyZOUbxKGwnIHWb8z4qqR2P2B0Nw8XLxIUmIKt 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)(4744005)(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: NKkvDJy5fZgXDreSHExQg/61r949SINlFVDSR5vPUZ04+2hOT3dcoRPOXIyOh+CNyx079T1En1FMQp9ehsvQHrJv35fpYCBq1y9OplJeTC0ztnoECNJFwZxPQW2BijwDRCnWnyfY8Ra9o0giS0ElHDf6cxrxIHtVIjtEHDZSouwbutDeAKjBKS+5OvzIr9nD5zbguiKqgaiCK6rBj60HkmcDDMRRwBZCrGBXkzWTfw7FC6vY3CBgViLTmnZjVcfIL0xHQ+GavbL76d5o9L9WT+oeVCb2hLKAzvIpQUK2SfjKujXMVe0SP+kb4cFmOrrYT+mBFh/+yXlICHgGncctBa8f9mt+DaZpl+VjJy6xabKI2Pr8C20Bs8wyOD7zId9jqHL5M2W397Z973/E2KrEvHPoSaNsAFONtipSoOtGJPfgJz+UKJsKmL5840w+7aVJ6di0rLhMPdWSsz+3ddgZW/9SeFKB/BOxHERHdNuypNAu96PkH034W6k6ZJ2+IkbzxYQLFz300bgXMkIdE3uGgZmYdxfkemwDrXif+6Jks4Kkr8WE4qthG7GUQBpA36btDADd8An7AOmdM3fmv9PORPSfQP+PcnumWEqB/un2u5+EKY2sf9zKsNkX51FudEH2HowaD1vlkA63ZOGgCsPrRA== X-OriginatorOrg: voleatech.de X-MS-Exchange-CrossTenant-Network-Message-Id: 4d6ee22c-b07f-454e-6f50-08d88663eca3 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:00.4466 (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: LoZmbs747vguA5YoAFd5j1op21Ceiol/fbs8bNEHCqWuyjSc8I4nKLz4I5STbw7IG4w+wpgPcvbgZyosu7UfZXWZJaVFV402V5tOaRPUOiw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3921 Subject: [Intel-wired-lan] [PATCH v4 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: pmenzel@molgen.mpg.de, 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 Tested-by: Sandeep Penigalapati --- 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 fa93aec0ba04..b6c793441585 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -8781,7 +8781,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 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: 1398443 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=gBWSqlEE; 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 4CWX4r4T6Xz9s1l for ; Thu, 12 Nov 2020 04:38:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DFF3D87192; Wed, 11 Nov 2020 17:38:01 +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 b4Tz+D3jmVPp; Wed, 11 Nov 2020 17:37:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A26E587180; Wed, 11 Nov 2020 17:37:59 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 130821BF322 for ; Wed, 11 Nov 2020 17:37:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0A7072DEC9 for ; Wed, 11 Nov 2020 17:37:58 +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 w3ujpEcWu35j for ; Wed, 11 Nov 2020 17:37:57 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2114.outbound.protection.outlook.com [40.107.20.114]) by silver.osuosl.org (Postfix) with ESMTPS id C08FE2042E for ; Wed, 11 Nov 2020 17:37:56 +0000 (UTC) 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 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 Subject: [Intel-wired-lan] [PATCH v4 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: pmenzel@molgen.mpg.de, 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 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;