From patchwork Mon Feb 26 23:02:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1904773 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TkGPK4hlyz1yX0 for ; Tue, 27 Feb 2024 10:03:17 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rejzx-0008QI-5d; Mon, 26 Feb 2024 23:03:01 +0000 Received: from mail-dm6nam12on2044.outbound.protection.outlook.com ([40.107.243.44] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rejzk-0008ME-Td for kernel-team@lists.ubuntu.com; Mon, 26 Feb 2024 23:02:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iFsZIf4pk6rk/o1UWd0RlvIeXsfSE6GSfJLl4+kvkfHqNwSCm6BYKVPxjYR6qHiQGS5d8xCRw0mxw/SJ2JWSMt7h7s5SpVqgNUhCc+/e+v6+srzqxNrIqHoO1+EVfZZZqIASApQ1tCUIC8Mxz4qhsbkAzEAzPiRS6MYmejRSyxXu9vp77v1sYCt97eEk65S2e+T/bALub3tYJKmLvKHSXg3qTx0RkiU7Kxw6x16dCRtVS39x6v3gPxuD9gfgGBKwzpjA6wqxjfQTSIo5bREzGq4dJHuR8elIKdeHDeQtMSRdQlFcMiKVRTSIv3qMYW+rbH9PxluxUBpK7W+ZC9zl9A== 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=YCRG24XZOVY8tXvmdyChrOPvTAOL6z7NviZLCIsgj0E=; b=drPUFD5b2vfgZRU/AbckAjmPvygHYujFtNDya7AjG74YAey5wB8HB4SSU2zv6fgRdC8AbaETPp++Jprzikj5D3Pu8Zw3DR/4hNlbAORtfDuwxBfqADTNgqF3XWEf4/PCq/NcN592flgeNW5tygbIy7fnUW/wNCBUId/+PKhzxCMH0W0Th+3A0/+IoHaepC4ucAGKV8e8F4YzJ41BC3okbedIOgAQ7N06MutSMbkzm9kpnZjwXSL/g4fIlXB4SjwCgeiRGzm9ZPzMBrymjlg73eevDuOFARtGC1iPHalbeQaJp13MiRrEcMeHZ/kT18XyEwERtWE62xjpVbAd1nceZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=lists.ubuntu.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) Received: from DS7PR03CA0016.namprd03.prod.outlook.com (2603:10b6:5:3b8::21) by DS0PR12MB9345.namprd12.prod.outlook.com (2603:10b6:8:1a9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.36; Mon, 26 Feb 2024 23:02:42 +0000 Received: from DS3PEPF000099D7.namprd04.prod.outlook.com (2603:10b6:5:3b8:cafe::b) by DS7PR03CA0016.outlook.office365.com (2603:10b6:5:3b8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Mon, 26 Feb 2024 23:02:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by DS3PEPF000099D7.mail.protection.outlook.com (10.167.17.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Mon, 26 Feb 2024 23:02:42 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 26 Feb 2024 15:02:32 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Mon, 26 Feb 2024 15:02:31 -0800 Received: from vdi.nvidia.com (10.127.8.14) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Mon, 26 Feb 2024 15:02:31 -0800 From: William Tu To: Subject: [SRU][J:linux-bluefield][PATCH 1/1] net/sched: flower: Add lock protection when remove filter handle Date: Mon, 26 Feb 2024 15:02:30 -0800 Message-ID: <20240226230230.86102-2-witu@nvidia.com> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) In-Reply-To: <20240226230230.86102-1-witu@nvidia.com> References: <20240226230230.86102-1-witu@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099D7:EE_|DS0PR12MB9345:EE_ X-MS-Office365-Filtering-Correlation-Id: de6cd9f0-469a-49fa-9ae2-08dc371f09d1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TO68B2PWULymkFHllZYYebl+TVyTp7cXUl4Yktxir6fKW2s7wIt5tfqzK9vvT04DFTNcotr3NPz+xKdTxDjakQtQuzg7DWfX+6eTOHmgeJPaUKzM2rjtDn/2Xv4MwcaP0k399SHoolE5rFQ8uSgnPKbeaCSCtKYZingTXw/KCn/z+l1xQx9BEdcKd9p69TR5C/poMP3ylloeQ2vTnrGhNuK44k56bLkvxwVEXA1J7eGAhISjIahqwRXU3Q83UBrSUKepHbLsejSK+ETfIXAMDfD9Pud4saNCGL5yEoqOKavgXfBTsvTHjEXugto0LLJf4FKU0IxB13JLfMk+HimS42JGBhq+J8h+Xvuvqs2p2ZtW/sC0FKNm7h6hbWNx6fe3//CHCqpUoSMF3V0R/BY83aInCIlWbfwEQ6vcS6Nubq8EQFlZrilkuTwYlXVF7jwwqClyCsFStosqXXaAMBM8EBCRyYZlzzHbibVFsSO4tPMcP89k4es19d/nk2ijp+x8RuHST+90gYn7pp7Gobnc2LemuFO19xBnkl5Mk85PbWAkSQkX+ovfZHNvaD22QIoV/va+C+cV6FtWK6BTDmrdRXItIpqG7YRxr7+RRACPkDqeeQfZ10HU5IT/intiXZ1OFTpVAHnuAw/wfYRRyCrWE2bCXe2mJej3rz8aAew7OKvJiqODFBVMo9+4177drco49+3v3i55LF0sq1yO1Gopbe+zrHB9husoL6E4qOXE/tmMA08w4x1o7Q8JOIceFX9KEwsJzPWsuKrZBj5GhS16a7xudy4WHuQNsVceFPPg/s8= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230031)(82310400014)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 23:02:42.6607 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: de6cd9f0-469a-49fa-9ae2-08dc371f09d1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099D7.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9345 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bodong@nvidia.com, vlad@nvidia.com, paulb@nvidia.com, dann.frazier@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jianbo Liu BugLink: https://bugs.launchpad.net/bugs/2055052 As IDR can't protect itself from the concurrent modification, place idr_remove() under the protection of tp->lock. Fixes: 08a0063df3ae ("net/sched: flower: Move filter handle initialization earlier") Signed-off-by: Jianbo Liu Reviewed-by: Cosmin Ratiu Reviewed-by: Gal Pressman Reviewed-by: Jiri Pirko Acked-by: Jamal Hadi Salim Link: https://lore.kernel.org/r/20240220085928.9161-1-jianbol@nvidia.com Signed-off-by: Jakub Kicinski (Backported from commit 1fde0ca3a0de7e9f917668941156959dd5e9108b) [witu: resolve trivial conflicts in net/sched/cls_flower.c] Signed-off-by: William Tu Acked-by: Bartlomiej Zolnierkiewicz Acked-by: Andrei Gherzan --- net/sched/cls_flower.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 323d8bf02fa6..a2361b632a09 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -2196,9 +2196,11 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, errout_mask: fl_mask_put(head, fnew->mask); errout_idr: - if (!fold) + if (!fold) { + spin_lock(&tp->lock); idr_remove(&head->handle_idr, fnew->handle); -errout: + spin_unlock(&tp->lock); + } __fl_put(fnew); errout_tb: kfree(tb);