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 3826348AEF for ; Wed, 12 Nov 2025 17:53:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 324AD402A0; Wed, 12 Nov 2025 17:53:49 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id BAF6B40B95 for ; Wed, 12 Nov 2025 17:53:47 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4775ae77516so11333085e9.1 for ; Wed, 12 Nov 2025 08:53:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762966427; x=1763571227; 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=M78/mYwlPPzoQkHOzoK53ChhRZqezyVuW28RrczOJWo=; b=ZxEwtUS1T2Gic+NsMgakbgxUoQZdIBiqJpN0b/ndJePWdbfaZFZk2l5Qvriudh+J9O 45DbyzEs55Jq11io34BjQmPreI8R/nmYgfBuM3mNpgXhfv6jcUEnKDImwHqJWk7xxGYW B5N2PfBix5mLlQnCVCTqGyvtWKXLQ/HZlvaSHjmbtHTIodAlpywiFFvmsoS+cCKGvelT oCRG9TpC9tUfsdR9fH6jAnQKU1nKQN8BR8kJve5mrGyYoOqHEFxfeQMYDdqniYBFISB6 kKKPZJdAOmJ9V+yrfmlaMQRcxYT8JV3my8aPc7zmWV5CanqvMpIpePdmetmU2PBoVA/y 48Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762966427; x=1763571227; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=M78/mYwlPPzoQkHOzoK53ChhRZqezyVuW28RrczOJWo=; b=tFk2L3nWjn7SwpjBxS3oNU65ikqfrVWXblwd5xcbgdPOC+HvLDG2FOObS3zpD/SE7t QZ2s78k8akmu4nPwr0CqEaWJHhZhpZ6fDZxZpVuFASmzIP72q3rk3RbKbrkc8qWpPpbZ UJgrlwijG/1A7N19Av8bW+K6uQTtFnTxbmqgH9yLCAjbfg2EV0NuQzaj0pcCFUcucWhL /VLR5Rc4+GSS+X+JOrC7jtttRFmba0hTPm+jqllmS24uLXKm4hiQ6qaSATmSEeMviee9 jUh8XvxZ0utCU1hO2W7DkLztEc1n0OyRyo5W3mgHFYzfQvbzgoKaBmcB9AMLqWyGI5Jd cy/w== X-Gm-Message-State: AOJu0YwmlmDDIO+7EkXmVv/tjNGtdebxUjxgYD/ya3D5EtotR9bRxEWy LxMBVItooxEqwxhjSUlC2NHtT7CBU03R6AMMheb/sPpoQzFhLuRGuqFm0dUgdA== X-Gm-Gg: ASbGncsfrAMIIvaXGdyYefoLORZ3fgJGRSAXV1qepNLxW/mipCnQSofUjfPqXRRqiPc Zy/+yi33QUNupLC4wQLQK13BFjUADSLrncpO47oH8FmRAjPWmULB+BJkwN7/WB/lsV0ldZ70mGd WVLQrefvU8/NOzba9qLxlH5QueEk5nEaUYCtsA931ODXzV85IqKnUYIlPA2mBLLvIb0OtomHuEJ OD5wPq7HBi7olVS3qAo32vWVy/wVXYBdxX8iekU+1yIonSXOInvoXPfyoRwv8Ix+jFx5wJz1QI1 PgfCbsk41T9DumV6mqI7uV+cWd29Qge9MCxhEr2cwPlQQBjoSg0Rw5jdTCjQY7YykGOZA6Rrx5E prd3mozKGz94+qdmUpRwOGXHuLXkw7ac2S+mrhAB1yhYfvj5DdAIqtghqzPlCsvrSV0b9yA+kUr PT4J17tg== X-Google-Smtp-Source: AGHT+IFfI8YTzqd/wqgiEx8qglQOyQek/RlgQq0nI/woirVcndQHKCXm7dB1t7uOcggdRPQYMsXMTw== X-Received: by 2002:a05:600c:3511:b0:477:58af:a91d with SMTP id 5b1f17b1804b1-477870450a2mr35642725e9.5.1762966427201; Wed, 12 Nov 2025 08:53:47 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:a397:14bc:5982:5745]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-47787e95327sm43051035e9.12.2025.11.12.08.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 08:53:46 -0800 (PST) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: dpdk stable Subject: patch 'net/mlx5: remove unused macros' has been queued to stable release 22.11.11 Date: Wed, 12 Nov 2025 16:52:26 +0000 Message-ID: <20251112165308.1618107-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112165308.1618107-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-79-luca.boccassi@gmail.com> <20251112165308.1618107-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 11/14/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/76893a59ba135b0c07901e94a7e78002374051f3 Thanks. Luca Boccassi --- >From 76893a59ba135b0c07901e94a7e78002374051f3 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 73d6bb6ad9..3cae07a6b9 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -413,8 +413,6 @@ struct mlx5_hw_q { #define MLX5_MAX_PENDING_QUERIES 4 #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 39d7864f93..39ca4a6599 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1398,13 +1398,6 @@ struct rte_flow_template_table { #define MLX5_RSS_HASH_NONE 0ULL -/* 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[] = { MLX5_RSS_HASH_IPV4, diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index 82e8298781..3981bb7807 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -25,9 +25,6 @@ /* Convert a bit number to the corresponding 64-bit mask */ #define MLX5_BITSHIFT(v) (UINT64_C(1) << (v)) -/* Save and restore errno around argument evaluation. */ -#define ERRNO_SAFE(x) ((errno = (int []){ errno, ((x), 0) }[0])) - extern int mlx5_logtype; #define MLX5_NET_LOG_PREFIX "mlx5_net" -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-12 16:20:41.435886493 +0000 +++ 0012-net-mlx5-remove-unused-macros.patch 2025-11-12 16:20:40.895716156 +0000 @@ -1 +1 @@ -From f2638f1f388c9300850d217f9a820c1c40f78a77 Mon Sep 17 00:00:00 2001 +From 76893a59ba135b0c07901e94a7e78002374051f3 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 73d6bb6ad9..3cae07a6b9 100644 @@ -26 +27 @@ -@@ -509,8 +509,6 @@ struct __rte_cache_aligned mlx5_hw_q { +@@ -413,8 +413,6 @@ struct mlx5_hw_q { @@ -36 +37 @@ -index 1dca6e0532..c525516672 100644 +index 39d7864f93..39ca4a6599 100644 @@ -39,3 +40,3 @@ -@@ -1888,13 +1888,6 @@ flow_hw_get_reg_id_from_ctx(void *dr_ctx, enum rte_flow_item_type type, - (((func) == RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) || \ - ((func) == RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ_SORT)) +@@ -1398,13 +1398,6 @@ struct rte_flow_template_table { + #define MLX5_RSS_HASH_NONE 0ULL + @@ -54 +55 @@ -index c65839c5d9..95866351c2 100644 +index 82e8298781..3981bb7807 100644 @@ -57,3 +58,3 @@ -@@ -22,9 +22,6 @@ - - #include "mlx5_defs.h" +@@ -25,9 +25,6 @@ + /* Convert a bit number to the corresponding 64-bit mask */ + #define MLX5_BITSHIFT(v) (UINT64_C(1) << (v))