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 0A631432DA for ; Wed, 8 Nov 2023 20:26:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0504C42E28; Wed, 8 Nov 2023 20:26:48 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 4748F42E28 for ; Wed, 8 Nov 2023 20:26:47 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-408382da7f0so23045e9.0 for ; Wed, 08 Nov 2023 11:26:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699471607; x=1700076407; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7UBC5lj+0kW15yvomqUtfjvsxXczVoWE4AAnp8S5nqk=; b=bcUqrphAun27fLwTxc83KKb5HTpt7iXutPJ3ofm30+PZaZr8gTWCAYba38Hr0OWfR8 Jch1TUeHgqEehEgxy+C44SwaNbve/3Og+VLvkGLBHdbd4D9D+mavtllXfvU/SFtJsGRU 2OiQQlL2Z2YaG46EAWGcThOVcq2Oi6p6FZU2gsTC90cOMfCXsm91u0+ci0HCYxioG0fm kuq3TrvrUFVHgowuUWmpS8LfMmZRYo8jR4Py94neHRg576xtkF71cEL1nToMPTNtCYsq zAf91XEjgUPyROHayiJ6doXDdpKXtT9S+/+e3VI197H1OklE3Zt8Eg47zLw01rQxj0Zu 1wUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699471607; x=1700076407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7UBC5lj+0kW15yvomqUtfjvsxXczVoWE4AAnp8S5nqk=; b=gzAX1hzD3dZQ2dhnheuH5QsES0GlQCzPraYyt1xyfm7wXXS68DPE3bubvi1OqwFaBD z64UcLU5hB/16MJatnTmgbJsfsisO9JmckcNzAdA6JnrhFQwXkLEDqNvHtO6g0Up4Rt2 IOim0nd00XAypAttELa6k+YFNVzRqv40e64Vrn0NOi9YVoDt8QwDGRepWnzJyUXSwsy8 HSm40/vW2bl6OIfjJ7KyUUYLYW5dS4z494Qg0J4dQn+33hfJJMSuszt07kUwE0yJZit1 RGpkV8kmqsFsB9mrEza1Pc5Db13guG3SbStaZUmwioq/dPF7rJDAbK13sp/T3JV0HRHg GpbQ== X-Gm-Message-State: AOJu0Yy0qg7uFCrPYBVtxswuYTWn58kHayxAa647al3dJvvGfztxd2Lv lfy1Wy+i7pFArESQtqCGqes= X-Google-Smtp-Source: AGHT+IHopWgkVMc/BrhXURUP93U3EWBcpi6H9WeOXEynv8te4K57KLMqPD2H6LPqfDpGs9+aH1aeVg== X-Received: by 2002:a05:600c:3596:b0:409:351:873d with SMTP id p22-20020a05600c359600b004090351873dmr2598289wmq.31.1699471606845; Wed, 08 Nov 2023 11:26:46 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id fo15-20020a05600c690f00b0040535648639sm19587848wmb.36.2023.11.08.11.26.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 11:26:46 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Ales Musil , Ferruh Yigit , dpdk stable Subject: patch 'net/tap: fix L4 checksum offloading' has been queued to stable release 20.11.10 Date: Wed, 8 Nov 2023 19:25:23 +0000 Message-Id: <20231108192535.922238-25-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231108192535.922238-1-luca.boccassi@gmail.com> References: <20231018235930.3144-41-luca.boccassi@gmail.com> <20231108192535.922238-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.10 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/10/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3c5688e78a52578d1e27d68dd126ee3fe5a61b31 Thanks. Luca Boccassi --- >From 3c5688e78a52578d1e27d68dd126ee3fe5a61b31 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 --- drivers/net/tap/rte_eth_tap.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index e6dc870594..2a7006c7b2 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -656,13 +656,22 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, ((mbuf->ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_IPV4) || (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM || (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM))) { + unsigned int l4_len = 0; + is_cksum = 1; + if ((mbuf->ol_flags & PKT_TX_L4_MASK) == + PKT_TX_UDP_CKSUM) + l4_len = sizeof(struct rte_udp_hdr); + else if ((mbuf->ol_flags & PKT_TX_L4_MASK) == + PKT_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; @@ -672,7 +681,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, rte_memcpy(m_copy, rte_pktmbuf_mtod(mbuf, void *), 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); iovecs[k].iov_base = m_copy; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-08 19:23:53.203624041 +0000 +++ 0025-net-tap-fix-L4-checksum-offloading.patch 2023-11-08 19:23:51.805396955 +0000 @@ -1 +1 @@ -From 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a Mon Sep 17 00:00:00 2001 +From 3c5688e78a52578d1e27d68dd126ee3fe5a61b31 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +16,0 @@ - .mailmap | 1 + @@ -18 +18 @@ - 2 files changed, 12 insertions(+), 2 deletions(-) + 1 file changed, 11 insertions(+), 2 deletions(-) @@ -20,12 +19,0 @@ -diff --git a/.mailmap b/.mailmap -index c384d97a1a..c0ab6d090b 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -41,6 +41,7 @@ Aleksandr Loktionov - Aleksandr Miloshenko - Aleksey Baulin - Aleksey Katargin -+Ales Musil - Alexander Bechikov - Alexander Belyakov - Alexander Chernavin @@ -33 +21 @@ -index b25a52655f..66335d2755 100644 +index e6dc870594..2a7006c7b2 100644 @@ -36,4 +24,4 @@ -@@ -645,13 +645,22 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, - ((mbuf->ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_IPV4) || - (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))) { +@@ -656,13 +656,22 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, + ((mbuf->ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_IPV4) || + (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM || + (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM))) { @@ -44,2 +32,2 @@ -+ if ((mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == -+ RTE_MBUF_F_TX_UDP_CKSUM) ++ if ((mbuf->ol_flags & PKT_TX_L4_MASK) == ++ PKT_TX_UDP_CKSUM) @@ -47,2 +35,2 @@ -+ else if ((mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == -+ RTE_MBUF_F_TX_TCP_CKSUM) ++ else if ((mbuf->ol_flags & PKT_TX_L4_MASK) == ++ PKT_TX_TCP_CKSUM) @@ -60 +48 @@ -@@ -661,7 +670,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, +@@ -672,7 +681,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,