From patchwork Fri Dec 6 03:19:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 13896359 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2078.outbound.protection.outlook.com [40.107.237.78]) (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 1ECFD1E522; Fri, 6 Dec 2024 03:25:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.78 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733455514; cv=fail; b=turZ3sy+CSLGWnH3IN418scUIlIWhsFSWqFIiCD5tQBTa8I4oGGPyUYUSK1F6UHUbRFqmNAG+b72POHL4e1iok2Padyx7914mWphHLA1PFupbsH64UiBZRVANTcjlKshI7n06i23MKm0cK1U/Nr6D/VthqXER38S0suwKZJ7/v8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733455514; c=relaxed/simple; bh=z0GlcC9vwRUmxS0LWl2nrqiX/2qAQj38IxksQe1F4C8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KWMjT89jwlHovqqsaVJDm2FMjpKYzBVxqLK0a1aXEp2OtnPHaf2abOyvCIVL4+hPA+j7c/DdUIn0WlSL7SKgYNqh5qESLkKVnNsGmdIU/3+U5kworEUFSOaVk15OZJD7+othlQR2ghYmyZ6WW7LHIPuEJIuocKdu4hg4NgNguYA= 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=2WIWsEZx; arc=fail smtp.client-ip=40.107.237.78 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="2WIWsEZx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vMq+ZnwbAxIjKpmYKdr6lXT81kj6kYozPl7OsQVrCMD0YeeKAEbUXaJ7fgTWG8TKPRM+OFPuGNoWnT6agl6Hi1l0NEQCq7CUz/6odPvTFFnYaXaXn+o1QY1Xg0oCsUBaf3cG1ES8xRydpzdA9HEEIPpWGVwVaGcwPvgg+0RZrpzsvgADf6Tz1B9B6PG7B1TUtpTz5ZtYRxpiNWL7YgQO/67XwYuKGRosZ4zzorpTOyDDtymTkju4mq3k6H6Rzq/Rh7hypCn5eo4YN6v+10BaB2VCqj/L//p+UDeou28L4n1k2VzFM4okDDXYx+Sc9l131dftLATfRPrBoY5wH9H1Pg== 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=Fbrw9w+y1t+fOwFGCAec/Yj7kmTgUhQgGzFW3WCgW90=; b=SyLE9ZVR6qpUfjLHCd2mnojoub7DeNQ+1/wXZQdZo4oj1y5ItvB4agocZtT1QodBeRWdACf2JuphNIYTB66NC3Tf8uVjYE3eLYQ1FiS3khcgU5DWroXUJ1PTs7Gw7ec/S+dKaY6yWJJ6zf61JfIzitIhyI/KYdl4JMqg2N/e/PIK/8VVG+e2oom+KmRxpTlKQVSyas3dTnfuOW4BU7id3avkw2ssaC0MgTza0gcGlzFqxNzxjJVAk4p0g5bvkj1+PCVmSzJdv05fxkv0kTFpqL08XGMjtrL7UDaCR+KPSQl0zEMioKtOyFZlxauzWogCYedwRN8ILN+FhJrEI3y6Vw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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=Fbrw9w+y1t+fOwFGCAec/Yj7kmTgUhQgGzFW3WCgW90=; b=2WIWsEZxt11oib+fn8dYtI9212X+ShIShRBqtCCZLE8zQPLR1WjUMG5TDNWLDf5ziunnSEoVseZk/newr6g6Zu+EWJDziuVhd1/FoZTa3HK9zzth3B4GUtTM9jRd8807PBn97Dd/lONvJXv4aDCcSdotRYBlc0yiRIT8VRrimkU= Received: from BYAPR01CA0053.prod.exchangelabs.com (2603:10b6:a03:94::30) by SA3PR12MB9160.namprd12.prod.outlook.com (2603:10b6:806:399::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.11; Fri, 6 Dec 2024 03:25:09 +0000 Received: from MWH0EPF000A6735.namprd04.prod.outlook.com (2603:10b6:a03:94:cafe::b) by BYAPR01CA0053.outlook.office365.com (2603:10b6:a03:94::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.18 via Frontend Transport; Fri, 6 Dec 2024 03:25:08 +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 MWH0EPF000A6735.mail.protection.outlook.com (10.167.249.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8230.7 via Frontend Transport; Fri, 6 Dec 2024 03:25:08 +0000 Received: from AUS-P9-MLIMONCI.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; Thu, 5 Dec 2024 21:22:53 -0600 From: Mario Limonciello To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= CC: "Rafael J . Wysocki" , Len Brown , Maximilian Luz , Lee Chun-Yi , "Shyam Sundar S K" , Corentin Chary , "Luke D . Jones" , Ike Panhc , Henrique de Moraes Holschuh , "Alexis Belmonte" , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Ai Chao , Gergo Koteles , open list , "open list:ACPI" , "open list:MICROSOFT SURFACE PLATFORM PROFILE DRIVER" , "open list:THINKPAD ACPI EXTRAS DRIVER" , Mark Pearson , Matthew Schwartz , Mario Limonciello , Armin Wolf Subject: [PATCH v10 06/22] ACPI: platform_profile: Move sanity check out of the mutex Date: Thu, 5 Dec 2024 21:19:02 -0600 Message-ID: <20241206031918.1537-7-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241206031918.1537-1-mario.limonciello@amd.com> References: <20241206031918.1537-1-mario.limonciello@amd.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000A6735:EE_|SA3PR12MB9160:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ae44da0-8b22-4d10-10ce-08dd15a5961c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?ENpsiooYtcAYqmEEnjX9yI9cKayZWWy?= =?utf-8?q?OOePoh8B73zL84mPDZqJDWwipATX4rmGvmSrm98WpN0+KIkXzVn0HWHmimDLX3YWf?= =?utf-8?q?oU8HgUsVNJXKblVisLkzwnxynme4wFHS7ry9QKSm0S2nYIE2r86n5oOInX5G01LJg?= =?utf-8?q?hF75LlC+mHo93vifV4DWygfbbZA5jePyn8DaTGcUsawoQBhGi0VpQW4REU/rTO0jd?= =?utf-8?q?hYhWu61Bm4DZG+hcl94w7vPr16+aoIHxe62ih7V10K7aKHRPUrG3ZrMJCSZcqrw2p?= =?utf-8?q?IYwgOLBQug1tDgSsf4xUVNenzAZHe46eBnin+anxQkgifoDdOcVaIXDZaPn27fjc1?= =?utf-8?q?sUWxUr9n7DGjQvSzvehxXwhkaZjDiLGQJrUzeYnX4R+0fYIQAnqyoqnWpONADVXWp?= =?utf-8?q?cAtanxr56vNMVrfzaoq2J7nmVEKPfdBJvTIf8tq8JRFYk7VBjoENySnu7PMxQm3b3?= =?utf-8?q?H0EDt/fvkiP+FCWa8NkS14F6y8zHgqwRRqZYGoHVwpxhigjvemPpobx5EGOt/FhnD?= =?utf-8?q?PjF38df5xuz0fNqmRf6G2UWTXqe8HtKuUTdGRE52BiQUlrSQeuCcIH1Q2N+xJhQns?= =?utf-8?q?AX1cw++3O6EQD0II7fl5UHUwo/x3QLNNQF6bqod9719p91m6H6ISVVbdl9wbEDtiU?= =?utf-8?q?CWDfY6OGtnq/tdNniNaL0+RfgT4t9P6fJNOSkGR5Ri1HawaV+rTyGA777ls2TU0Tx?= =?utf-8?q?Rv1prZN51qoMTDA3x5LSOeXFtfritfVA3AqZs0Upe6PLR++zPKLj/2RQe8lIBAJ6R?= =?utf-8?q?CQE57GAEQozFQi8z08qKOLD0IrPgHMc03b+3CWDK4LWckJMKLzHw+LvkesRl2j8QE?= =?utf-8?q?ihjnLk0L5CElYisRZ+A64ovgvpblPAcC5ot8qCAFhw/I2dmGUjVnoOlfOktpVDyW1?= =?utf-8?q?7HOdMEaL7hOw7VYXJ2e0terfpy5srz7slmfgvzu7vfZAM0NP2Q9zvxUCjwpEXLpZu?= =?utf-8?q?dLqP+seECN+FphNJzVwRRJ2urKVH2VfxM4PgeRjwAo75mtXMV6MXvFjv9BD16bcyW?= =?utf-8?q?FWo5R3S7HeoUr29f652Wo7fISQBpq3/q/UtNVc2Pefb7DBB+BdyCyYiTPMByZrQUQ?= =?utf-8?q?R6Hs1G0LB7e8q0Rjk5c7AmlaBBf6OhqbqNKkqQUg38QR6jepemToFh1v5RomjU8+W?= =?utf-8?q?mz3+Xd/zHR129AxQtlwm6xLHuCcXTxJi0vRetR6zZ5YkQkoe/I+ZAFYaRxlM/ofbM?= =?utf-8?q?KjU/g1peKcNMz4zgDM5Bxn3Rr3oflWcpW72yQ0bMrHUNCmdft2AjWEzR/IgC3UycO?= =?utf-8?q?M1jv1beynenWnLPIvlfzWZtLHhMMyiXDT/Y0fl5jV01d5FtEXr74Ub0bUbOnVw6A4?= =?utf-8?q?Ox8/g7zdlBXOGd/5WZibPvzYAFsdyX7zgpGbm+YQJFXa1UJvY8dOR3c02jXh4G9Hq?= =?utf-8?q?ESXRuvO65K4?= 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)(82310400026)(36860700013)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2024 03:25:08.7124 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5ae44da0-8b22-4d10-10ce-08dd15a5961c 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: MWH0EPF000A6735.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9160 The sanity check that the platform handler had choices set doesn't need the mutex taken. Move it to earlier in the registration. Tested-by: Mark Pearson Tested-by: Matthew Schwartz Reviewed-by: Ilpo Järvinen Reviewed-by: Mark Pearson Reviewed-by: Armin Wolf Signed-off-by: Mario Limonciello --- drivers/acpi/platform_profile.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/platform_profile.c b/drivers/acpi/platform_profile.c index 927a2f7456c9a..4f5623fc27c09 100644 --- a/drivers/acpi/platform_profile.c +++ b/drivers/acpi/platform_profile.c @@ -179,6 +179,13 @@ int platform_profile_register(struct platform_profile_handler *pprof) { int err; + /* Sanity check the profile handler */ + if (!pprof || bitmap_empty(pprof->choices, PLATFORM_PROFILE_LAST) || + !pprof->profile_set || !pprof->profile_get) { + pr_err("platform_profile: handler is invalid\n"); + return -EINVAL; + } + mutex_lock(&profile_lock); /* We can only have one active profile */ if (cur_profile) { @@ -186,13 +193,6 @@ int platform_profile_register(struct platform_profile_handler *pprof) return -EEXIST; } - /* Sanity check the profile handler field are set */ - if (!pprof || bitmap_empty(pprof->choices, PLATFORM_PROFILE_LAST) || - !pprof->profile_set || !pprof->profile_get) { - mutex_unlock(&profile_lock); - return -EINVAL; - } - err = sysfs_create_group(acpi_kobj, &platform_profile_group); if (err) { mutex_unlock(&profile_lock);