[STABLE][PATCH 4.4] thermal/core/fair share: Lock the thermal zone while looping over instances

[STABLE][PATCH 4.4] thermal/core/fair share: Lock the thermal zone while looping over instances

[Lukasz Luba]

commit fef05776eb02238dcad8d5514e666a42572c3f32 upstream.

The tz->lock must be hold during the looping over the instances in that
thermal zone. This lock was missing in the governor code since the
beginning, so it's hard to point into a particular commit.

CC: stable@vger.kernel.org # 4.4
Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
---
Hi all,

I've backported my patch which was sent to LKML:
https://lore.kernel.org/linux-pm/20210422153624.6074-2-lukasz.luba@arm.com/

The upstream patch failed while applying:
https://lore.kernel.org/stable/16206371483193@kroah.com/

This patch should apply to stable v4.4.y, on top of stable tree branch:
linux-4.4.y which head was at:
commit 47127fcd287c ("Linux 4.4.268")

Regards,
Lukasz Luba

 drivers/thermal/fair_share.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/thermal/fair_share.c b/drivers/thermal/fair_share.c
index 34fe36504a55..e701356441a9 100644
--- a/drivers/thermal/fair_share.c
+++ b/drivers/thermal/fair_share.c
@@ -93,6 +93,8 @@ static int fair_share_throttle(struct thermal_zone_device *tz, int trip)
 	int total_instance = 0;
 	int cur_trip_level = get_trip_level(tz);
 
+	mutex_lock(&tz->lock);
+
 	list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
 		if (instance->trip != trip)
 			continue;
@@ -119,6 +121,8 @@ static int fair_share_throttle(struct thermal_zone_device *tz, int trip)
 		instance->cdev->updated = false;
 		thermal_cdev_update(cdev);
 	}
+
+	mutex_unlock(&tz->lock);
 	return 0;
 }
 
-- 
2.17.1

Re: [STABLE][PATCH 4.4] thermal/core/fair share: Lock the thermal zone while looping over instances

[Greg KH]

On Fri, May 14, 2021 at 11:49:16AM +0100, Lukasz Luba wrote:
> commit fef05776eb02238dcad8d5514e666a42572c3f32 upstream.
> 
> The tz->lock must be hold during the looping over the instances in that
> thermal zone. This lock was missing in the governor code since the
> beginning, so it's hard to point into a particular commit.
> 
> CC: stable@vger.kernel.org # 4.4
> Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
> ---
> Hi all,
> 
> I've backported my patch which was sent to LKML:
> https://lore.kernel.org/linux-pm/20210422153624.6074-2-lukasz.luba@arm.com/
> 
> The upstream patch failed while applying:
> https://lore.kernel.org/stable/16206371483193@kroah.com/
> 
> This patch should apply to stable v4.4.y, on top of stable tree branch:
> linux-4.4.y which head was at:
> commit 47127fcd287c ("Linux 4.4.268")

What about 4.9, 4.14, 4.14, and 5.4 releases?  They need this fix as
well, right?

thanks,

greg k-h

Re: [STABLE][PATCH 4.4] thermal/core/fair share: Lock the thermal zone while looping over instances

[Lukasz Luba]

On 5/14/21 11:56 AM, Greg KH wrote:
> On Fri, May 14, 2021 at 11:49:16AM +0100, Lukasz Luba wrote:
>> commit fef05776eb02238dcad8d5514e666a42572c3f32 upstream.
>>
>> The tz->lock must be hold during the looping over the instances in that
>> thermal zone. This lock was missing in the governor code since the
>> beginning, so it's hard to point into a particular commit.
>>
>> CC: stable@vger.kernel.org # 4.4
>> Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
>> ---
>> Hi all,
>>
>> I've backported my patch which was sent to LKML:
>> https://lore.kernel.org/linux-pm/20210422153624.6074-2-lukasz.luba@arm.com/
>>
>> The upstream patch failed while applying:
>> https://lore.kernel.org/stable/16206371483193@kroah.com/
>>
>> This patch should apply to stable v4.4.y, on top of stable tree branch:
>> linux-4.4.y which head was at:
>> commit 47127fcd287c ("Linux 4.4.268")
> 
> What about 4.9, 4.14, 4.14, and 5.4 releases?  They need this fix as
> well, right?

s/4.14/4.19

Yes, I'm going to send them in next few hours after building and
testing.

Regards,
Lukasz

Re: [STABLE][PATCH 4.4] thermal/core/fair share: Lock the thermal zone while looping over instances

[Greg KH]

On Fri, May 14, 2021 at 11:58:10AM +0100, Lukasz Luba wrote:
> 
> 
> On 5/14/21 11:56 AM, Greg KH wrote:
> > On Fri, May 14, 2021 at 11:49:16AM +0100, Lukasz Luba wrote:
> > > commit fef05776eb02238dcad8d5514e666a42572c3f32 upstream.
> > > 
> > > The tz->lock must be hold during the looping over the instances in that
> > > thermal zone. This lock was missing in the governor code since the
> > > beginning, so it's hard to point into a particular commit.
> > > 
> > > CC: stable@vger.kernel.org # 4.4
> > > Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
> > > ---
> > > Hi all,
> > > 
> > > I've backported my patch which was sent to LKML:
> > > https://lore.kernel.org/linux-pm/20210422153624.6074-2-lukasz.luba@arm.com/
> > > 
> > > The upstream patch failed while applying:
> > > https://lore.kernel.org/stable/16206371483193@kroah.com/
> > > 
> > > This patch should apply to stable v4.4.y, on top of stable tree branch:
> > > linux-4.4.y which head was at:
> > > commit 47127fcd287c ("Linux 4.4.268")
> > 
> > What about 4.9, 4.14, 4.14, and 5.4 releases?  They need this fix as
> > well, right?
> 
> s/4.14/4.19
> 
> Yes, I'm going to send them in next few hours after building and
> testing.

All now queued up, thanks.

greg k-h