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 E8ADF489EF for ; Mon, 27 Oct 2025 17:23:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E2EAD4028B; Mon, 27 Oct 2025 17:23:59 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 5818C4028B for ; Mon, 27 Oct 2025 17:23:59 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-475dd54d7cdso7790665e9.1 for ; Mon, 27 Oct 2025 09:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761582239; x=1762187039; 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=5h3PXMnoNAYQSuMVdXzQ4eIpa2sumAw7pYbzMOWZGW4=; b=X/LrpFyEOYwfNOJfQeAmIBxpeK3eFMHGEIQOYnCBjE8X8PBT40ayhD9Z+3V3JyNQTi bPwHDb763TeQcnpUWzdB+FFKcWMsvIlbD9HJI2up4BCJwClX846KcD07d+gRcYjABV79 R44muAVyXaF35DTUI2RZSDVvwG2R3H3PE5HG3Mc5Kb4ZKcgcJKGe2cOROEpyunP+lGom utZ/rR8Pzr77LLivdZU7KBKQP0vAKPmhC90/CQ/fD+ud/GCuXOxpSp3Ghg5zJ5VrILms v7/NEyizdQdd07kY1TrOSFnSlEDwTRC+9g3qiXNBKwxODQmTGbtIsXgtya/vQerWdBc9 E4GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761582239; x=1762187039; 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=5h3PXMnoNAYQSuMVdXzQ4eIpa2sumAw7pYbzMOWZGW4=; b=tRryBDqggUn8y4lOkITF6vEv0jB57/H5KQ2wtbeT0Vp1G54zDNr+8tTqERc6EQQfSg Kqzm97YuXuKZ5cDXyo41XmSi3Qje81onjbTAtDAu58xg0bF2ZB8EUUBVBx0yPFF+JyoC JBDOAxOQHh7hPl2smwIt6LkfMLntH4ZgwHmNz5vRe2n502cP8IxjMbTGSC6wrYqVxGID V679bj7eCKUI4zjo5eyh4XRYMhXqP0H0ZzE0WJNrBuQKafagEkjfZWt4DqjeAbrMN5Jn ZyL1xGQbDiaj7XUtEafUPTVv657x6p5WtGzj6vC4CEoVavTp1pHE6UOFJwAz7ul1sXT+ JwSw== X-Forwarded-Encrypted: i=1; AJvYcCVSbQ8i7x5b6Qh4NNp70DkiXO+XpHQ8XTGySkcixn1PAwbo0c8Dyxer2/76mZOYWFl/nsRJD+w=@dpdk.org X-Gm-Message-State: AOJu0YwOe83lmdIotXx1HxeGLBI8BhXxHV9/cFQrNBP7/XRZyvuHTfch zQa6gI2uaksOUusPcY//KIA1zbxJcq+3G05ITBOqEUZm5zl341ZARBoB/xsSX7xU X-Gm-Gg: ASbGncvE72zpMLzgU+v+6iRiIsxHY94ozsNaAUOdbT40GsF0uWpUbYtJC0un67FHsdT d8l14xEL3aO+8kH1Ud6zGh8xr5/Aw6vtmqt0U6mhfwuvQPdXTQzZ5KxS93kiCWBotsRJEmqGPhM 8SmwmeH4mBRsm0mnic+6PfJ48NOqncDJAKwvsR6MmTzms8fEobspOIJLuZ11hJVC8c4+4IbdYgU t4C3iMh17vl0B46rdtSRpXDA8ShypHsGHnASf9eBwb+n73xhfbWp9EKIoY6adeuufu69c8FhppN U08/lHxpGzLjF8iRDgdKaXMa8owG0jINezl9OFuiE5eAb2VtrWifVdYG9uT8uppkOCt+95T2PwK wNzQ9EgOxGv0FOwggO5pApYSFG0a0FUWbilLf36mgI70Hj4b+zCOAWioufkhaPQxTC2K/Ae26DR qS5rvKExG+BtTI5Nu2 X-Google-Smtp-Source: AGHT+IE97SPmRuRUHV5wlYV+muGB1TzjBaWVfBsV2rfZB9OYfeyGj3Hj8phuo7oxo7uIGqth7i3oOw== X-Received: by 2002:a05:600c:4ec8:b0:476:84e9:b55a with SMTP id 5b1f17b1804b1-47717dfcad1mr2288915e9.12.1761582238736; Mon, 27 Oct 2025 09:23:58 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:6fc5:c3bc:147e:832c]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-475dd489e6dsm143141915e9.6.2025.10.27.09.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 09:23:58 -0700 (PDT) From: luca.boccassi@gmail.com To: Brick Yang Cc: Gagandeep Singh , dpdk stable Subject: patch 'net/dpaa2: fix L3/L4 checksum results' has been queued to stable release 22.11.11 Date: Mon, 27 Oct 2025 16:19:49 +0000 Message-ID: <20251027162001.3710450-71-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027162001.3710450-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-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 22.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/29/25. 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/68a50d66909c7bb8305eac7cdd1325fcbab01341 Thanks. Luca Boccassi --- >From 68a50d66909c7bb8305eac7cdd1325fcbab01341 Mon Sep 17 00:00:00 2001 From: Brick Yang Date: Thu, 16 Oct 2025 15:57:53 +0530 Subject: [PATCH] net/dpaa2: fix L3/L4 checksum results [ upstream commit 870354264644bc8a2f014571e9a34757258d2ec8 ] Layer3 and layer4 checksum validation and error status is part of word1 of annotation area, but driver is looking into wrong word. This patch fixes the checksum error status in packet parsing. Fixes: 94d31549c380 ("net/dpaa2: support Rx checksum offload in slow parsing") Signed-off-by: Gagandeep Singh Signed-off-by: Brick Yang --- drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h | 10 +++++----- drivers/net/dpaa2/dpaa2_rxtx.c | 16 ++++------------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h index 7e5e499b6a..4f5ac1a481 100644 --- a/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h +++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. - * Copyright 2016,2019 NXP + * Copyright 2016,2019,2022,2024 NXP * */ @@ -298,13 +298,13 @@ struct dpaa2_faead { #define DPAA2_ETH_FAS_PHE 0x00000020 #define DPAA2_ETH_FAS_BLE 0x00000010 /* L3 csum validation performed */ -#define DPAA2_ETH_FAS_L3CV 0x00000008 +#define DPAA2_ETH_FAS_L3CV 0x0000000800000000 /* L3 csum error */ -#define DPAA2_ETH_FAS_L3CE 0x00000004 +#define DPAA2_ETH_FAS_L3CE 0x0000000400000000 /* L4 csum validation performed */ -#define DPAA2_ETH_FAS_L4CV 0x00000002 +#define DPAA2_ETH_FAS_L4CV 0x0000000200000000 /* L4 csum error */ -#define DPAA2_ETH_FAS_L4CE 0x00000001 +#define DPAA2_ETH_FAS_L4CE 0x0000000100000000 #ifdef __cplusplus } diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index a9de1c9f99..a40bf57004 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -196,14 +196,10 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf, goto parse_done; } - if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L3CE)) + if (BIT_ISSET_AT_POS(annotation->word1, DPAA2_ETH_FAS_L3CE)) mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD; - else - mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD; - if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE)) + else if (BIT_ISSET_AT_POS(annotation->word1, DPAA2_ETH_FAS_L4CE)) mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD; - else - mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD; if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_FIRST_FRAGMENT | L3_IP_1_MORE_FRAGMENT | @@ -243,14 +239,10 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr) DPAA2_PMD_DP_DEBUG("(fast parse) Annotation = 0x%" PRIx64 "\t", annotation->word4); - if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L3CE)) + if (BIT_ISSET_AT_POS(annotation->word1, DPAA2_ETH_FAS_L3CE)) mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD; - else - mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD; - if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE)) + else if (BIT_ISSET_AT_POS(annotation->word1, DPAA2_ETH_FAS_L4CE)) mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD; - else - mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD; if (dpaa2_enable_ts[mbuf->port]) { *dpaa2_timestamp_dynfield(mbuf) = annotation->word2; -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-27 15:54:37.375535617 +0000 +++ 0071-net-dpaa2-fix-L3-L4-checksum-results.patch 2025-10-27 15:54:34.847950853 +0000 @@ -1 +1 @@ -From 870354264644bc8a2f014571e9a34757258d2ec8 Mon Sep 17 00:00:00 2001 +From 68a50d66909c7bb8305eac7cdd1325fcbab01341 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 870354264644bc8a2f014571e9a34757258d2ec8 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index d156b07087..a670098958 100644 +index 7e5e499b6a..4f5ac1a481 100644 @@ -35 +36 @@ -@@ -304,13 +304,13 @@ struct dpaa2_faead { +@@ -298,13 +298,13 @@ struct dpaa2_faead { @@ -54 +55 @@ -index 656a3a423f..da0c06caad 100644 +index a9de1c9f99..a40bf57004 100644 @@ -57 +58 @@ -@@ -201,14 +201,10 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf, +@@ -196,14 +196,10 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf, @@ -74 +75 @@ -@@ -248,14 +244,10 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr) +@@ -243,14 +239,10 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr) @@ -89,2 +90,2 @@ - if (unlikely(dpaa2_print_parser_result)) - dpaa2_print_parse_result(annotation); + if (dpaa2_enable_ts[mbuf->port]) { + *dpaa2_timestamp_dynfield(mbuf) = annotation->word2;