From nobody Sun Dec 14 21:46:11 2025 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2049.outbound.protection.outlook.com [40.107.212.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2809C2B9A5 for ; Mon, 23 Dec 2024 04:36:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734928568; cv=fail; b=Y4xZ1JOicOCJnsqvECmfK0lSwTqCSfR1RTJ9o2Lw4lR2qNnoiGzbu8BAFJxn0GL2Mle8clfR/NV00uvjWapQ/47bKs4JF6F/wDTkZw3fqEf7/s3Cl5ZGut+JsrbpfxcYLmBUMuZ1/No+6L/TjEOOrmmvDQzUdXJ2COfykqk1lYM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734928568; c=relaxed/simple; bh=60PMUAzfqClYmUx4kXX7jogkYRzU8BRr/2f2HEY6Mfg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FW4D4YEfk03sPasX/ccum81EwSi5MpnZCDpu5HfCyNBBpKNAO5NHlaDjq25rq2CFX5/AdKmAoY1nBFmU4y3s9ULApkjXYH4uP8ghtneA2ApFKA7Sc8Ya4YZ/WOFFw31p+32LnRB/7RWk3iDoLdXke6ZYcdTsmizWUhI4Lcr91XA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=iUOzLekB; arc=fail smtp.client-ip=40.107.212.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="iUOzLekB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y0Lqbkzk9QefEN8a8GT0chDcrmX/X2dYAgiddS4YL5PLRYBh5X0t/8RwqcwauduqUo6tG93QOUJhd/TndQKDnAIv74YftRnIlbVB6qGdVg1qX6JPWWxJzOfBflltvkz+Rkr6rKJTE3mFdrs1VvdQK7SRvpuU6H3CyBofTFDiLYcF/HgNDv73RCFY1EFDMSrwpWCPWFuXCHdPXAcZozXM6zu+iysG6ChVbOv/3zX+3qIn4Y537JiRj94D+i7Ji1/cid9qFgK83YaWALInxyQ2AIIQrYkuv5BS8vPCuu+WhPeGSzMjNElPMydytRU5fHygMn12JDAYMvSzvKNAdle2tg== 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=0W+6vAaLMWM4YAgzx1wXlM2VmIT0uSsEP2tXq6WzK+s=; b=NOWcfm1PDBRFxFfFIBzDJwqoM+Q9JySmWki1ikknytgxdR0OBKTbMQZsDWbVLFcASiPfyuLScftNXZls+3AppTcB+D83nO8N/HoDYVdd0ZH5pDey2s23532JsQoIww9Ibef5DPkd1ZXGQfb4F1ZAlTm3wU0X1nysfUYlMoBrsi7rzR5242UwwFsiQlM5GYcjUSS1sClO/4g3H4G7VyURiv9NSHbPHkOpeqGStTGqVaEfN05Mv0er1vKY3iyXZpoUWK1GRnIuWbW0E+GxqzHdIw1zQ0lLlkABgzgDRayVMbCwq/AYtFtEl46H9dUoO1ZOGgCcSvE4Ii6wdKAGpJpLMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linutronix.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0W+6vAaLMWM4YAgzx1wXlM2VmIT0uSsEP2tXq6WzK+s=; b=iUOzLekB8tADIuf0cRm5IsPD2/g+PVSDbh6rZNHNcjjkTtwFfkQOA7muva/a4jurGysgxkYE4Tp9uOf/6O1ij4JOXFZJ/DExyuuj7L03RNyGzIUia5VRgokt6EgSzYdYB4js60Dzrm4whu3KZy337YwbEJ/uht4c7YLK1O4r1lY= Received: from CY8PR10CA0024.namprd10.prod.outlook.com (2603:10b6:930:4f::18) by MN2PR12MB4254.namprd12.prod.outlook.com (2603:10b6:208:1d0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8272.20; Mon, 23 Dec 2024 04:35:56 +0000 Received: from CY4PEPF0000FCC3.namprd03.prod.outlook.com (2603:10b6:930:4f:cafe::1f) by CY8PR10CA0024.outlook.office365.com (2603:10b6:930:4f::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8272.20 via Frontend Transport; Mon, 23 Dec 2024 04:35:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000FCC3.mail.protection.outlook.com (10.167.242.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8293.12 via Frontend Transport; Mon, 23 Dec 2024 04:35:55 +0000 Received: from BLRKPRNAYAK.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sun, 22 Dec 2024 22:35:46 -0600 From: K Prateek Nayak To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Peter Zijlstra , Juri Lelli , Vincent Guittot , , CC: "H. Peter Anvin" , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , "Rafael J. Wysocki" , Ricardo Neri , Tim Chen , Shrikanth Hegde , "Mario Limonciello" , Meng Li , Huang Rui , "Gautham R. Shenoy" , "K Prateek Nayak" Subject: [PATCH v2 2/8] x86/itmt: Use guard() for itmt_update_mutex Date: Mon, 23 Dec 2024 04:34:01 +0000 Message-ID: <20241223043407.1611-3-kprateek.nayak@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241223043407.1611-1-kprateek.nayak@amd.com> References: <20241223043407.1611-1-kprateek.nayak@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCC3:EE_|MN2PR12MB4254:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c7e5c6a-bfc9-40cf-d4d3-08dd230b4a6c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?j58pGon2rEdycarP6Aqvjc62eYm+cC1dTmvga84WfYedNbP2mc7/JFULs0Zl?= =?us-ascii?Q?hvnd0NaxNX5IwLZyhGKUYO8W4yquG3hKLEBcCvHJ1RTJO0wSjktz+dG6PYVA?= =?us-ascii?Q?j++Cpf8EiGJU5zeBX5IwU+0Sru8M+KdX30A7D8vea/nEUcPvoR/pdJupDZTx?= =?us-ascii?Q?mOPUF98S9C2JJdZoVQfFGSqx0+7VQTgPp1LvGqMADDj79JuaDj8Zoq4YZ78u?= =?us-ascii?Q?Uf0fWhu5p0pNOylL3UEDUXnNMZPamaRrmAq4+lPfsHnrJec5FRjDtR9+ztHp?= =?us-ascii?Q?vMZCDbrUWYyL3uqVU5ByZ3xOiodeXRqVhsY9FDzzGveNszD5dodBWIT+li69?= =?us-ascii?Q?3cizqyKMS/63vV/gn4843zQPKxO1sVB6Szp4ev8f311oVSR07/SSfKZuUReJ?= =?us-ascii?Q?puBGnOVG3G/DS3LiwSuueeiop03TEHPOYZvQJ+pUUrxFTlvgH8OI2s12Ny26?= =?us-ascii?Q?DBa2xC199d1o5/XvBxRbk6E/wdRgOvf7r9HOIe3btXgR5PiKoqwupgoJG3An?= =?us-ascii?Q?GvofWzNHYYeqqWeivE2VSOKPR5+b19qMO1cOlQ/vkHBmQyEXGLOegGVuTjlG?= =?us-ascii?Q?nT7fy021UtZ/UV+YUgmH2DNvByOJlj5Lkjuqtlf+hVG329Qq6DkovaZjD84X?= =?us-ascii?Q?28mHumacNAZ4OUKm+t/Vn4+gmqAYDTIK/RWB4htJ8ccCkv8mhSGaZUnbK5MA?= =?us-ascii?Q?zSSF0az0pdXD8x+6SNcb1qWOWFQnN0WeqQxdPfrNLeOaj1ThcG7YHi14x1w7?= =?us-ascii?Q?JMFX2uAwWnwBF8oV3cM1X5iyO3LItG2XtvFbgg3DSLjXY1VerGeddvWSuvFA?= =?us-ascii?Q?NoD3/CcpjW1ec8RK/hoia+gijtrZ8c2i8YBBEHtrw0hS8uKWrb1R04s6qZdM?= =?us-ascii?Q?ZVXn2eVe5RMKkW0bWyodYnEUQdrn4j6D+EQHXCfuWQAgoVG7TL0ThGH7Py/e?= =?us-ascii?Q?UBdxpbv4WQKaYzHK9l2SwJpNHkH4QXDVqvbk75ByVoxUEffjw2Jb6VnuOL9l?= =?us-ascii?Q?6VHb79b360whgTP4tU0Nn4OjeYSzXcmyP5VJhdt64sG1Qa2oLlchKZWx3sVW?= =?us-ascii?Q?cSq4WvjnZ0+x526GyZc0znEBVIJq03XUlJnym9NrB12LOej3H7CbAB9QgrPJ?= =?us-ascii?Q?pZ2/EIV1kR1Fp7cKdud974yQj9/+jXz2lLxYPool6+jQHIj56rLeMP2Z85tG?= =?us-ascii?Q?Vx//sy5qZy8bS4aMpnuqstbsJnf6z4Xa/SeiajnkOhVLJVHT1MfD4cdxuABT?= =?us-ascii?Q?VKjahguiGDqsonbYlS61rER9l+uJe3MKGrf4Wedmh7UfdluakewlckFu2vj9?= =?us-ascii?Q?5oJ0nGdKX2OUOv6ILULfHup3dWEK9JpF1GlFj/WfIXRBkqIBn/n7ov+up37w?= =?us-ascii?Q?6aU/K8KKOwd1bZtqrg3xIl/VZGkMtMAdijyYO2ZmcTtGloJpJFboU8rTFUEQ?= =?us-ascii?Q?RsprX0dGKPWWCHJmoCvafliKp9m6WqKAYX7DAu7y7vGoeCF5auhj7Hwpmmql?= =?us-ascii?Q?05U/sTn3z9RIdCI=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2024 04:35:55.5018 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c7e5c6a-bfc9-40cf-d4d3-08dd230b4a6c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCC3.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4254 Content-Type: text/plain; charset="utf-8" Use guard() for itmt_update_mutex which avoids the extra mutex_unlock() in the bailout and return paths. Reviewed-by: Tim Chen Signed-off-by: K Prateek Nayak --- v1..v2: o Collected tags from Tim. --- arch/x86/kernel/itmt.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/arch/x86/kernel/itmt.c b/arch/x86/kernel/itmt.c index 28f449123d68..ee43d1bd41d0 100644 --- a/arch/x86/kernel/itmt.c +++ b/arch/x86/kernel/itmt.c @@ -44,12 +44,10 @@ static int sched_itmt_update_handler(const struct ctl_t= able *table, int write, unsigned int old_sysctl; int ret; =20 - mutex_lock(&itmt_update_mutex); + guard(mutex)(&itmt_update_mutex); =20 - if (!sched_itmt_capable) { - mutex_unlock(&itmt_update_mutex); + if (!sched_itmt_capable) return -EINVAL; - } =20 old_sysctl =3D sysctl_sched_itmt_enabled; ret =3D proc_dointvec_minmax(table, write, buffer, lenp, ppos); @@ -59,8 +57,6 @@ static int sched_itmt_update_handler(const struct ctl_tab= le *table, int write, rebuild_sched_domains(); } =20 - mutex_unlock(&itmt_update_mutex); - return ret; } =20 @@ -97,18 +93,14 @@ static struct ctl_table_header *itmt_sysctl_header; */ int sched_set_itmt_support(void) { - mutex_lock(&itmt_update_mutex); + guard(mutex)(&itmt_update_mutex); =20 - if (sched_itmt_capable) { - mutex_unlock(&itmt_update_mutex); + if (sched_itmt_capable) return 0; - } =20 itmt_sysctl_header =3D register_sysctl("kernel", itmt_kern_table); - if (!itmt_sysctl_header) { - mutex_unlock(&itmt_update_mutex); + if (!itmt_sysctl_header) return -ENOMEM; - } =20 sched_itmt_capable =3D true; =20 @@ -117,8 +109,6 @@ int sched_set_itmt_support(void) x86_topology_update =3D true; rebuild_sched_domains(); =20 - mutex_unlock(&itmt_update_mutex); - return 0; } =20 @@ -134,12 +124,11 @@ int sched_set_itmt_support(void) */ void sched_clear_itmt_support(void) { - mutex_lock(&itmt_update_mutex); + guard(mutex)(&itmt_update_mutex); =20 - if (!sched_itmt_capable) { - mutex_unlock(&itmt_update_mutex); + if (!sched_itmt_capable) return; - } + sched_itmt_capable =3D false; =20 if (itmt_sysctl_header) { @@ -153,8 +142,6 @@ void sched_clear_itmt_support(void) x86_topology_update =3D true; rebuild_sched_domains(); } - - mutex_unlock(&itmt_update_mutex); } =20 int arch_asym_cpu_priority(int cpu) --=20 2.43.0