public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Subject: [PATCH v2 04/12] thermal: core: Mark thermal zones as initializing to start with
Date: Fri, 04 Oct 2024 21:15:04 +0200	[thread overview]
Message-ID: <9360231.CDJkKcVGEf@rjwysocki.net> (raw)
In-Reply-To: <2215082.irdbgypaU6@rjwysocki.net>

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

After thermal_zone_device_register_with_trips() has called
device_register() and it has registered the new thermal zone device
with the driver core, user space may access its sysfs attributes and,
among other things, it may enable the thermal zone before it is ready.

To address this, introduce a new thermal zone state flag for
initialization and set it before calling device_register() in
thermal_zone_device_register_with_trips().  This causes
__thermal_zone_device_update() to return early until the new flag
is cleared.

To clear it when the thermal zone is ready, introduce a new
function called thermal_zone_init_complete() that will also invoke
__thermal_zone_device_update() after clearing that flag (both under the
thernal zone lock) and make thermal_zone_device_register_with_trips()
call the new function instead of checking need_update and calling
thermal_zone_device_update() when it is set.

After this change, if user space enables the thermal zone prematurely,
__thermal_zone_device_update() will return early for it until
thermal_zone_init_complete() is called.  In turn, if the thermal zone
is not enabled by user space before thermal_zone_init_complete() is
called, the __thermal_zone_device_update() call in it will return early
because the thermal zone has not been enabled yet, but that function
will be invoked again by thermal_zone_device_set_mode() when the thermal
zone is enabled and it will not return early this time.

The checking of need_update is not necessary any more because the
__thermal_zone_device_update() calls potentially triggered by cooling
device binding take place before calling thermal_zone_init_complete(),
so they all will return early, which means that
thermal_zone_init_complete() must call __thermal_zone_device_update()
in case the thermal zone is enabled prematurely by user space.

Fixes: 203d3d4aa482 ("the generic thermal sysfs driver")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

This is a new iteration of

https://lore.kernel.org/linux-pm/2973309.e9J7NaK4W3@rjwysocki.net/

v1 -> v2: Rebase and add a Fixes tag.

---
 drivers/thermal/thermal_core.c |   16 +++++++++++++---
 drivers/thermal/thermal_core.h |    1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

Index: linux-pm/drivers/thermal/thermal_core.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.c
+++ linux-pm/drivers/thermal/thermal_core.c
@@ -1332,6 +1332,16 @@ int thermal_zone_get_crit_temp(struct th
 }
 EXPORT_SYMBOL_GPL(thermal_zone_get_crit_temp);
 
+static void thermal_zone_init_complete(struct thermal_zone_device *tz)
+{
+	mutex_lock(&tz->lock);
+
+	tz->state &= ~TZ_STATE_FLAG_INIT;
+	__thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
+
+	mutex_unlock(&tz->lock);
+}
+
 /**
  * thermal_zone_device_register_with_trips() - register a new thermal zone device
  * @type:	the thermal zone device type
@@ -1451,6 +1461,8 @@ thermal_zone_device_register_with_trips(
 	tz->passive_delay_jiffies = msecs_to_jiffies(passive_delay);
 	tz->recheck_delay_jiffies = THERMAL_RECHECK_DELAY;
 
+	tz->state = TZ_STATE_FLAG_INIT;
+
 	/* sys I/F */
 	/* Add nodes that are always present via .groups */
 	result = thermal_zone_create_device_groups(tz);
@@ -1504,9 +1516,7 @@ thermal_zone_device_register_with_trips(
 
 	mutex_unlock(&thermal_list_lock);
 
-	/* Update the new thermal zone and mark it as already updated. */
-	if (atomic_cmpxchg(&tz->need_update, 1, 0))
-		thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
+	thermal_zone_init_complete(tz);
 
 	thermal_notify_tz_create(tz);
 
Index: linux-pm/drivers/thermal/thermal_core.h
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.h
+++ linux-pm/drivers/thermal/thermal_core.h
@@ -63,6 +63,7 @@ struct thermal_governor {
 
 #define	TZ_STATE_FLAG_SUSPENDED	BIT(0)
 #define	TZ_STATE_FLAG_RESUMING	BIT(1)
+#define	TZ_STATE_FLAG_INIT	BIT(2)
 
 #define TZ_STATE_READY		0
 




  parent reply	other threads:[~2024-10-04 19:43 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-04 19:01 [PATCH v2 00/12] thermal: core: Fixes and cleanups, mostly related to thermal zone init and exit Rafael J. Wysocki
2024-10-04 19:05 ` [PATCH v2 01/12] thermal: core: Initialize thermal zones before registering them Rafael J. Wysocki
2024-10-21 22:16   ` Lukasz Luba
2024-10-04 19:09 ` [PATCH v2 02/12] thermal: core: Rearrange PM notification code Rafael J. Wysocki
2024-10-21 22:18   ` Lukasz Luba
2024-10-04 19:11 ` [PATCH v2 03/12] thermal: core: Represent suspend-related thermal zone flags as bits Rafael J. Wysocki
2024-10-21 22:23   ` Lukasz Luba
2024-10-04 19:15 ` Rafael J. Wysocki [this message]
2024-10-21 22:26   ` [PATCH v2 04/12] thermal: core: Mark thermal zones as initializing to start with Lukasz Luba
2024-10-04 19:19 ` [PATCH v2 05/12] thermal: core: Fix race between zone registration and system suspend Rafael J. Wysocki
2024-10-21 22:27   ` Lukasz Luba
2024-10-04 19:23 ` [PATCH v2 06/12] thermal: core: Consolidate thermal zone locking during initialization Rafael J. Wysocki
2024-10-21 22:30   ` Lukasz Luba
2024-10-04 19:26 ` [PATCH v2 07/12] thermal: core: Mark thermal zones as exiting before unregistration Rafael J. Wysocki
2024-10-21 22:31   ` Lukasz Luba
2024-10-04 19:30 ` [PATCH v2 08/12] thermal: core: Consolidate thermal zone locking in the exit path Rafael J. Wysocki
2024-10-21 22:33   ` Lukasz Luba
2024-10-04 19:33 ` [PATCH v2 09/12] thermal: core: Update thermal zones after cooling device binding Rafael J. Wysocki
2024-10-21 22:35   ` Lukasz Luba
2024-10-04 19:35 ` [PATCH v2 10/12] thermal: core: Drop need_update field from struct thermal_zone_device Rafael J. Wysocki
2024-10-21 22:36   ` Lukasz Luba
2024-10-04 19:39 ` [PATCH v2 11/12] thermal: core: Move lists of thermal instances to trip descriptors Rafael J. Wysocki
2024-10-21 22:44   ` Lukasz Luba
2024-10-04 19:42 ` [PATCH v2 12/12] thermal: core: Pass trip descriptors to trip bind/unbind functions Rafael J. Wysocki
2024-10-21 22:37   ` Lukasz Luba
2024-10-11 18:50 ` [PATCH v2 00/12] thermal: core: Fixes and cleanups, mostly related to thermal zone init and exit Rafael J. Wysocki
2024-10-21 11:05   ` Rafael J. Wysocki
2024-10-21 22:45     ` Lukasz Luba
2024-10-22  9:56       ` 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=9360231.CDJkKcVGEf@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 \
    --cc=srinivas.pandruvada@linux.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