One more step to the thermal zone structure encapsulation
Subsystems (2)
v2 cover One more step to the thermal zone structure encapsulation
The series provides more changes to self-encapsulate the thermal zone device structure in order to protect wild accesses to the thermal zone device internals, especially the trip points and the locks.
The first patch adds a macro to warn at compilation time if the thermal_core.h is included in a file not belonging to the thermal core code. One warning will happen with the nvidia drivers but this is in the way to be solved.
The second patch reorders the headers inclusion in the core code.
The next patches makes the int340x drivers to use the thermal trip update above and the different accessors for thermal zone structure.
Daniel Lezcano (4):
thermal/core: Hardening the self-encapsulation thermal/core: Reorder the headers inclusion thermal/drivers/int3400: Use thermal zone device wrappers thermal/drivers/int340x: Do not check the thermal zone state
drivers/thermal/gov_bang_bang.c | 1 + drivers/thermal/gov_fair_share.c | 1 + drivers/thermal/gov_power_allocator.c | 7 +-- drivers/thermal/gov_step_wise.c | 1 + drivers/thermal/gov_user_space.c | 1 + .../intel/int340x_thermal/int3400_thermal.c | 44 +++++++++---------- drivers/thermal/thermal_acpi.c | 1 + drivers/thermal/thermal_core.c | 7 +-- drivers/thermal/thermal_core.h | 4 ++ drivers/thermal/thermal_helpers.c | 1 + drivers/thermal/thermal_hwmon.c | 1 + drivers/thermal/thermal_netlink.c | 1 + drivers/thermal/thermal_of.c | 1 + drivers/thermal/thermal_sysfs.c | 1 + drivers/thermal/thermal_trip.c | 1 + 15 files changed, 45 insertions(+), 28 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/4 thermal/core: Hardening the self-encapsulation
The thermal private header has leaked all around the drivers which interacted with the core internals. The thermal zone structure which was part of the exported header led also to a leakage of the fields into the different drivers, making very difficult to improve the core code without having to change the drivers.
Now we fixed how the thermal drivers were interacting with the thermal zones (actually fixed how they should not interact). The thermal zone structure has been moved to the private thermal core header. This header has been removed from the different drivers and must belong to the core code only. In order to prevent this private header to be included again in the drivers, make explicit only the core code can include this header by defining a THERMAL_CORE_SUBSYS macro. The private header will contain a check against this macro.
The Tegra SoCtherm driver needs to access thermal_core.h to have the get_thermal_instance() function definition. It is the only one remaining driver which need to access the thermal_core.h header, so the check will emit a warning at compilation time.
Thierry Reding is reworking the driver to get rid of this function [1] and thus when the changes will be merged, the compilation warning will be converted to a compilation error, closing definitively the door to the drivers willing to play with the thermal zone device internals.
No functional changes intended.
[1] https://lore.kernel.org/all/[email protected]/
--- drivers/thermal/gov_bang_bang.c | 1 + drivers/thermal/gov_fair_share.c | 1 + drivers/thermal/gov_power_allocator.c | 1 + drivers/thermal/gov_step_wise.c | 1 + drivers/thermal/gov_user_space.c | 1 + drivers/thermal/thermal_acpi.c | 1 + drivers/thermal/thermal_core.c | 1 + drivers/thermal/thermal_core.h | 4 ++++ drivers/thermal/thermal_helpers.c | 1 + drivers/thermal/thermal_hwmon.c | 1 + drivers/thermal/thermal_netlink.c | 1 + drivers/thermal/thermal_of.c | 1 + drivers/thermal/thermal_sysfs.c | 1 + drivers/thermal/thermal_trip.c | 1 + 14 files changed, 17 insertions(+)
drivers/thermal/gov_bang_bang.c +1 -0
@@ -11,6 +11,7 @@#include <linux/thermal.h> +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" static int thermal_zone_trip_update (struct thermal_zone_device *tz,int trip_id)
drivers/thermal/gov_fair_share.c +1 -0
@@ -13,6 +13,7 @@#include <linux/thermal.h> #include "thermal_trace.h" +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" /**
drivers/thermal/gov_power_allocator.c +1 -0
@@ -14,6 +14,7 @@#define CREATE_TRACE_POINTS #include "thermal_trace_ipa.h" +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" #define INVALID_TRIP -1
drivers/thermal/gov_step_wise.c +1 -0
@@ -14,6 +14,7 @@#include <linux/minmax.h> #include "thermal_trace.h" +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" /*
drivers/thermal/gov_user_space.c +1 -0
@@ -13,6 +13,7 @@#include <linux/slab.h> #include <linux/thermal.h> +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" static int user_space_bind (struct thermal_zone_device *tz)
drivers/thermal/thermal_acpi.c +1 -0
@@ -9,6 +9,7 @@#include <linux/acpi.h> #include <linux/units.h> +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" /*
drivers/thermal/thermal_core.c +1 -0
@@ -24,6 +24,7 @@#define CREATE_TRACE_POINTS #include "thermal_trace.h" +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" #include "thermal_hwmon.h"
drivers/thermal/thermal_core.h +4 -0
@@ -14,6 +14,10 @@#include "thermal_netlink.h" +#ifndef THERMAL_CORE_SUBSYS +#warning This header can only be included by the thermal core code +#endif +/* Default Thermal Governor */ #if defined(CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE )#define DEFAULT_THERMAL_GOVERNOR "step_wise"
drivers/thermal/thermal_helpers.c +1 -0
@@ -19,6 +19,7 @@#include <linux/string.h> #include <linux/sysfs.h> +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" #include "thermal_trace.h"
drivers/thermal/thermal_hwmon.c +1 -0
@@ -17,6 +17,7 @@#include <linux/thermal.h> #include "thermal_hwmon.h" +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" /* hwmon sys I/F */
drivers/thermal/thermal_netlink.c +1 -0
@@ -11,6 +11,7 @@#include <net/genetlink.h> #include <uapi/linux/thermal.h> +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" static const struct genl_multicast_group thermal_genl_mcgrps[] = {
drivers/thermal/thermal_of.c +1 -0
@@ -17,6 +17,7 @@#include <linux/types.h> #include <linux/string.h> +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" /*** functions parsing device tree nodes ***/
drivers/thermal/thermal_sysfs.c +1 -0
@@ -19,6 +19,7 @@#include <linux/string.h> #include <linux/jiffies.h> +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" /* sys I/F for thermal zone */
drivers/thermal/thermal_trip.c +1 -0
@@ -7,6 +7,7 @@* * Thermal trips handling */ +#define THERMAL_CORE_SUBSYS #include "thermal_core.h" int __for_each_thermal_trip(struct thermal_zone_device *tz,
Signature · 1 line
2.34.1
PATCH v2 2/4 thermal/core: Reorder the headers inclusion
In reply to Daniel LezcanoThe next changes will move the thermal device structure inside the thermal core code. Consequently, the traces must be included after thermal_core.h as this one contains the thermal zone device structure definition the traces need.
Reorder the inclusions.
No functional changes intended.
--- drivers/thermal/gov_power_allocator.c | 6 +++--- drivers/thermal/thermal_core.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/thermal/gov_power_allocator.c +3 -3
@@ -11,12 +11,12 @@#include <linux/slab.h> #include <linux/thermal.h> -#define CREATE_TRACE_POINTS -#include "thermal_trace_ipa.h" -#define THERMAL_CORE_SUBSYS #include "thermal_core.h" +#define CREATE_TRACE_POINTS +#include "thermal_trace_ipa.h" +#define INVALID_TRIP -1#define FRAC_BITS 10
drivers/thermal/thermal_core.c +3 -3
@@ -21,13 +21,13 @@#include <linux/of.h> #include <linux/suspend.h> -#define CREATE_TRACE_POINTS -#include "thermal_trace.h" -#define THERMAL_CORE_SUBSYS #include "thermal_core.h" #include "thermal_hwmon.h" +#define CREATE_TRACE_POINTS +#include "thermal_trace.h" +static DEFINE_IDA (thermal_tz_ida);static DEFINE_IDA (thermal_cdev_ida);
Signature · 1 line
2.34.1
PATCH v2 3/4 thermal/drivers/int3400: Use thermal zone device wrappers
In reply to Daniel LezcanoUse the thermal core API to access the thermal zone "type" field instead of directly using the structure field. While here, remove access to the temperature field, as this driver is reporting fake temperature, which can be replaced with INT3400_FAKE_TEMP. Also replace hardcoded 20C with INT3400_FAKE_TEMP
--- .../thermal/intel/int340x_thermal/int3400_thermal.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +8 -4
@@ -15,6 +15,7 @@#define INT3400_THERMAL_TABLE_CHANGED 0x83#define INT3400_ODVP_CHANGED 0x88#define INT3400_KEEP_ALIVE 0xA0 +#define INT3400_FAKE_TEMP (20 * 1000)/* faked temp sensor with 20C */ enum int3400_thermal_uuid {INT3400_THERMAL_ACTIVE =0 ,
@@ -453,6 +454,7 @@ static void int3400_notify(acpi_handle handle, void *data) {struct int3400_thermal_priv *priv = data; +struct device *dev;char *thermal_prop[5 ];int therm_event;
@@ -475,12 +477,14 @@ static void int3400_notify(acpi_handle handle,return ; } - thermal_prop[0 ] =kasprintf (GFP_KERNEL ,"NAME=%s" , priv->thermal->type); - thermal_prop[1 ] =kasprintf (GFP_KERNEL ,"TEMP=%d" , priv->thermal->temperature); + dev =thermal_zone_device (priv->thermal); + + thermal_prop[0 ] =kasprintf (GFP_KERNEL ,"NAME=%s" ,thermal_zone_device_type (priv->thermal)); + thermal_prop[1 ] =kasprintf (GFP_KERNEL ,"TEMP=%d" ,INT3400_FAKE_TEMP ); thermal_prop[2 ] =kasprintf (GFP_KERNEL ,"TRIP=" ); thermal_prop[3 ] =kasprintf (GFP_KERNEL ,"EVENT=%d" , therm_event); thermal_prop[4 ] =NULL ; -kobject_uevent_env (&priv->thermal->device.kobj,KOBJ_CHANGE , thermal_prop); +kobject_uevent_env (&dev->kobj,KOBJ_CHANGE , thermal_prop);kfree (thermal_prop[0 ]);kfree (thermal_prop[1 ]);kfree (thermal_prop[2 ]);
@@ -490,7 +494,7 @@ static void int3400_notify(acpi_handle handle,static int int3400_thermal_get_temp (struct thermal_zone_device *thermal,int *temp) { - *temp =20 *1000 ;/* faked temp sensor with 20C */ + *temp =INT3400_FAKE_TEMP ;return 0 ; }
Signature · 1 line
2.34.1
PATCH v2 4/4 thermal/drivers/int340x: Do not check the thermal zone state
In reply to Daniel LezcanoThe driver is accessing the thermal zone state to ensure the state is different from the one we want to set.
We don't want the driver to access the thermal zone device internals.
Actually, the thermal core code already checks if the thermal zone's state is different before calling this function, thus this check is duplicate.
Remove it.
--- .../intel/int340x_thermal/int3400_thermal.c | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +14 -18
@@ -503,32 +503,28 @@ static int int3400_thermal_change_mode(struct thermal_zone_device *thermal, {struct int3400_thermal_priv *priv =thermal_zone_device_priv (thermal);int result =0 ; +int enabled;if (!priv)return -EINVAL ; -if (mode != thermal->mode) { -int enabled; + enabled = mode ==THERMAL_DEVICE_ENABLED ; - enabled = mode ==THERMAL_DEVICE_ENABLED ; - -if (priv->os_uuid_mask) { -if (!enabled) { - priv->os_uuid_mask =0 ; - result =set_os_uuid_mask (priv, priv->os_uuid_mask); - } - goto eval_odvp; +if (priv->os_uuid_mask) { +if (!enabled) { + priv->os_uuid_mask =0 ; + result =set_os_uuid_mask (priv, priv->os_uuid_mask); } - -if (priv->current_uuid_index <0 || - priv->current_uuid_index >=INT3400_THERMAL_MAXIMUM_UUID ) -return -EINVAL ; - - result =int3400_thermal_run_osc (priv->adev->handle, - int3400_thermal_uuids[priv->current_uuid_index], - &enabled); + goto eval_odvp; } +if (priv->current_uuid_index <0 || + priv->current_uuid_index >=INT3400_THERMAL_MAXIMUM_UUID ) +return -EINVAL ; + + result =int3400_thermal_run_osc (priv->adev->handle, + int3400_thermal_uuids[priv->current_uuid_index], + &enabled); eval_odvp:evaluate_odvp (priv);
Signature · 1 line
2.34.1
Daniel Lezcano
AppliedQuoted 20 lines · Daniel Lezcano
The series provides more changes to self-encapsulate the thermal zone device structure in order to protect wild accesses to the thermal zone device internals, especially the trip points and the locks.
The first patch adds a macro to warn at compilation time if the
thermal_core.his included in a file not belonging to the thermal core code. One warning will happen with the nvidia drivers but this is in the way to be solved.The second patch reorders the headers inclusion in the core code.
The next patches makes the int340x drivers to use the thermal trip update above and the different accessors for thermal zone structure.
Daniel Lezcano (4):
thermal/core: Hardening the self-encapsulation thermal/core: Reorder the headers inclusion thermal/drivers/int3400: Use thermal zone device wrappers thermal/drivers/int340x: Do not check the thermal zone state
Quoted 16 lines
drivers/thermal/gov_bang_bang.c | 1 + drivers/thermal/gov_fair_share.c | 1 + drivers/thermal/gov_power_allocator.c | 7 +-- drivers/thermal/gov_step_wise.c | 1 + drivers/thermal/gov_user_space.c | 1 + .../intel/int340x_thermal/int3400_thermal.c | 44 +++++++++---------- drivers/thermal/thermal_acpi.c | 1 + drivers/thermal/thermal_core.c | 7 +-- drivers/thermal/thermal_core.h | 4 ++ drivers/thermal/thermal_helpers.c | 1 + drivers/thermal/thermal_hwmon.c | 1 + drivers/thermal/thermal_netlink.c | 1 + drivers/thermal/thermal_of.c | 1 + drivers/thermal/thermal_sysfs.c | 1 + drivers/thermal/thermal_trip.c | 1 + 15 files changed, 45 insertions(+), 28 deletions(-)
Applied
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Rafael J. Wysocki
maintainerQuoted 39 lines · Daniel Lezcano
Quoted 20 lines · Daniel Lezcano
The series provides more changes to self-encapsulate the thermal zone device structure in order to protect wild accesses to the thermal zone device internals, especially the trip points and the locks.
The first patch adds a macro to warn at compilation time if the
thermal_core.his included in a file not belonging to the thermal core code. One warning will happen with the nvidia drivers but this is in the way to be solved.The second patch reorders the headers inclusion in the core code.
The next patches makes the int340x drivers to use the thermal trip update above and the different accessors for thermal zone structure.
Daniel Lezcano (4):
thermal/core: Hardening the self-encapsulation thermal/core: Reorder the headers inclusion thermal/drivers/int3400: Use thermal zone device wrappers thermal/drivers/int340x: Do not check the thermal zone stateQuoted 16 lines
drivers/thermal/gov_bang_bang.c | 1 + drivers/thermal/gov_fair_share.c | 1 + drivers/thermal/gov_power_allocator.c | 7 +-- drivers/thermal/gov_step_wise.c | 1 + drivers/thermal/gov_user_space.c | 1 + .../intel/int340x_thermal/int3400_thermal.c | 44 +++++++++---------- drivers/thermal/thermal_acpi.c | 1 + drivers/thermal/thermal_core.c | 7 +-- drivers/thermal/thermal_core.h | 4 ++ drivers/thermal/thermal_helpers.c | 1 + drivers/thermal/thermal_hwmon.c | 1 + drivers/thermal/thermal_netlink.c | 1 + drivers/thermal/thermal_of.c | 1 + drivers/thermal/thermal_sysfs.c | 1 + drivers/thermal/thermal_trip.c | 1 + 15 files changed, 45 insertions(+), 28 deletions(-)
Quoted 1 line
Applied
OK
Quoted 41 lines · Rafael J. Wysocki
Quoted 39 lines · Daniel Lezcano
Quoted 36 lines · Daniel Lezcano
The series provides more changes to self-encapsulate the thermal zone device structure in order to protect wild accesses to the thermal zone device internals, especially the trip points and the locks.
The first patch adds a macro to warn at compilation time if the
thermal_core.his included in a file not belonging to the thermal core code. One warning will happen with the nvidia drivers but this is in the way to be solved.The second patch reorders the headers inclusion in the core code.
The next patches makes the int340x drivers to use the thermal trip update above and the different accessors for thermal zone structure.
Daniel Lezcano (4):
thermal/core: Hardening the self-encapsulation thermal/core: Reorder the headers inclusion thermal/drivers/int3400: Use thermal zone device wrappers thermal/drivers/int340x: Do not check the thermal zone statedrivers/thermal/gov_bang_bang.c | 1 + drivers/thermal/gov_fair_share.c | 1 + drivers/thermal/gov_power_allocator.c | 7 +-- drivers/thermal/gov_step_wise.c | 1 + drivers/thermal/gov_user_space.c | 1 + .../intel/int340x_thermal/int3400_thermal.c | 44 +++++++++---------- drivers/thermal/thermal_acpi.c | 1 + drivers/thermal/thermal_core.c | 7 +-- drivers/thermal/thermal_core.h | 4 ++ drivers/thermal/thermal_helpers.c | 1 + drivers/thermal/thermal_hwmon.c | 1 + drivers/thermal/thermal_netlink.c | 1 + drivers/thermal/thermal_of.c | 1 + drivers/thermal/thermal_sysfs.c | 1 + drivers/thermal/thermal_trip.c | 1 + 15 files changed, 45 insertions(+), 28 deletions(-)
Quoted 1 line
Quoted 1 line
Applied
Sorry, I did not think you may wanted pull them in.
I can drop them from the tree if you prefer?
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Rafael J. Wysocki
maintainerQuoted 43 lines · Daniel Lezcano
Quoted 41 lines · Rafael J. Wysocki
Quoted 39 lines · Daniel Lezcano
Quoted 36 lines · Daniel Lezcano
The series provides more changes to self-encapsulate the thermal zone device structure in order to protect wild accesses to the thermal zone device internals, especially the trip points and the locks.
The first patch adds a macro to warn at compilation time if the
thermal_core.his included in a file not belonging to the thermal core code. One warning will happen with the nvidia drivers but this is in the way to be solved.The second patch reorders the headers inclusion in the core code.
The next patches makes the int340x drivers to use the thermal trip update above and the different accessors for thermal zone structure.
Daniel Lezcano (4):
thermal/core: Hardening the self-encapsulation thermal/core: Reorder the headers inclusion thermal/drivers/int3400: Use thermal zone device wrappers thermal/drivers/int340x: Do not check the thermal zone statedrivers/thermal/gov_bang_bang.c | 1 + drivers/thermal/gov_fair_share.c | 1 + drivers/thermal/gov_power_allocator.c | 7 +-- drivers/thermal/gov_step_wise.c | 1 + drivers/thermal/gov_user_space.c | 1 + .../intel/int340x_thermal/int3400_thermal.c | 44 +++++++++---------- drivers/thermal/thermal_acpi.c | 1 + drivers/thermal/thermal_core.c | 7 +-- drivers/thermal/thermal_core.h | 4 ++ drivers/thermal/thermal_helpers.c | 1 + drivers/thermal/thermal_hwmon.c | 1 + drivers/thermal/thermal_netlink.c | 1 + drivers/thermal/thermal_of.c | 1 + drivers/thermal/thermal_sysfs.c | 1 + drivers/thermal/thermal_trip.c | 1 + 15 files changed, 45 insertions(+), 28 deletions(-)
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Applied
Sorry, I did not think you may wanted pull them in.
I can drop them from the tree if you prefer?
Let me apply them directly.
Quoted 45 lines · Rafael J. Wysocki
Quoted 43 lines · Daniel Lezcano
Quoted 41 lines · Rafael J. Wysocki
Quoted 39 lines · Daniel Lezcano
Quoted 36 lines · Daniel Lezcano
The series provides more changes to self-encapsulate the thermal zone device structure in order to protect wild accesses to the thermal zone device internals, especially the trip points and the locks.
The first patch adds a macro to warn at compilation time if the
thermal_core.his included in a file not belonging to the thermal core code. One warning will happen with the nvidia drivers but this is in the way to be solved.The second patch reorders the headers inclusion in the core code.
The next patches makes the int340x drivers to use the thermal trip update above and the different accessors for thermal zone structure.
Daniel Lezcano (4):
thermal/core: Hardening the self-encapsulation thermal/core: Reorder the headers inclusion thermal/drivers/int3400: Use thermal zone device wrappers thermal/drivers/int340x: Do not check the thermal zone state
drivers/thermal/gov_bang_bang.c| 1 +
drivers/thermal/gov_fair_share.c| 1 +
drivers/thermal/gov_power_allocator.c| 7 +--
drivers/thermal/gov_step_wise.c| 1 +
drivers/thermal/gov_user_space.c| 1 +
.../intel/int340x_thermal/int3400_thermal.c| 44 +++++++++----------
drivers/thermal/thermal_acpi.c| 1 +
drivers/thermal/thermal_core.c| 7 +--
drivers/thermal/thermal_core.h| 4 ++
drivers/thermal/thermal_helpers.c| 1 +
drivers/thermal/thermal_hwmon.c| 1 +
drivers/thermal/thermal_netlink.c| 1 +
drivers/thermal/thermal_of.c| 1 +
drivers/thermal/thermal_sysfs.c| 1 +
drivers/thermal/thermal_trip.c| 1 +
15 files changed, 45 insertions(+), 28 deletions(-)
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Applied
Sorry, I did not think you may wanted pull them in.
I can drop them from the tree if you prefer?
Let me apply them directly.
Ok
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog