linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH V2] thermal: Fix locking in cooling device sysfs update cur_state
@ 2018-11-27 22:43 Thara Gopinath
  2019-01-03  2:29 ` Thara Gopinath
  0 siblings, 1 reply; 3+ messages in thread
From: Thara Gopinath @ 2018-11-27 22:43 UTC (permalink / raw)
  To: rui.zhang, edubezval, daniel.lezcano; +Cc: linux-pm, linux-kernel

Sysfs interface to update cooling device cur_state does not
currently holding cooling device lock sometimes leading to
stale values in cur_state if getting updated simultanelously
from user space and thermal framework. Adding the proper locking
code fixes this issue.

Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org>
---

V1->V2: Rearranged the code as per Daniel's  review comment 

 drivers/thermal/thermal_sysfs.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 2241cea..aa99edb 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -712,11 +712,14 @@ cur_state_store(struct device *dev, struct device_attribute *attr,
 	if ((long)state < 0)
 		return -EINVAL;
 
+	mutex_lock(&cdev->lock);
+
 	result = cdev->ops->set_cur_state(cdev, state);
-	if (result)
-		return result;
-	thermal_cooling_device_stats_update(cdev, state);
-	return count;
+	if (!result)
+		thermal_cooling_device_stats_update(cdev, state);
+
+	mutex_unlock(&cdev->lock);
+	return result ? result : count;
 }
 
 static struct device_attribute
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH V2] thermal: Fix locking in cooling device sysfs update cur_state
  2018-11-27 22:43 [PATCH V2] thermal: Fix locking in cooling device sysfs update cur_state Thara Gopinath
@ 2019-01-03  2:29 ` Thara Gopinath
  2019-01-03  2:51   ` Zhang Rui
  0 siblings, 1 reply; 3+ messages in thread
From: Thara Gopinath @ 2019-01-03  2:29 UTC (permalink / raw)
  To: rui.zhang, edubezval, daniel.lezcano; +Cc: linux-pm, linux-kernel

On 11/27/2018 05:43 PM, Thara Gopinath wrote:
> Sysfs interface to update cooling device cur_state does not
> currently holding cooling device lock sometimes leading to
> stale values in cur_state if getting updated simultanelously
> from user space and thermal framework. Adding the proper locking
> code fixes this issue.
> 
> Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org>
> ---
> 
> V1->V2: Rearranged the code as per Daniel's  review comment 

Hi Eduardo, Daniel

Any comments on this ?

Regards
Thara

> 
>  drivers/thermal/thermal_sysfs.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
> index 2241cea..aa99edb 100644
> --- a/drivers/thermal/thermal_sysfs.c
> +++ b/drivers/thermal/thermal_sysfs.c
> @@ -712,11 +712,14 @@ cur_state_store(struct device *dev, struct device_attribute *attr,
>  	if ((long)state < 0)
>  		return -EINVAL;
>  
> +	mutex_lock(&cdev->lock);
> +
>  	result = cdev->ops->set_cur_state(cdev, state);
> -	if (result)
> -		return result;
> -	thermal_cooling_device_stats_update(cdev, state);
> -	return count;
> +	if (!result)
> +		thermal_cooling_device_stats_update(cdev, state);
> +
> +	mutex_unlock(&cdev->lock);
> +	return result ? result : count;
>  }
>  
>  static struct device_attribute
> 




^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH V2] thermal: Fix locking in cooling device sysfs update cur_state
  2019-01-03  2:29 ` Thara Gopinath
@ 2019-01-03  2:51   ` Zhang Rui
  0 siblings, 0 replies; 3+ messages in thread
From: Zhang Rui @ 2019-01-03  2:51 UTC (permalink / raw)
  To: Thara Gopinath, edubezval, daniel.lezcano; +Cc: linux-pm, linux-kernel

On 三, 2019-01-02 at 21:29 -0500, Thara Gopinath wrote:
> On 11/27/2018 05:43 PM, Thara Gopinath wrote:
> > 
> > Sysfs interface to update cooling device cur_state does not
> > currently holding cooling device lock sometimes leading to
> > stale values in cur_state if getting updated simultanelously
> > from user space and thermal framework. Adding the proper locking
> > code fixes this issue.
> > 
> > Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org>
> > ---
> > 
> > V1->V2: Rearranged the code as per Daniel's  review comment 
> Hi Eduardo, Daniel
> 
> Any comments on this ?
> 
it's already in my tree, and will be included in my pull request which
will be sent out soon.

thanks,
rui

> Regards
> Thara
> 
> > 
> > 
> >  drivers/thermal/thermal_sysfs.c | 11 +++++++----
> >  1 file changed, 7 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/thermal/thermal_sysfs.c
> > b/drivers/thermal/thermal_sysfs.c
> > index 2241cea..aa99edb 100644
> > --- a/drivers/thermal/thermal_sysfs.c
> > +++ b/drivers/thermal/thermal_sysfs.c
> > @@ -712,11 +712,14 @@ cur_state_store(struct device *dev, struct
> > device_attribute *attr,
> >  	if ((long)state < 0)
> >  		return -EINVAL;
> >  
> > +	mutex_lock(&cdev->lock);
> > +
> >  	result = cdev->ops->set_cur_state(cdev, state);
> > -	if (result)
> > -		return result;
> > -	thermal_cooling_device_stats_update(cdev, state);
> > -	return count;
> > +	if (!result)
> > +		thermal_cooling_device_stats_update(cdev, state);
> > +
> > +	mutex_unlock(&cdev->lock);
> > +	return result ? result : count;
> >  }
> >  
> >  static struct device_attribute
> > 
> 
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-01-03  2:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-27 22:43 [PATCH V2] thermal: Fix locking in cooling device sysfs update cur_state Thara Gopinath
2019-01-03  2:29 ` Thara Gopinath
2019-01-03  2:51   ` Zhang Rui

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).