| 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
| ||
|
Message-ID: <2018087.usQuhbGJ8B@rjwysocki.net>
Date: Sat, 14 Sep 2024 12:40:00 +0200
From: "Rafael J. Wysocki" <rjw@...ysocki.net>
To: Linux PM <linux-pm@...r.kernel.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
Daniel Lezcano <daniel.lezcano@...aro.org>,
Lukasz Luba <lukasz.luba@....com>, Zhang Rui <rui.zhang@...el.com>
Subject:
[RFC PATCH for 6.13 v1 12/20] thermal: core: Manage thermal_list_lock using a
mutex guard
From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Switch over the thermal core to using a mutex guard for
thermal_list_lock management.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
---
drivers/thermal/thermal_core.c | 151 ++++++++++++++++++-----------------------
1 file changed, 69 insertions(+), 82 deletions(-)
Index: linux-pm/drivers/thermal/thermal_core.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.c
+++ linux-pm/drivers/thermal/thermal_core.c
@@ -139,7 +139,7 @@ int thermal_register_governor(struct the
def_governor = governor;
}
- mutex_lock(&thermal_list_lock);
+ guard(mutex)(&thermal_list_lock);
list_for_each_entry(pos, &thermal_tz_list, node) {
/*
@@ -162,7 +162,6 @@ int thermal_register_governor(struct the
}
}
- mutex_unlock(&thermal_list_lock);
mutex_unlock(&thermal_governor_lock);
return err;
@@ -180,7 +179,9 @@ void thermal_unregister_governor(struct
if (!__find_governor(governor->name))
goto exit;
- mutex_lock(&thermal_list_lock);
+ list_del(&governor->governor_list);
+
+ guard(mutex)(&thermal_list_lock);
list_for_each_entry(pos, &thermal_tz_list, node) {
if (!strncasecmp(pos->governor->name, governor->name,
@@ -188,8 +189,6 @@ void thermal_unregister_governor(struct
thermal_set_governor(pos, NULL);
}
- mutex_unlock(&thermal_list_lock);
- list_del(&governor->governor_list);
exit:
mutex_unlock(&thermal_governor_lock);
}
@@ -681,50 +680,50 @@ int for_each_thermal_cooling_device(int
void *), void *data)
{
struct thermal_cooling_device *cdev;
- int ret = 0;
- mutex_lock(&thermal_list_lock);
+ guard(mutex)(&thermal_list_lock);
+
list_for_each_entry(cdev, &thermal_cdev_list, node) {
+ int ret;
+
ret = cb(cdev, data);
if (ret)
- break;
+ return ret;
}
- mutex_unlock(&thermal_list_lock);
- return ret;
+ return 0;
}
int for_each_thermal_zone(int (*cb)(struct thermal_zone_device *, void *),
void *data)
{
struct thermal_zone_device *tz;
- int ret = 0;
- mutex_lock(&thermal_list_lock);
+ guard(mutex)(&thermal_list_lock);
+
list_for_each_entry(tz, &thermal_tz_list, node) {
+ int ret;
+
ret = cb(tz, data);
if (ret)
- break;
+ return ret;
}
- mutex_unlock(&thermal_list_lock);
- return ret;
+ return 0;
}
struct thermal_zone_device *thermal_zone_get_by_id(int id)
{
- struct thermal_zone_device *tz, *match = NULL;
+ struct thermal_zone_device *tz;
+
+ guard(mutex)(&thermal_list_lock);
- mutex_lock(&thermal_list_lock);
list_for_each_entry(tz, &thermal_tz_list, node) {
- if (tz->id == id) {
- match = tz;
- break;
- }
+ if (tz->id == id)
+ return tz;
}
- mutex_unlock(&thermal_list_lock);
- return match;
+ return NULL;
}
/*
@@ -963,14 +962,12 @@ static void thermal_cooling_device_init_
{
struct thermal_zone_device *tz;
- mutex_lock(&thermal_list_lock);
+ guard(mutex)(&thermal_list_lock);
list_add(&cdev->node, &thermal_cdev_list);
list_for_each_entry(tz, &thermal_tz_list, node)
thermal_zone_cdev_bind(tz, cdev);
-
- mutex_unlock(&thermal_list_lock);
}
/**
@@ -1204,10 +1201,10 @@ void thermal_cooling_device_update(struc
* Hold thermal_list_lock throughout the update to prevent the device
* from going away while being updated.
*/
- mutex_lock(&thermal_list_lock);
+ guard(mutex)(&thermal_list_lock);
if (!thermal_cooling_device_present(cdev))
- goto unlock_list;
+ return;
/*
* Update under the cdev lock to prevent the state from being set beyond
@@ -1249,9 +1246,6 @@ void thermal_cooling_device_update(struc
unlock:
mutex_unlock(&cdev->lock);
-
-unlock_list:
- mutex_unlock(&thermal_list_lock);
}
EXPORT_SYMBOL_GPL(thermal_cooling_device_update);
@@ -1275,24 +1269,18 @@ static void thermal_zone_cdev_unbind(str
static bool thermal_cooling_device_exit(struct thermal_cooling_device *cdev)
{
struct thermal_zone_device *tz;
- bool ret = true;
- mutex_lock(&thermal_list_lock);
+ guard(mutex)(&thermal_list_lock);
- if (!thermal_cooling_device_present(cdev)) {
- ret = false;
- goto unlock;
- }
+ if (!thermal_cooling_device_present(cdev))
+ return false;
list_del(&cdev->node);
list_for_each_entry(tz, &thermal_tz_list, node)
thermal_zone_cdev_unbind(tz, cdev);
-unlock:
- mutex_unlock(&thermal_list_lock);
-
- return ret;
+ return true;
}
/**
@@ -1339,7 +1327,7 @@ static void thermal_zone_init_complete(s
{
struct thermal_cooling_device *cdev;
- mutex_lock(&thermal_list_lock);
+ guard(mutex)(&thermal_list_lock);
list_add_tail(&tz->node, &thermal_tz_list);
@@ -1359,8 +1347,6 @@ static void thermal_zone_init_complete(s
tz->state |= TZ_STATE_FLAG_SUSPENDED;
__thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
-
- mutex_unlock(&thermal_list_lock);
}
/**
@@ -1579,14 +1565,11 @@ EXPORT_SYMBOL_GPL(thermal_zone_device);
static bool thermal_zone_exit(struct thermal_zone_device *tz)
{
struct thermal_cooling_device *cdev;
- bool ret = true;
- mutex_lock(&thermal_list_lock);
+ guard(mutex)(&thermal_list_lock);
- if (list_empty(&tz->node)) {
- ret = false;
- goto unlock;
- }
+ if (list_empty(&tz->node))
+ return false;
guard(thermal_zone)(tz);
@@ -1597,10 +1580,7 @@ static bool thermal_zone_exit(struct the
list_for_each_entry(cdev, &thermal_cdev_list, node)
__thermal_zone_cdev_unbind(tz, cdev);
-unlock:
- mutex_unlock(&thermal_list_lock);
-
- return ret;
+ return true;
}
/**
@@ -1654,24 +1634,23 @@ struct thermal_zone_device *thermal_zone
unsigned int found = 0;
if (!name)
- goto exit;
+ return ERR_PTR(-EINVAL);
+
+ guard(mutex)(&thermal_list_lock);
- mutex_lock(&thermal_list_lock);
list_for_each_entry(pos, &thermal_tz_list, node)
if (!strncasecmp(name, pos->type, THERMAL_NAME_LENGTH)) {
found++;
ref = pos;
}
- mutex_unlock(&thermal_list_lock);
- /* nothing has been found, thus an error code for it */
- if (found == 0)
- ref = ERR_PTR(-ENODEV);
- else if (found > 1)
- /* Success only when an unique zone is found */
- ref = ERR_PTR(-EEXIST);
+ if (!found)
+ return ERR_PTR(-ENODEV);
+
+ /* Success only when one zone is found. */
+ if (found > 1)
+ return ERR_PTR(-EEXIST);
-exit:
return ref;
}
EXPORT_SYMBOL_GPL(thermal_zone_get_zone_by_name);
@@ -1714,6 +1693,18 @@ static void thermal_zone_pm_prepare(stru
tz->state |= TZ_STATE_FLAG_SUSPENDED;
}
+static void thermal_pm_notify_prepare(void)
+{
+ struct thermal_zone_device *tz;
+
+ guard(mutex)(&thermal_list_lock);
+
+ thermal_pm_suspended = true;
+
+ list_for_each_entry(tz, &thermal_tz_list, node)
+ thermal_zone_pm_prepare(tz);
+}
+
static void thermal_zone_pm_complete(struct thermal_zone_device *tz)
{
guard(thermal_zone)(tz);
@@ -1732,35 +1723,31 @@ static void thermal_zone_pm_complete(str
mod_delayed_work(system_freezable_power_efficient_wq, &tz->poll_queue, 0);
}
-static int thermal_pm_notify(struct notifier_block *nb,
- unsigned long mode, void *_unused)
+static void thermal_pm_notify_complete(void)
{
struct thermal_zone_device *tz;
+ guard(mutex)(&thermal_list_lock);
+
+ thermal_pm_suspended = false;
+
+ list_for_each_entry(tz, &thermal_tz_list, node)
+ thermal_zone_pm_complete(tz);
+}
+
+static int thermal_pm_notify(struct notifier_block *nb,
+ unsigned long mode, void *_unused)
+{
switch (mode) {
case PM_HIBERNATION_PREPARE:
case PM_RESTORE_PREPARE:
case PM_SUSPEND_PREPARE:
- mutex_lock(&thermal_list_lock);
-
- thermal_pm_suspended = true;
-
- list_for_each_entry(tz, &thermal_tz_list, node)
- thermal_zone_pm_prepare(tz);
-
- mutex_unlock(&thermal_list_lock);
+ thermal_pm_notify_prepare();
break;
case PM_POST_HIBERNATION:
case PM_POST_RESTORE:
case PM_POST_SUSPEND:
- mutex_lock(&thermal_list_lock);
-
- thermal_pm_suspended = false;
-
- list_for_each_entry(tz, &thermal_tz_list, node)
- thermal_zone_pm_complete(tz);
-
- mutex_unlock(&thermal_list_lock);
+ thermal_pm_notify_complete();
break;
default:
break;
Powered by blists - more mailing lists