From: Eduardo Valentin <edubezval@gmail.com>
To: Rui Zhang <rui.zhang@intel.com>
Cc: Linux PM <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Eduardo Valentin <edubezval@gmail.com>
Subject: [PATCH 06/15] thermal: sysfs: lock tz while on passive properties
Date: Mon, 30 May 2016 23:31:27 -0700 [thread overview]
Message-ID: <1464676296-5610-7-git-send-email-edubezval@gmail.com> (raw)
In-Reply-To: <1464676296-5610-1-git-send-email-edubezval@gmail.com>
Serialized calls to tz.ops in user facing
sysfs handler passive_store() and
passive_show().
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
---
drivers/thermal/thermal_sysfs.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index afb42a2..dcaeb17 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -252,18 +252,24 @@ passive_store(struct device *dev, struct device_attribute *attr,
if (state && state < 1000)
return -EINVAL;
+ mutex_lock(&tz->lock);
if (state && !tz->forced_passive) {
if (!tz->passive_delay)
tz->passive_delay = 1000;
+ mutex_unlock(&tz->lock);
thermal_zone_device_rebind_exception(tz, "Processor",
sizeof("Processor"));
+ mutex_lock(&tz->lock);
} else if (!state && tz->forced_passive) {
tz->passive_delay = 0;
+ mutex_unlock(&tz->lock);
thermal_zone_device_unbind_exception(tz, "Processor",
sizeof("Processor"));
+ mutex_lock(&tz->lock);
}
tz->forced_passive = state;
+ mutex_unlock(&tz->lock);
thermal_zone_device_update(tz);
@@ -275,8 +281,13 @@ passive_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct thermal_zone_device *tz = to_thermal_zone(dev);
+ unsigned int passive;
- return sprintf(buf, "%d\n", tz->forced_passive);
+ mutex_lock(&tz->lock);
+ passive = tz->forced_passive;
+ mutex_unlock(&tz->lock);
+
+ return sprintf(buf, "%u\n", passive);
}
static ssize_t
@@ -494,7 +505,9 @@ static umode_t thermal_zone_passive_is_visible(struct kobject *kobj,
tz = container_of(dev, struct thermal_zone_device, device);
for (count = 0; count < tz->trips; count++) {
+ mutex_lock(&tz->lock);
tz->ops->get_trip_type(tz, count, &trip_type);
+ mutex_unlock(&tz->lock);
if (trip_type == THERMAL_TRIP_PASSIVE)
return attr->mode;
--
2.1.4
next prev parent reply other threads:[~2016-05-31 6:35 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-31 6:31 [PATCH 00/15] thermal: sysfs: add locking Eduardo Valentin
2016-05-31 6:31 ` [PATCH 01/15] thermal: sysfs: lock tz in type_show Eduardo Valentin
2016-05-31 6:31 ` [PATCH 02/15] thermal: sysfs: lock tz while on access to mode properties Eduardo Valentin
2016-06-07 9:08 ` Keerthy
2016-06-07 9:22 ` Keerthy
2016-06-22 2:45 ` Zhang Rui
2016-06-22 5:06 ` [PATCH 1/1] thermal: core: call thermal_zone_device_update() after mode update Eduardo Valentin
2016-06-23 12:27 ` Rafael J. Wysocki
2016-06-23 12:37 ` Keerthy
2016-07-01 20:53 ` Eduardo Valentin
2016-06-22 5:15 ` [PATCHv2 " Eduardo Valentin
2016-06-22 9:33 ` Keerthy
2016-06-22 14:36 ` Eduardo Valentin
2016-06-22 15:05 ` Eduardo Valentin
2016-06-22 14:34 ` [PATCHv3 " Eduardo Valentin
2016-06-22 15:03 ` [PATCHv4 " Eduardo Valentin
2016-06-23 4:38 ` Keerthy
2016-06-23 4:51 ` Darren Hart
2016-06-29 6:23 ` Zhang Rui
2016-07-01 20:57 ` Eduardo Valentin
2016-07-03 9:03 ` Peter Feuerer
2016-07-02 2:49 ` [PATCHv2 1/1] thermal: sysfs: lock tz while on access to mode properties Eduardo Valentin
2016-05-31 6:31 ` [PATCH 03/15] thermal: sysfs: lock tz while on trip_point_type properties Eduardo Valentin
2016-05-31 6:31 ` [PATCH 04/15] thermal: sysfs: lock tz while on trip_point_temp properties Eduardo Valentin
2016-05-31 6:31 ` [PATCH 05/15] thermal: sysfs: lock tz while on trip_point_hyst properties Eduardo Valentin
2016-05-31 6:31 ` Eduardo Valentin [this message]
2016-05-31 6:31 ` [PATCH 07/15] thermal: sysfs: lock tz while on policy properties Eduardo Valentin
2016-05-31 6:31 ` [PATCH 08/15] thermal: sysfs: improve locking of emul_temp_store() Eduardo Valentin
2016-05-31 6:31 ` [PATCH 09/15] thermal: sysfs: lock tz when access sustainable power properties Eduardo Valentin
2016-05-31 6:31 ` [PATCH 10/15] thermal: sysfs: lock tz when access tzp properties Eduardo Valentin
2016-05-31 6:31 ` [PATCH 11/15] thermal: sysfs: lock cdev while accessing type Eduardo Valentin
2016-05-31 6:31 ` [PATCH 12/15] thermal: sysfs: lock cdev while accessing max_state Eduardo Valentin
2016-05-31 6:31 ` [PATCH 13/15] thermal: sysfs: lock cdev while accessing cur_state Eduardo Valentin
2016-05-31 6:31 ` [PATCH 14/15] thermal: sysfs: serialize access to instances Eduardo Valentin
2016-05-31 6:31 ` [PATCH 15/15] thermal: sysfs: add comments describing locking strategy Eduardo Valentin
2016-06-01 3:56 ` [PATCH 00/15] thermal: sysfs: add locking Keerthy
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=1464676296-5610-7-git-send-email-edubezval@gmail.com \
--to=edubezval@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).