| Message ID | 1492147105-26692-1-git-send-email-j-keerthy@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 14, 2017 at 10:48:24AM +0530, Keerthy wrote: > thermal_zone_device_check --> thermal_zone_device_update --> > handle_thermal_trip --> handle_critical_trips --> orderly_poweroff > > The above sequence happens every 250/500 mS based on the configuration. > The orderly_poweroff function is getting called every 250/500 mS. > With a full fledged file system it takes at least 5-10 Seconds to > power off gracefully. > > In that period due to the thermal_zone_device_check triggering > periodically the thermal work queues bombard with > orderly_poweroff calls multiple times eventually leading to > failures in gracefully powering off the system. > > Make sure that orderly_poweroff is called only once. > > Reported-by: Keerthy <j-keerthy@ti.com> > Signed-off-by: Keerthy <j-keerthy@ti.com> > --- > > Changes in v3: > > * Changed the place where mutex was locked and unlocked. > > Changes in v2: > > * Added a global mutex to serialize poweroff code sequence. > > drivers/thermal/thermal_core.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 11f0675..9cad1ba 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -45,6 +45,7 @@ > > static DEFINE_MUTEX(thermal_list_lock); > static DEFINE_MUTEX(thermal_governor_lock); > +static DEFINE_MUTEX(poweroff_lock); > > static atomic_t in_suspend; > > @@ -326,6 +327,7 @@ static void handle_critical_trips(struct thermal_zone_device *tz, > int trip, enum thermal_trip_type trip_type) > { > int trip_temp; > + static bool power_off_triggered; I would prefer this to be closer to its lock. Can you please move this to the global section? > > tz->ops->get_trip_temp(tz, trip, &trip_temp); > > @@ -342,7 +344,12 @@ static void handle_critical_trips(struct thermal_zone_device *tz, > dev_emerg(&tz->device, > "critical temperature reached(%d C),shutting down\n", > tz->temperature / 1000); > - orderly_poweroff(true); > + mutex_lock(&poweroff_lock); > + if (!power_off_triggered) { > + orderly_poweroff(true); > + power_off_triggered = true; > + } > + mutex_unlock(&poweroff_lock); > } > } > > @@ -1463,6 +1470,7 @@ static int __init thermal_init(void) > { > int result; > > + mutex_init(&poweroff_lock); > result = thermal_register_governors(); > if (result) > goto error; > @@ -1497,6 +1505,7 @@ static int __init thermal_init(void) > ida_destroy(&thermal_cdev_ida); > mutex_destroy(&thermal_list_lock); > mutex_destroy(&thermal_governor_lock); > + mutex_destroy(&poweroff_lock); > return result; > } > > -- > 1.9.1 >
On Friday 14 April 2017 11:30 AM, Eduardo Valentin wrote: > On Fri, Apr 14, 2017 at 10:48:24AM +0530, Keerthy wrote: >> thermal_zone_device_check --> thermal_zone_device_update --> >> handle_thermal_trip --> handle_critical_trips --> orderly_poweroff >> >> The above sequence happens every 250/500 mS based on the configuration. >> The orderly_poweroff function is getting called every 250/500 mS. >> With a full fledged file system it takes at least 5-10 Seconds to >> power off gracefully. >> >> In that period due to the thermal_zone_device_check triggering >> periodically the thermal work queues bombard with >> orderly_poweroff calls multiple times eventually leading to >> failures in gracefully powering off the system. >> >> Make sure that orderly_poweroff is called only once. >> >> Reported-by: Keerthy <j-keerthy@ti.com> >> Signed-off-by: Keerthy <j-keerthy@ti.com> >> --- >> >> Changes in v3: >> >> * Changed the place where mutex was locked and unlocked. >> >> Changes in v2: >> >> * Added a global mutex to serialize poweroff code sequence. >> >> drivers/thermal/thermal_core.c | 11 ++++++++++- >> 1 file changed, 10 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c >> index 11f0675..9cad1ba 100644 >> --- a/drivers/thermal/thermal_core.c >> +++ b/drivers/thermal/thermal_core.c >> @@ -45,6 +45,7 @@ >> >> static DEFINE_MUTEX(thermal_list_lock); >> static DEFINE_MUTEX(thermal_governor_lock); >> +static DEFINE_MUTEX(poweroff_lock); >> >> static atomic_t in_suspend; >> >> @@ -326,6 +327,7 @@ static void handle_critical_trips(struct thermal_zone_device *tz, >> int trip, enum thermal_trip_type trip_type) >> { >> int trip_temp; >> + static bool power_off_triggered; > > I would prefer this to be closer to its lock. Can you please move this > to the global section? Sure. I can do that. > >> >> tz->ops->get_trip_temp(tz, trip, &trip_temp); >> >> @@ -342,7 +344,12 @@ static void handle_critical_trips(struct thermal_zone_device *tz, >> dev_emerg(&tz->device, >> "critical temperature reached(%d C),shutting down\n", >> tz->temperature / 1000); >> - orderly_poweroff(true); >> + mutex_lock(&poweroff_lock); >> + if (!power_off_triggered) { >> + orderly_poweroff(true); >> + power_off_triggered = true; >> + } >> + mutex_unlock(&poweroff_lock); >> } >> } >> >> @@ -1463,6 +1470,7 @@ static int __init thermal_init(void) >> { >> int result; >> >> + mutex_init(&poweroff_lock); >> result = thermal_register_governors(); >> if (result) >> goto error; >> @@ -1497,6 +1505,7 @@ static int __init thermal_init(void) >> ida_destroy(&thermal_cdev_ida); >> mutex_destroy(&thermal_list_lock); >> mutex_destroy(&thermal_governor_lock); >> + mutex_destroy(&poweroff_lock); >> return result; >> } >> >> -- >> 1.9.1 >> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> thermal_zone_device_check --> thermal_zone_device_update --> > handle_thermal_trip --> handle_critical_trips --> orderly_poweroff > > The above sequence happens every 250/500 mS based on the configuration. > The orderly_poweroff function is getting called every 250/500 mS. > With a full fledged file system it takes at least 5-10 Seconds to > power off gracefully. > > In that period due to the thermal_zone_device_check triggering > periodically the thermal work queues bombard with > orderly_poweroff calls multiple times eventually leading to > failures in gracefully powering off the system. > > Make sure that orderly_poweroff is called only once. Pretty please, can we do it in the core code, not in thermal/? There are other reasons kernel may want to shut the system down, like for example critical battery, and if both thermal _and_ bad battery happen, we want just one shutdown... > Reported-by: Keerthy <j-keerthy@ti.com> > Signed-off-by: Keerthy <j-keerthy@ti.com> And here probably we need your full name. Thanks, Pavel
On Monday 08 May 2017 02:32 AM, Pavel Machek wrote: >> thermal_zone_device_check --> thermal_zone_device_update --> >> handle_thermal_trip --> handle_critical_trips --> orderly_poweroff >> >> The above sequence happens every 250/500 mS based on the configuration. >> The orderly_poweroff function is getting called every 250/500 mS. >> With a full fledged file system it takes at least 5-10 Seconds to >> power off gracefully. >> >> In that period due to the thermal_zone_device_check triggering >> periodically the thermal work queues bombard with >> orderly_poweroff calls multiple times eventually leading to >> failures in gracefully powering off the system. >> >> Make sure that orderly_poweroff is called only once. > > Pretty please, can we do it in the core code, not in thermal/? There > are other reasons kernel may want to shut the system down, like for > example critical battery, and if both thermal _and_ bad battery > happen, we want just one shutdown... Pavel, Thermal fix is still valid. As it is having multiple calls. I can work on fixing the core code as well. BTW the latest of this series is v6: https://patchwork.kernel.org/patch/9684929/ - Keerthy > >> Reported-by: Keerthy <j-keerthy@ti.com> >> Signed-off-by: Keerthy <j-keerthy@ti.com> > > And here probably we need your full name. > > Thanks, > Pavel > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 11f0675..9cad1ba 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -45,6 +45,7 @@ static DEFINE_MUTEX(thermal_list_lock); static DEFINE_MUTEX(thermal_governor_lock); +static DEFINE_MUTEX(poweroff_lock); static atomic_t in_suspend; @@ -326,6 +327,7 @@ static void handle_critical_trips(struct thermal_zone_device *tz, int trip, enum thermal_trip_type trip_type) { int trip_temp; + static bool power_off_triggered; tz->ops->get_trip_temp(tz, trip, &trip_temp); @@ -342,7 +344,12 @@ static void handle_critical_trips(struct thermal_zone_device *tz, dev_emerg(&tz->device, "critical temperature reached(%d C),shutting down\n", tz->temperature / 1000); - orderly_poweroff(true); + mutex_lock(&poweroff_lock); + if (!power_off_triggered) { + orderly_poweroff(true); + power_off_triggered = true; + } + mutex_unlock(&poweroff_lock); } } @@ -1463,6 +1470,7 @@ static int __init thermal_init(void) { int result; + mutex_init(&poweroff_lock); result = thermal_register_governors(); if (result) goto error; @@ -1497,6 +1505,7 @@ static int __init thermal_init(void) ida_destroy(&thermal_cdev_ida); mutex_destroy(&thermal_list_lock); mutex_destroy(&thermal_governor_lock); + mutex_destroy(&poweroff_lock); return result; }
thermal_zone_device_check --> thermal_zone_device_update --> handle_thermal_trip --> handle_critical_trips --> orderly_poweroff The above sequence happens every 250/500 mS based on the configuration. The orderly_poweroff function is getting called every 250/500 mS. With a full fledged file system it takes at least 5-10 Seconds to power off gracefully. In that period due to the thermal_zone_device_check triggering periodically the thermal work queues bombard with orderly_poweroff calls multiple times eventually leading to failures in gracefully powering off the system. Make sure that orderly_poweroff is called only once. Reported-by: Keerthy <j-keerthy@ti.com> Signed-off-by: Keerthy <j-keerthy@ti.com> --- Changes in v3: * Changed the place where mutex was locked and unlocked. Changes in v2: * Added a global mutex to serialize poweroff code sequence. drivers/thermal/thermal_core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)