patch 'net/cnxk: fix default meter pre-color' has been queued to stable release 22.11.11

[luca.boccassi at gmail.com]

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/22/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/c135bec74e0add175ddb27a7675bdf812de8256f

Thanks.

Luca Boccassi

---
>From c135bec74e0add175ddb27a7675bdf812de8256f Mon Sep 17 00:00:00 2001
From: Aarnav JP <ajp at marvell.com>
Date: Thu, 13 Nov 2025 10:08:08 +0530
Subject: [PATCH] net/cnxk: fix default meter pre-color

[ upstream commit b595d05bf739b5330cbfca00bdb984edea579a57 ]

While converting to HW specific icolor, check for invalid
default pre color.

Fixes: ac35d4bf4cd6 ("net/cnxk: support ingress meter pre-color")

Signed-off-by: Aarnav JP <ajp at marvell.com>
---
 drivers/net/cnxk/cnxk_ethdev_mtr.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c
index 0fa18f01c7..f4450be582 100644
--- a/drivers/net/cnxk/cnxk_ethdev_mtr.c
+++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c
@@ -1245,7 +1245,13 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_cfg *cfg)
 
 	cfg->alg = alg_map[profile->profile.alg];
 	cfg->lmode = profile->profile.packet_mode;
-	cfg->icolor = color_map[mtr->params.default_input_color];
+	int idx = mtr->params.default_input_color;
+
+	/* Index validation */
+	if (idx >= RTE_COLORS)
+		cfg->icolor = ROC_NIX_BPF_COLOR_GREEN;
+	else
+		cfg->icolor = color_map[idx];
 
 	switch (RTE_MTR_COLOR_IN_PROTO_OUTER_IP) {
 	case RTE_MTR_COLOR_IN_PROTO_OUTER_IP:
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-11-20 12:44:13.079791666 +0000
+++ 0008-net-cnxk-fix-default-meter-pre-color.patch	2025-11-20 12:44:12.778087984 +0000
@@ -1 +1 @@
-From b595d05bf739b5330cbfca00bdb984edea579a57 Mon Sep 17 00:00:00 2001
+From c135bec74e0add175ddb27a7675bdf812de8256f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b595d05bf739b5330cbfca00bdb984edea579a57 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index edeca6dcc3..992e2d446e 100644
+index 0fa18f01c7..f4450be582 100644
@@ -21 +22 @@
-@@ -1261,7 +1261,13 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_cfg *cfg)
+@@ -1245,7 +1245,13 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_cfg *cfg)