From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM <linux-pm@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Lukasz Luba <lukasz.luba@arm.com>,
Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH v2 07/17] thermal: core: Move thermal zone locking out of bind/unbind functions
Date: Mon, 12 Aug 2024 16:04:38 +0200 [thread overview]
Message-ID: <4611405.cEBGB3zze1@rjwysocki.net> (raw)
In-Reply-To: <114901234.nniJfEyVGO@rjwysocki.net>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Since thermal_bind_cdev_to_trip() and thermal_unbind_cdev_from_trip()
acquire the thermal zone lock, the locking rules for their callers get
complicated. In particular, the thermal zone lock cannot be acquired
in any code path leading to one of these functions even though it might
be useful to do so.
To address this, remove the thermal zone locking from both these
functions, add lockdep assertions for the thermal zone lock to both
of them and make their callers acquire the thermal zone lock instead.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
v1 -> v2: No changes
---
drivers/acpi/thermal.c | 2 +-
drivers/thermal/thermal_core.c | 30 ++++++++++++++++++++++--------
2 files changed, 23 insertions(+), 9 deletions(-)
Index: linux-pm/drivers/thermal/thermal_core.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.c
+++ linux-pm/drivers/thermal/thermal_core.c
@@ -789,6 +789,7 @@ int thermal_bind_cdev_to_trip(struct the
int result;
lockdep_assert_held(&thermal_list_lock);
+ lockdep_assert_held(&tz->lock);
if (list_empty(&tz->node) || list_empty(&cdev->node))
return -EINVAL;
@@ -851,7 +852,6 @@ int thermal_bind_cdev_to_trip(struct the
if (result)
goto remove_trip_file;
- mutex_lock(&tz->lock);
mutex_lock(&cdev->lock);
list_for_each_entry(instance, &td->thermal_instances, trip_node) {
@@ -868,7 +868,6 @@ int thermal_bind_cdev_to_trip(struct the
thermal_governor_update_tz(tz, THERMAL_TZ_BIND_CDEV);
mutex_unlock(&cdev->lock);
- mutex_unlock(&tz->lock);
return 0;
@@ -892,11 +891,19 @@ int thermal_zone_bind_cooling_device(str
unsigned long upper, unsigned long lower,
unsigned int weight)
{
+ int ret;
+
if (trip_index < 0 || trip_index >= tz->num_trips)
return -EINVAL;
- return thermal_bind_cdev_to_trip(tz, &tz->trips[trip_index].trip, cdev,
- upper, lower, weight);
+ mutex_lock(&tz->lock);
+
+ ret = thermal_bind_cdev_to_trip(tz, &tz->trips[trip_index].trip, cdev,
+ upper, lower, weight);
+
+ mutex_unlock(&tz->lock);
+
+ return ret;
}
EXPORT_SYMBOL_GPL(thermal_zone_bind_cooling_device);
@@ -919,7 +926,8 @@ int thermal_unbind_cdev_from_trip(struct
struct thermal_trip_desc *td = trip_to_trip_desc(trip);
struct thermal_instance *pos, *next;
- mutex_lock(&tz->lock);
+ lockdep_assert_held(&tz->lock);
+
mutex_lock(&cdev->lock);
list_for_each_entry_safe(pos, next, &td->thermal_instances, trip_node) {
@@ -930,13 +938,11 @@ int thermal_unbind_cdev_from_trip(struct
thermal_governor_update_tz(tz, THERMAL_TZ_UNBIND_CDEV);
mutex_unlock(&cdev->lock);
- mutex_unlock(&tz->lock);
goto free;
}
}
mutex_unlock(&cdev->lock);
- mutex_unlock(&tz->lock);
return -ENODEV;
@@ -954,10 +960,18 @@ int thermal_zone_unbind_cooling_device(s
int trip_index,
struct thermal_cooling_device *cdev)
{
+ int ret;
+
if (trip_index < 0 || trip_index >= tz->num_trips)
return -EINVAL;
- return thermal_unbind_cdev_from_trip(tz, &tz->trips[trip_index].trip, cdev);
+ mutex_lock(&tz->lock);
+
+ ret = thermal_unbind_cdev_from_trip(tz, &tz->trips[trip_index].trip, cdev);
+
+ mutex_unlock(&tz->lock);
+
+ return ret;
}
EXPORT_SYMBOL_GPL(thermal_zone_unbind_cooling_device);
Index: linux-pm/drivers/acpi/thermal.c
===================================================================
--- linux-pm.orig/drivers/acpi/thermal.c
+++ linux-pm/drivers/acpi/thermal.c
@@ -609,7 +609,7 @@ static int acpi_thermal_bind_unbind_cdev
.thermal = thermal, .cdev = cdev, .bind = bind
};
- return for_each_thermal_trip(thermal, bind_unbind_cdev_cb, &bd);
+ return thermal_zone_for_each_trip(thermal, bind_unbind_cdev_cb, &bd);
}
static int
next prev parent reply other threads:[~2024-08-12 14:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 13:50 [PATCH v2 00/17] thermal: Rework binding cooling devices to trip points Rafael J. Wysocki
2024-08-12 13:51 ` [PATCH v2 01/17] thermal: core: Fold two functions into their respective callers Rafael J. Wysocki
2024-08-12 13:53 ` [PATCH v2 02/17] thermal: core: Rearrange checks in thermal_bind_cdev_to_trip() Rafael J. Wysocki
2024-08-12 13:54 ` [PATCH v2 03/17] thermal: core: Drop redundant thermal instance checks Rafael J. Wysocki
2024-08-12 13:56 ` [PATCH v2 04/17] thermal: core: Clean up cdev binding/unbinding functions Rafael J. Wysocki
2024-08-13 7:38 ` Zhang, Rui
2024-08-13 10:54 ` Rafael J. Wysocki
2024-08-12 13:59 ` [PATCH v2 05/17] thermal: core: Move lists of thermal instances to trip descriptors Rafael J. Wysocki
2024-08-12 14:02 ` [PATCH v2 06/17] thermal: sysfs: Use the dev argument in instance-related show/store Rafael J. Wysocki
2024-08-12 14:04 ` Rafael J. Wysocki [this message]
2024-08-12 14:06 ` [PATCH v2 08/17] thermal: core: Introduce .should_bind() thermal zone callback Rafael J. Wysocki
2024-08-12 14:07 ` [PATCH v2 09/17] thermal: ACPI: Use the " Rafael J. Wysocki
2024-08-12 14:09 ` [PATCH v2 10/17] thermal: core: Unexport thermal_bind_cdev_to_trip() and thermal_unbind_cdev_from_trip() Rafael J. Wysocki
2024-08-12 14:17 ` [PATCH v2 11/17] thermal: imx: Use the .should_bind() thermal zone callback Rafael J. Wysocki
2024-08-12 14:19 ` [PATCH v2 12/17] platform/x86: acerhdf: " Rafael J. Wysocki
2024-08-19 10:20 ` Hans de Goede
2024-08-12 14:23 ` [PATCH v2 13/17] mlxsw: core_thermal: " Rafael J. Wysocki
2024-08-13 10:25 ` Ido Schimmel
2024-08-12 14:25 ` [PATCH v2 14/17] thermal/of: " Rafael J. Wysocki
2024-08-12 14:26 ` [PATCH v2 15/17] thermal: core: Drop unused bind/unbind functions and callbacks Rafael J. Wysocki
2024-08-12 14:27 ` [PATCH v2 16/17] thermal: code: Clean up trip bind/unbind functions Rafael J. Wysocki
2024-08-12 14:28 ` [PATCH v2 17/17] thermal: code: Pass trip descriptors to " Rafael J. Wysocki
2024-08-13 16:55 ` [PATCH v2 00/17] thermal: Rework binding cooling devices to trip points Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4611405.cEBGB3zze1@rjwysocki.net \
--to=rjw@rjwysocki.net \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®