2024-04-25 13:58:03

by Rafael J. Wysocki

Subject: [PATCH v1 1/3] thermal/debugfs: Free all thermal zone debug memory on zone removal

From: Rafael J. Wysocki <[email protected]>

Because thermal_debug_tz_remove() does not free all memory allocated for
thermal zone diagnostics, some of that memory becomes unreachable after
freeing the thermal zone's struct thermal_debugfs object.

Address this by making thermal_debug_tz_remove() free all of the memory
in question.

Fixes: 7ef01f228c9f ("thermal/debugfs: Add thermal debugfs information for mitigation episodes")
Cc :6.8+ <[email protected]> # 6.8+
Signed-off-by: Rafael J. Wysocki <[email protected]>
---
drivers/thermal/thermal_debugfs.c | 13 +++++++++++++
1 file changed, 13 insertions(+)

Index: linux-pm/drivers/thermal/thermal_debugfs.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_debugfs.c
+++ linux-pm/drivers/thermal/thermal_debugfs.c
@@ -832,15 +832,28 @@ void thermal_debug_tz_add(struct thermal
void thermal_debug_tz_remove(struct thermal_zone_device *tz)
{
struct thermal_debugfs *thermal_dbg = tz->debugfs;
+ struct tz_episode *tze, *tmp;
+ struct tz_debugfs *tz_dbg;
+ int *trips_crossed;

if (!thermal_dbg)
return;

+ tz_dbg = &thermal_dbg->tz_dbg;
+
mutex_lock(&thermal_dbg->lock);

+ trips_crossed = tz_dbg->trips_crossed;
+
+ list_for_each_entry_safe(tze, tmp, &tz_dbg->tz_episodes, node) {
+ list_del(&tze->node);
+ kfree(tze);
+ }
+
tz->debugfs = NULL;

mutex_unlock(&thermal_dbg->lock);

thermal_debugfs_remove_id(thermal_dbg);
+ kfree(trips_crossed);
}

2024-04-25 22:14:43

by Lukasz Luba

Subject: Re: [PATCH v1 1/3] thermal/debugfs: Free all thermal zone debug memory on zone removal

On 4/25/24 14:49, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <[email protected]>
>
> Because thermal_debug_tz_remove() does not free all memory allocated for
> thermal zone diagnostics, some of that memory becomes unreachable after
> freeing the thermal zone's struct thermal_debugfs object.
>
> Address this by making thermal_debug_tz_remove() free all of the memory
> in question.
>
> Fixes: 7ef01f228c9f ("thermal/debugfs: Add thermal debugfs information for mitigation episodes")
> Cc :6.8+ <[email protected]> # 6.8+
> Signed-off-by: Rafael J. Wysocki <[email protected]>
> ---
> drivers/thermal/thermal_debugfs.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> Index: linux-pm/drivers/thermal/thermal_debugfs.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/thermal_debugfs.c
> +++ linux-pm/drivers/thermal/thermal_debugfs.c
> @@ -832,15 +832,28 @@ void thermal_debug_tz_add(struct thermal
> void thermal_debug_tz_remove(struct thermal_zone_device *tz)
> {
> struct thermal_debugfs *thermal_dbg = tz->debugfs;
> + struct tz_episode *tze, *tmp;
> + struct tz_debugfs *tz_dbg;
> + int *trips_crossed;
>
> if (!thermal_dbg)
> return;
>
> + tz_dbg = &thermal_dbg->tz_dbg;
> +
> mutex_lock(&thermal_dbg->lock);
>
> + trips_crossed = tz_dbg->trips_crossed;
> +
> + list_for_each_entry_safe(tze, tmp, &tz_dbg->tz_episodes, node) {
> + list_del(&tze->node);
> + kfree(tze);
> + }
> +
> tz->debugfs = NULL;
>
> mutex_unlock(&thermal_dbg->lock);
>
> thermal_debugfs_remove_id(thermal_dbg);
> + kfree(trips_crossed);
> }
>
>
>
>

Reviewed-by: Lukasz Luba <[email protected]>