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 A74E9431D5 for ; Sun, 22 Oct 2023 16:25:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A089340A6C; Sun, 22 Oct 2023 16:25:40 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2087.outbound.protection.outlook.com [40.107.101.87]) by mails.dpdk.org (Postfix) with ESMTP id 67AA64069F for ; Sun, 22 Oct 2023 16:25:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KrUTjr8w7HgNGnGc5w/UmX8B9SvA2+x8/V38tPiKJRgMigzJpPLbKi29w825GMb6kphiZGDiF/jsBgdC6n4PhDUAmh0ZTNNjRbgGReUJvkpVzbYVimwTLicgv5hUOVyfRLIiEX/SYzjLm9sQHL8n2QOI1cb3YjI/W9HMsPx4EFoxRRpHcPce/yatouX77xLpd/BqvIfrYSVbCkI7bcFfOevGhBxtLZNmrXpr4auqaou1pa2iMSAEsHj6fEbZDSopeOlJZiCray0Ktuqjmap+Ezn+3lRXAFpUuoWwHa70X3gpOlKD9RKjJJ+a+k2VMCg4J+YTNj4JaRjr0z9vvNCpqw== 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=Wrrj5+GrHc66cgyvxkZPDspQuUzcyKS4fgStpR5p/KE=; b=RznxjeKG1PqcvujqP7VPBbVayOYFDUwTxy+Wbu1fAZsFKBftpP0bvih2Gx3vElFmQz3K5YpeiV/iiLvq90zUzNPV2CSQ2RX05eVc7dp/tuH+kfklnkzlb2uy94kZRm/SKDle1pGPYs09ifzbhrskXO9H6JzpTFGOIzJFpE191wwyjku+PF/GrWrOg+IRRxfsicfv1mrf3b083YdNIqtNO6Ew9tM4jL0JPgSGlZlsTpI/OtT0HwGvTHyX3fDIuaPe7bgsikoYuCPXpYUs+nZzqximJ2zOxFXooBvTwU9Iab/9Qjf53U9x2Gm5IBgHw8xGOuOhnhVd+4t96g0BOoyCpg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=trustnetic.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=Wrrj5+GrHc66cgyvxkZPDspQuUzcyKS4fgStpR5p/KE=; b=gGFjka89QS3FnyG8QQOAyzM7GxEqlPhTOejGcVGGw9+Nun0Hfat9l4KQldIdzrwERa9Zp/8n4t44tLxv8IRl2koL0Y2sZIxtOk8X1U/l1LHc0UgJzShU1gI2Km2fBvKy6/DpcjGu8tfHNNIQrc61Y3pB9tezBnoNmN/smnkShHAOV2ZpJrobfT2Bpf4IAx8dVok0xMMt7sfHxJX8HPIBxWlauXsrdkE52vq2OUHbl0wscrjKvDKAnVjF7n57W++GT+WGSo8QY9cWNXLS1rjbc3iW39cnHJB52iut/6C/a3Vd0GCcC8k4wfBVSSScr6Vc7DvdCQ5ljKNo/aG+tkLpxA== Received: from MW4PR03CA0302.namprd03.prod.outlook.com (2603:10b6:303:dd::7) by SN7PR12MB6837.namprd12.prod.outlook.com (2603:10b6:806:267::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31; Sun, 22 Oct 2023 14:25:34 +0000 Received: from CO1PEPF000044F4.namprd05.prod.outlook.com (2603:10b6:303:dd:cafe::92) by MW4PR03CA0302.outlook.office365.com (2603:10b6:303:dd::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31 via Frontend Transport; Sun, 22 Oct 2023 14:25:34 +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 CO1PEPF000044F4.mail.protection.outlook.com (10.167.241.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:25:34 +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.41; Sun, 22 Oct 2023 07:25:24 -0700 Received: from nvidia.com (10.126.231.35) 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.41; Sun, 22 Oct 2023 07:25:22 -0700 From: Xueming Li To: Jiawen Wu CC: dpdk stable Subject: patch 'net/txgbe: fix GRE tunnel packet checksum' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:20:55 +0800 Message-ID: <20231022142250.10324-27-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F4:EE_|SN7PR12MB6837:EE_ X-MS-Office365-Filtering-Correlation-Id: 06258085-bb32-4061-64e9-08dbd30ac0e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CYmWHyW+ReTshiaMW4tWueS8sEI0bvGPb4cImr4LLkPCklIQqTVRxuCnEt/Y1zzfmJ5fh1OwvnikbHHCDscokrABAslIb8hMeuQKIXezeQ8b9Z4a+ugwespFAwa+210Bp6ORORil6yaI3+SqLgd3oJwyO7DeliOJwDedEaTUjAAmTDeYlqjNclHVgoe1C7Tw/byjeZcyTZHbZhXDfTiYFoWvJuC7ynNwhWMv/aYIo5pDtRJrhxqxeK3ZiMVp+2DLoi4PjphBjwiO7YlBJ6sWw41V4LbIXrDK98sWOlbfDOMPcY4M1OPGtZQetxQsxLXLfR0CcgABMW16LaL8i01VIQ6FfCeeW+gFVaPmegHu8zMwKJ4XoFnndu7TAeAngJ2BiJdF7PzCRQ3uhdOMXLPBMGF7WVWiPZVMMv+22CZYgZHYRA9KH0KLot/t6Oij/DV2uye221BDXWICl0iAWWllfXmmkPS/EuQdw3u79NKhYjXlO6Iy1StrSehMYPc7tQ3rl55Ga9xBpjDjlRiiwAG5bwyr1mXPTpA20zo+hB7o9EHpJ1Fx+9uQvQgcNkNejXX9WitLcZNrn2b0/+bpqImnlWzgR9y+izgrtUldqu1CiikTsPG3k9V9Iz+hhyqyJXRLqHhvNYd8L3FnkhMui75rZ0dHcGTFSoqvhvDkJityUvRaa1J1TqZMF160RSwJcd4fajfwiYWp5rsr8GLy/beYfnmOv3dIAsOcStUNWVKQSGOE+sW+CRpOOeCGmC4zMI3DxjldMi04iNlBzkt9pmfjNofUxxUnLXo7k542bKsCiBw= 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:(13230031)(4636009)(396003)(376002)(346002)(39860400002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(82310400011)(40470700004)(46966006)(36840700001)(40480700001)(26005)(6286002)(2616005)(1076003)(426003)(336012)(16526019)(83380400001)(6666004)(53546011)(7696005)(82740400003)(86362001)(36756003)(7636003)(356005)(47076005)(36860700001)(4001150100001)(2906002)(966005)(478600001)(8936002)(8676002)(4326008)(41300700001)(6916009)(316002)(70586007)(70206006)(5660300002)(40460700003)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:25:34.0887 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 06258085-bb32-4061-64e9-08dbd30ac0e5 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: CO1PEPF000044F4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6837 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.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/15/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=ae0ac0ba92a3f377880ce4019585e653d34a4cc3 Thanks. Xueming Li --- >From ae0ac0ba92a3f377880ce4019585e653d34a4cc3 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Thu, 28 Sep 2023 17:47:49 +0800 Subject: [PATCH] net/txgbe: fix GRE tunnel packet checksum Cc: Xueming Li [ upstream commit 5bbaf75ed6df2605a8cf780057211f2592add80d ] Fix transmit context descriptor for GRE tunnel packet to make the hardware compute the checksum successfully. Fixes: e5ece1f467aa ("net/txgbe: fix VXLAN-GPE packet checksum") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ptypes.c | 16 ---------------- drivers/net/txgbe/txgbe_ptypes.h | 5 +++++ drivers/net/txgbe/txgbe_rxtx.c | 23 ++++++++++++----------- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ptypes.c b/drivers/net/txgbe/txgbe_ptypes.c index e1299d7363..c444d5d3f1 100644 --- a/drivers/net/txgbe/txgbe_ptypes.c +++ b/drivers/net/txgbe/txgbe_ptypes.c @@ -320,8 +320,6 @@ txgbe_encode_ptype_tunnel(u32 ptype) ptid |= TXGBE_PTID_TUN_EI; break; case RTE_PTYPE_TUNNEL_GRE: - ptid |= TXGBE_PTID_TUN_EIG; - break; case RTE_PTYPE_TUNNEL_VXLAN: case RTE_PTYPE_TUNNEL_VXLAN_GPE: case RTE_PTYPE_TUNNEL_NVGRE: @@ -332,20 +330,6 @@ txgbe_encode_ptype_tunnel(u32 ptype) return ptid; } - switch (ptype & RTE_PTYPE_INNER_L2_MASK) { - case RTE_PTYPE_INNER_L2_ETHER: - ptid |= TXGBE_PTID_TUN_EIGM; - break; - case RTE_PTYPE_INNER_L2_ETHER_VLAN: - ptid |= TXGBE_PTID_TUN_EIGMV; - break; - case RTE_PTYPE_INNER_L2_ETHER_QINQ: - ptid |= TXGBE_PTID_TUN_EIGMV; - break; - default: - break; - } - switch (ptype & RTE_PTYPE_INNER_L3_MASK) { case RTE_PTYPE_INNER_L3_IPV4: case RTE_PTYPE_INNER_L3_IPV4_EXT: diff --git a/drivers/net/txgbe/txgbe_ptypes.h b/drivers/net/txgbe/txgbe_ptypes.h index fa6c347d53..6fa8147f05 100644 --- a/drivers/net/txgbe/txgbe_ptypes.h +++ b/drivers/net/txgbe/txgbe_ptypes.h @@ -348,4 +348,9 @@ struct txgbe_nvgrehdr { __be32 tni; }; +struct txgbe_grehdr { + __be16 flags; + __be16 proto; +}; + #endif /* _TXGBE_PTYPE_H_ */ diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c index 427f8b82ac..f7cd2333ab 100644 --- a/drivers/net/txgbe/txgbe_rxtx.c +++ b/drivers/net/txgbe/txgbe_rxtx.c @@ -572,7 +572,6 @@ tx_desc_ol_flags_to_ptype(uint64_t oflags) ptype |= RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_GRE; - ptype |= RTE_PTYPE_INNER_L2_ETHER; break; case RTE_MBUF_F_TX_TUNNEL_GENEVE: ptype |= RTE_PTYPE_L2_ETHER | @@ -705,22 +704,24 @@ txgbe_get_tun_len(struct rte_mbuf *mbuf) static inline uint8_t txgbe_parse_tun_ptid(struct rte_mbuf *tx_pkt) { - uint64_t l2_none, l2_mac, l2_mac_vlan; + uint64_t l2_vxlan, l2_vxlan_mac, l2_vxlan_mac_vlan; + uint64_t l2_gre, l2_gre_mac, l2_gre_mac_vlan; uint8_t ptid = 0; - if ((tx_pkt->ol_flags & (RTE_MBUF_F_TX_TUNNEL_VXLAN | - RTE_MBUF_F_TX_TUNNEL_VXLAN_GPE)) == 0) - return ptid; + l2_vxlan = sizeof(struct txgbe_udphdr) + sizeof(struct txgbe_vxlanhdr); + l2_vxlan_mac = l2_vxlan + sizeof(struct rte_ether_hdr); + l2_vxlan_mac_vlan = l2_vxlan_mac + sizeof(struct rte_vlan_hdr); - l2_none = sizeof(struct txgbe_udphdr) + sizeof(struct txgbe_vxlanhdr); - l2_mac = l2_none + sizeof(struct rte_ether_hdr); - l2_mac_vlan = l2_mac + sizeof(struct rte_vlan_hdr); + l2_gre = sizeof(struct txgbe_grehdr); + l2_gre_mac = l2_gre + sizeof(struct rte_ether_hdr); + l2_gre_mac_vlan = l2_gre_mac + sizeof(struct rte_vlan_hdr); - if (tx_pkt->l2_len == l2_none) + if (tx_pkt->l2_len == l2_vxlan || tx_pkt->l2_len == l2_gre) ptid = TXGBE_PTID_TUN_EIG; - else if (tx_pkt->l2_len == l2_mac) + else if (tx_pkt->l2_len == l2_vxlan_mac || tx_pkt->l2_len == l2_gre_mac) ptid = TXGBE_PTID_TUN_EIGM; - else if (tx_pkt->l2_len == l2_mac_vlan) + else if (tx_pkt->l2_len == l2_vxlan_mac_vlan || + tx_pkt->l2_len == l2_gre_mac_vlan) ptid = TXGBE_PTID_TUN_EIGMV; return ptid; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:35.402278600 +0800 +++ 0026-net-txgbe-fix-GRE-tunnel-packet-checksum.patch 2023-10-22 22:17:34.166723700 +0800 @@ -1 +1 @@ -From 5bbaf75ed6df2605a8cf780057211f2592add80d Mon Sep 17 00:00:00 2001 +From ae0ac0ba92a3f377880ce4019585e653d34a4cc3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5bbaf75ed6df2605a8cf780057211f2592add80d ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org