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 4066148B69 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 3A99B402DB; 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.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 4D62F402D4 for ; Fri, 21 Nov 2025 12:22:28 +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=GaXN/V2M/nZ7DC5dVuIXoyDCssedChm3GYEFNNqmsQ0=; b=KgMY6+c09PHQCMmSDsravNMsDWPw9rixUPnZ8OxSjqT/0llIF6nWA0VUU8Qi/NIf4zqAz2 YoY4fKwwqybM8vtx6042nG8GF9OqL/wDxgrjMnq8zULDvk4Ia//6Xn2NM/RrUk12WZym94 b4V2UUtItEUjb0ovzpTlh/lOV9rv9HU= Received: from mx-prod-mc-05.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-43-bHc_dcDrOnu_rdDZEEK1OQ-1; Fri, 21 Nov 2025 06:22:24 -0500 X-MC-Unique: bHc_dcDrOnu_rdDZEEK1OQ-1 X-Mimecast-MFC-AGG-ID: bHc_dcDrOnu_rdDZEEK1OQ_1763724143 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 59223195608E; Fri, 21 Nov 2025 11:22:23 +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 4139930044DB; Fri, 21 Nov 2025 11:22:22 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: dpdk stable Subject: patch 'net/mlx5: remove useless constants' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:19:59 +0000 Message-ID: <20251121112128.485623-15-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: TZFmKsHhxSsnhFytHAZ9Tr61Lnvd61zKrXPDJalxm2A_1763724143 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/ecf592265c91146f7140f637d262d94a37595fdf Thanks. Kevin --- >From ecf592265c91146f7140f637d262d94a37595fdf Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 31 Oct 2025 21:38:26 +0100 Subject: [PATCH] net/mlx5: remove useless constants [ upstream commit 9d3788534cba7cc3424e2a83db6b186211d4e94f ] - MLX5_VEC_TX_CKSUM_OFFLOAD_CAP became unused when Tx metadata moved to a dynamic field. - MLX5_ALARM_TIMEOUT_US became unused when reworking link status wait. - MLX5_FLOW_SFT_HLIST_ARRAY_SIZE was never used in hash list handling. - MLX5_FLOW_MIN_ID_POOL_SIZE and MLX5_ID_GENERATION_ARRAY_FACTOR became unused when the flow ID generator was replaced by ipool. - MLX5_RSSQ_DEFAULT_NUM was used in the old per-thread flow workspace. - MLX5_FLOW_TABLE_HWS_POLICY became unused because meter is not supported in HWS. - IPPROTO_MPLS became unused because MPLS over IP is not supported. - MLX5_L4_RSS_TYPES has never been used. - ETH_TYPE_IPV4/V6_VXLAN were never used in HWS. - PCI_DRV_FLAGS became unused when migrating to bus-agnostic probing. Fixes: 9bf26e1318e3 ("ethdev: move egress metadata to dynamic field") Fixes: cfee94752b8f ("net/mlx5: fix link status to use wait to complete") Fixes: f3020a331dca ("net/mlx5: optimize hash list table allocate on demand") Fixes: 4ae8825c5085 ("net/mlx5: use indexed pool as id generator") Fixes: dc7c5e0aa905 ("net/mlx5: fix flow workspace destruction") Fixes: 645f240d1cd5 ("net/mlx5: remove unsupported flow meter action in HWS") Fixes: 14ad99d78a46 ("net/mlx5: remove unsupported flow item MPLS over IP") Fixes: ae67e3c43dd5 ("net/mlx5: support RSS expansion in non-template HWS setup") Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer") Fixes: a7f34989e9ad ("net/mlx5: migrate to bus-agnostic common interface") Signed-off-by: Thomas Monjalon --- drivers/net/mlx5/hws/mlx5dr_definer.c | 2 -- drivers/net/mlx5/mlx5.c | 3 --- drivers/net/mlx5/mlx5.h | 1 - drivers/net/mlx5/mlx5_defs.h | 6 ------ drivers/net/mlx5/mlx5_flow.h | 10 ---------- drivers/net/mlx5/mlx5_rxtx_vec.h | 7 ------- drivers/net/mlx5/windows/mlx5_os.h | 2 -- 7 files changed, 31 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 25d7f729c5..6122728cf7 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -10,6 +10,4 @@ #define BAD_PORT 0xBAD #define BAD_SQN 0xBAD -#define ETH_TYPE_IPV4_VXLAN 0x0800 -#define ETH_TYPE_IPV6_VXLAN 0x86DD #define UDP_VXLAN_PORT 4789 #define UDP_VXLAN_GPE_PORT 4790 diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 0580e5d030..981af06fc0 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -386,7 +386,4 @@ static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = { }; -#define MLX5_FLOW_MIN_ID_POOL_SIZE 512 -#define MLX5_ID_GENERATION_ARRAY_FACTOR 16 - #define MLX5_FLOW_TABLE_HLIST_ARRAY_SIZE 1024 diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 7966b65bae..6cb4a29953 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1245,5 +1245,4 @@ struct mlx5_flow_tbl_resource { #define MLX5_FLOW_TABLE_LEVEL_POLICY (MLX5_MAX_TABLES - 4) #define MLX5_MAX_TABLES_EXTERNAL MLX5_FLOW_TABLE_LEVEL_POLICY -#define MLX5_FLOW_TABLE_HWS_POLICY (MLX5_MAX_TABLES - 10) #define MLX5_MAX_TABLES_FDB UINT16_MAX #define MLX5_FLOW_TABLE_PTYPE_RSS_NUM 1024 diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index 9c454983be..11141daef5 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -47,7 +47,4 @@ #define MLX5_HWS_CNT_DCS_NUM 4 -/* Alarm timeout. */ -#define MLX5_ALARM_TIMEOUT_US 100000 - /* Maximum number of extended statistics counters. */ #define MLX5_MAX_XSTATS 64 @@ -171,7 +168,4 @@ #define MLX5_TAGS_HLIST_ARRAY_SIZE (1 << 15) -/* Size fo the hash table for SFT table. */ -#define MLX5_FLOW_SFT_HLIST_ARRAY_SIZE 4096 - /* Hairpin TX/RX queue configuration parameters. */ #define MLX5_HAIRPIN_QUEUE_STRIDE 6 diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 1e60bc76dd..ad15b0de32 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -207,7 +207,4 @@ enum mlx5_feature_name { }; -/* Default queue number. */ -#define MLX5_RSSQ_DEFAULT_NUM 16 - #define MLX5_FLOW_LAYER_OUTER_L2 (1u << 0) #define MLX5_FLOW_LAYER_OUTER_L3_IPV4 (1u << 1) @@ -454,8 +451,4 @@ enum mlx5_feature_name { #define MLX5_FLOW_XCAP_ACTIONS (MLX5_FLOW_ACTION_ENCAP | MLX5_FLOW_ACTION_DECAP) -#ifndef IPPROTO_MPLS -#define IPPROTO_MPLS 137 -#endif - #define MLX5_IPV6_HDR_ECN_MASK 0x3 #define MLX5_IPV6_HDR_DSCP_SHIFT 2 @@ -504,7 +497,4 @@ enum mlx5_feature_name { RTE_ETH_RSS_NONFRAG_IPV4_OTHER) -/* Valid L4 RSS types */ -#define MLX5_L4_RSS_TYPES (RTE_ETH_RSS_L4_SRC_ONLY | RTE_ETH_RSS_L4_DST_ONLY) - /* IBV hash source bits for IPV4. */ #define MLX5_IPV4_IBV_RX_HASH (IBV_RX_HASH_SRC_IPV4 | IBV_RX_HASH_DST_IPV4) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.h b/drivers/net/mlx5/mlx5_rxtx_vec.h index 77c3f4efa0..672e301f77 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec.h @@ -14,11 +14,4 @@ #include "mlx5_autoconf.h" -/* HW checksum offload capabilities of vectorized Tx. */ -#define MLX5_VEC_TX_CKSUM_OFFLOAD_CAP \ - (RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | \ - RTE_ETH_TX_OFFLOAD_UDP_CKSUM | \ - RTE_ETH_TX_OFFLOAD_TCP_CKSUM | \ - RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM) - /* * Compile time sanity check for vectorized functions. diff --git a/drivers/net/mlx5/windows/mlx5_os.h b/drivers/net/mlx5/windows/mlx5_os.h index 8b58265687..7085e9b258 100644 --- a/drivers/net/mlx5/windows/mlx5_os.h +++ b/drivers/net/mlx5/windows/mlx5_os.h @@ -13,6 +13,4 @@ enum { }; -#define PCI_DRV_FLAGS 0 - #define MLX5_NAMESIZE MLX5_FS_NAME_MAX -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:10.101307869 +0000 +++ 0015-net-mlx5-remove-useless-constants.patch 2025-11-21 11:05:09.385200837 +0000 @@ -1 +1 @@ -From 9d3788534cba7cc3424e2a83db6b186211d4e94f Mon Sep 17 00:00:00 2001 +From ecf592265c91146f7140f637d262d94a37595fdf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9d3788534cba7cc3424e2a83db6b186211d4e94f ] + @@ -30 +31,0 @@ -Cc: stable@dpdk.org @@ -44 +45 @@ -index 1c6b3e38c4..afa70bf793 100644 +index 25d7f729c5..6122728cf7 100644 @@ -55 +56 @@ -index b018a4f0e2..4705c30801 100644 +index 0580e5d030..981af06fc0 100644 @@ -58 +59 @@ -@@ -395,7 +395,4 @@ static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = { +@@ -386,7 +386,4 @@ static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = { @@ -67 +68 @@ -index 07418b0922..233cb416cb 100644 +index 7966b65bae..6cb4a29953 100644 @@ -70 +71 @@ -@@ -1260,5 +1260,4 @@ struct mlx5_flow_tbl_resource { +@@ -1245,5 +1245,4 @@ struct mlx5_flow_tbl_resource { @@ -77 +78 @@ -index d326fec000..b8e5122323 100644 +index 9c454983be..11141daef5 100644 @@ -97 +98 @@ -index ff61706054..1dca6e0532 100644 +index 1e60bc76dd..ad15b0de32 100644 @@ -100 +101 @@ -@@ -223,7 +223,4 @@ struct mlx5_mirror { +@@ -207,7 +207,4 @@ enum mlx5_feature_name { @@ -108 +109 @@ -@@ -470,8 +467,4 @@ struct mlx5_mirror { +@@ -454,8 +451,4 @@ enum mlx5_feature_name { @@ -117 +118 @@ -@@ -520,7 +513,4 @@ struct mlx5_mirror { +@@ -504,7 +497,4 @@ enum mlx5_feature_name { @@ -142 +143 @@ -index fb7198c244..57d147bd8c 100644 +index 8b58265687..7085e9b258 100644 @@ -145,2 +146,2 @@ -@@ -8,6 +8,4 @@ - #include "mlx5_win_ext.h" +@@ -13,6 +13,4 @@ enum { + };