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 1D8024326F for ; Thu, 2 Nov 2023 14:13:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1526140A76; Thu, 2 Nov 2023 14:13:44 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id EBAE940A76 for ; Thu, 2 Nov 2023 14:13:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6CspPwpS6HtAwu9cEzd+Y5Oug3hNE7p17GPdPUgFxlw=; b=CJyEjoFXLyP64n/XvVAIVlXLP4D7aQkdfFP0qghn5Y/En1pe1GQO1MalXexUuVFxaqiaM9 NPJGWhKgJqPkq4p7D5AsuLzf65hEzB/nzae15toOB+z+VXE6fs0BMuoWUj3tuJyjqx05u9 kXCurS0UPREcIURcDkJbUgMu6gomA00= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-520-9TAdDOE0OtC4cQ3z86-lTQ-1; Thu, 02 Nov 2023 09:13:38 -0400 X-MC-Unique: 9TAdDOE0OtC4cQ3z86-lTQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9BB023C025D3; Thu, 2 Nov 2023 13:13:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 11678492BFA; Thu, 2 Nov 2023 13:13:36 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix GRE tunnel packet checksum' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:23 +0000 Message-ID: <20231102131254.315947-17-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.6 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/08/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/289d492046e8ac78bbe65f396ae83f175a9102c9 Thanks. Kevin --- >From 289d492046e8ac78bbe65f396ae83f175a9102c9 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 [ 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 0ed757d820..f9da4e4ceb 100644 --- a/drivers/net/txgbe/txgbe_ptypes.c +++ b/drivers/net/txgbe/txgbe_ptypes.c @@ -321,6 +321,4 @@ txgbe_encode_ptype_tunnel(u32 ptype) break; case RTE_PTYPE_TUNNEL_GRE: - ptid |= TXGBE_PTID_TUN_EIG; - break; case RTE_PTYPE_TUNNEL_VXLAN: case RTE_PTYPE_TUNNEL_VXLAN_GPE: @@ -333,18 +331,4 @@ txgbe_encode_ptype_tunnel(u32 ptype) } - 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: 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 @@ -349,3 +349,8 @@ struct txgbe_nvgrehdr { }; +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 28e5a78cc9..d0f7fe6945 100644 --- a/drivers/net/txgbe/txgbe_rxtx.c +++ b/drivers/net/txgbe/txgbe_rxtx.c @@ -573,5 +573,4 @@ tx_desc_ol_flags_to_ptype(uint64_t oflags) RTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_GRE; - ptype |= RTE_PTYPE_INNER_L2_ETHER; break; case RTE_MBUF_F_TX_TUNNEL_GENEVE: @@ -706,20 +705,22 @@ 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; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.299890918 +0000 +++ 0017-net-txgbe-fix-GRE-tunnel-packet-checksum.patch 2023-11-02 13:09:40.796163281 +0000 @@ -1 +1 @@ -From 5bbaf75ed6df2605a8cf780057211f2592add80d Mon Sep 17 00:00:00 2001 +From 289d492046e8ac78bbe65f396ae83f175a9102c9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5bbaf75ed6df2605a8cf780057211f2592add80d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index e1299d7363..c444d5d3f1 100644 +index 0ed757d820..f9da4e4ceb 100644 @@ -63 +64 @@ -index 427f8b82ac..f7cd2333ab 100644 +index 28e5a78cc9..d0f7fe6945 100644