Re: [PATCH 02/15] thermal: sysfs: lock tz while on access to mode properties

[Zhang Rui]

On ä, 2016-06-07 at 14:52 +0530, Keerthy wrote:
> 
> On Tuesday 07 June 2016 02:38 PM, Keerthy wrote:
> > 
> > Hi Eduardo,
> > 
> > On Tuesday 31 May 2016 12:01 PM, Eduardo Valentin wrote:
> > > 
> > > Serialized calls to tz.ops in user facing
> > > sysfs handler mode_show()ÂÂand mode_store().
> > This seems to be causing a deadlock at boot time during the ending
> > stages of boot:
> > 
> > http://pastebin.ubuntu.com/17085291/
> > 
> > It took a while to git bisect on linux-next.
> > 
> > Seems like you introduced new locking at the sysfs layer which
> > causes
> > this deadlock as the underlying code again tries to acquire the
> > same
> > tz->lock.
> I confirm reverting this patch helps me boot on linux-next. This
> patchÂ
> can be dropped as the lower layer functions are already acquiring tz-
> >lock.
> 
> Thanks Vignesh for reporting the deadlock.
> 
the root cause of the deadlock is that some platform driver invokes
thermal_zone_device_update() in .set_mode(), after mode changed.

If we wants to lock tz->ops->set_mode(), we should cleanup all the
platform thermal drivers, and deliver a thermal_zone_device_update()
inÂmode_store(), at the same time.

thanks,
rui

> Regards,
> Keerthy
> 
> > 
> > 
> > Regards,
> > Keerthy
> > 
> > > 
> > > 
> > > Cc: Zhang Rui <rui.zhang@xxxxxxxxx>
> > > Cc: linux-pm@xxxxxxxxxxxxxxx
> > > Cc: linux-kernel@xxxxxxxxxxxxxxx
> > > Signed-off-by: Eduardo Valentin <edubezval@xxxxxxxxx>
> > > ---
> > > Â drivers/thermal/thermal_sysfs.c | 13 ++++++++++---
> > > Â 1 file changed, 10 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/thermal/thermal_sysfs.c
> > > b/drivers/thermal/thermal_sysfs.c
> > > index ee983ca..1db2406 100644
> > > --- a/drivers/thermal/thermal_sysfs.c
> > > +++ b/drivers/thermal/thermal_sysfs.c
> > > @@ -62,7 +62,9 @@ mode_show(struct device *dev, struct
> > > device_attribute *attr, char *buf)
> > > ÂÂÂÂÂÂif (!tz->ops->get_mode)
> > > ÂÂÂÂÂÂÂÂÂÂreturn -EPERM;
> > > 
> > > +ÂÂÂÂmutex_lock(&tz->lock);
> > > ÂÂÂÂÂÂresult = tz->ops->get_mode(tz, &mode);
> > > +ÂÂÂÂmutex_unlock(&tz->lock);
> > > ÂÂÂÂÂÂif (result)
> > > ÂÂÂÂÂÂÂÂÂÂreturn result;
> > > 
> > > @@ -75,17 +77,22 @@ mode_store(struct device *dev, struct
> > > device_attribute *attr,
> > > ÂÂÂÂÂÂÂÂÂconst char *buf, size_t count)
> > > Â {
> > > ÂÂÂÂÂÂstruct thermal_zone_device *tz = to_thermal_zone(dev);
> > > +ÂÂÂÂenum thermal_device_mode mode = THERMAL_DEVICE_DISABLED;
> > > ÂÂÂÂÂÂint result;
> > > 
> > > ÂÂÂÂÂÂif (!tz->ops->set_mode)
> > > ÂÂÂÂÂÂÂÂÂÂreturn -EPERM;
> > > 
> > > ÂÂÂÂÂÂif (!strncmp(buf, "enabled", sizeof("enabled") - 1))
> > > -ÂÂÂÂÂÂÂÂresult = tz->ops->set_mode(tz, THERMAL_DEVICE_ENABLED);
> > > +ÂÂÂÂÂÂÂÂmode = THERMAL_DEVICE_ENABLED;
> > > ÂÂÂÂÂÂelse if (!strncmp(buf, "disabled", sizeof("disabled") - 1))
> > > -ÂÂÂÂÂÂÂÂresult = tz->ops->set_mode(tz, THERMAL_DEVICE_DISABLED);
> > > +ÂÂÂÂÂÂÂÂmode = THERMAL_DEVICE_DISABLED;
> > > ÂÂÂÂÂÂelse
> > > -ÂÂÂÂÂÂÂÂresult = -EINVAL;
> > > +ÂÂÂÂÂÂÂÂreturn -EINVAL;
> > > +
> > > +ÂÂÂÂmutex_lock(&tz->lock);
> > > +ÂÂÂÂresult = tz->ops->set_mode(tz, mode);
> > > +ÂÂÂÂmutex_unlock(&tz->lock);
> > > 
> > > ÂÂÂÂÂÂif (result)
> > > ÂÂÂÂÂÂÂÂÂÂreturn result;
> > > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-pm" 
> > in
> > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > More majordomo info atÂÂhttp://vger.kernel.org/majordomo-info.html