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 E39E548B69 for ; Fri, 21 Nov 2025 12:23:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE8274026F; Fri, 21 Nov 2025 12:23:21 +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 5FDF9402D7 for ; Fri, 21 Nov 2025 12:23:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724200; 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=6XQf4z/i1hZjpD9uxnmO5TjwoVsCRCHj8rckD/ugdFk=; b=S+b/4X3Fsr4jMYoeOZjrK2zpsOFIFZc+cCfPjle3bowW8gfFrINCbZ45T5eQTfEY3OVPCC xKuw9X0ZQeuLpUL1fS3A8n0qG9k2SijSbTkbbzX4uZiPqRdqHkBfbkxlt3DjpOhWdIJTQ2 oAPBzFP9rc63tMweFSY5mj3tEAPvsBM= 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-177-95TI_zIvMuKfb1VhnHTCcw-1; Fri, 21 Nov 2025 06:23:16 -0500 X-MC-Unique: 95TI_zIvMuKfb1VhnHTCcw-1 X-Mimecast-MFC-AGG-ID: 95TI_zIvMuKfb1VhnHTCcw_1763724195 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 C30571956054; Fri, 21 Nov 2025 11:23:15 +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 5203530044DB; Fri, 21 Nov 2025 11:23:14 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix unnecessary commas' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:20:29 +0000 Message-ID: <20251121112128.485623-45-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: qjw_PdxRadjxTVBnW9FuWCzWHBoi6YaJJbZEXx8xd9g_1763724195 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/586d9f3009194f94a83a44d1de74abaf6aeefc67 Thanks. Kevin --- >From 586d9f3009194f94a83a44d1de74abaf6aeefc67 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Wed, 29 Oct 2025 11:55:04 +0200 Subject: [PATCH] net/mlx5: fix unnecessary commas [ upstream commit 3b769d8389080ef0fd1b34765b9844db8f40729a ] The patch fixes compilation warnings produced by clang -Wcomma option. Bugzilla ID: 1810 Fixes: 630a587bfb37 ("net/mlx5: support matching on VXLAN reserved field") Fixes: 86d259cec852 ("net/mlx5: separate Tx queue object creations") Fixes: bc1d90a3cf6f ("net/mlx5: fix build with Direct Verbs disabled") Fixes: 444320186393 ("net/mlx5: support meter creation with policy") Fixes: 821a6a5cc495 ("net/mlx5: add metadata split for compatibility") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/linux/mlx5_os.c | 4 ++-- drivers/net/mlx5/linux/mlx5_verbs.c | 2 +- drivers/net/mlx5/mlx5_flow.c | 12 ++++++------ drivers/net/mlx5/mlx5_flow_dv.c | 2 +- drivers/net/mlx5/mlx5_nta_split.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index b23ee265b6..de037b25f1 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -432,6 +432,6 @@ __mlx5_discovery_misc5_cap(struct mlx5_priv *priv) return; } - dv_attr.type = IBV_FLOW_ATTR_NORMAL, - dv_attr.match_mask = (void *)&matcher_mask, + dv_attr.type = IBV_FLOW_ATTR_NORMAL; + dv_attr.match_mask = (void *)&matcher_mask; dv_attr.match_criteria_enable = (1 << MLX5_MATCH_CRITERIA_ENABLE_OUTER_BIT) | diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c index 9011319a3e..01d3d6ae5d 100644 --- a/drivers/net/mlx5/linux/mlx5_verbs.c +++ b/drivers/net/mlx5/linux/mlx5_verbs.c @@ -884,5 +884,5 @@ mlx5_txq_ibv_qp_create(struct rte_eth_dev *dev, uint16_t idx) */ qp_attr.cap.max_send_sge = 1; - qp_attr.qp_type = IBV_QPT_RAW_PACKET, + qp_attr.qp_type = IBV_QPT_RAW_PACKET; /* Do *NOT* enable this, completions events are managed per Tx burst. */ qp_attr.sq_sig_all = 0; diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 944d422f97..58ab218d1c 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -11131,10 +11131,10 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, "invalid default miss RSS"); - ctx->action_rss.func = RTE_ETH_HASH_FUNCTION_DEFAULT, - ctx->action_rss.level = 0, - ctx->action_rss.types = priv->rss_conf.rss_hf, - ctx->action_rss.key_len = priv->rss_conf.rss_key_len, - ctx->action_rss.queue_num = priv->reta_idx_n, - ctx->action_rss.key = priv->rss_conf.rss_key, + ctx->action_rss.func = RTE_ETH_HASH_FUNCTION_DEFAULT; + ctx->action_rss.level = 0; + ctx->action_rss.types = priv->rss_conf.rss_hf; + ctx->action_rss.key_len = priv->rss_conf.rss_key_len; + ctx->action_rss.queue_num = priv->reta_idx_n; + ctx->action_rss.key = priv->rss_conf.rss_key; ctx->action_rss.queue = ctx->queue; if (!priv->reta_idx_n || !priv->rxqs_n) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 1faae8ab32..192dfd282d 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -18890,5 +18890,5 @@ flow_dv_create_mtr_tbls(struct rte_eth_dev *dev, } /* Create default matcher in drop table. */ - matcher.tbl = mtrmng->drop_tbl[domain], + matcher.tbl = mtrmng->drop_tbl[domain]; tbl_data = container_of(mtrmng->drop_tbl[domain], struct mlx5_flow_tbl_data_entry, tbl); diff --git a/drivers/net/mlx5/mlx5_nta_split.c b/drivers/net/mlx5/mlx5_nta_split.c index 6a85ab7fd1..c95da56d72 100644 --- a/drivers/net/mlx5/mlx5_nta_split.c +++ b/drivers/net/mlx5/mlx5_nta_split.c @@ -346,6 +346,6 @@ flow_nta_mreg_create_cb(void *tool_ctx, void *cb_ctx) items[1].type = RTE_FLOW_ITEM_TYPE_END; /* (Mark) or void + copy to Rx meta + jump to the MREG_ACT_TABLE_GROUP. */ - actions[1].type = RTE_FLOW_ACTION_TYPE_MODIFY_FIELD, - actions[1].conf = &rx_meta, + actions[1].type = RTE_FLOW_ACTION_TYPE_MODIFY_FIELD; + actions[1].conf = &rx_meta; actions[2].type = RTE_FLOW_ACTION_TYPE_JUMP; actions[2].conf = &jump; -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:10.998118919 +0000 +++ 0045-net-mlx5-fix-unnecessary-commas.patch 2025-11-21 11:05:09.461201161 +0000 @@ -1 +1 @@ -From 3b769d8389080ef0fd1b34765b9844db8f40729a Mon Sep 17 00:00:00 2001 +From 586d9f3009194f94a83a44d1de74abaf6aeefc67 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3b769d8389080ef0fd1b34765b9844db8f40729a ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 8d11b1ac3a..c742e0f282 100644 +index b23ee265b6..de037b25f1 100644 @@ -51 +52 @@ -index 1de398982a..f354008a60 100644 +index 944d422f97..58ab218d1c 100644 @@ -54 +55 @@ -@@ -11133,10 +11133,10 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev, +@@ -11131,10 +11131,10 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev, @@ -72 +73 @@ -index bcce1597e2..1564bd7cbe 100644 +index 1faae8ab32..192dfd282d 100644 @@ -75 +76 @@ -@@ -18904,5 +18904,5 @@ flow_dv_create_mtr_tbls(struct rte_eth_dev *dev, +@@ -18890,5 +18890,5 @@ flow_dv_create_mtr_tbls(struct rte_eth_dev *dev,