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 3710F41D8D for ; Mon, 27 Feb 2023 08:15:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 33656410EE; Mon, 27 Feb 2023 08:15:18 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2054.outbound.protection.outlook.com [40.107.237.54]) by mails.dpdk.org (Postfix) with ESMTP id DDC5F40A84 for ; Mon, 27 Feb 2023 08:15:15 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CxDStpoNP6pc39k3dXHURft4txf+Sat4w77VL48QoswNoybPdYrTrmPTsA5ZCTXZQkVbDicQXEwX39IRapTwoWkvh6oHVZq8N3f6fTm7p82puAEn5tIfOxDtCzVe2GKgwYKXEtcJCAVss6pCu8KbK2Cy/qFq2EMy0JLDka3azb5dpo9dcaCHh1xtj8St9SPMQXMUAMEHdAi9f9UbVvoQ0G8tx3CqvFaMxxMx/11xiqdnUpKufnwncIaH5v52oSPXV7KY7QwvC97ClPqRFEZvldZB4YteKkSD5Oh/lVmyl/z1nK3IFU1LnEqac5u6K52m8tYdAcZCYfZcw9Swvx5AiA== 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=ywy3C3xlTKw6wbMhXFCtiIuVmcgEaJCEtygXBarzhjc=; b=VePyFbmbkVvmTW6uKHPdXfYdbJfmAx3d/P/ekgR+B2ZQg50ae0vsYYVXAeP0L2MoCdhsN/DWp6cZIR2WfKQbrzWv9SxLNb9XlF4B4bFP6psJMHmhBPajNyVpJTef7ZHNOykOLjhtmpfU7QlQAZMKtc34YNeWFQUm5KoAG3JaVpo8GbuwUyQeM6mdrAKNUd/CRO30ENqBopsuuOhgQqSN3NxMUYETdG/Gl0vRY14IQp/laOOLRAcUVNY5KRMwfIS9Gb065B3HEUxnhWViGE8cfOzLTSxtgGFW+S5etQ3gF6s4sh2dkFY7oaIvZ8EsrSlG3go9YU4uaa8jMCQnu6Wo3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=ywy3C3xlTKw6wbMhXFCtiIuVmcgEaJCEtygXBarzhjc=; b=Q461XyXMX5isr78bBbTzWCckjmzXvT/C8bMHNQ87ASxE+wmrfedDREGLwOnXWCZaK/BN9eyrcsDnaTExrbKjaChjnmMg/BgFspROWulofF1rbTddtcxSEdKf11ZrPvkHaVPCOvfJhDk374a5ig31Y2HwwecQLZcFCxf4MT9dIebJeYu5K2PqP9lnxGKu2JaZpz3Yl2HkQ14+BflNCHXzHcc+0QedaIrQnIGOMCu4cAyQ9PJS/nrhvi4I2BRJj7moXlPuHKvWcOS3lP5UTMZbAMkjJqaorsIHDrWcIIVHYRTZ8r4+z8XHdij6pKz0GOy4OPTvhTeNynkuYFUn8rX0uQ== Received: from DM6PR18CA0017.namprd18.prod.outlook.com (2603:10b6:5:15b::30) by DS0PR12MB8441.namprd12.prod.outlook.com (2603:10b6:8:123::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:15:14 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:5:15b:cafe::58) by DM6PR18CA0017.outlook.office365.com (2603:10b6:5:15b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:15:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:15:14 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) 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:15:02 -0800 Received: from nvidia.com (10.126.230.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:14:59 -0800 From: Xueming Li To: Zhichao Zeng CC: Ke Xu , Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix outer UDP checksum offload' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:38 +0800 Message-ID: <20230227070107.15664-130-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.230.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: DM6NAM11FT003:EE_|DS0PR12MB8441:EE_ X-MS-Office365-Filtering-Correlation-Id: 9bad362d-debd-424e-b8d7-08db18925f1f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dnBhCgibGg4cNJtJCfMr2bWE/ijP5lukmMM1YOA+1KfH/cy5U++zr1ye3C6+/exx4NSV5rAc6fAicAP6Jrhket2RYSbhwzKiy42YvIxj4QZNGyVVlNdVFJHK1Ln4+iSMybtUqPB3S6rBsFpX5t5b6OgqBYfzj8SfSstiCb3WkcCn9ySW5ooWX9lV9HjqYZZbl+KW3XJM4LWXlZ4Hrz6HsgnbY73kk+EI7m81VZ4tusf1uatIoRfD1OkyzOT8sadBRMsPa88yts5RkFkwAcbUoHBoplc5bjhHgRSH5tMPqeh/I5q/EzYFvjTtYRonb0svnEmwpWDdspL9Rw7w9WSh85vHhoYuxLQ7mo66urAS89p8zGyjDWh1gqybBzuFPp8C/NhCVvCmMBOl2V5Jl1/cal8mkrKkHhY/R+OUSyZF5Y+6K81QspcJZSFGV5952eUFYo3IaDhLBmvZhWex2vrq3HF7GeGsDK9ovqqcQM1KZ/ZtQVkRQwsaj65m3CkqldpEpri2Shq+8NmJS2fkjQPcKyQ/AC+8elMWGzGKU9oxRQZ1TFx0dpp0iFEAbxBfsQ1UkDygforiIvfCL4vPoL4dSVAoK5asQW1S+L4X+LGoknjWvrnx10gW/TsbyebNv70p9P6irfvDEHy5OAnWVtccffbKq/19FWCX9510abXUlUxhttLKOspJrbYMHm0e42MT6OoeIRQl594MfMsGw2HwYeoths+eQO5/kudgBmyvLKUvQb9ThSu0GBjeO++AmLPPBAjJWPDwnqJHXQUtsoRy/YPzBYOqZ3WpfvgWDoE9T6ASs/IXz7XeVHeSnJFc1ozw X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(346002)(39860400002)(396003)(376002)(136003)(451199018)(40470700004)(36840700001)(46966006)(66899018)(2616005)(966005)(316002)(36756003)(82310400005)(86362001)(54906003)(16526019)(40460700003)(6286002)(186003)(2906002)(34020700004)(36860700001)(5660300002)(8676002)(4326008)(8936002)(6916009)(70586007)(70206006)(41300700001)(1076003)(426003)(47076005)(478600001)(53546011)(6666004)(26005)(336012)(55016003)(40480700001)(7696005)(7636003)(356005)(82740400003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:15:14.1857 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9bad362d-debd-424e-b8d7-08db18925f1f 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8441 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=6e50af124fb99278fe3cea4ff7d87bebca856704 Thanks. Xueming Li --- >From 6e50af124fb99278fe3cea4ff7d87bebca856704 Mon Sep 17 00:00:00 2001 From: Zhichao Zeng Date: Tue, 13 Dec 2022 09:45:11 +0800 Subject: [PATCH] net/iavf: fix outer UDP checksum offload Cc: Xueming Li [ upstream commit feb4f66b5a8c8fc32a7e721368728dd53f541e3b ] Currently, when dealing with UDP tunnel pkts checksum offloading, the outer-udp checksum will be offloaded by default. So the 'csum set outer-udp hw/sw' command does not work. This patch fixes judgment of the EIPT flag and enables the 'csum set outer-udp hw/sw' command by adding judgment for the outer-udp checksum offload flag. Fixes: 0c550022fb82 ("net/iavf: fix Tx descriptors for IPsec") Signed-off-by: Zhichao Zeng Tested-by: Ke Xu Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index cf87a6beda..8d49967538 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2453,8 +2453,11 @@ iavf_fill_ctx_desc_tunnelling_field(volatile uint64_t *qw0, * Calculate the tunneling UDP checksum. * Shall be set only if L4TUNT = 01b and EIPT is not zero */ - if (!(eip_typ & IAVF_TX_CTX_EXT_IP_NONE) && - (eip_typ & IAVF_TXD_CTX_UDP_TUNNELING)) + if ((eip_typ & (IAVF_TX_CTX_EXT_IP_IPV6 | + IAVF_TX_CTX_EXT_IP_IPV4 | + IAVF_TX_CTX_EXT_IP_IPV4_NO_CSUM)) && + (eip_typ & IAVF_TXD_CTX_UDP_TUNNELING) && + (m->ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM)) eip_typ |= IAVF_TXD_CTX_QW0_L4T_CS_MASK; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:45.074284200 +0800 +++ 0131-net-iavf-fix-outer-UDP-checksum-offload.patch 2023-02-27 14:08:40.909237000 +0800 @@ -1 +1 @@ -From feb4f66b5a8c8fc32a7e721368728dd53f541e3b Mon Sep 17 00:00:00 2001 +From 6e50af124fb99278fe3cea4ff7d87bebca856704 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit feb4f66b5a8c8fc32a7e721368728dd53f541e3b ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org