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 D5EC8470E5 for ; Thu, 25 Dec 2025 10:21:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CEF7B4025E; Thu, 25 Dec 2025 10:21:53 +0100 (CET) Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010031.outbound.protection.outlook.com [52.101.46.31]) by mails.dpdk.org (Postfix) with ESMTP id 159144025E for ; Thu, 25 Dec 2025 10:21:53 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FEyAv1EP67hITsrrZYhyAeO/CyKlkZVKxbXEvmX2tIxlg7ZP4bog1OZo0rEohnGq3H9rh5lim6/6thKESjhX+8FgCpAoretOsdRZgBNF1HXX8vZCnLDGaitAJVm6c6guXJ6F7Wacix7OjjpRjUQ0Ch6ThJ879zjGesLSPYC110lmSn3S8WqPYlp7D2i+r9hMLdpRfM59T2V2oxs5P4SWFFvUYjs7/7NC6X0emqi7m0x1A16q4SgL1v6LHrS5uaimZdyDVGWrABEjVPYMcFnbxDhEYgNM5I5LYrikBTLbqIWUaoG4VUdeh47uJXHFr8B1ZZt9to963gJKP5gWYlgVFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SEq80ERI4cZtC5y2ZkHUfEvO8LFoPTMxwWvRV8hFxAk=; b=H4+x3TqKluw42Cd9tMgWiZEQ2STbq82fFFv7AmjQR8p8G1oKa6crS74mZzwCiKzaTq0JkTogKUk+3yIp6ZxcaWXdYlylr7ysKwU4myXtXnzUDV4Q6yD8A/qfTKgVi5ETlVRP+rOT7FAX3mRnkE4XsMeWxqP0MkOezqwoYwO7qRPDFT0E5AforafWM+LpMmbfsW9XDg8QC+30GR3a98ZaVTq+SuEb9ceEb14xtF0CR+Wpx1MQ8meWyfHUg8Do48KQ2pLdvOMq369JBRq6vcBUcfISDccbc7sCOHs61MdnKCG3iyhFT3nmCr03bPz97xaeRFQp+VK2z/1O3Ar/6de8nQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SEq80ERI4cZtC5y2ZkHUfEvO8LFoPTMxwWvRV8hFxAk=; b=LUbNEdq6V23nVKEUHhiqZfr2If/jNXEa0YVRDW/4pZ3VaSM3gFrDsNTjuZiLTgHf5ewHiz7l+uTBwEUg5A//PWciVRVAwZdY3et48TvDT9IbZ+Wl4lq14+HlSPXL+eKTTFVeuzy72FZoGqUhtvoK6YQG0y/Z4404K5NXofK/JXFa5fd5LFmIjSy/f1CpIaTjE7zl7jjlVjCqtCj/1tV6efGxmk9GsRsm8kToWHHCVY8zPwTIbvrBMwiO7bNA5d4TpNhImlPYm0FwOwi49ik63n1bQvuovRISpkdmEJow9pWS6ZUWAMAVIDEeG/U03QOmx7pHG8jCJ6Xg+BVZ6hiNNg== Received: from CH0PR03CA0410.namprd03.prod.outlook.com (2603:10b6:610:11b::22) by PH7PR12MB9254.namprd12.prod.outlook.com (2603:10b6:510:308::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.11; Thu, 25 Dec 2025 09:21:49 +0000 Received: from CH2PEPF00000142.namprd02.prod.outlook.com (2603:10b6:610:11b:cafe::ee) by CH0PR03CA0410.outlook.office365.com (2603:10b6:610:11b::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9434.11 via Frontend Transport; Thu, 25 Dec 2025 09:21:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by CH2PEPF00000142.mail.protection.outlook.com (10.167.244.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:21:48 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:21:33 -0800 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:21:33 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:21:32 -0800 From: Shani Peretz To: Thomas Monjalon CC: dpdk stable Subject: patch 'net/mlx5: remove unused macros' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:17:48 +0200 Message-ID: <20251225091938.345892-27-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000142:EE_|PH7PR12MB9254:EE_ X-MS-Office365-Filtering-Correlation-Id: 3cf79003-e5f8-4907-b34f-08de43970807 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|376014|36860700013|7053199007|13003099007|7142099003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?EECwBXYQNeDD1BYHSUflZOfSkpKMu2ZY04vyYrcJQQoh1mzSlKKMsfrTEjkf?= =?us-ascii?Q?cVwYvbkwAzGb0ToYt6PM3mYfFZ8OBskELgOE/4O7STUIyWuF3Oz+rs2DBb3E?= =?us-ascii?Q?SNCG8n57+CkPj+y3Ua/mhF9bMXnrmJGdEpyNCyX/MrRAQ1bDKtMotgKfbLNi?= =?us-ascii?Q?pzL5oLy3umWwYGlZyJyeGKTWfellwp6o2Hgvn89JM2nNUecqnNQExojDzhy0?= =?us-ascii?Q?91ig/BJPoIfAScydX8XN3c9XCHSKSnEOubVSBrSjYYKBNDthKux98MbF30d1?= =?us-ascii?Q?dNjKnbgco/AnkClF+GiczlLFD9sGmILbwCoropV6YPyojxnxEuxp5VU3ds+g?= =?us-ascii?Q?3S71JZpA1AqjqXnNY8MH1G0oQ7hHk2C1xVoGscGg/ldnnmznGwcNsu+PYb0i?= =?us-ascii?Q?wG6BkzFss9JpZbgqe7sMBTjnr0zcafxbR+9ImkuVbcYRaBWZ9RWM7a5DhcpJ?= =?us-ascii?Q?MQSNhsPCwxViCUUBe2PKFMNDMHYq5BPQ4AG8dPYrLkWhfEf8SeYJOjKwszhf?= =?us-ascii?Q?e0nwzvLcFToCPXoTF0eIIMsW1IKHs4kZiWBeSjKxir2qOg5WajWJ+c9Aj9sY?= =?us-ascii?Q?r+6Mmg5rrV/NSVSkuCHcHAzOP86tHNYnm8yGXuW9yDioxjtZs7wrc+e3/Zvd?= =?us-ascii?Q?7+dHzKKEDdqWSlaneuI/JDczzDD3Mts4+bgAeVqpnSl8zfBJqFx8gOw7enQB?= =?us-ascii?Q?18Yl5StQgoi5M9In05DvkKKkxFKPyZIwCgejOOAdmikJ3a6U5vtlcZxW8tdI?= =?us-ascii?Q?obBxUqv7uoteT4VI9HZYW0XI9/73rEnJVjlPF5kbbmNaS4EJ1sozA5P+ZRjR?= =?us-ascii?Q?5o4C3Ia1eGf4USHrRae82eUWwAJNm61VG27BfFFKfJTKwW33krkGCM5Ye98G?= =?us-ascii?Q?ZLqtYjChaWgcydfzK+Rb7KcZI6D+iN+QhPCmW30JPQ+G7yAoa88/0eiMZ3QR?= =?us-ascii?Q?Kz6I7pTYt/8/ZjmYIqRJstCTUyaVbqpxfLEXJ6QEFuZpBFZ2r+gtVIyL/sn5?= =?us-ascii?Q?SaCZUVJsMbXC+8v/VbhbHQEBlHdiauut19+kK385IXQP4gSQgm2+J0qNhuMH?= =?us-ascii?Q?zTcFvvLrmN7CVHB54nHUQJ2QSePZjSApjDrbbya8RMmV5nXucDSSDZEkOisU?= =?us-ascii?Q?Z1Y+SWQPhV5b/+78g/hYcFI8LKoWtDIAqfGwbj8kX15EaAaE3IQ/ZIaC2jxU?= =?us-ascii?Q?R+gh1UWN7S8glPvUUY0XnY1prpblD3ZFiWt83+jMnbhSkm/rPNWlODMc9yTu?= =?us-ascii?Q?czrSKtUlyUB0XGw/3AoG76QwOtsejrzeRiidYwT7oK1htCT+7XMt1un90qlT?= =?us-ascii?Q?1OE/4XJMz5n0R+6QjF6639cPae7MINmBxrDv4TxDe0+aw0DC4itUrAox4KBP?= =?us-ascii?Q?lrzN9RDmbNc5omIys1s0uzDtKX2H1emw3DZyC66eB45M6H5+tr9ASrTvRc7d?= =?us-ascii?Q?7xjLvdyo8O71sYpoY5dnQKNDzP6z5DmDIfDTxSf9UaZ8omRSc8lbgnSJUJ+h?= =?us-ascii?Q?C8aw1lwSxPZ0e/Wggb5OoGq/tC9IJFm5Hec8SJXdk+AqxFeHx3lEoW+oNzs4?= =?us-ascii?Q?ovXc7W596HZ4ZUA6siE=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013)(7053199007)(13003099007)(7142099003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:21:48.5602 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3cf79003-e5f8-4907-b34f-08de43970807 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF00000142.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9254 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 23.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 12/30/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/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/0e11c19fb0deaade09bc0d2b04074fa6241991f5 Thanks. Shani --- >From 0e11c19fb0deaade09bc0d2b04074fa6241991f5 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 5157aefe31..a20efed3ae 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -452,8 +452,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 b4d743ea52..805b346d3c 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1550,13 +1550,6 @@ struct rte_flow_template_table { (((func) == RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) || \ ((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[] = { 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.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:37.669149925 +0200 +++ 0027-net-mlx5-remove-unused-macros.patch 2025-12-25 11:16:35.494905000 +0200 @@ -1 +1 @@ -From f2638f1f388c9300850d217f9a820c1c40f78a77 Mon Sep 17 00:00:00 2001 +From 0e11c19fb0deaade09bc0d2b04074fa6241991f5 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 5157aefe31..a20efed3ae 100644 @@ -26 +27 @@ -@@ -509,8 +509,6 @@ struct __rte_cache_aligned mlx5_hw_q { +@@ -452,8 +452,6 @@ struct mlx5_hw_q { @@ -36 +37 @@ -index 1dca6e0532..c525516672 100644 +index b4d743ea52..805b346d3c 100644 @@ -39 +40 @@ -@@ -1888,13 +1888,6 @@ flow_hw_get_reg_id_from_ctx(void *dr_ctx, enum rte_flow_item_type type, +@@ -1550,13 +1550,6 @@ struct rte_flow_template_table { @@ -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))