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 A5A6A46BAE for ; Fri, 18 Jul 2025 21:37:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A066C40611; Fri, 18 Jul 2025 21:37:27 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 66FF140611 for ; Fri, 18 Jul 2025 21:37:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867446; 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=RrAx/OM4TZOOtJDSemNrB9EtFKra2Dg9FWxYuOSypwI=; b=ChaX9SScCgtPYM3xhhtL+C5xaR0hzJu7lxXH437/OFPo7EZBgn0mJVbvZAtYcRYhwWHIQj F8FKzdQ5lFiEqyDGQDHaQrDWP7WHlJ9HeQXWGeL/aGKQ/AWiYA2IxzwSD69Ag5D4Q4JrFm YPHGs9q59tcpFZalILU2gI9SXHhYORw= Received: from mx-prod-mc-05.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-20-qQbUFpuIN2SMNGutLhVcuw-1; Fri, 18 Jul 2025 15:37:23 -0400 X-MC-Unique: qQbUFpuIN2SMNGutLhVcuw-1 X-Mimecast-MFC-AGG-ID: qQbUFpuIN2SMNGutLhVcuw_1752867442 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9DCDB1956088; Fri, 18 Jul 2025 19:37:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5EB6C180049D; Fri, 18 Jul 2025 19:37:21 +0000 (UTC) From: Kevin Traynor To: Pravin Pathak Cc: dpdk stable Subject: patch 'event/dlb2: fix validaton of LDB port COS ID arguments' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:31:03 +0100 Message-ID: <20250718193247.1008129-129-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: cdG7NQ6AU2EqFgycJwSjHQI7IIfzk0PaG-I9KyuhgNY_1752867442 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.3 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/23/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/95d3b02eb18b8a3b7ac7dfe27e3eb03416864eab Thanks. Kevin --- >From 95d3b02eb18b8a3b7ac7dfe27e3eb03416864eab Mon Sep 17 00:00:00 2001 From: Pravin Pathak 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 --- 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 c5ab31f52b..8efba3109b 100644 --- a/drivers/event/dlb2/dlb2.c +++ b/drivers/event/dlb2/dlb2.c @@ -138,8 +138,6 @@ dlb2_init_port_cos(struct dlb2_eventdev *dlb2, int *port_cos) 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; - } } } @@ -448,6 +446,6 @@ set_port_cos(const char *key __rte_unused, 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) { @@ -483,4 +481,12 @@ set_port_cos(const char *key __rte_unused, 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; } @@ -783,7 +789,8 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, 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) { @@ -793,4 +800,6 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, } + total_asked_ports = resources_asked->num_ldb_ports + resources_asked->num_dir_ports; + /* Map generic qm resources to dlb2 resources */ cfg = &handle->cfg.resources; @@ -814,7 +823,12 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, 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"); + 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", + 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 52da31ed31..4118d69465 100644 --- a/drivers/event/dlb2/dlb2_priv.h +++ b/drivers/event/dlb2/dlb2_priv.h @@ -650,5 +650,4 @@ 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 */ bool enable_cq_weight; }; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:15.538720939 +0100 +++ 0129-event-dlb2-fix-validaton-of-LDB-port-COS-ID-argument.patch 2025-07-18 20:29:11.081907794 +0100 @@ -1 +1 @@ -From 49b5fe1a6d59edb32c2bd50459ed499a794b9c91 Mon Sep 17 00:00:00 2001 +From 95d3b02eb18b8a3b7ac7dfe27e3eb03416864eab Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 49b5fe1a6d59edb32c2bd50459ed499a794b9c91 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index bec1e88074..8722e62948 100644 +index c5ab31f52b..8efba3109b 100644 @@ -24 +25 @@ -@@ -195,8 +195,6 @@ dlb2_init_port_cos(struct dlb2_eventdev *dlb2, int *port_cos) +@@ -138,8 +138,6 @@ dlb2_init_port_cos(struct dlb2_eventdev *dlb2, int *port_cos) @@ -34 +35 @@ -@@ -532,6 +530,6 @@ set_port_cos(const char *key __rte_unused, +@@ -448,6 +446,6 @@ set_port_cos(const char *key __rte_unused, @@ -42 +43 @@ -@@ -567,4 +565,12 @@ set_port_cos(const char *key __rte_unused, +@@ -483,4 +481,12 @@ set_port_cos(const char *key __rte_unused, @@ -55 +56 @@ -@@ -867,7 +873,8 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, +@@ -783,7 +789,8 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, @@ -66 +67 @@ -@@ -877,4 +884,6 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, +@@ -793,4 +800,6 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, @@ -73 +74 @@ -@@ -898,7 +907,12 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, +@@ -814,7 +823,12 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, @@ -90 +91 @@ -index 4dd7532519..285d427397 100644 +index 52da31ed31..4118d69465 100644