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 21DB448B69 for ; Fri, 21 Nov 2025 12:22:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D3544026F; Fri, 21 Nov 2025 12:22:29 +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 E1B3E402D4 for ; Fri, 21 Nov 2025 12:22:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724147; 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=izkW10LQBHjJJK78EjGGXHPiBzc+x8GtnUj7KpKP0ko=; b=WUiJzoBLwLfcdy3hj7pPjdD7py648U1M2elJL5vhm7y3M36wuBwlKVSbcZfo5oImDKGtk/ RIXqimaIWaVY5mWfUsQCvIaVLiK1jttN2B9rJobBgcgNXenTOOOs0yO1q/FYIs9ZQ84Txx TM0A6enz6PL9Ah1GiC7KZPfLUEnyhVc= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-696-8Nw6BlZrMCyCRbT9fipDlw-1; Fri, 21 Nov 2025 06:22:26 -0500 X-MC-Unique: 8Nw6BlZrMCyCRbT9fipDlw-1 X-Mimecast-MFC-AGG-ID: 8Nw6BlZrMCyCRbT9fipDlw_1763724145 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2A4601956066; Fri, 21 Nov 2025 11:22:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.42.28.165]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E906B30044DB; Fri, 21 Nov 2025 11:22:23 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: dpdk stable Subject: patch 'net/mlx5: remove unused macros' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:20:00 +0000 Message-ID: <20251121112128.485623-16-ktraynor@redhat.com> In-Reply-To: <20251121112128.485623-1-ktraynor@redhat.com> References: <20251121112128.485623-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Id17rO5VpHw3mHWOZRuCJMYv5OMmi5GlTcaaJAyLGc8_1763724145 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 24.11.4 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/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/48ef824ea126c751d324e706cf1769ac7ab3282f Thanks. Kevin --- >From 48ef824ea126c751d324e706cf1769ac7ab3282f Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 31 Oct 2025 21:38:26 +0100 Subject: [PATCH] net/mlx5: remove unused macros [ upstream commit f2638f1f388c9300850d217f9a820c1c40f78a77 ] - IS_BATCH_CNT became unused when removing flow counter container. - MLX5_ETHER_TYPE_FROM_HEADER was used in the first integrity item check. - ERRNO_SAFE was used in the old logging macros. Fixes: 994829e695c0 ("net/mlx5: remove single counter container") Fixes: 23b0a8b298b1 ("net/mlx5: fix integrity item validation and translation") Fixes: a170a30d22a8 ("net/mlx5: use dynamic logging") Signed-off-by: Thomas Monjalon --- drivers/net/mlx5/mlx5.h | 2 -- drivers/net/mlx5/mlx5_flow.h | 7 ------- drivers/net/mlx5/mlx5_utils.h | 3 --- 3 files changed, 12 deletions(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 6cb4a29953..f2ddb5c7b4 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -495,6 +495,4 @@ struct __rte_cache_aligned mlx5_hw_q { #define MLX5_CNT_MR_ALLOC_BULK 64 #define MLX5_CNT_SHARED_OFFSET 0x80000000 -#define IS_BATCH_CNT(cnt) (((cnt) & (MLX5_CNT_SHARED_OFFSET - 1)) >= \ - MLX5_CNT_BATCH_OFFSET) #define MLX5_CNT_SIZE (sizeof(struct mlx5_flow_counter)) #define MLX5_AGE_SIZE (sizeof(struct mlx5_age_param)) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index ad15b0de32..aa8ea54c66 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1865,11 +1865,4 @@ flow_hw_get_reg_id_from_ctx(void *dr_ctx, enum rte_flow_item_type type, ((func) == RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ_SORT)) -/* extract next protocol type from Ethernet & VLAN headers */ -#define MLX5_ETHER_TYPE_FROM_HEADER(_s, _m, _itm, _prt) do { \ - (_prt) = ((const struct _s *)(_itm)->mask)->_m; \ - (_prt) &= ((const struct _s *)(_itm)->spec)->_m; \ - (_prt) = rte_be_to_cpu_16((_prt)); \ -} while (0) - /* array of valid combinations of RX Hash fields for RSS */ static const uint64_t mlx5_rss_hash_fields[] = { diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index f933daf03c..1ad251cbc9 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -23,7 +23,4 @@ #include "mlx5_defs.h" -/* Save and restore errno around argument evaluation. */ -#define ERRNO_SAFE(x) ((errno = (int []){ errno, ((x), 0) }[0])) - extern int mlx5_logtype; -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:10.133082115 +0000 +++ 0016-net-mlx5-remove-unused-macros.patch 2025-11-21 11:05:09.389200854 +0000 @@ -1 +1 @@ -From f2638f1f388c9300850d217f9a820c1c40f78a77 Mon Sep 17 00:00:00 2001 +From 48ef824ea126c751d324e706cf1769ac7ab3282f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f2638f1f388c9300850d217f9a820c1c40f78a77 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 233cb416cb..4d9cf6b70b 100644 +index 6cb4a29953..f2ddb5c7b4 100644 @@ -26 +27 @@ -@@ -510,6 +510,4 @@ struct __rte_cache_aligned mlx5_hw_q { +@@ -495,6 +495,4 @@ struct __rte_cache_aligned mlx5_hw_q { @@ -34 +35 @@ -index 1dca6e0532..c525516672 100644 +index ad15b0de32..aa8ea54c66 100644 @@ -37 +38 @@ -@@ -1889,11 +1889,4 @@ flow_hw_get_reg_id_from_ctx(void *dr_ctx, enum rte_flow_item_type type, +@@ -1865,11 +1865,4 @@ flow_hw_get_reg_id_from_ctx(void *dr_ctx, enum rte_flow_item_type type, @@ -50 +51 @@ -index c65839c5d9..95866351c2 100644 +index f933daf03c..1ad251cbc9 100644