patch 'event/dlb2: fix validaton of LDB port COS ID arguments' has been queued to stable release 22.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/02/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/6235023dc8818d2d1e48026c25be1310e350d8fb

Thanks.

Luca Boccassi

---
>From 6235023dc8818d2d1e48026c25be1310e350d8fb Mon Sep 17 00:00:00 2001
From: Pravin Pathak <pravin.pathak at intel.com>
Date: Wed, 18 Jun 2025 23:03:11 -0500
Subject: [PATCH] event/dlb2: fix validaton of LDB port COS ID arguments

[ upstream commit 49b5fe1a6d59edb32c2bd50459ed499a794b9c91 ]

While providing port_cos as vdev/pf CLI argument, the port numbers should
take into account all ports (LDB and DIR) that are created by the
application and the same order should be provided for port_cos parameter.
This fix add checks to ensure that above is validated correctly.

Fixes: bec8901bfe9f ("event/dlb2: support ldb port specific COS")

Signed-off-by: Pravin Pathak <pravin.pathak at intel.com>
---
 drivers/event/dlb2/dlb2.c      | 32 +++++++++++++++++++++++---------
 drivers/event/dlb2/dlb2_priv.h |  1 -
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c
index 50b88802c6..c9c64e8f84 100644
--- a/drivers/event/dlb2/dlb2.c
+++ b/drivers/event/dlb2/dlb2.c
@@ -184,10 +184,8 @@ dlb2_init_port_cos(struct dlb2_eventdev *dlb2, int *port_cos)
 	for (q = 0; q < DLB2_MAX_NUM_PORTS_ALL; q++) {
 		dlb2->ev_ports[q].cos_id = port_cos[q];
 		if (port_cos[q] != DLB2_COS_DEFAULT &&
-		    dlb2->cos_ports[port_cos[q]] < DLB2_MAX_NUM_LDB_PORTS_PER_COS) {
+		    dlb2->cos_ports[port_cos[q]] < DLB2_MAX_NUM_LDB_PORTS_PER_COS)
 			dlb2->cos_ports[port_cos[q]]++;
-			dlb2->max_cos_port = q;
-		}
 	}
 }
 
@@ -495,8 +493,8 @@ set_port_cos(const char *key __rte_unused,
 	     const char *value,
 	     void *opaque)
 {
+	int first, last, cos_id, i, ports_per_cos[DLB2_COS_NUM_VALS] = {0};
 	struct dlb2_port_cos *port_cos = opaque;
-	int first, last, cos_id, i;
 
 	if (value == NULL || opaque == NULL) {
 		DLB2_LOG_ERR("NULL pointer\n");
@@ -530,6 +528,14 @@ set_port_cos(const char *key __rte_unused,
 	for (i = first; i <= last; i++)
 		port_cos->cos_id[i] = cos_id; /* indexed by port */
 
+	for (i = 0; i < DLB2_MAX_NUM_PORTS_ALL; i++)
+		if (port_cos->cos_id[i] != DLB2_COS_DEFAULT &&
+			++ports_per_cos[port_cos->cos_id[i]] > DLB2_MAX_NUM_LDB_PORTS_PER_COS) {
+			DLB2_LOG_ERR("Error parsing ldb port cos_id devarg: More than 16 ports for "
+				"cos_id %d.", port_cos->cos_id[i]);
+			return -EINVAL;
+		}
+
 	return 0;
 }
 
@@ -810,9 +816,10 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2,
 			    const struct dlb2_hw_rsrcs *resources_asked,
 			    uint8_t device_version)
 {
-	int ret = 0;
-	uint32_t cos_ports = 0;
+	uint32_t total_asked_ports;
 	struct dlb2_create_sched_domain_args *cfg;
+	uint32_t cos_ports = 0, max_cos_port = 0;
+	int ret = 0;
 
 	if (resources_asked == NULL) {
 		DLB2_LOG_ERR("dlb2: dlb2_create NULL parameter\n");
@@ -820,6 +827,8 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2,
 		goto error_exit;
 	}
 
+	total_asked_ports = resources_asked->num_ldb_ports + resources_asked->num_dir_ports;
+
 	/* Map generic qm resources to dlb2 resources */
 	cfg = &handle->cfg.resources;
 
@@ -841,9 +850,14 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2,
 	cos_ports = dlb2->cos_ports[0] + dlb2->cos_ports[1] +
 		    dlb2->cos_ports[2] + dlb2->cos_ports[3];
 
-	if (cos_ports > resources_asked->num_ldb_ports ||
-	    (cos_ports && dlb2->max_cos_port >= resources_asked->num_ldb_ports)) {
-		DLB2_LOG_ERR("dlb2: num_ldb_ports < cos_ports\n");
+	for (int i = 0; i < DLB2_MAX_NUM_PORTS_ALL; i++) {
+		if (dlb2->ev_ports[i].cos_id != DLB2_COS_DEFAULT)
+			max_cos_port = i;
+	}
+
+	if (cos_ports > resources_asked->num_ldb_ports || max_cos_port >= total_asked_ports) {
+		DLB2_LOG_ERR("dlb2: Insufficient num_ldb_ports=%d: cos_ports=%d max_cos_port=%d\n",
+			resources_asked->num_ldb_ports, cos_ports, max_cos_port);
 		ret = EINVAL;
 		goto error_exit;
 	}
diff --git a/drivers/event/dlb2/dlb2_priv.h b/drivers/event/dlb2/dlb2_priv.h
index f4b9e7f9ff..e37d05cd32 100644
--- a/drivers/event/dlb2/dlb2_priv.h
+++ b/drivers/event/dlb2/dlb2_priv.h
@@ -636,7 +636,6 @@ struct dlb2_eventdev {
 	};
 	uint32_t cos_ports[DLB2_COS_NUM_VALS]; /* total ldb ports in each class */
 	uint32_t cos_bw[DLB2_COS_NUM_VALS]; /* bandwidth per cos domain */
-	uint8_t max_cos_port; /* Max LDB port from any cos */
 };
 
 /* used for collecting and passing around the dev args */
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-30 13:21:22.514824401 +0100
+++ 0020-event-dlb2-fix-validaton-of-LDB-port-COS-ID-argument.patch	2025-06-30 13:21:21.763057717 +0100
@@ -1 +1 @@
-From 49b5fe1a6d59edb32c2bd50459ed499a794b9c91 Mon Sep 17 00:00:00 2001
+From 6235023dc8818d2d1e48026c25be1310e350d8fb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 49b5fe1a6d59edb32c2bd50459ed499a794b9c91 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index bec1e88074..8722e62948 100644
+index 50b88802c6..c9c64e8f84 100644
@@ -24 +25 @@
-@@ -194,10 +194,8 @@ dlb2_init_port_cos(struct dlb2_eventdev *dlb2, int *port_cos)
+@@ -184,10 +184,8 @@ dlb2_init_port_cos(struct dlb2_eventdev *dlb2, int *port_cos)
@@ -36 +37 @@
-@@ -531,8 +529,8 @@ set_port_cos(const char *key __rte_unused,
+@@ -495,8 +493,8 @@ set_port_cos(const char *key __rte_unused,
@@ -45,2 +46,2 @@
- 		DLB2_LOG_ERR("NULL pointer");
-@@ -566,6 +564,14 @@ set_port_cos(const char *key __rte_unused,
+ 		DLB2_LOG_ERR("NULL pointer\n");
+@@ -530,6 +528,14 @@ set_port_cos(const char *key __rte_unused,
@@ -61 +62 @@
-@@ -866,9 +872,10 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2,
+@@ -810,9 +816,10 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2,
@@ -73,2 +74,2 @@
- 		DLB2_LOG_ERR("dlb2: dlb2_create NULL parameter");
-@@ -876,6 +883,8 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2,
+ 		DLB2_LOG_ERR("dlb2: dlb2_create NULL parameter\n");
+@@ -820,6 +827,8 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2,
@@ -83 +84 @@
-@@ -897,9 +906,14 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2,
+@@ -841,9 +850,14 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2,
@@ -89 +90 @@
--		DLB2_LOG_ERR("dlb2: num_ldb_ports < cos_ports");
+-		DLB2_LOG_ERR("dlb2: num_ldb_ports < cos_ports\n");
@@ -96 +97 @@
-+		DLB2_LOG_ERR("dlb2: Insufficient num_ldb_ports=%d: cos_ports=%d max_cos_port=%d",
++		DLB2_LOG_ERR("dlb2: Insufficient num_ldb_ports=%d: cos_ports=%d max_cos_port=%d\n",
@@ -102 +103 @@
-index 4dd7532519..285d427397 100644
+index f4b9e7f9ff..e37d05cd32 100644
@@ -105 +106 @@
-@@ -649,7 +649,6 @@ struct dlb2_eventdev {
+@@ -636,7 +636,6 @@ struct dlb2_eventdev {
@@ -110 +110,0 @@
- 	bool enable_cq_weight;
@@ -112,0 +113 @@
+ /* used for collecting and passing around the dev args */