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 0AEB843345 for ; Thu, 16 Nov 2023 14:24:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05C7540DCA; Thu, 16 Nov 2023 14:24:38 +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 8DEAC402C6 for ; Thu, 16 Nov 2023 14:24:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141076; 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=5BTa/vKedN6aDO+WBfO6doz155kuyLXqpBryyECshfc=; b=YIiYKA56VDTLQlZJGGBR5wBMsaGiAG44zSbNQ/lBl5gjJgBHungTOs5HY7s7bMOXVpGDpD xcJcVOoXK0vpTrZGQ2pU83ZW8bG6Ems0Kqwdx+xYadquUam2KcsAy6MaxcJvXT86S/g/ht a8aVmM+0d1y8lFuKd2Tn0HHYbjCbbig= 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-684-vkscySBNPoiATI5gTtRUww-1; Thu, 16 Nov 2023 08:24:34 -0500 X-MC-Unique: vkscySBNPoiATI5gTtRUww-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 6CC7F3C0FC87; Thu, 16 Nov 2023 13:24:34 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DB902166B27; Thu, 16 Nov 2023 13:24:33 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Ales Musil , Ferruh Yigit , dpdk stable Subject: patch 'net/tap: fix L4 checksum offloading' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:08 +0000 Message-ID: <20231116132348.557257-26-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/8b094ad673b01545f34aee2b5f52da3b4cdfa801 Thanks. Kevin --- >From 8b094ad673b01545f34aee2b5f52da3b4cdfa801 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 24 Aug 2023 09:18:20 +0200 Subject: [PATCH] net/tap: fix L4 checksum offloading [ upstream commit 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a ] The L4 checksum offloading API does not require l4_len to be set. Make the driver discover the L4 headers size by itself. Fixes: 6546e76056e3 ("net/tap: calculate checksums of multi segs packets") Signed-off-by: David Marchand Tested-by: Ales Musil Acked-by: Ferruh Yigit --- .mailmap | 1 + drivers/net/tap/rte_eth_tap.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 3ba8d68383..4e27a991ba 100644 --- a/.mailmap +++ b/.mailmap @@ -39,4 +39,5 @@ Aleksandr Miloshenko Aleksey Baulin Aleksey Katargin +Ales Musil Alexander Bechikov Alexander Belyakov diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 470ea65f93..bcc5f42cdf 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -632,11 +632,20 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, (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))) { + unsigned int l4_len = 0; + is_cksum = 1; + if ((mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == + RTE_MBUF_F_TX_UDP_CKSUM) + l4_len = sizeof(struct rte_udp_hdr); + else if ((mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == + RTE_MBUF_F_TX_TCP_CKSUM) + l4_len = sizeof(struct rte_tcp_hdr); + /* Support only packets with at least layer 4 * header included in the first segment */ seg_len = rte_pktmbuf_data_len(mbuf); - l234_hlen = mbuf->l2_len + mbuf->l3_len + mbuf->l4_len; + l234_hlen = mbuf->l2_len + mbuf->l3_len + l4_len; if (seg_len < l234_hlen) return -1; @@ -648,5 +657,5 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, l234_hlen); tap_tx_l3_cksum(m_copy, mbuf->ol_flags, - mbuf->l2_len, mbuf->l3_len, mbuf->l4_len, + mbuf->l2_len, mbuf->l3_len, l4_len, &l4_cksum, &l4_phdr_cksum, &l4_raw_cksum); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.181229936 +0000 +++ 0026-net-tap-fix-L4-checksum-offloading.patch 2023-11-16 13:21:52.453946384 +0000 @@ -1 +1 @@ -From 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a Mon Sep 17 00:00:00 2001 +From 8b094ad673b01545f34aee2b5f52da3b4cdfa801 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c384d97a1a..c0ab6d090b 100644 +index 3ba8d68383..4e27a991ba 100644 @@ -24 +25 @@ -@@ -42,4 +42,5 @@ Aleksandr Miloshenko +@@ -39,4 +39,5 @@ Aleksandr Miloshenko @@ -31 +32 @@ -index b25a52655f..66335d2755 100644 +index 470ea65f93..bcc5f42cdf 100644 @@ -34 +35 @@ -@@ -646,11 +646,20 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, +@@ -632,11 +632,20 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, @@ -56 +57 @@ -@@ -662,5 +671,5 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, +@@ -648,5 +657,5 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,