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 93D1948AEF for ; Wed, 12 Nov 2025 17:55:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8EAD640DCB; Wed, 12 Nov 2025 17:55:08 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 5CEE340BA6 for ; Wed, 12 Nov 2025 17:55:07 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-42b32a5494dso571681f8f.2 for ; Wed, 12 Nov 2025 08:55:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762966507; x=1763571307; 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=OWOBF+15tN7XTa8c+BqOIli/LJ5+oHR0XLOgdr9TFBI=; b=KJjFyz/fRFj1j+4Gs4Y7dE1Qnut8kPGwlCL4cQhMxnruW6s+2K3TjDPw6tNlxwD3Pc Kra69uBfI9u6T36DTaPgQqVW0VNmFHkywJ0cv5RAhVbYPWqr6jmLXHSHkZ8YuhyEZ/8B 3bcMxBdshyXrIfsKFp7l7v/DRRFOOjpZswGazWaGGBS1TAqqccOeR0et0gRIbnfGZeGN zifBbjKojUmMoRM9IRnP6r3sYOj0yvRvD2DioDbmXBlsNZrtgUsF8uWjSYIqn+RjvxT0 80+IlFCA8rvtQ3LxnZRZQitl/5XPsYjVh629BTr8G+6j4qNX79eh0G3h+cGZ9HQQJQq5 Qy2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762966507; x=1763571307; 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=OWOBF+15tN7XTa8c+BqOIli/LJ5+oHR0XLOgdr9TFBI=; b=g9QGhEa2TmeCqOraJH78Jtny7MrThKi0hdL2OnwcceYz62eCIkL+yf2QMgpdZl7d1i HUZqE4xBcnET2NC6V6xFTKIrE4cANU2vQJuibKQ7fHuNxPGNB5RsMInMwgi4po5CLtsp KiiwivC6W0Bj1k3PiyToKtMgNBBC9oWS0yrAPamxNuqG96A0XUOwORMxa/eEjwjBTGvf rxehaMMqSDhf+4U5dfcyDDy1sFUPB8sowyD0XPjuNEG1DuIgd77QOFth0oCv1Fmna46B L9Vsyc0JpeWieNd98bILVTxx1CXJFEYsXQSLoAqK0hWg9UX4+9ga2S5dCj8Qs6aE3FA2 myEA== X-Forwarded-Encrypted: i=1; AJvYcCUl8DpH66x+VGGzP7qcA500rZajILSVxyog3f1hsc21A37feda54CaCnjsnqJ8+t5eA7E7/nkM=@dpdk.org X-Gm-Message-State: AOJu0YyoxrVcTHAYT+XlLmZLlI062FUsihq188E5Sbu3O+70S+fSTlAH UIbNVEJPOAbHtzsjrol6qorFrFnKAfF/svfEqDh0gYDK8QaeXGZb8O7J X-Gm-Gg: ASbGnct0h28bawBfb4hAEqBTWxWK57V44/MSvwkQhRS8QZrcPzS3JyAocsa7kdB3Zxp LAhGSomc3LWS/is6FLU5TLWeP96j2Pa6OkegJG4P89Aie2N8SekdR/wIDN/nYbS7gXBHnEDUgc9 6BgavIwR/0T3+f8wZfpZirvOhikraurxd8s3NrsIWnym6V7XeSa3+m5EQot4Fs88cm8nGw/9Y9j LxX4fdqPIuVa9fuVGr951cmjvlMCSsgpUpARC/XB1GJGBbXWscUtgNwGMoLsPocbq5zR+RMW490 usuAeJVuzzrk2/V7aio6BjIMVcSSrLmhAMZdakRuUDfuMEjMGRUrcsgiJDtS5mLssKlf85i/Xhv qk022qzZoj3WFxYmxMLnx0b4bMvwS/QlwFzFbe7qUirV+Rh0+2/pHcuPOFHKrMPiTMxFggLhcVT LOyXIKHA== X-Google-Smtp-Source: AGHT+IFPMgGIrE8Q+PYPuc69YM3jxL7OZRHAfvycsw3pomvym/a4kFULiJu5qlwFRtpiUlb7WMn4NQ== X-Received: by 2002:a05:6000:240e:b0:42b:3268:bfc0 with SMTP id ffacd0b85a97d-42b4bdb6794mr3330372f8f.49.1762966506786; Wed, 12 Nov 2025 08:55:06 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:a397:14bc:5982:5745]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-42b29e4b9bdsm31777252f8f.32.2025.11.12.08.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 08:55:06 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix unnecessary commas' has been queued to stable release 22.11.11 Date: Wed, 12 Nov 2025 16:52:50 +0000 Message-ID: <20251112165308.1618107-36-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/c48bc0174fc2cb050a6b3f2f7205b588ecb039b7 Thanks. Luca Boccassi --- >From c48bc0174fc2cb050a6b3f2f7205b588ecb039b7 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 fc7d5f68e7..028b9adece 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 70761d2299..befe9e38b5 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 ea637ea9b0..b69f578ea4 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -10426,12 +10426,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 f036b14a7b..5b8e022f34 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -17709,7 +17709,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.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-12 16:20:42.297957426 +0000 +++ 0036-net-mlx5-fix-unnecessary-commas.patch 2025-11-12 16:20:40.959717733 +0000 @@ -1 +1 @@ -From 3b769d8389080ef0fd1b34765b9844db8f40729a Mon Sep 17 00:00:00 2001 +From c48bc0174fc2cb050a6b3f2f7205b588ecb039b7 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 fc7d5f68e7..028b9adece 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 70761d2299..befe9e38b5 100644 @@ -55 +55 @@ -index 1de398982a..f354008a60 100644 +index ea637ea9b0..b69f578ea4 100644 @@ -58 +58 @@ -@@ -11132,12 +11132,12 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev, +@@ -10426,12 +10426,12 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev, @@ -78 +78 @@ -index bcce1597e2..1564bd7cbe 100644 +index f036b14a7b..5b8e022f34 100644 @@ -81 +81 @@ -@@ -18903,7 +18903,7 @@ flow_dv_create_mtr_tbls(struct rte_eth_dev *dev, +@@ -17709,7 +17709,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;