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 8729A46BAE for ; Fri, 18 Jul 2025 21:37:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80D3440E41; Fri, 18 Jul 2025 21:37:24 +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 79BCA40E7C for ; Fri, 18 Jul 2025 21:37:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867443; 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=VpYLiQYUHBSTQI59ZM0IK1L106gDkwGn6iPkBS+0Nv4=; b=iy3l6TpttfjhvjcraS7XyRCGcl1XMBeqmxOFtpGimXuNR05zWmoOYq+mMORv4t2IFxxvZ6 C2F9opZSR46fZoZsk5zDnYgsamqeqoiRFjkUNfuf68vpJMynrjAu9PU0E2RRh2/DruVmRW j0nOD5zAltiniUMztHXy8MCT4zPTYyE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-682-4bvcFM3ZNoyI9pt_AY_gfg-1; Fri, 18 Jul 2025 15:37:21 -0400 X-MC-Unique: 4bvcFM3ZNoyI9pt_AY_gfg-1 X-Mimecast-MFC-AGG-ID: 4bvcFM3ZNoyI9pt_AY_gfg_1752867440 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C28A01800281; Fri, 18 Jul 2025 19:37:20 +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 2131B18003FC; Fri, 18 Jul 2025 19:37:18 +0000 (UTC) From: Kevin Traynor To: Pravin Pathak Cc: Tirthendu Sarkar , dpdk stable Subject: patch 'event/dlb2: fix dequeue with CQ depth <= 16' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:31:02 +0100 Message-ID: <20250718193247.1008129-128-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: -CfNVDIkG5X0TYGmb6Cw6-c_OOw0ekVrY3TTXtFNG-8_1752867440 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/8a644d6c9a20059c40624d41d35e2874e84cfae5 Thanks. Kevin --- >From 8a644d6c9a20059c40624d41d35e2874e84cfae5 Mon Sep 17 00:00:00 2001 From: Pravin Pathak Date: Wed, 18 Jun 2025 23:03:10 -0500 Subject: [PATCH] event/dlb2: fix dequeue with CQ depth <= 16 [ upstream commit 0b92203cdae06dee0626e46e62b9c34450e776d8 ] When application configures a DIR port with CQ depth less than 8, DLB PMD sets port's cq_depth as 8 and token reservation is used to make the effective cq_depth smaller. However, while setting port's cq_depth_mask application configured CQ depth was used resulting in reading incorrect cachelines while dequeuing. Use PMD calculated CQ depth for cq_depth_mask calculation. Fixes: 3a6d0c04e7fb3e ("event/dlb2: add port setup") Signed-off-by: Pravin Pathak Signed-off-by: Tirthendu Sarkar --- drivers/event/dlb2/dlb2.c | 4 ++-- drivers/event/dlb2/pf/dlb2_pf.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c index 934fcafcfe..c5ab31f52b 100644 --- a/drivers/event/dlb2/dlb2.c +++ b/drivers/event/dlb2/dlb2.c @@ -1850,7 +1850,7 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, if (dlb2->poll_mode == DLB2_CQ_POLL_MODE_SPARSE) - qm_port->cq_depth_mask = (cfg.cq_depth * 4) - 1; + qm_port->cq_depth_mask = (qm_port->cq_depth * 4) - 1; else - qm_port->cq_depth_mask = cfg.cq_depth - 1; + qm_port->cq_depth_mask = qm_port->cq_depth - 1; qm_port->gen_bit_shift = rte_popcount32(qm_port->cq_depth_mask); diff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c index ed4e6e424c..31b5487d85 100644 --- a/drivers/event/dlb2/pf/dlb2_pf.c +++ b/drivers/event/dlb2/pf/dlb2_pf.c @@ -401,5 +401,5 @@ dlb2_pf_dir_port_create(struct dlb2_hw_dev *handle, * cache line. */ - alloc_sz = cfg->cq_depth * qe_sz; + alloc_sz = RTE_MAX(cfg->cq_depth, DLB2_MIN_HARDWARE_CQ_DEPTH) * qe_sz; alloc_sz = RTE_CACHE_LINE_ROUNDUP(alloc_sz); -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:15.498906834 +0100 +++ 0128-event-dlb2-fix-dequeue-with-CQ-depth-16.patch 2025-07-18 20:29:11.078907784 +0100 @@ -1 +1 @@ -From 0b92203cdae06dee0626e46e62b9c34450e776d8 Mon Sep 17 00:00:00 2001 +From 8a644d6c9a20059c40624d41d35e2874e84cfae5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0b92203cdae06dee0626e46e62b9c34450e776d8 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 08291b10b8..bec1e88074 100644 +index 934fcafcfe..c5ab31f52b 100644 @@ -27 +28 @@ -@@ -1952,7 +1952,7 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, +@@ -1850,7 +1850,7 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, @@ -38 +39 @@ -index ac432b81ad..cd2788c035 100644 +index ed4e6e424c..31b5487d85 100644 @@ -41 +42 @@ -@@ -428,5 +428,5 @@ dlb2_pf_dir_port_create(struct dlb2_hw_dev *handle, +@@ -401,5 +401,5 @@ dlb2_pf_dir_port_create(struct dlb2_hw_dev *handle,