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 18ABF46C54 for ; Wed, 30 Jul 2025 17:01:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 126E9402C3; Wed, 30 Jul 2025 17:01:45 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2060.outbound.protection.outlook.com [40.107.102.60]) by mails.dpdk.org (Postfix) with ESMTP id DEDFF402C3 for ; Wed, 30 Jul 2025 17:01:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rmRZyeBMFapyKT8GngL2r7HuzooaDRQNXqc7IlgWgdeUsv8V8+Z3Q/ZonV1N67OekZciZLJUJZAPVwYudUNm0YVVeRb/KaBD4RAct7HdAVLegiWl/y1hZSmAe9dUL7QNScBFEodm+LA96BQDW1pMpTvvMR3+sVL/1K29JZV0k8U+GTv0gaseYDQBW6NSZVZRp1aI5H8s158CCIiveLaw/HAHVzj0yc56T5cAVzKTNt4ea/uVjeAP1jI2aOrWMJ4iQxHdtHcbra8wYLSTfBycaF0TZIkwhjd3Vc5AXWFNeFEO3BJh8UvU1JL+Y0ddcrT0oFVa+RSInIAmhU435STkyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RYdQCOpOvre+zBt+vt13gE96l6CGawLIe56DyYlWhBM=; b=RuJMlty4a0G3RxaU4eYExKsFNTV0dod5F6CtiovO63iqWahdSMw1r8j1uvkRGnLhH48qYFPlC1jrbE+Pfk76u1QuCdaJfOWkmlEOO+Y20OH2oPfv/eJmXMJ/ddg/pWrOMI0r5NpXHtffba3Wk+QwqEqhaqw24PBVEdOPnK/6DUgvE6sloyQbSbV+F4Xm37/pdVWTnC8JN++87ZYGLPLgHeGNcJL8XNFCAuofG902IJpu0VurlRu0TWkUwUYDrchkFbK8zspalgGRl5Tm9HXAjpctJigSRzQMChpDs24bREHA2Wqik8zqHqgecl7nOTNh2JTjb/qgO9yL31w9M8nPPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RYdQCOpOvre+zBt+vt13gE96l6CGawLIe56DyYlWhBM=; b=caymVoyc4lXqpw/FurX8y3cfLZGWcpe3CUdUQPj3nk+BC+tfW/F0VRt0M4iwZUzdpkvHtahL+T4QrfHQ2q2LSn5DqOyfyBALvtODTYliYnKwEHZjS1XFYmpuJ43tUmDZsaTRkwqAiL0lEAON4PqQYhbMbgkryueAWjELnJBl6NLcX7RVT7RONVQnJ65mgoPQ9gPVfXfiQ/9zrGq94a7hDKFfUy+LCud3JHP4MwXgp9hN+DNeNefmDcypuwVgo+MGKPjjyTvBKd60rDOJpexVZOy1Bm7wJzdzr8J/5fvj+ERXJiGZ/fk03jOJyluzbxQ0e+wY2k5UtcNuLDz5QpbN6g== Received: from BN9PR03CA0682.namprd03.prod.outlook.com (2603:10b6:408:10e::27) by CH2PR12MB4327.namprd12.prod.outlook.com (2603:10b6:610:7d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.27; Wed, 30 Jul 2025 15:01:40 +0000 Received: from BL6PEPF00022573.namprd02.prod.outlook.com (2603:10b6:408:10e:cafe::8f) by BN9PR03CA0682.outlook.office365.com (2603:10b6:408:10e::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.12 via Frontend Transport; Wed, 30 Jul 2025 15:01:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BL6PEPF00022573.mail.protection.outlook.com (10.167.249.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 15:01:40 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 30 Jul 2025 08:01:15 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 30 Jul 2025 08:00:59 -0700 From: Xueming Li To: Pravin Pathak CC: Xueming Li , Tirthendu Sarkar , dpdk stable Subject: patch 'event/dlb2: fix dequeue with CQ depth <= 16' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 22:56:24 +0800 Message-ID: <20250730145633.245984-16-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730145633.245984-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730145633.245984-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00022573:EE_|CH2PR12MB4327:EE_ X-MS-Office365-Filtering-Correlation-Id: 592ed2ef-d144-4f4d-6a28-08ddcf79fd83 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jkGDniD6QDoVsEe5+PPNao6B9fLxlGv23LCkXHvZzeOXDovUP8k92/X4j2Wn?= =?us-ascii?Q?5OwPlIr8tvSDQv/Gp944OGjkh20H+Y45DR3LkvpnWvMbtKFix/nzGo56/xWT?= =?us-ascii?Q?fGzzaRMlRU3ZiMqI2t6goWoCMn2UgvbOJ9Yp28jnKm7/DKuAoAlNGkYuBOX9?= =?us-ascii?Q?hsA7mh4XEivZbuhy1z6UtCB4Ypa7WCnubl7C1aq8UbsrxoCxtVzhWRJeb7pq?= =?us-ascii?Q?3xq5COuKFZKCD9rF4wNArxdy61JlvaEh6Ka8jSnl1iGEQW4INxuoDpREk193?= =?us-ascii?Q?Sh8g9F6f40xuhNxtRGdZhzzA9GWMvRQqzGBpots23CkK70kr6/ZE+Sm0hGqC?= =?us-ascii?Q?d72dBVuUn1AJvx8Lx5/URRpuhOBcgKqHhp0+FCgVFp0I0JccOk19XsNfymYz?= =?us-ascii?Q?m651l1iPP8AZr72H3vffMcswq+T8zaGwZANCA5msywOXZ5yHzr73DZ8Jfpzb?= =?us-ascii?Q?jHfE3s2eUzSigIqoW39s+56XVPpWxjO4pQ4F1r/f+xcuzUFlO+zMX9SMudhV?= =?us-ascii?Q?5sFTnoX1zCInuNc48kMrrHTaWIi5f/di3JAzLm4+DbdbwAb6ktq/tvqR7Osd?= =?us-ascii?Q?kxthzsIenlfcQS6GyIfV9MENzS7pTf6hUM7pL9LNIbvXh1sUhCTPSxT3lHUG?= =?us-ascii?Q?7aStZhZJEvDU4D4LQOedDQ6JoTXe4J850C5F0TQq7BgqS9psxTlwSBXtuSzH?= =?us-ascii?Q?iMavHSiN7W9FiYJPWGDNVjpErUblPhpwzvUa/98w/Nbnum/ge0gMLEqauPCz?= =?us-ascii?Q?R83vOKI++cXi2K2iZ6PPE656m+5EqWazkMhdUZOpkqOa+UvlycZpSV+eZAh4?= =?us-ascii?Q?nZetILMoeKP8w1EqI/ONCXho4Ygk7/bH5dVFR+7und1aYxvc8BY/GLq8TWzu?= =?us-ascii?Q?D48Oh/ZCLYOEP7MKYc3X6W2KnQcnGUo2VJ5/+jyiXe76zEwj42mbyLwnIYZ1?= =?us-ascii?Q?9BSXObtcHFvMF/t2fswYFpVxgzvbRKtychKgCXzpTs6fqQ0d1Zfzui/Srm50?= =?us-ascii?Q?DJlhA2NlIR6XGvbTyIezlX+Bo44pGcMAK9Rwbxir+r7UgSUsSrtNoq0RncVr?= =?us-ascii?Q?xoe1GccdkAVxl8xHKPHzjnXh/hpanNvbVw4/p5L7IN7EbKuYl2WUi/uRFUIj?= =?us-ascii?Q?NuaigRxQYhH9g611Y43kvUbtwXV5stTb084bdvg1rP2yrsAIfvb1dhN9zoLH?= =?us-ascii?Q?LTuHtMa5oDT5oZXhUtq3kmynzJC2h9AAvEXJ30nKS9YtzVkKeFwWWno8b0YD?= =?us-ascii?Q?gi9oIfwaJ56kogTp60+wnmuOxPxtroGuEqsWqNImBYO0hUFjEE8cyGM8ncfU?= =?us-ascii?Q?yV5ZOxJpzOqU0LxKMD4hc6WJ+rKwE6Q4qX0Ilkt8eYRFs1xLQ3wEHOSe/gqn?= =?us-ascii?Q?yPFQNO1/0MdZlEF/fz2Aqt2Li2qjRBd282kzbQyRtyoMWzz6Iy01mj1BfB+C?= =?us-ascii?Q?b/74xSVgJY04GPFrKEWcU4uUU/RCcJ866RNp4QsqD8A5zLpevwJe0dODw5xb?= =?us-ascii?Q?MKPyI3rT/JYaVwWyD2mVf+6SRWbz07/4jSS0?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 15:01:40.5810 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 592ed2ef-d144-4f4d-6a28-08ddcf79fd83 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF00022573.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4327 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 23.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/10/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=3712f69908613ff983eca0ec51096b5323e34be0 Thanks. Xueming Li --- >From 3712f69908613ff983eca0ec51096b5323e34be0 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 Cc: Xueming Li [ 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") Cc: stable@dpdk.org 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 cb25be6959..b252e9cac8 100644 --- a/drivers/event/dlb2/dlb2.c +++ b/drivers/event/dlb2/dlb2.c @@ -1858,9 +1858,9 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, qm_port->cq_idx_unmasked = 0; 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); /* starting value of gen bit - it toggles at wrap time */ diff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c index 019e90f7e7..3ce8178135 100644 --- a/drivers/event/dlb2/pf/dlb2_pf.c +++ b/drivers/event/dlb2/pf/dlb2_pf.c @@ -400,7 +400,7 @@ dlb2_pf_dir_port_create(struct dlb2_hw_dev *handle, /* Calculate the port memory required, and round up to the nearest * 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); port_base = dlb2_alloc_coherent_aligned(&mz, &cq_base, alloc_sz, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 22:50:04.065310440 +0800 +++ 0015-event-dlb2-fix-dequeue-with-CQ-depth-16.patch 2025-07-30 22:50:03.028756723 +0800 @@ -1 +1 @@ -From 0b92203cdae06dee0626e46e62b9c34450e776d8 Mon Sep 17 00:00:00 2001 +From 3712f69908613ff983eca0ec51096b5323e34be0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0b92203cdae06dee0626e46e62b9c34450e776d8 ] @@ -24 +27 @@ -index 08291b10b8..bec1e88074 100644 +index cb25be6959..b252e9cac8 100644 @@ -27 +30 @@ -@@ -1951,9 +1951,9 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, +@@ -1858,9 +1858,9 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, @@ -40 +43 @@ -index ac432b81ad..cd2788c035 100644 +index 019e90f7e7..3ce8178135 100644 @@ -43 +46 @@ -@@ -427,7 +427,7 @@ dlb2_pf_dir_port_create(struct dlb2_hw_dev *handle, +@@ -400,7 +400,7 @@ dlb2_pf_dir_port_create(struct dlb2_hw_dev *handle,