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 01C17A034F for ; Wed, 10 Nov 2021 07:58:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFF844068B; Wed, 10 Nov 2021 07:58:40 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2072.outbound.protection.outlook.com [40.107.212.72]) by mails.dpdk.org (Postfix) with ESMTP id 4700C41102 for ; Wed, 10 Nov 2021 07:58:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cTmQeRPLIbi3oNdkuu2Qd/vfJ+06nnVwvO2g03MQvXQiHHPSF4PyBhuEd/e09P4FXoWzgMjhU67G+omJSK4zeykkoB5sdiqXiWnJexVYzH63pvkKYD/gbbNFYKh+MWt0aoIEnIU4XERD7iDJWuUFCqKkpSztM8X7bCUebPPXAA2171/SiL7QxkefcS3iBf7qx+oukX64Rv3hkgXCf1wjHs3hFShiqrKDXMlWmlC8WQZ8WFpJw2NXjrj23ymgYGWmyigipIWl9LHGFcgp7C94pivoeEGyiglmzT6GRRhbsmvPn6UKsE1rr5eUOnsjxYy2QTxyTQbYr7m3zOZ7s6Vxow== 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=4RQODs2Lyymd9f5RdNFBizekzkSee5NRoSBAsvs2dds=; b=R05CKxKFgCxZzAqUPVPOBou5BumITAcIvruMDhfri+GPy35PRCE3LDNqxxF7utQjzuD3Ie/Wy22VX0FONn6TNEKOEht3y7xad6b/pOFGNPMRKNi3zzJkcTp41RHpybJQFDSMgOWIh9JKYCcgSfa4zYaooP0le60NIVcAhGQX0vmzQ7UFfFQFpC1M7BRtybFfr4nQVODf8DEL74+/pXUFvOCpXJ8PwU0lzqs7aWAHRiRbDf77hznJkN7FfbzsnJCA+G9374hqI3/H724sqjfBMeYEpCqbWN/ZD/jq+QNaYh5MTlSBgR6BDxQHtwUGvP4M+hP7nbZ5h7tPFUlkG9XWVQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=4RQODs2Lyymd9f5RdNFBizekzkSee5NRoSBAsvs2dds=; b=daqvqZ2TmopLqC9JIUtN7stp7wQaYjRDNWtMdTlWXjYu9claFY5gF91ByKYouPty1OuemW07GwqjtxU47EEX2SDuhvJXdGnm9x03Dyb70UoB/Xg1tcPi9LzbWN+BvmwG19S9lxhyha+GomzHhDPgXkwXJtft74Kpak3cZhsMZ1zYUPT1WUGKozZaAQR+tziqsLJeQtEbA1fclnbGBaZuK8KawY+58/ddD9LfB8OP36rU8BTnwt/GGzUedIzoaRFGLGI+CwjuA2Fbh35JtcEtg8gIzMUOjSRKAIWeJVHVfL3XFVHCJRGSYxSJ5lODHITiAxU2mMgOdjddfcqv2SzHlA== Received: from DS7PR06CA0049.namprd06.prod.outlook.com (2603:10b6:8:54::35) by DM6PR12MB4188.namprd12.prod.outlook.com (2603:10b6:5:215::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:58:38 +0000 Received: from DM6NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:8:54:cafe::6a) by DS7PR06CA0049.outlook.office365.com (2603:10b6:8:54::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:58:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT056.mail.protection.outlook.com (10.13.173.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:58:38 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:58:36 +0000 From: Xueming Li To: Jie Wang CC: Luca Boccassi , Beilei Xing , dpdk stable Date: Wed, 10 Nov 2021 14:32:02 +0800 Message-ID: <20211110063216.2744012-239-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5b112e1-8a49-435c-e25d-08d9a4178599 X-MS-TrafficTypeDiagnostic: DM6PR12MB4188: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZevVztJsiIpE1tedzubowC2LLJ6WQ5i5wLIOfqbLuEAlj3UYcp31H7McjW+sNSGUj9pZQnz+m4VYfnhMdSGdOJ9iw7DfKP+qQzv2gjb0QwlKCrzkzLcvaWWmdST6lGqWFVJJOFCNDPYijIHw8h9ZTm1P6yQb+rLZV5QqAGvThjzXcUZYgOp81tUntDmITkRiO+ckFQ/9hGGTfwvzuUn1HIGid22XxUYo/NDIA0WVw7uLBlmFMMBzG3IvA6Z0dNoX2KQ7PFbF1SpH3vOrqNA3YmOc9XBFvmxsEt7/jvrU8lZGHS59y7NLjr16RquWOE/JmHzkkgoCXdjHbnXBMKIDGBg+6gZE97oM5GTGZvsv+U9Em7X2hcAEKJdIh57qHlLV9TwKQO3XCZzTikkH6mCO7xjT+sPIDF8TE07j/fKLV3DtjiXNlSRygETXFCzhSIUpK+u6uMazObf9c3ySWn2f5qL7z4cbXyhbEAcyjAn9nmKQr4o07p/XsTH/pPHNLp7623xyIFR4QSur6M8HzqJAOHI7ynAIdowpki0SWbouk1h7jESvuuGE672UOahleebYWNPFCNE8sIeNPfGgKmVTlr/U0BhGqiiK6LNG8KoMgoOLGGLwt8hmrrxSI4jM08DujRuVu48cnXcbLGLTFlPIjVn66nxw+eKwun0DkTFuYK05HdFFieylv/QVVG18/qb8wkyweVPg7cE0oghDvtf9z5QBoAsHP2IxgBIyNkFqb82AKGixvu1GfD3Y4e2CbOu9adl8z5Libon3uZyNH1AiBh9qiY4YLjZ65qX57KxvJrVPS0LBxlvHmjuAhaqiDYwbgO76GhYUfEYf9NXJemStKQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(316002)(7696005)(6666004)(53546011)(8936002)(47076005)(336012)(82310400003)(6916009)(5660300002)(8676002)(966005)(7636003)(508600001)(70206006)(54906003)(1076003)(36906005)(86362001)(36860700001)(55016002)(426003)(2616005)(4326008)(2906002)(19627235002)(70586007)(36756003)(26005)(4001150100001)(186003)(6286002)(356005)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:58:38.1104 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f5b112e1-8a49-435c-e25d-08d9a4178599 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4188 Subject: [dpdk-stable] patch 'net/i40e: fix forward outer IPv6 VXLAN' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/137c9ce9929eef28f83e50650ee8b0ff4a49e3f4 Thanks. Xueming Li --- >From 137c9ce9929eef28f83e50650ee8b0ff4a49e3f4 Mon Sep 17 00:00:00 2001 From: Jie Wang Date: Fri, 5 Nov 2021 11:37:05 +0800 Subject: [PATCH] net/i40e: fix forward outer IPv6 VXLAN Cc: Xueming Li [ upstream commit 8cc79a1636cda2e9d6ba4cfd1cf16cf2a782ae1b ] Testpmd forwards packets in checksum mode that it need to calculate the checksum of each layer's protocol. Then it will fill flags and header length into mbuf. In process_outer_cksums, HW calculates the outer checksum if tx_offloads contains outer UDP checksum otherwise SW calculates the outer checksum. When tx_offloads contains outer UDP checksum or outer IPv4 checksum, mbuf will be filled with correct header length. This patch added outer UDP checksum in tx_offload_capa and I40E_TX_OFFLOAD_MASK, when we set csum hw outer-udp on that the engine can forward outer IPv6 VXLAN packets. Fixes: 7497d3e2f777 ("net/i40e: convert to new Tx offloads API") Signed-off-by: Jie Wang Acked-by: Beilei Xing --- drivers/net/i40e/i40e_ethdev.c | 1 + drivers/net/i40e/i40e_rxtx.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index d2116910a0..a195281795 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -3842,6 +3842,7 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) DEV_TX_OFFLOAD_IPIP_TNL_TSO | DEV_TX_OFFLOAD_GENEVE_TNL_TSO | DEV_TX_OFFLOAD_MULTI_SEGS | + DEV_TX_OFFLOAD_OUTER_UDP_CKSUM | dev_info->tx_queue_offload_capa; dev_info->dev_capa = RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP | diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index d1659ef060..02389905ce 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -67,6 +67,7 @@ PKT_TX_QINQ_PKT | \ PKT_TX_VLAN_PKT | \ PKT_TX_TUNNEL_MASK | \ + PKT_TX_OUTER_UDP_CKSUM | \ I40E_TX_IEEE1588_TMST) #define I40E_TX_OFFLOAD_NOTSUP_MASK \ -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:12.372690449 +0800 +++ 0238-net-i40e-fix-forward-outer-IPv6-VXLAN.patch 2021-11-10 14:17:02.077411067 +0800 @@ -1 +1 @@ -From 8cc79a1636cda2e9d6ba4cfd1cf16cf2a782ae1b Mon Sep 17 00:00:00 2001 +From 137c9ce9929eef28f83e50650ee8b0ff4a49e3f4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8cc79a1636cda2e9d6ba4cfd1cf16cf2a782ae1b ] @@ -22 +24,0 @@ -Cc: stable@dpdk.org @@ -32 +34 @@ -index 9ea5f303ff..344cbd25d3 100644 +index d2116910a0..a195281795 100644 @@ -35,5 +37,5 @@ -@@ -3746,6 +3746,7 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) - RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO | - RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO | - RTE_ETH_TX_OFFLOAD_MULTI_SEGS | -+ RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM | +@@ -3842,6 +3842,7 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) + DEV_TX_OFFLOAD_IPIP_TNL_TSO | + DEV_TX_OFFLOAD_GENEVE_TNL_TSO | + DEV_TX_OFFLOAD_MULTI_SEGS | ++ DEV_TX_OFFLOAD_OUTER_UDP_CKSUM | @@ -44 +46 @@ -index 6ccb598677..41fe3bf481 100644 +index d1659ef060..02389905ce 100644 @@ -47,5 +49,5 @@ -@@ -65,6 +65,7 @@ - RTE_MBUF_F_TX_QINQ | \ - RTE_MBUF_F_TX_VLAN | \ - RTE_MBUF_F_TX_TUNNEL_MASK | \ -+ RTE_MBUF_F_TX_OUTER_UDP_CKSUM | \ +@@ -67,6 +67,7 @@ + PKT_TX_QINQ_PKT | \ + PKT_TX_VLAN_PKT | \ + PKT_TX_TUNNEL_MASK | \ ++ PKT_TX_OUTER_UDP_CKSUM | \