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 5A8B743345 for ; Thu, 16 Nov 2023 14:24:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5565740697; Thu, 16 Nov 2023 14:24:41 +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 3E56940DC9 for ; Thu, 16 Nov 2023 14:24:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141078; 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=Xzr8Ri02GRrVbrXNGZ4yJoy3C7NV3aRClM73wN0BEsw=; b=Z4STvWYr0OtNjL3uzALx7I7JfO0OxwcpFav0hzNc6F4cqGVnytwB2701pBKUczExM/o7m2 ESBaxfLeE67wOC2BvHoDFDQPgBwHqDNiOsN+pP/DiCguqMh8J+RkpEHQQLkitifx9xyoSK 8sZAXAJEDbzNMx/0ojhM3mk7m5rs8QA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-230-4lKCwQnXNhiKGQeSDhdzVQ-1; Thu, 16 Nov 2023 08:24:35 -0500 X-MC-Unique: 4lKCwQnXNhiKGQeSDhdzVQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 9D6F3185A781; Thu, 16 Nov 2023 13:24:35 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id B82812166B27; Thu, 16 Nov 2023 13:24:34 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/tap: fix IPv4 checksum offloading' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:09 +0000 Message-ID: <20231116132348.557257-27-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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/21/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/774c444b1cc75fbcd86912ccbab273292e9b2714 Thanks. Kevin --- >From 774c444b1cc75fbcd86912ccbab273292e9b2714 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 24 Aug 2023 09:18:21 +0200 Subject: [PATCH] net/tap: fix IPv4 checksum offloading [ upstream commit 3e9c82e88069b1e6e945479626b4c054edf8ba96 ] Checking that one of RTE_MBUF_F_TX_IPV4 or RTE_MBUF_F_TX_IP_CKSUM is present is not compliant with the offloading API which specifies that IP checksum requires RTE_MBUF_F_TX_IP_CKSUM. On the other hand, RTE_MBUF_F_TX_IP_CKSUM is invalid for IPv6 packets, so we can simply check for RTE_MBUF_F_TX_IP_CKSUM and assume this is an IPv4 packet. Fixes: 8ae3023387e9 ("net/tap: add Rx/Tx checksum offload support") Signed-off-by: David Marchand Acked-by: Ferruh Yigit --- drivers/net/tap/rte_eth_tap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index bcc5f42cdf..29b4860656 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -546,5 +546,5 @@ tap_tx_l3_cksum(char *packet, uint64_t ol_flags, unsigned int l2_len, void *l3_hdr = packet + l2_len; - if (ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_IPV4)) { + if (ol_flags & RTE_MBUF_F_TX_IP_CKSUM) { struct rte_ipv4_hdr *iph = l3_hdr; uint16_t cksum; @@ -629,5 +629,5 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, nb_segs = mbuf->nb_segs; if (txq->csum && - ((mbuf->ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_IPV4) || + ((mbuf->ol_flags & RTE_MBUF_F_TX_IP_CKSUM || (mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == RTE_MBUF_F_TX_UDP_CKSUM || (mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == RTE_MBUF_F_TX_TCP_CKSUM))) { -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.204494619 +0000 +++ 0027-net-tap-fix-IPv4-checksum-offloading.patch 2023-11-16 13:21:52.455946390 +0000 @@ -1 +1 @@ -From 3e9c82e88069b1e6e945479626b4c054edf8ba96 Mon Sep 17 00:00:00 2001 +From 774c444b1cc75fbcd86912ccbab273292e9b2714 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3e9c82e88069b1e6e945479626b4c054edf8ba96 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 66335d2755..939c68db9a 100644 +index bcc5f42cdf..29b4860656 100644 @@ -26 +27 @@ -@@ -560,5 +560,5 @@ tap_tx_l3_cksum(char *packet, uint64_t ol_flags, unsigned int l2_len, +@@ -546,5 +546,5 @@ tap_tx_l3_cksum(char *packet, uint64_t ol_flags, unsigned int l2_len, @@ -33 +34 @@ -@@ -643,5 +643,5 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, +@@ -629,5 +629,5 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,