linux-kernel - Re: [PATCH v3 11/22] ACPI: platform_profile: Use `scoped_cond_guard` for platform_profile

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <51a93c87-7192-4df0-b61d-a4da57ac0903@app.fastmail.com>
Date: Fri, 01 Nov 2024 22:14:10 -0400
From: "Mark Pearson" <mpearson-lenovo@...ebb.ca>
To: "Limonciello, Mario" <mario.limonciello@....com>,
 "Hans de Goede" <hdegoede@...hat.com>,
 Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
Cc: "Rafael J. Wysocki" <rafael@...nel.org>, "Len Brown" <lenb@...nel.org>,
 "Maximilian Luz" <luzmaximilian@...il.com>, "Lee Chun-Yi" <jlee@...e.com>,
 "Shyam Sundar S K" <Shyam-sundar.S-k@....com>,
 "Corentin Chary" <corentin.chary@...il.com>,
 "Luke D . Jones" <luke@...nes.dev>, "Ike Panhc" <ike.pan@...onical.com>,
 "Henrique de Moraes Holschuh" <hmh@....eng.br>,
 "Alexis Belmonte" <alexbelm48@...il.com>,
 Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
 "Ai Chao" <aichao@...inos.cn>, "Gergo Koteles" <soyer@....hu>,
 "open list" <linux-kernel@...r.kernel.org>,
 "linux-acpi@...r.kernel.org" <linux-acpi@...r.kernel.org>,
 "platform-driver-x86@...r.kernel.org" <platform-driver-x86@...r.kernel.org>,
 "open list:THINKPAD ACPI EXTRAS DRIVER" <ibm-acpi-devel@...ts.sourceforge.net>,
 "Matthew Schwartz" <matthew.schwartz@...ux.dev>
Subject: Re: [PATCH v3 11/22] ACPI: platform_profile: Use `scoped_cond_guard` for
 platform_profile_cycle()

On Thu, Oct 31, 2024, at 12:09 AM, Mario Limonciello wrote:
> Migrate away from using an interruptible mutex to scoped_cond_guard.
>
> Signed-off-by: Mario Limonciello <mario.limonciello@....com>
> ---
>  drivers/acpi/platform_profile.c | 39 +++++++++++++--------------------
>  1 file changed, 15 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/acpi/platform_profile.c b/drivers/acpi/platform_profile.c
> index 63a5f5ac33898..2d971dba2d917 100644
> --- a/drivers/acpi/platform_profile.c
> +++ b/drivers/acpi/platform_profile.c
> @@ -124,36 +124,27 @@ int platform_profile_cycle(void)
>  	enum platform_profile_option next;
>  	int err;
> 
> -	err = mutex_lock_interruptible(&profile_lock);
> -	if (err)
> -		return err;
> +	scoped_cond_guard(mutex_intr, return -ERESTARTSYS, &profile_lock) {
> +		if (!cur_profile)
> +			return -ENODEV;
> 
> -	if (!cur_profile) {
> -		mutex_unlock(&profile_lock);
> -		return -ENODEV;
> -	}
> +		err = cur_profile->profile_get(cur_profile, &profile);
> +		if (err)
> +			return err;
> 
> -	err = cur_profile->profile_get(cur_profile, &profile);
> -	if (err) {
> -		mutex_unlock(&profile_lock);
> -		return err;
> -	}
> +		next = find_next_bit_wrap(cur_profile->choices, PLATFORM_PROFILE_LAST,
> +					  profile + 1);
> 
> -	next = find_next_bit_wrap(cur_profile->choices, PLATFORM_PROFILE_LAST,
> -				  profile + 1);
> +		if (WARN_ON(next == PLATFORM_PROFILE_LAST))
> +			return -EINVAL;
> 
> -	if (WARN_ON(next == PLATFORM_PROFILE_LAST)) {
> -		mutex_unlock(&profile_lock);
> -		return -EINVAL;
> +		err = cur_profile->profile_set(cur_profile, next);
> +		if (err)
> +			return err;
>  	}
> 
> -	err = cur_profile->profile_set(cur_profile, next);
> -	mutex_unlock(&profile_lock);
> -
> -	if (!err)
> -		sysfs_notify(acpi_kobj, NULL, "platform_profile");
> -
> -	return err;
> +	sysfs_notify(acpi_kobj, NULL, "platform_profile");
> +	return 0;
>  }
>  EXPORT_SYMBOL_GPL(platform_profile_cycle);
> 
> -- 
> 2.43.0

For patches 8 to 11 - Looks good to me (guards are new to me - I had to go read up on them. Very cool and a nice clean-up)

Reviewed-by: Mark Pearson <mpearson-lenovo@...ebb.ca>

Mark