From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5F26941D8D for ; Mon, 27 Feb 2023 08:16:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 59FE041140; Mon, 27 Feb 2023 08:16:23 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2052.outbound.protection.outlook.com [40.107.93.52]) by mails.dpdk.org (Postfix) with ESMTP id 274C4410D3 for ; Mon, 27 Feb 2023 08:16:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ArqPZ4J7AuTtc52hYhg3RQF6iKB44R8huB+MfkuHKmhhrSZn8wP7Xgo0KKBk3yV2BG5yxMaoi8mB8LTf9nyBPYnk2uU0eIiIYoHYp9qGQZYgofIG7FITOwku5cUxq7AGkU7B8QMdSFplKlMAAtnAPKEYyQ3b+tNgBCa5IjNm6DeKLejXwF2IM+lXmNGi2MrQXI4w45E8AN7P07ydYoc5Cf+j3XMO/WOmsdPbtJ+lNtsdqyDFqsO/1DDIMe35n533sdQfLxLWiTs1gEvjuZlousqOO5miBalQf2DH26wyPcCUlIIQ9FhAoALTJLJH0nVk0hROddd2lREaMbGrqeiDOQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vrNuOp4WHJoQM+k/pNfc60Ke18cMfygbWF6edUXCjOI=; b=nb3gN22u6OIA43mN+wmsBAs+DMmLaxRSQzeZlKGkIZ74pBWox0y9tesXy0rJsuIuICSKrIq4yZZAU5UBcDE50AxOE+xh5y3xepUJUHfiwy2b9CWNH8nCRndvwseEoU/T0TATidhzd0MDjmVEImVn+JRd9uvR+Oe7+OO2LEs9wEJPKB/HTON+KR64pMZwgcVnnIpp6DZkgPyL3KEEMx13K0E7gAN1U6PaGbiS5OJfkOQvrWoYL5bVm2BaxqoDNSmoS9ZM8bBWJA3tBJfE2zRi2BqZ/M6lXcaxlx1XDTQnc3zwYhsXV6L63znJMjJAZmiqe5X6qgjjyytjrsoizhMYZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vrNuOp4WHJoQM+k/pNfc60Ke18cMfygbWF6edUXCjOI=; b=qr/5aS7e4gncWkQxEeSeyxAU42eGTz0IGcXG1plej2O/244Pp6zyigiPGAcYiKvRslwtAyxoyjxGC55Vny9pfmaMqdhl0kkDvNyaGwlP0db+8cpxzoQJoW1oO5nb9R47FEKxpGY3u7RQr2d/PFpIyzkDqrKUfabtVZC9yMlYmxVeYyGIVEBiE21CUqniiI9ra2yipEY0otq2geKkzs4USoLiks73NbpcaHfarn5TxcaPHTMAuOCsfV23/TyzCWdzqVTnteJ4GZUfuVb4G34vWwQiW6KJTLAGE6lSmmEEHzOJlmwuC66rFcv6o1J/ohAaw6nqdWgIxUmp7A5wrRcBaA== Received: from MN2PR19CA0027.namprd19.prod.outlook.com (2603:10b6:208:178::40) by BN9PR12MB5131.namprd12.prod.outlook.com (2603:10b6:408:118::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.27; Mon, 27 Feb 2023 07:16:20 +0000 Received: from BL02EPF00010206.namprd05.prod.outlook.com (2603:10b6:208:178:cafe::95) by MN2PR19CA0027.outlook.office365.com (2603:10b6:208:178::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Mon, 27 Feb 2023 07:16:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BL02EPF00010206.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:16:19 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:16:02 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:16:01 -0800 From: Xueming Li To: Zhichao Zeng CC: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix building data desc' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:47 +0800 Message-ID: <20230227070107.15664-139-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00010206:EE_|BN9PR12MB5131:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d0bc8d4-1ce8-4175-fba7-08db18928660 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p3PKOIwEvz8WaCv/+0CoZ2f7dy/qkZRQemMZUXxs/0FyX25Ho0ukg+6BL4dA4RER5pEEWIn3QtIv7VRfcU9lPlGo1nSe7qKpBKItE9PcrMiy0//6C422a/R1GlH6VG8uWe2yEy6ncM+oNTLaTfqvxTJSiOGFX9RFtLLHI7ANijg5a2iz4ne1RwV94DUrNmpodTovHpWqUYXUl8NdBdNogT+3cRZ3HZDrTQIW4Kiv6VeTdlUnPrAkqWuotGIGDeZZNxaxBtXBk1SNkGqZZNLXzsdXcvStPbWb50oQHWOk/AmVrIqpxwWszTvW9xPMc/SaFcoo7cwWT47I3+7XNXUarHbenXKiMzBVtVLFkKebq8g2HK8PEaP3prKfEELHguPEs5y/rBhsDEmIJjsJetZE1nxs8nGqd9w911mz0mUK6HnExrFBnU9qSqRZJNmxCWpyiI2d/TDOm0IHgb7Y1e+ejcS2+hKy9BE3+BBxX7bkpobjVuvo02crvN6X7Zj506kRa75nDzgPIOZ2MYd3xEYTgnhmJGnHQ1XpnUi3yzRdHBNf5D9P9hltBXqHq9K8gdAIoznpUc35HL8GAVFp8hdJmws3ZZ9OZp//2H6Cn096K3aNxI2THevApmEvg8ox8bPvpnH/NDPYqG5fgDRb92IkMFJFX9vNpM6fIz3McUepmP8ZOtiMzjn10uTI4D/aylKLSSWPi77ECQy1ThV31nHKm3rJieabJRAPQYupLG/jthHf1Wx+QDOQvj37TKv33MVRasSa353OY1qR0lZk9FlX7g== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(396003)(136003)(376002)(346002)(451199018)(36840700001)(40470700004)(46966006)(70586007)(6916009)(70206006)(4326008)(83380400001)(47076005)(41300700001)(36860700001)(426003)(82740400003)(54906003)(316002)(6286002)(36756003)(16526019)(8676002)(336012)(7636003)(8936002)(5660300002)(2616005)(356005)(7696005)(86362001)(2906002)(966005)(478600001)(53546011)(186003)(26005)(40460700003)(82310400005)(55016003)(40480700001)(1076003)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:16:19.9820 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d0bc8d4-1ce8-4175-fba7-08db18928660 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00010206.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5131 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=79781cd64628e19f61c9d25d9809f7e94dfb74b6 Thanks. Xueming Li --- >From 79781cd64628e19f61c9d25d9809f7e94dfb74b6 Mon Sep 17 00:00:00 2001 From: Zhichao Zeng Date: Thu, 12 Jan 2023 17:31:51 +0800 Subject: [PATCH] net/iavf: fix building data desc Cc: Xueming Li [ upstream commit d082b37d081e6de467700128f217e14b5e852bf6 ] Build correct data desc for UFO pkt by adding UDP_SEG flag, and disable L4 checksum offload when TSO/UFO is enabled to prevent the MDD. Fixes: 1e728b01120c ("net/iavf: rework Tx path") Signed-off-by: Zhichao Zeng Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 8d49967538..3d9224b38d 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2619,10 +2619,21 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1, offset |= (m->l3_len >> 2) << IAVF_TX_DESC_LENGTH_IPLEN_SHIFT; } - if (m->ol_flags & RTE_MBUF_F_TX_TCP_SEG) { - command |= IAVF_TX_DESC_CMD_L4T_EOFT_TCP; + if (m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG)) { + if (m->ol_flags & RTE_MBUF_F_TX_TCP_SEG) + command |= IAVF_TX_DESC_CMD_L4T_EOFT_TCP; + else + command |= IAVF_TX_DESC_CMD_L4T_EOFT_UDP; offset |= (m->l4_len >> 2) << IAVF_TX_DESC_LENGTH_L4_FC_LEN_SHIFT; + + *qw1 = rte_cpu_to_le_64((((uint64_t)command << + IAVF_TXD_DATA_QW1_CMD_SHIFT) & IAVF_TXD_DATA_QW1_CMD_MASK) | + (((uint64_t)offset << IAVF_TXD_DATA_QW1_OFFSET_SHIFT) & + IAVF_TXD_DATA_QW1_OFFSET_MASK) | + ((uint64_t)l2tag1 << IAVF_TXD_DATA_QW1_L2TAG1_SHIFT)); + + return; } /* Enable L4 checksum offloads */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:45.339447500 +0800 +++ 0140-net-iavf-fix-building-data-desc.patch 2023-02-27 14:08:40.929237000 +0800 @@ -1 +1 @@ -From d082b37d081e6de467700128f217e14b5e852bf6 Mon Sep 17 00:00:00 2001 +From 79781cd64628e19f61c9d25d9809f7e94dfb74b6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d082b37d081e6de467700128f217e14b5e852bf6 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org