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 8B8EF4625C for ; Tue, 18 Feb 2025 13:37:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 807E4402A0; Tue, 18 Feb 2025 13:37:42 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2047.outbound.protection.outlook.com [40.107.102.47]) by mails.dpdk.org (Postfix) with ESMTP id A7547402E9 for ; Tue, 18 Feb 2025 13:37:39 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RcDE1mfg08xCGUNy4q1nFmFPsAAljF5O/q+nV6XgZ5dWxZyIiCRSeWMzOmTUN7S1CpFUz16YARe6y9zmtQ1jz9w96PLi4f9F1+xeDyUzWXCMQsyFzabwPtNxzqF9sq09MqZuD2+RwwgTIfZawfEs1e6Hqew+aebgZmqzc6/Yo6X1lpNyXthjeSciemiup7jQ8bMcyMT/ACzKecvZ/9TC5gVmjg1hJW651TVee6TxSRTP+0GQwwOse2YzRQ7DQg2fewEdMPow82Nj0hUi0zuL2IKlm2fAOUK7jECkfJGSgPQ8KpeinGqk62n/iY++y1rOE6ymA8NHxlc+yi6Q50jL8A== 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=JszmsrN+/Fjn10/WKHBr3+8p4/tkLgh2BQnaEs7NZxs=; b=aNIE9ZMIP3SgcmoBHv1q0b/b9bvfPtbIPOvDGYK5uneO5uw1dvR36dZ4WpVB/7YSec9rAt84nEnveZXLm3ZU8HxCQsgEqwwGXLqcigskd5u1rx+jGa7TKFbKcTahgvS2/61/JnQSnlpblHlrLob7Ng68B/wAx0NdFsZZVkerHwjlLMFoh8iZk6jS7KubPTElyTyY8v+B3I+DNZ0vIWjUbUAavg7tBbh+CI/bMivR6vZ48I10z2cFv2m82JsFFmj3mYrBXLgtdRiTrysmrK9ch8gRXiAIPjvuPJ34irRSptd1mvKIH+Qhz1PmO/ORAAXxuafsYsLK+t9C3L7KVCZSDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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=JszmsrN+/Fjn10/WKHBr3+8p4/tkLgh2BQnaEs7NZxs=; b=W7lLaJ57yzScCGZxd7yjL7qSp2BqYn2f9usODYgYaPc4KKa1Ky9bYoLdqgvec/uYlggeb6gL/1KJDQAMW/2k9pnfaDlSp+yIKMGi3fawY3VXkR7aLjq3gbFHBMMwFTwTtcRbkmQnfUd0DafqqCbMdldALglDnisf5gBYOiLwBjcCaOkKjFNHMPQpCUB5YES5SrK54e29RpC1M0f8203TSDqg0OMCYkqmtrlCcnfYfcsQA2/lZjWUmNufwiKSfGA5G5uxHD/ZWYaF/njiR3kisKmJzXNeDs5qH0s5cUwByDy6ddq8HYyANUEh7LeSFk060hKJV72ytbBJllrHn8koNw== Received: from MW4PR03CA0070.namprd03.prod.outlook.com (2603:10b6:303:b6::15) by PH7PR12MB7161.namprd12.prod.outlook.com (2603:10b6:510:200::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.20; Tue, 18 Feb 2025 12:37:35 +0000 Received: from MWH0EPF000989EA.namprd02.prod.outlook.com (2603:10b6:303:b6:cafe::71) by MW4PR03CA0070.outlook.office365.com (2603:10b6:303:b6::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.14 via Frontend Transport; Tue, 18 Feb 2025 12:37:34 +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 MWH0EPF000989EA.mail.protection.outlook.com (10.167.241.137) 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:37:34 +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.4; Tue, 18 Feb 2025 04:37:23 -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:37:21 -0800 From: Xueming Li To: Nawal Kishor CC: , dpdk stable Subject: patch 'common/cnxk: fix atomic load in batch ops' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:13 +0800 Message-ID: <20250218123523.36836-19-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: MWH0EPF000989EA:EE_|PH7PR12MB7161:EE_ X-MS-Office365-Filtering-Correlation-Id: cfcf79e4-5fc5-4273-e68b-08dd50190513 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dysOpTDLBiOUV7PTqxMcUCaBteUSI5SXuNTNla8KJS2SdpYOHroY9hqx0OsK?= =?us-ascii?Q?AJzOGHBbSeDqt3n11HbI+HXcgXoatxojGnW9Jg7CsgG+H8Be5akDmc4Q7K+A?= =?us-ascii?Q?znEt7dYLbJ9kBQceMKjbd/eRc7u5gFA62yLK5wzN5RxbbPfqBFXKLba5ktgN?= =?us-ascii?Q?Sht3L19YswnuUjZQ5pcR1bbVBmkCs7Xyk7eWvx5+zo1Hdr6raPlGqEATZaVC?= =?us-ascii?Q?kvzBmE4nD3F/8gVZQi9OBgKdlfz7BJUUO+7ZkZ65wZGAq1HVe38CqrX1y4Tc?= =?us-ascii?Q?u7KJUT3B9zIgKTJl5Ih1XpMdQYq/aMiUsNeLcHp3p3PB8uCMl78MX91cdFaF?= =?us-ascii?Q?n9m9WkoT4weYeygGh8h9ZwloyIV6mVMG19FECwITKFuh5t8/+MGnUEErTcjy?= =?us-ascii?Q?qKBFjH6RzywAos3ikA2E10oo7DCw2keVaqqfkjBPPtkNSPEVznhJnQTtF23q?= =?us-ascii?Q?HTYLacyi8OYDCp6tYcrJWH2Jz5dgEXgU+x6hH27HRTVZJADV6SpcswJ5mREo?= =?us-ascii?Q?SI0apSXeEnuNd3Imi4X/4okofNudUT1Mg33/PUgnUADQHwdvhIF0+SJXTCwJ?= =?us-ascii?Q?pJLh/zJhMHb865d9uT5t7py60oqAQoFlURbIlZMpekNi8vJAOQ04ggbkv0me?= =?us-ascii?Q?+Vk8IwfxfdlZVU/UhZty3Qp2LsxOULqK7tGQhky8OMPOUndREn+KggCI6hvQ?= =?us-ascii?Q?06GA5H2EtMZww8U1j0VsDyknQtopU8iYQL0eYT0GYP4q0I3INdyl1ibxSlMx?= =?us-ascii?Q?at3qBli7SwErchcR6tCFRYCEjLC3hld1gaEMQGkSTLY3icZrMKnEd4kq9D0v?= =?us-ascii?Q?qwSXzVnUgss7aJ/44vV+EETG+sg83itNx16pHXF657mbumONjwkpJV0ZyJv8?= =?us-ascii?Q?IGPoFVMlR/xAPRdsnnIuebaHoAgIW/jbb5c5LG382lFivvkAnmhu35kNu3jI?= =?us-ascii?Q?XaCQDf+vH8375H/kCHoVaC9H08DpxQY9OFcMWxfRBC83KKUYfHikO0R+p6Id?= =?us-ascii?Q?ofcWQU6ufnnef0hrpjUCx5evA+XnUsEAF04/j++6MhjveKvZiFzn+KQjc6vg?= =?us-ascii?Q?rWBd6NStn9H8+D/SELee+X7SNsN3Y9uGCu0EuMBfjAcrkMNS+GtAGDIOyzny?= =?us-ascii?Q?Kw5Yy7peLU9yYJGDEz+AmpbObqdQUA7wN0mdEuVH6b+8DRrZ2Qblq2BeoA1N?= =?us-ascii?Q?D19ZtCzALNqCgT2CY/rYXQkALiw4xC4d4d6hK5IaCW4waWGLSUv72+WRhc47?= =?us-ascii?Q?wHW+wP5H7wur7+GsSRnaNKkczSC+7f/+pruzf3ztVJ1+/p1rL78tRW/4IbkD?= =?us-ascii?Q?DEN15tNeae4RrxJczn9wGJDw4hwxCQU1Tc+C2tVYiL3MkLFUjr/eQckkJoT0?= =?us-ascii?Q?TnRzYskHrFe9QbI67K4Z771nyosbv9xD1V4vIFhkYyLF0tZjVtTNQs0v9MT0?= =?us-ascii?Q?UyjQGjYQ7NMmmqK8oAv1wrJDGX9Cztn8bEOrLEj7MaHTyzoVkl5JNm2cFlDW?= =?us-ascii?Q?sHA/dsHh45KMPp0=3D?= 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)(1800799024)(82310400026)(36860700013)(376014)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:37:34.4979 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfcf79e4-5fc5-4273-e68b-08dd50190513 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: MWH0EPF000989EA.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7161 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=3d543686ef3e94e2da99b52b42d02293e7b511bc Thanks. Xueming Li --- >From 3d543686ef3e94e2da99b52b42d02293e7b511bc Mon Sep 17 00:00:00 2001 From: Nawal Kishor Date: Mon, 2 Dec 2024 22:27:39 +0530 Subject: [PATCH] common/cnxk: fix atomic load in batch ops Cc: Xueming Li [ upstream commit 73d38682fddd614d95942442c20b3a1de211bb4c ] In roc batch alloc wait code, __ATOMIC_RELAXED is changed to __ATOMIC_ACQUIRE in order to avoid potential out of order loads. Fixes: 50d08d3934ec ("common/cnxk: fix batch alloc completion poll logic") Signed-off-by: Nawal Kishor --- .mailmap | 1 + drivers/common/cnxk/roc_npa.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 820c201bfe..75440baa40 100644 --- a/.mailmap +++ b/.mailmap @@ -1025,6 +1025,7 @@ Natanael Copa Nathan Brown Nathan Law Nathan Skrzypczak +Nawal Kishor Neel Patel Neil Horman Nelio Laranjeiro diff --git a/drivers/common/cnxk/roc_npa.h b/drivers/common/cnxk/roc_npa.h index 4ad5f044b5..ebc2a62536 100644 --- a/drivers/common/cnxk/roc_npa.h +++ b/drivers/common/cnxk/roc_npa.h @@ -247,7 +247,7 @@ roc_npa_batch_alloc_wait(uint64_t *cache_line, unsigned int wait_us) /* Batch alloc status code is updated in bits [5:6] of the first word * of the 128 byte cache line. */ - while (((__atomic_load_n(cache_line, __ATOMIC_RELAXED) >> 5) & 0x3) == + while (((__atomic_load_n(cache_line, __ATOMIC_ACQUIRE) >> 5) & 0x3) == ALLOC_CCODE_INVAL) if (wait_us && (plt_tsc_cycles() - start) >= ticks) break; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.393198316 +0800 +++ 0018-common-cnxk-fix-atomic-load-in-batch-ops.patch 2025-02-18 19:39:00.458244077 +0800 @@ -1 +1 @@ -From 73d38682fddd614d95942442c20b3a1de211bb4c Mon Sep 17 00:00:00 2001 +From 3d543686ef3e94e2da99b52b42d02293e7b511bc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 73d38682fddd614d95942442c20b3a1de211bb4c ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 1ed47e1cad..8524952d24 100644 +index 820c201bfe..75440baa40 100644 @@ -22 +24 @@ -@@ -1079,6 +1079,7 @@ Natanael Copa +@@ -1025,6 +1025,7 @@ Natanael Copa @@ -31 +33 @@ -index f7cb4460e7..8525038810 100644 +index 4ad5f044b5..ebc2a62536 100644 @@ -34 +36 @@ -@@ -255,7 +255,7 @@ roc_npa_batch_alloc_wait(uint64_t *cache_line, unsigned int wait_us) +@@ -247,7 +247,7 @@ roc_npa_batch_alloc_wait(uint64_t *cache_line, unsigned int wait_us)