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 0B72E4625C for ; Tue, 18 Feb 2025 13:44:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F393B402A0; Tue, 18 Feb 2025 13:44:03 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2061.outbound.protection.outlook.com [40.107.220.61]) by mails.dpdk.org (Postfix) with ESMTP id 82717402A0 for ; Tue, 18 Feb 2025 13:44:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VE1CdTwAVDeM2eRPwL7YIZpvS9Lijm9jIasx2uP9ZVntx0RlRr2LV5fH3hfNEjKHjvmepyr70MOKU/Jq4eqJ8jVb+stWxzMbIDv26iAYvuXihl/SEOCieTy/RN+8X5dWo8CBNnHtWPOV1H0yj3E54UVnI02MJ+SL+nHJu1Es3OuRO+PGpEuTLc3XTYBWagwrEPJEWtsLp8U+xz6VLdeX/gDG77Y49OIIGdSrv85U1H2UFAJzVp9Hnz+2RhaBfKPBl25r+9fv4sgRZ7gH5mYNd38Ci53UA5AoJLKIGdPureyVa8edg+9rxdoHxZzy17ScLhT03GIz6UDC2+AwbCVMbA== 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=0ljzJRQrserHyQU635rHt78+YyWdEB1xUYqLMY+tdOg=; b=EJ1R25wtkGai6lWxBRDZIF/qFXptRILmGS7/xlSN+5r903VJn3BvFJ98aPHqUeRNmPbAceoocUx+QUncEnfm2XqYfQIJgBfuv3O0LLwIu5+XkCgo14bZbn2gHws/2UaQjt4wy7JkUS9drUvUwbXTNAtWyDoov4Swdnf4x9/01O9i00bijpR/nLItNhAymwOMwe+KSIzlEGu55FAtkT55hekyMgbF6zPpvgp36vKCZNykLpED0ZTCp0nQ4lIRVOhv0ZF11C1o0grn2KbI3S9vBAhgfE8ueedKKZvB3ceysWMXHRiKHqCGVUtUHbCxuBuVaLv6UtzjQI2ytBbZHL8Amg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org 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=0ljzJRQrserHyQU635rHt78+YyWdEB1xUYqLMY+tdOg=; b=kzzrgGBUsDcRwWsOTShAom/YXzYRgvq0RdQNCf9CNNgu9G7W/OkN/LlfN1Dj7uFOY4vwuCX+qD8Kbt5690bujRMf+U4HfHKHCwLLuBqq3OpbGm5knIbGwGo6t/S1K07SlUShSkWh8DNKt+5j/XhCKaE2VG0rL8T9Vx3deWtzfSBGMPhwwtMP5Nw6D9RtrW3i66bN7NJKKAY4dOOo/TKCCyYYL9lGf88msOVquipCCHsKkGbvTxUAbngQRbEEGLR7wigooMLBg4YzffsiA16gGBcUNRtGeqMTDBWpYRw6nVOTQRq6gHCRifkLekeQAW+r0yMmelKv8lAyLXxNsmIyQg== Received: from BYAPR06CA0063.namprd06.prod.outlook.com (2603:10b6:a03:14b::40) by PH8PR12MB6889.namprd12.prod.outlook.com (2603:10b6:510:1c9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Tue, 18 Feb 2025 12:43:57 +0000 Received: from SJ1PEPF00002324.namprd03.prod.outlook.com (2603:10b6:a03:14b:cafe::47) by BYAPR06CA0063.outlook.office365.com (2603:10b6:a03:14b::40) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.19 via Frontend Transport; Tue, 18 Feb 2025 12:43:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF00002324.mail.protection.outlook.com (10.167.242.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:43:57 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:43:48 -0800 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; Tue, 18 Feb 2025 04:43:46 -0800 From: Xueming Li To: Stephen Hemminger CC: , Hemant Agrawal , "dpdk stable" Subject: patch 'event/dpaa: fix bitmask truncation' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:16 +0800 Message-ID: <20250218123523.36836-82-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00002324:EE_|PH8PR12MB6889:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f203243-de24-4f8f-f5d5-08dd5019e971 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?AxVtIaF01IvXk4vDJ6hAOQxJ4POXGRu4Qu+6I6GH4vfLYjQCTPKOERepiLMr?= =?us-ascii?Q?oCI4Ix4XYlsQlQ8eNm2peX4KBRLfXoP3t1cupsAPNoA3+QstyvgS+PJX8rAs?= =?us-ascii?Q?dU7DxlL6VX4UtOseXpN36GoFCvvKxcl8d4yoQK1/Fxa5T290lEa2XTc9gNBl?= =?us-ascii?Q?mC77iNTc+m+kx8ORerM8J04arKH0RtdeZ+H5hUCcyciShWXE/1MbFxXzm5DP?= =?us-ascii?Q?Q/pWYF/VxIVwLsmDHHAA6WWiV6hpdj9Gz8HoBIc+cJDAgbRKmMO2Uy+GUp8k?= =?us-ascii?Q?TJyJYkxQqsUKVex7GQaVSajTD8KrL/QpvHNkpATPqzbw2gR5MbJ+bWOo10mK?= =?us-ascii?Q?VtvKiFab/ADaQvj7w8X46ycagF30rgSCNzGBUUAvsIB/wLBm2Fo9/q2bTSYC?= =?us-ascii?Q?JXeA/pA6a86r9wuOxK/VCZFPiFL42AT7eauQoERlWD4JfJxdgW2qQk4etjt8?= =?us-ascii?Q?7IGJQC5L+iySgfdxDT6MABM+eerTcnbwHAlg64JqoE4WYF3lBqp1rz84zMQN?= =?us-ascii?Q?Sf1O9nNG/P3G8jECM3yFywFK20KGOMBWnbeaJQFPZp3wxzNqoaQJ3YxAD83K?= =?us-ascii?Q?aW6HiO3zrrph8AS7nFNDkhPaADENt6xZba9nt0IoB36UgR7XpJCAmfrU0DZB?= =?us-ascii?Q?b8KSxX125sI5Zy4ke1/ZI8pIYTZA79J4l2myw0nhMJq8jeJx9djhqGK9oF4j?= =?us-ascii?Q?FhTzw4Iz7GbzO37R22pq4Zksk+ZQ/1Wh6cPFyOgGDxSXRPEwP8XCll9z5WZM?= =?us-ascii?Q?ZM8bLsy5DhH5AfDvdGIYExDkeZCUgJKd8JZ2CP9iysLmya02UdCj9OrWKj1F?= =?us-ascii?Q?YClHBltDPJGtL+kgsXA+ILnezKQk+TMF0XJ+YwxzPSMoaomgGbpVijbbkeZy?= =?us-ascii?Q?Ez02RthiK62ArfMIU889MNbGgylVW1/dVWk5RjXxqHsLwuaU88yRgkKG8fXQ?= =?us-ascii?Q?sgkbURUkHbUerECEEarAwxS5OH0iHmgcUPrkrDQIEVTesKzhr7/kFkRH7akf?= =?us-ascii?Q?6b3hFvOnyh3/ncAf/dZD/rSP942AIq3UNjMCgtIHazZHoK3anq6aJ2bWZ1r8?= =?us-ascii?Q?i+FnL6wTReppb5JsWKZJSKMNzZucSyAKHaaZ+kMa/ENJYEkj1rMMTmo3Z/k+?= =?us-ascii?Q?JHiJ6FISQYbsoGfmoTq7V/nw0xE4sm5lDXnQGv8MLOmhuxaMMyLXGD4qs6km?= =?us-ascii?Q?SNm5WnrjP4siOreehkBSWpZ47Ayy716pv8KRoGz7gilZHCqca5S4aDIaZLGa?= =?us-ascii?Q?RZDAEHpfA2n0dEiH0WqFA5Dx/uttUn77986cAKK0rGk4DIi6ooZYmM58ln+S?= =?us-ascii?Q?//HD7GmN6Wh2QVcGjUV/1Wkr51P694lLQbm3bPU80LrkjXoDWXjTl0L00qlx?= =?us-ascii?Q?4gt9Hh+IyuWMiPjAkJ4WYV7W4IqDujIkh48A9/ItlXaTCmh4b1ISUn9HMbZU?= =?us-ascii?Q?EOoF6P3gTitG+DHQs+BJKCpy6a9u+Nf9qWhSipgCnG94daj/WmejHiW9CNhJ?= =?us-ascii?Q?zUub3CAcs+wegyQ=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(82310400026)(376014)(36860700013)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:43:57.6974 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9f203243-de24-4f8f-f5d5-08dd5019e971 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00002324.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6889 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=0c943314f2fb50d446cbe0635816d3f68fc5e3d4 Thanks. Xueming Li --- >From 0c943314f2fb50d446cbe0635816d3f68fc5e3d4 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:15 -0800 Subject: [PATCH] event/dpaa: fix bitmask truncation Cc: Xueming Li [ upstream commit a82888ed6edc599f82263a1bd067a7edb7cceeee ] More bitmask truncation from mask computation. Fixes: 0ee17f79ebd0 ("event/dpaa: add enqueue/dequeue") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/event/dpaa/dpaa_eventdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c index 46a9b88c73..6b931e8054 100644 --- a/drivers/event/dpaa/dpaa_eventdev.c +++ b/drivers/event/dpaa/dpaa_eventdev.c @@ -101,7 +101,7 @@ dpaa_event_enqueue_burst(void *port, const struct rte_event ev[], qman_dca_index(ev[i].impl_opaque, 0); mbuf = DPAA_PER_LCORE_DQRR_MBUF(i); *dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN; - DPAA_PER_LCORE_DQRR_HELD &= ~(1 << i); + DPAA_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << i); DPAA_PER_LCORE_DQRR_SIZE--; break; default: @@ -204,11 +204,11 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[], /* Check if there are atomic contexts to be released */ i = 0; while (DPAA_PER_LCORE_DQRR_SIZE) { - if (DPAA_PER_LCORE_DQRR_HELD & (1 << i)) { + if (DPAA_PER_LCORE_DQRR_HELD & (UINT64_C(1) << i)) { qman_dca_index(i, 0); mbuf = DPAA_PER_LCORE_DQRR_MBUF(i); *dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN; - DPAA_PER_LCORE_DQRR_HELD &= ~(1 << i); + DPAA_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << i); DPAA_PER_LCORE_DQRR_SIZE--; } i++; @@ -274,11 +274,11 @@ dpaa_event_dequeue_burst_intr(void *port, struct rte_event ev[], /* Check if there are atomic contexts to be released */ i = 0; while (DPAA_PER_LCORE_DQRR_SIZE) { - if (DPAA_PER_LCORE_DQRR_HELD & (1 << i)) { + if (DPAA_PER_LCORE_DQRR_HELD & (UINT64_C(1) << i)) { qman_dca_index(i, 0); mbuf = DPAA_PER_LCORE_DQRR_MBUF(i); *dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN; - DPAA_PER_LCORE_DQRR_HELD &= ~(1 << i); + DPAA_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << i); DPAA_PER_LCORE_DQRR_SIZE--; } i++; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.517993150 +0800 +++ 0081-event-dpaa-fix-bitmask-truncation.patch 2025-02-18 19:39:00.728244030 +0800 @@ -1 +1 @@ -From a82888ed6edc599f82263a1bd067a7edb7cceeee Mon Sep 17 00:00:00 2001 +From 0c943314f2fb50d446cbe0635816d3f68fc5e3d4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a82888ed6edc599f82263a1bd067a7edb7cceeee ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 853cc1ecf9..400e0ecd1c 100644 +index 46a9b88c73..6b931e8054 100644 @@ -21 +23 @@ -@@ -102,7 +102,7 @@ dpaa_event_enqueue_burst(void *port, const struct rte_event ev[], +@@ -101,7 +101,7 @@ dpaa_event_enqueue_burst(void *port, const struct rte_event ev[], @@ -30 +32 @@ -@@ -199,11 +199,11 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[], +@@ -204,11 +204,11 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[], @@ -44 +46 @@ -@@ -263,11 +263,11 @@ dpaa_event_dequeue_burst_intr(void *port, struct rte_event ev[], +@@ -274,11 +274,11 @@ dpaa_event_dequeue_burst_intr(void *port, struct rte_event ev[],