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 90F3C43B86 for ; Tue, 5 Mar 2024 10:53:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B2404026B; Tue, 5 Mar 2024 10:53:05 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2046.outbound.protection.outlook.com [40.107.102.46]) by mails.dpdk.org (Postfix) with ESMTP id 3175D4014F for ; Tue, 5 Mar 2024 10:53:04 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VKM+mbK+Dzgzn/9rhyJJvyJaPNH5X7ncBArnmGcmjVWfyBLO0EeTDzUnPK2raXz5UuHTjDwIYYpGHeAjxS/3AU03pdTktPD0hUJGRK4MVScFMcfe27SyJonHSQzkXnbB2WazqOsX0FshH9glU8JLckWE4jld8Vborw/0Fuy/HZtRm29kDoxQpOhSaAxbvD5yDnk5POt+h3HmzTEtwUEli550vy7cGCISGZq8cFbq51t2lq2aTNiKM5c4zuK/JG0qKeYgl2u0VhFLiVj90105SyfpwIRS1HQeDhtYalg4eozqOtF2/b/n7ZDuAHKy6Sn6WAKJhFJza/dLbAf/L63LXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=ZbyZkdqFqmV3KTPWhoiU/dw5J4v6FH8UMq6pMdUL6w4=; b=a/mRyofQzhxNuw/4DlzGhnoFPMU7+xrb41F7/WsMolAx+kfHLKfczPLpU5VK8MQiJ9HHSKlZYWL3VSIXwRC+/W6nsjD12o0Whh/fj0bLnCfzaq9vHO42UxITSKosVZTgb3CxEmT6gxOB+U6FxWlgUoqtJ9WWjsP4rA4WEprZIIRm6o6b6M3UZ5l5P0IJU4E7pdJLQdEcDdKytIYY2rKb/H3fdRAOQFRKNN/6WdZg/SVJmfL796TS+TJG3cuHCh8WLhMlUH32D8M9EnpuKAQjYtXlhQvbHro041En/VinbYN5j3QmXWEs2L20H6GUFRLTm0nHHboTMHCC5++21bTpqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=arm.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=ZbyZkdqFqmV3KTPWhoiU/dw5J4v6FH8UMq6pMdUL6w4=; b=gd2HqnV8dVX+5m0S5YBzNUIp4pOY/C+F1VjLmotOIY9lT7PjeqfRANE2MP4vaUXZ8fWQI3zL5AhZoz9rYR+DcTToVTp3VKeX+p8i5tKwsidcy/9dTaLvJHwyhHlj+otxfx4v0NlI6fNIZrwX3RZYtPFYoLV8Ze0fc9JdjmfbNyHyV6JMyG91Pcv+5whUaglLLzrbzS+7lwhrAmHpLhR5lYzGcTSILRCmFXbKy16kBXdaxZBkEGyf25rGqcUC843v/e0GuP3UeUC31FmtnV2aJFbi5JyRRjuG1onukH40N9GzjFDJIiN7DKgTvBQNS3U7eAjHqUZG6XGC5Bg7/eNb8Q== Received: from PH7PR10CA0003.namprd10.prod.outlook.com (2603:10b6:510:23d::24) by CH3PR12MB9313.namprd12.prod.outlook.com (2603:10b6:610:1ca::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:53:01 +0000 Received: from SN1PEPF0002BA4D.namprd03.prod.outlook.com (2603:10b6:510:23d:cafe::85) by PH7PR10CA0003.outlook.office365.com (2603:10b6:510:23d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24 via Frontend Transport; Tue, 5 Mar 2024 09:53:01 +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 SN1PEPF0002BA4D.mail.protection.outlook.com (10.167.242.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:53:00 +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.986.41; Tue, 5 Mar 2024 01:52:45 -0800 Received: from nvidia.com (10.126.231.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.1258.12; Tue, 5 Mar 2024 01:52:44 -0800 From: Xueming Li To: Honnappa Nagarahalli CC: Nathan Brown , dpdk stable Subject: patch 'rcu: fix acked token in debug log' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:34 +0800 Message-ID: <20240305094757.439387-54-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002BA4D:EE_|CH3PR12MB9313:EE_ X-MS-Office365-Filtering-Correlation-Id: 3cfd8870-c4be-48c3-fe00-08dc3cfa0b59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fp113Aoq5uiyVxSx+D/i4yGSP/BSJHEZHe/F5mEfQnvn4P6n3lxv5hc2dpUJJF4TvSXKiw+1w22C1bWkKbtMIe2OvQdQYOhsyEcMYj1YiNVlEOdd46uriWbtaNFLQ4rmASh+cfSfV+I0Emr0cFaNw41hgao5qbur3R8L0GmsPdPxPhdTAKAEG+kTilfhRfBVMiNqmv/aFRxAzk72nVm+aXSlFvVOAvjL72mLV42EPPWNnn5sfKXs5e7PiZFlWy35ytUDMwLGbpfyf6vlbRVHhSb+7JlqJTdFeCfIOBf19uHbhtMy+9i67jNGyVaklAw8MK6tc7rWfVmGykoeIGcPq65dut+hHfxiurirQnkYEAz//xbW6yRmqUhznzWJ9UxZlAxFQH30jW8P0HJJR045lyPOzCFGbDytusjS6v2docnDQb3GbVWr7qwDewRauCKQk/c7ynzW9w6b2DlbJ6PWWwhMXjRMcFxDexMTDz1cPO+1+6L/gSuB4+U7cTf+UbuCMYYMMvnimA75Vj4WQRWnUXRIIaAdfpEvU9maj8mASlUGhGIC+fwYlLPtTOOlEv6y3tDOOu3CsT837JxwuCHmu/FE4GvwPcNokck7B9wYMC8OxiWi2Hq0Efbj1PiufVHD2sDDOUWjJVSXMQQqPbp0sFqCv+yokaj35pxvfSuItJRpFFUJaUzKKtDksvzOLmIGQLMQNfdMsw85byogn8dStRlQOrC53HNhVWaUbVZUYocLUVGcBMEiLJscov/IeXgO 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:(13230031)(82310400014)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:53:00.8455 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3cfd8870-c4be-48c3-fe00-08dc3cfa0b59 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: SN1PEPF0002BA4D.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9313 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/24. 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=c30a4f8b3162bbe1178e79fdf476b2d65f182ea9 Thanks. Xueming Li --- >From c30a4f8b3162bbe1178e79fdf476b2d65f182ea9 Mon Sep 17 00:00:00 2001 From: Honnappa Nagarahalli Date: Mon, 5 Feb 2024 04:59:49 +0000 Subject: [PATCH] rcu: fix acked token in debug log Cc: Xueming Li [ upstream commit df33fb53e464cb1efc79fa65f923aaa60ae10f42 ] Debug print should use acked token value that was used for comparison. Fixes: bf386ae377aa ("rcu: add additional debug logs") Reported-by: Nathan Brown Signed-off-by: Honnappa Nagarahalli Reviewed-by: Nathan Brown --- lib/rcu/rte_rcu_qsbr.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h index 66780b324b..8bda00e911 100644 --- a/lib/rcu/rte_rcu_qsbr.h +++ b/lib/rcu/rte_rcu_qsbr.h @@ -664,17 +664,20 @@ __rte_rcu_qsbr_check_all(struct rte_rcu_qsbr *v, uint64_t t, bool wait) static __rte_always_inline int rte_rcu_qsbr_check(struct rte_rcu_qsbr *v, uint64_t t, bool wait) { + uint64_t acked_token; + RTE_ASSERT(v != NULL); /* Check if all the readers have already acknowledged this token */ - if (likely(t <= rte_atomic_load_explicit(&v->acked_token, - rte_memory_order_relaxed))) { + acked_token = rte_atomic_load_explicit(&v->acked_token, + rte_memory_order_relaxed); + if (likely(t <= acked_token)) { __RTE_RCU_DP_LOG(DEBUG, "%s: check: token = %" PRIu64 ", wait = %d", __func__, t, wait); __RTE_RCU_DP_LOG(DEBUG, "%s: status: least acked token = %" PRIu64, - __func__, v->acked_token); + __func__, acked_token); return 1; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.576372153 +0800 +++ 0053-rcu-fix-acked-token-in-debug-log.patch 2024-03-05 17:39:30.753566492 +0800 @@ -1 +1 @@ -From df33fb53e464cb1efc79fa65f923aaa60ae10f42 Mon Sep 17 00:00:00 2001 +From c30a4f8b3162bbe1178e79fdf476b2d65f182ea9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit df33fb53e464cb1efc79fa65f923aaa60ae10f42 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index ef1621d597..e7ef788175 100644 +index 66780b324b..8bda00e911 100644 @@ -22 +24 @@ -@@ -663,17 +663,20 @@ __rte_rcu_qsbr_check_all(struct rte_rcu_qsbr *v, uint64_t t, bool wait) +@@ -664,17 +664,20 @@ __rte_rcu_qsbr_check_all(struct rte_rcu_qsbr *v, uint64_t t, bool wait)