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 2CDDC470E6 for ; Thu, 25 Dec 2025 10:23:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9141E40669; Thu, 25 Dec 2025 10:23:12 +0100 (CET) Received: from BL2PR02CU003.outbound.protection.outlook.com (mail-eastusazon11011000.outbound.protection.outlook.com [52.101.52.0]) by mails.dpdk.org (Postfix) with ESMTP id D948B40648 for ; Thu, 25 Dec 2025 10:23:10 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ppq55ZA64NkRSTwOoPQBc0yG/gOPsIpe4RurA2YFAzKZMNIOLJ3N9+s+ep6+nQLwrOnp9R01iNE7zBEv56RmSjfro246OXC0yCNWc9zHcBBR5Oz5ArizXJuVdpXRiPWYFJe0BoN2mHdfbqehgsm7xhi8Q5kTsvs1G5W2eHbWGkP1SCTM841i9+l5LbIhuX6m3+v7hCspl6gyXipn+6DNNJ/5vSLzOyTm9A2/ZXh31XMtIMZ3s1nY1iwGLPwWhZmT2yxTBvzwHfjIjmlHKq03VA0P//xlCQUDXGCeFds8ZnMwSHKbBUNI+aaTy2gXNa/s44LbGTRBu+N6kN6CrvBmWg== 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=R8UgaI5xxCCvtAEeIBp+ZJhSdGGdxPx/ej9QS8g2SCI=; b=baLH36MmFpvsBymVAUdy27uupl9bH5PfSQsP0eoDqdya74oZizxnRdB4EsmHedIRdQ0X5ykNZiwP+2hm5qWDvxamKHXE6+X5np/SuNh87nd+D4hV6hYKpJxzTflZ3cDu8wJXX+VDX0uhOmpw/oMST5rhW7ZtgVDTyluhmtdHAgiqTg/RdfCTdAV3LO0nG/4vU52yBj78/F7zD/eoOdXLwmQBMV4kqPCqu6KGhjOx1kQCvwJAU0Wh5Wah6ODQ/0ytJTe7Vh0nQRaA5rfkfVmnrXw0ZGlfwBlxRR+PzkKEzqQeLMWaImCyBTrqUOh7IMVfoT5UDiJ7ILF63B9QrfrVFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=dpdk.org 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=R8UgaI5xxCCvtAEeIBp+ZJhSdGGdxPx/ej9QS8g2SCI=; b=IwkWjfDbQ9nn7EO0jfqGbY/Ew2vHjd//3/ut24EFe86c+d3hqkQTud3fOzhAM2NuLHTYjW7YhrajbucdGCO+1CrjV/iUe+YBMEflP600+I63wPDyWxtk9mBSW5UsSDlTw/cZAGlaSR3iofkIBLJy3IW1+eDHRybMYH8STGu95LzOvxhd3Mk5+ooy6x6gZ/5EzGaxfA8uG5Mn5b/z27ibPf12LmpkyVMoZLXIVG5pDaqpW3vIfkB75cHayndRp8PNke94PVKC7zVyYAgJVDjQpVccviBjbGr/dYgaRmv1S90433XRb3uBJ1Gq2ogh0dQ4E0heqVKJQkXBFsiu9aJB7w== Received: from BY3PR05CA0038.namprd05.prod.outlook.com (2603:10b6:a03:39b::13) by BN7PPF5D27497F1.namprd12.prod.outlook.com (2603:10b6:40f:fc02::6d1) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.12; Thu, 25 Dec 2025 09:23:04 +0000 Received: from BY1PEPF0001AE18.namprd04.prod.outlook.com (2603:10b6:a03:39b:cafe::ed) by BY3PR05CA0038.outlook.office365.com (2603:10b6:a03:39b::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9478.2 via Frontend Transport; Thu, 25 Dec 2025 09:23:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BY1PEPF0001AE18.mail.protection.outlook.com (10.167.242.100) 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:23:04 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) 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:22:58 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail203.nvidia.com (10.126.190.182) 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:22:58 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.182) 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:22:57 -0800 From: Shani Peretz To: Gregory Etelson CC: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix unnecessary commas' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:11 +0200 Message-ID: <20251225091938.345892-50-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: BY1PEPF0001AE18:EE_|BN7PPF5D27497F1:EE_ X-MS-Office365-Filtering-Correlation-Id: eaf891e7-ef8c-4aca-4129-08de43973500 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?sig0rg1csCs8cCzyKlyitOrTgEsQJr/jGmyQbFKfXMozG/Tv0lsfEAsCjPaz?= =?us-ascii?Q?32kbaoHIMTbXDeygqZ/EuJl3CfELerInKb7FNjDUWUWqqBZ4klXKPG9kfhiv?= =?us-ascii?Q?Wga6cg2gbeL8emoZTdH0hUMCofB4kfoksOB4ctZIt+gjHWz2sO44LsBFZEiM?= =?us-ascii?Q?Isb3H1o2m7eiYHO1rPbpUiqBG8YxiE/zlxN849u6SE4Vn8vrB8MUTix9HaAl?= =?us-ascii?Q?Aoft8VMSGXzrShL02X7Vwy15rv/wKQnxuZJCc4xO7Sm2zDJ0OC6yL9DK7kw5?= =?us-ascii?Q?nmqAX7k8IBxmMt41/koWrje20bXCDMKFmaDKYUG0v/D1LrUBMD+k8IK3MwJK?= =?us-ascii?Q?jQIB3wSN5LuzVYUADSNs73ZTa4boU3W6Q34K79rgQZqfhSwR2j5HlD6512SC?= =?us-ascii?Q?6/X8isMDtexVbpQFLCulllaQhPsjXd1x2OD/U0XeVH33SU1/ArU58Ng27KSG?= =?us-ascii?Q?skdCzbTvmgZDnBfGPtpS6ib4IeNlhnuMyJ9nTT81sS/cqJOvDIK4w5ROT7tf?= =?us-ascii?Q?Ydfbk7g9pf6P3vIvogb8J60GeupIKbHaN+xObQ8tPMQDK5sxI3IDRu/lteRa?= =?us-ascii?Q?bOfFCgpkq8iBW5DDSWOaIpg5NuURRtb+wGuAlqH4DltU8Jw+l1J3GiuZSglu?= =?us-ascii?Q?tdiB3Je4WMDqWIHjMJq1VcnKUh8+oNu7ySBMBzHFNuSu2f6ih+L+ldB3LdTp?= =?us-ascii?Q?c9/YyQxRLTh/6KSxQwj1ZAY4k4VzD/N/LZYroIAQWJTDrvqqVHvlRbEfNA6r?= =?us-ascii?Q?CSS7L5DxABBkmC8+KLpE24oWT4d+Qk5E/u6qJY3hQS+aBbIoEoNrn9sRNqjb?= =?us-ascii?Q?Uuj/i3FufL0wPO4WFIjrnAdZRowkhbUaxgrKQsBimck5ZOsL4c77vnCuIiwc?= =?us-ascii?Q?7rC/+gAkUxo3+6onxR4U/z0mgh5AngbI1YnT6xMi62bsxrbGZeH6+SYUzMtX?= =?us-ascii?Q?TKeGPX6+8a5ztXY96GjmGAafr9nkAf/29P5OIa2dHluDS2Q7MkXdTsMGBGtl?= =?us-ascii?Q?6Z6vG4+nI+6RVcCQfi80GfkpLvEfFeEJDCpgHSXGlJprssTynYMctrEHr6kN?= =?us-ascii?Q?lJ23Y+iqATm3teDYWn7sacmw8pWjupjFHRNGXhwed4Ql880pNAHpibnD7DPm?= =?us-ascii?Q?Nve0e0iOp6dipBOGv/995/r+dmsc1DsR1XsKytYZCqY8JqRd/Kv12JkT+4Li?= =?us-ascii?Q?JPO+EMHq6AxuGfii8XezEYzF1iaMFawE7znMKPCbzZY54ruSqk6w+/r78Xv+?= =?us-ascii?Q?5PwbVNXDZRTfwouc0pVh3y52j1yFMeDw/5aA6IjCbaMwzWgjZYyJyhS/mvqi?= =?us-ascii?Q?ndWRljVZStUIGzdpaUixdATz+sExwaFxXE3xxI80duipdB6aPGBkYKK3Yily?= =?us-ascii?Q?iBKmeuqj8T7R+iWS7nNyS1YhqV/SGORn/McqKWKxVu3ZUXXExOZixKuPO3aJ?= =?us-ascii?Q?k3FtFsASCiuq7daenUUQ8rClhIlrvKMaAr35r+0Xh8l7HqnqU9IPXkwKH6bj?= =?us-ascii?Q?nBZnCrTcNEynUDOFLIVdqMp6R+IUmE73H17eg3pX1RG9Bn3ogpW5ssycf7qE?= =?us-ascii?Q?VtWYe4vX2rI1yWgGTDA=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:23:04.0951 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eaf891e7-ef8c-4aca-4129-08de43973500 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.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF0001AE18.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PPF5D27497F1 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/4df0e453577b7ad7ace503515501deba5cc50808 Thanks. Shani --- >From 4df0e453577b7ad7ace503515501deba5cc50808 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 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 722a7e2691..4059a1f52c 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -419,8 +419,8 @@ __mlx5_discovery_misc5_cap(struct mlx5_priv *priv) DRV_LOG(INFO, "No SW steering support"); 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) | (1 << MLX5_MATCH_CRITERIA_ENABLE_MISC5_BIT); diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c index efe8aa12fb..36e295e391 100644 --- a/drivers/net/mlx5/linux/mlx5_verbs.c +++ b/drivers/net/mlx5/linux/mlx5_verbs.c @@ -883,7 +883,7 @@ mlx5_txq_ibv_qp_create(struct rte_eth_dev *dev, uint16_t idx) * dev_cap.max_sge limit and will still work properly. */ 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; qp_attr.pd = priv->sh->cdev->pd; diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 5d9e92fcc2..412f53d8c8 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -11387,12 +11387,12 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev, (error, ENOMEM, 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) return rte_flow_error_set diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 07dacae868..4c3c4aeffa 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -18219,7 +18219,7 @@ 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); if (!mtrmng->def_matcher[domain]) { -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:38.780476950 +0200 +++ 0050-net-mlx5-fix-unnecessary-commas.patch 2025-12-25 11:16:35.761811000 +0200 @@ -1 +1 @@ -From 3b769d8389080ef0fd1b34765b9844db8f40729a Mon Sep 17 00:00:00 2001 +From 4df0e453577b7ad7ace503515501deba5cc50808 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3b769d8389080ef0fd1b34765b9844db8f40729a ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23,2 +24 @@ - drivers/net/mlx5/mlx5_nta_split.c | 4 ++-- - 5 files changed, 12 insertions(+), 12 deletions(-) + 4 files changed, 10 insertions(+), 10 deletions(-) @@ -27 +27 @@ -index 8d11b1ac3a..c742e0f282 100644 +index 722a7e2691..4059a1f52c 100644 @@ -30 +30 @@ -@@ -431,8 +431,8 @@ __mlx5_discovery_misc5_cap(struct mlx5_priv *priv) +@@ -419,8 +419,8 @@ __mlx5_discovery_misc5_cap(struct mlx5_priv *priv) @@ -42 +42 @@ -index 9011319a3e..01d3d6ae5d 100644 +index efe8aa12fb..36e295e391 100644 @@ -55 +55 @@ -index 1de398982a..f354008a60 100644 +index 5d9e92fcc2..412f53d8c8 100644 @@ -58 +58 @@ -@@ -11132,12 +11132,12 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev, +@@ -11387,12 +11387,12 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev, @@ -78 +78 @@ -index bcce1597e2..1564bd7cbe 100644 +index 07dacae868..4c3c4aeffa 100644 @@ -81 +81 @@ -@@ -18903,7 +18903,7 @@ flow_dv_create_mtr_tbls(struct rte_eth_dev *dev, +@@ -18219,7 +18219,7 @@ flow_dv_create_mtr_tbls(struct rte_eth_dev *dev, @@ -90,15 +89,0 @@ -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 -@@ -345,8 +345,8 @@ flow_nta_mreg_create_cb(void *tool_ctx, void *cb_ctx) - /* (match REG 'tag') or all. */ - 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; - actions[3].type = RTE_FLOW_ACTION_TYPE_END;