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 2487F43B7D for ; Tue, 5 Mar 2024 10:59:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D15242E47; Tue, 5 Mar 2024 10:59:02 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2078.outbound.protection.outlook.com [40.107.93.78]) by mails.dpdk.org (Postfix) with ESMTP id 550A74026B for ; Tue, 5 Mar 2024 10:59:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KHHQkTfq7GPZVteelO1kUoAzY6QYuS/qjKBjkWJq9nE1RpusX4U6/4wbjJg7zHo7Ll2LNrLUtvPgWjqz7ZroSUwqujbDgsUC4RtGUMgstz8T4lz/PaHBFuebzx70j5p+QMnToceNn2Ukg6i7yCHcrY/brjVsLBqubYRBo7ON6qhtL+RGtTKAIOgLeAT/lQBFm8z1YFDXbcmW85F+7bIOCKvdo+u7W/bhLVLcskC58+UMbDFAQBobsA1BALQL/6sRcIgK4484jjI2MsjShZVbltukiQ7yGy907/fKszodl5r1sK+8OoF9V+xPLuxgH/63XDoJe1sVqg0okSYB4KBD/g== 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=Ya63hisXoV5iGMPk822rXULrjGBq6NM2/KDdxNbFgmU=; b=jyXubEb0+OC7yp4X7gVTkLcWGc6QDBjiUCWovIgTcyAhnaXq9zOky2Wo2eYG19YkEnPIVDI2uUFMPcwFxjyxzGYVj6k6LJpytDyO300oDW5nLQzYrcLmvH89pXP4pdg03LwumX/ZOkusbHHGlesE6oXQKt+v6H6jf/jD71i2L7Fui+PSWCPMjuM+11LIeEZXH2rYzi5nm7Jb8YHFdutSpt4lkMyBdGAV4n92r04WMnWf0N7R9e1SuK5nwIOkK3HPecCpcuBcJM+fMePtzT7oxP2CrQ6j56w5iVRWEEbKokgwKJBkEOeGNXYk8R944fSqNMZYaoEnJBqWQyTt1nOybw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=xencore.cn 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=Ya63hisXoV5iGMPk822rXULrjGBq6NM2/KDdxNbFgmU=; b=OffZrw9cg4EDmE4Tm9z/LVsiEdJ9ZtDX77xR3fKP4r9BXPBK6i6PO3R3dfuB/+Ons571rjarQ98LJzbZhnZ5yrfItyIEh0QPiV378H++m1w3Uy4Cr0LOHKb1vViuAen9IhQiHZzfjHmzoIyVP2xKoVqj8WAB8DGRxRDvqSQQUDqyNZu2fF5mNQ9zKE/9oZH1eNuQqm1IpOxa9docGWsRjk0EC97IXKvJ348fmFmNdTJJ0U9MUSyVi8TcvSEI8erx5KK7GPqUPxnalrkfgiIg+bwhIMMR5ZEgeplxkmhppAEbQdTGzNkxXF9qfFSqvUtsfoaR1X6+cgOoGyJ2nxmHPw== Received: from MW4PR04CA0183.namprd04.prod.outlook.com (2603:10b6:303:86::8) by MN0PR12MB6200.namprd12.prod.outlook.com (2603:10b6:208:3c3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.37; Tue, 5 Mar 2024 09:58:50 +0000 Received: from CO1PEPF000042AB.namprd03.prod.outlook.com (2603:10b6:303:86:cafe::d0) by MW4PR04CA0183.outlook.office365.com (2603:10b6:303:86::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38 via Frontend Transport; Tue, 5 Mar 2024 09:58:50 +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 CO1PEPF000042AB.mail.protection.outlook.com (10.167.243.40) 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:58:49 +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.986.41; Tue, 5 Mar 2024 01:58:30 -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:58:29 -0800 From: Xueming Li To: Weiguo Li CC: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix deadlock in ULP timer callback' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:39 +0800 Message-ID: <20240305094757.439387-119-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: CO1PEPF000042AB:EE_|MN0PR12MB6200:EE_ X-MS-Office365-Filtering-Correlation-Id: a1d53188-9b9f-42a1-cf03-08dc3cfadb64 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J5TltBans6/WZF7IWc4ISAjIRYbBbPa5JMgsxybflxw0W37mBdSAwpBZl1yu0OtRIJKx5IU0iq+Y2V6d8Im7/mVd9Hfcd/cj24asbvC/Ud0mQizw0GR8nMlxEady8TLp4L5V9ovBcMkaja0ieQYYaIILKwk1fF7KiZ75nuUjjVCd37XtW6ZRt24JwiPYLzLonJn598eFlqu7fCeplf+9orYIsHSFq989gjFx0Gf5vNpFIvKi7dszl5OpoU3IdwmZN9xmZWDR3wOwWKx35MoCT/N/QVfwSsNyLV5toQy94vNPV5c0mDjmb13cv1GvPnliVjUevS0e4ynoAGdbn3BmIosYZ1haWpiyR7TlYGT7FsMF0PzYld3FfRl/9NXu1cM6LG6K5kVhC3nW6GUsgvep+hoBDvulKnX6fKnSmA8bSONHNkkp/8BpnA8HH3fo5C7CkOXHeD54I+2PHP0L6xdljueFDoofAqO7LEQyExKE/XCvQxUYkIuvGgdFQz5h5FZqyCWss1p5nTWIyp/Rq7BVFblBlf/gDioJZ+SbYTPc4TmJl1YulZ+hAih+Ic92up22qm4DPj1nXZW4tPZK7tMMrejzZ4z+M4hHzQllBy18jf/zTZMwbBDmFzAg7tsOs3c286Vyi42Nv5nOw5a0Ia6T7XqxskCFOJv6THkry5j7tAM5xzlZ+lb8sCRuEIOc2VJlVFcdbGSVi1JYOHCLYQKwwm6eWgj0Ct5DT95lvoweFUn95LWEBkIy9Ft7SXLQrfca 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:(13230031)(376005)(82310400014)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:58:49.8669 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a1d53188-9b9f-42a1-cf03-08dc3cfadb64 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: CO1PEPF000042AB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6200 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=a77f545bd7ebc03a2bd8f7457ea4c76ce0e42f1f Thanks. Xueming Li --- >From a77f545bd7ebc03a2bd8f7457ea4c76ce0e42f1f Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Sat, 4 Nov 2023 12:06:58 +0800 Subject: [PATCH] net/bnxt: fix deadlock in ULP timer callback Cc: Xueming Li [ upstream commit 81132be766f57ad39a7fe0ad86717b9618e60889 ] The function 'ulp_ha_mgr_timer_cb' acquires a lock on the context entry at the beginning with bnxt_ulp_cntxt_entry_acquire(). This lock is expected to be released by bnxt_ulp_cntxt_entry_release() at the end of the function. However, the second early return statement in the function could potentially bypass the lock release. To fix this issue, add bnxt_ulp_cntxt_entry_release() before the return statement. Fixes: 1993b267dbcb ("net/bnxt: cleanup ULP parser and mapper") Signed-off-by: Weiguo Li Acked-by: Ajit Khaparde --- drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c index f3f5bda890..852deef3b4 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c +++ b/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c @@ -253,6 +253,7 @@ ulp_ha_mgr_timer_cb(void *arg) myclient_cnt = bnxt_ulp_cntxt_num_shared_clients_get(ulp_ctx); if (myclient_cnt == 0) { + bnxt_ulp_cntxt_entry_release(); BNXT_TF_DBG(ERR, "PANIC Client Count is zero kill timer\n."); return; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.509691217 +0800 +++ 0118-net-bnxt-fix-deadlock-in-ULP-timer-callback.patch 2024-03-05 17:39:30.953566499 +0800 @@ -1 +1 @@ -From 81132be766f57ad39a7fe0ad86717b9618e60889 Mon Sep 17 00:00:00 2001 +From a77f545bd7ebc03a2bd8f7457ea4c76ce0e42f1f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 81132be766f57ad39a7fe0ad86717b9618e60889 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org