Add thermal user thresholds support
v6 cover Add thermal user thresholds support
The trip points are a firmware description of the temperature limits of a specific thermal zone where we associate an action which is done by the kernel. The time resolution is low.
The userspace has to deal with a more complex thermal management based on heuristics from different information coming from different places. The logic is much more complex but based on a bigger time resolution, usually one second based.
The purpose of the userspace is to monitor the temperatures from different places and take actions. However, it can not be constantly reading the temperature to detect when a temperature threshold has been reached. This is especially bad for mobile or embedded system as that will lead to an unacceptable number of wakeup to check the temperature with nothing to do.
On the other side, the sensors are now most of the time interrupt driven. That means the thermal framework will use the temperature trip points to program the sensor to trigger an interrupt when a temperature limit is crossed.
Unfortunately, the userspace can not benefit this feature and current solutions found here and there, iow out-of-tree, are to add fake trip points in the firmware and enable the writable trip points.
This is bad for different reasons, the trip points are for in-kernel actions, the semantic of their types is used by the thermal framework and by adding trip points in the device tree is a way to overcome the current limitation but tampering with how the thermal framework is supposed to work. The writable trip points is a way to adjust a temperature limit given a specific platform if the firmware is not accurate enough and TBH it is more a debug feature from my POV.
The user thresholds mechanism is a way to have the userspace to tell thermal framework to send a notification when a temperature limit is crossed. There is no id, no hysteresis, just the temperature and the direction of the limit crossing. That means we can be notified when a temperature threshold is crossed the way up only, or the way down only or both ways. That allows to create hysteresis values if it is needed.
Those thresholds are refered as user thresholds in order to do the difference with the trip points which are similar.
An user threshold can be added, deleted or flushed. The latter means all user thresholds belonging to a thermal zone will be deleted.
When one or several user thresholds are crossed, an event is sent to the userspace.
All aforementioned actions and events lead to a notification to the userspace.
Along with the kernel changes, the thermal library has been extended to provide the different API to deal with the new user threshold netlink events and commands.
In addition, the thermal-engine skeleton uses these new API by flushing and adding user thresholds as well as getting the notification about these actions.
Overall the series has been tested with the thermal-engine skeleton and some selftests which are not part of this series.
Changelog:
V6:
- Added a comment in the parse_threshold_get() function to clarify how the size is computed (Lukasz)
- Changed comparison to check against non zero value in the __thermal_zone_discover() function (Lukasz)
V5:
- Added CAP_SYS_ADMIN needed capability when adding, deleting and flushing a threshold (Rafael)
- Remove the pid information to prevent leaking pid inside containers. Also the information is not really needed (Rafael)
- Renamed "THERMAL_GENL_ATTR_THRESHOLD_WAY" to "THERMAL_GENL_ATTR_THRESHOLD_DIRECTION". Did not used '*_DIR' as suggested initially because it can be ambiguous with 'directory' (Rafael)
- Renamed 'last_temp' to 'prev_temp' (Rafael)
- Used CLASS constructor/destructor to get / put the thermal zone's device refcount (Rafael)
- Moved locking inside thermal_thresholds_for_each() (Rafael)
- Reflected the changes above in the thermal library and the thermal engine skeleton
V4:
- Fix missing stubs when THERMAL_NETLINK=n (kernel test robot)
V3:
- the first patch of the v2 series has been merged
- Modified the description to split the information between the cover letter and the patch 1 description (Rafael)
- Made the thresholds code as part of the core (Rafael)
- Converted the thresholds into a list and directly declared in the thermal zone device structure (Rafael)
- Changed the name of the field in the thermal zone device structure to user_thresholds (Rafael)
- Added #include "thermal_thresholds.h" (Rafael)
- Combined the conditions in the function
__thermal_threshold_is_crossed (Rafael)
- Moved the function thermal_thresholds_flush() before thermal_thresholds_exit() (Rafael)
- Change thermal_thresholds_handle() to return void (Rafael)
- Move the list field on top the of the structure threshold and renamed it list_node (Rafael)
- Changed THERMAL_THRESHOLD_* notifications to THERMAL_TZ_THRESHOLD_* (Rafael)
V2:
- Compute min and max in thermal_zone_device_update() but keep the loop as it is (Rafael)
- Include slab.h to fix compilation warnings on some architectures with kmalloc and kfree (kernel test robot)
Daniel Lezcano (5):
thermal: core: Connect the threshold with the core thermal/netlink: Add the commands and the events for the thresholds tools/lib/thermal: Make more generic the command encoding function tools/lib/thermal: Add the threshold netlink ABI tools/thermal/thermal-engine: Take into account the thresholds API
drivers/thermal/thermal_core.c | 9 + drivers/thermal/thermal_netlink.c | 236 +++++++++++++++++- drivers/thermal/thermal_netlink.h | 34 +++ drivers/thermal/thermal_thresholds.c | 36 +-- drivers/thermal/thermal_thresholds.h | 2 +- include/uapi/linux/thermal.h | 27 +- tools/lib/thermal/commands.c | 177 ++++++++++++- tools/lib/thermal/events.c | 55 +++- tools/lib/thermal/include/thermal.h | 40 +++ tools/lib/thermal/libthermal.map | 5 + tools/lib/thermal/thermal.c | 17 ++ tools/thermal/lib/Makefile | 2 +- tools/thermal/thermal-engine/thermal-engine.c | 105 +++++++- 13 files changed, 681 insertions(+), 64 deletions(-)
Signature · 1 line
2.43.0
PATCH v6 1/5 thermal: core: Connect the threshold with the core
Initialize, de-initialize and handle the threshold in the same place than the trip points.
--- drivers/thermal/thermal_core.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/thermal/thermal_core.c +9 -0
@@ -585,6 +585,8 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz, high = td->threshold; } +thermal_thresholds_handle (tz, &low, &high); +thermal_zone_set_trips (tz, low, high);list_sort (NULL , &way_up_list, thermal_trip_notify_cmp);
@@ -1491,6 +1493,10 @@ thermal_zone_device_register_with_trips(const char *type, goto unregister; } + result =thermal_thresholds_init (tz); +if (result) + goto remove_hwmon; +mutex_lock (&thermal_list_lock);mutex_lock (&tz->lock);
@@ -1514,6 +1520,8 @@ thermal_zone_device_register_with_trips(const char *type,return tz; +remove_hwmon: +thermal_remove_hwmon_sysfs (tz); unregister:device_del (&tz->device); release_device:
@@ -1601,6 +1609,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)thermal_set_governor (tz,NULL ); +thermal_thresholds_exit (tz);thermal_remove_hwmon_sysfs (tz);ida_free (&thermal_tz_ida, tz->id);ida_destroy (&tz->ida);
Signature · 1 line
2.43.0
Re: [PATCH v6 1/5] thermal: core: Connect the threshold with the core
Quoted 25 lines · Daniel Lezcano
Initialize, de-initialize and handle the threshold in the same place than the trip points.
Signed-off-by Daniel Lezcano <[email protected]>[ rjw: Subject edit ]Signed-off-by Rafael J. Wysocki <[email protected]>--- drivers/thermal/thermal_core.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/thermal/thermal_core.c +2
-0@@ -585,6 +585,8 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz, high = td->threshold; } +thermal_thresholds_handle (tz, &low, &high); +thermal_zone_set_trips (tz, low, high);list_sort (NULL , &way_up_list, thermal_trip_notify_cmp);
drivers/thermal/thermal_core.c thermal_zone_device_register_with_trips(const char *type, · line 1499
Quoted 7 lines
drivers/thermal/thermal_core.c +4
-0@@ -1491,6 +1493,10 @@ thermal_zone_device_register_with_trips(const char *type, goto unregister; } + result =thermal_thresholds_init (tz); +if (result) + goto remove_hwmon; +
AFAICS the function thermal_thresholds_init() cannot fail.
It always returns 0. So compiler+linker will remove that check anyway. Therefore, I would remove the check in this code. Or maybe you have some other plans in near future to that init
function...
drivers/thermal/thermal_core.c thermal_zone_device_register_with_trips(const char *type, · line 1524
Quoted 9 lines
drivers/thermal/thermal_core.c +2
-0mutex_lock (&thermal_list_lock);mutex_lock (&tz->lock);@@ -1514,6 +1520,8 @@ thermal_zone_device_register_with_trips(const char *type,return tz; +remove_hwmon: +thermal_remove_hwmon_sysfs (tz);
So remove this line as well, since it cannot happen. Although, it's a minor so up to you.
drivers/thermal/thermal_core.c void thermal_zone_device_unregister(struct thermal_zone_device *tz) · line 1615
Quoted 11 lines
drivers/thermal/thermal_core.c +1
-0unregister:device_del (&tz->device); release_device:@@ -1601,6 +1609,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)thermal_set_governor (tz,NULL ); +thermal_thresholds_exit (tz);thermal_remove_hwmon_sysfs (tz);ida_free (&thermal_tz_ida, tz->id);ida_destroy (&tz->ida);
Other than that, since no functional issues
Re: [PATCH v6 1/5] thermal: core: Connect the threshold with the core
Quoted 31 lines · Lukasz Luba
Quoted 28 lines · Daniel Lezcano
Initialize, de-initialize and handle the threshold in the same place than the trip points.
Signed-off-by Daniel Lezcano <[email protected]>[ rjw: Subject edit ]Signed-off-by Rafael J. Wysocki <[email protected]>---
drivers/thermal/thermal_core.c| 9 +++++++++1 file changed, 9 insertions(+)drivers/thermal/thermal_core.c +3
-0@@ -585,6 +585,8 @@ void __thermal_zone_device_update(structthermal_zone_device *tz, high = td->threshold; } + thermal_thresholds_handle(tz, &low, &high); + thermal_zone_set_trips(tz, low, high); list_sort(NULL, &way_up_list, thermal_trip_notify_cmp);@@ -1491,6 +1493,10 @@ thermal_zone_device_register_with_trips(constchar *type, goto unregister; } + result = thermal_thresholds_init(tz);
Quoted 8 lines
drivers/thermal/thermal_core.c thermal_zone_device_register_with_trips(const char *type, · line 1499
Quoted 3 lines
drivers/thermal/thermal_core.c +3
-0+ if (result) + goto remove_hwmon; +AFAICS the function
thermal_thresholds_init()cannot fail.
It always returns 0. So compiler+linker will remove that check anyway. Therefore, I would remove the check in this code. Or maybe you have some other plans in near future to that init
function...
Yes, right. However, it is how I wrote the code. If the call site returns an error then the called functions must return an error.
That way the code handling the error is already there and when the underlying functions change their logic with a possible error then the call site is not impacted.
That makes the code more maintainable for external contributions and as you mentioned the compiler is smart enough to optimize the path so there is no performance penalty.
Quoted 25 lines
drivers/thermal/thermal_core.c thermal_zone_device_register_with_trips(const · line 1523
Quoted 7 lines
drivers/thermal/thermal_core.c +2
-0mutex_lock(&thermal_list_lock); mutex_lock(&tz->lock);@@ -1514,6 +1520,8 @@ thermal_zone_device_register_with_trips(constchar *type, return tz; +remove_hwmon: + thermal_remove_hwmon_sysfs(tz);So remove this line as well, since it cannot happen. Although, it's a minor so up to you.
drivers/thermal/thermal_core.c void thermal_zone_device_unregister(struct · line 1614
Quoted 10 lines
unregister:
device_del(&tz->device);
release_device:drivers/thermal/thermal_core.c +1
-0@@ -1601,6 +1609,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) thermal_set_governor(tz, NULL); + thermal_thresholds_exit(tz); thermal_remove_hwmon_sysfs(tz); ida_free(&thermal_tz_ida, tz->id); ida_destroy(&tz->ida);Other than that, since no functional issues
Reviewed-by Lukasz Luba <[email protected]>
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
PATCH v6 2/5 thermal/netlink: Add the commands and the events for the thresholds
In reply to Daniel LezcanoThe thresholds exist but there is no notification neither action code related to them yet.
These changes implement the netlink for the notifications when the thresholds are crossed, added, deleted or flushed as well as the commands which allows to get the list of the thresholds, flush them, add and delete.
--- drivers/thermal/thermal_netlink.c | 236 ++++++++++++++++++++++++++- drivers/thermal/thermal_netlink.h | 34 ++++ drivers/thermal/thermal_thresholds.c | 36 ++-- drivers/thermal/thermal_thresholds.h | 2 +- include/uapi/linux/thermal.h | 27 ++- 5 files changed, 307 insertions(+), 28 deletions(-)
drivers/thermal/thermal_netlink.c +230 -6
@@ -9,6 +9,7 @@#include <linux/module.h> #include <linux/notifier.h> #include <linux/kernel.h> +#include <net/sock.h> #include <net/genetlink.h> #include <uapi/linux/thermal.h>
@@ -49,6 +50,11 @@ static const struct nla_policy thermal_genl_policy[THERMAL_GENL_ATTR_MAX + 1] = [THERMAL_GENL_ATTR_CPU_CAPABILITY_ID] = { .type = NLA_U32 }, [THERMAL_GENL_ATTR_CPU_CAPABILITY_PERFORMANCE] = { .type = NLA_U32 }, [THERMAL_GENL_ATTR_CPU_CAPABILITY_EFFICIENCY ] = { .type =NLA_U32 }, + + /* Thresholds */ + [THERMAL_GENL_ATTR_THRESHOLD] = { .type = NLA_NESTED }, + [THERMAL_GENL_ATTR_THRESHOLD_TEMP] = { .type = NLA_U32 }, + [THERMAL_GENL_ATTR_THRESHOLD_DIRECTION] = { .type = NLA_U32 }, };struct param {
@@ -62,6 +68,8 @@ struct param {int trip_type;int trip_hyst;int temp; +int prev_temp; +int direction;int cdev_state;int cdev_max_state;struct thermal_genl_cpu_caps *cpu_capabilities;
@@ -234,6 +242,34 @@ static int thermal_genl_event_cpu_capability_change(struct param *p)return -EMSGSIZE ; } +static int thermal_genl_event_threshold_add (struct param *p) +{ +if (nla_put_u32 (p->msg,THERMAL_GENL_ATTR_TZ_ID , p->tz_id) || +nla_put_u32 (p->msg,THERMAL_GENL_ATTR_THRESHOLD_TEMP , p->temp) || +nla_put_u32 (p->msg,THERMAL_GENL_ATTR_THRESHOLD_DIRECTION , p->direction)) +return -EMSGSIZE ; + +return 0 ; +} + +static int thermal_genl_event_threshold_flush (struct param *p) +{ +if (nla_put_u32 (p->msg,THERMAL_GENL_ATTR_TZ_ID , p->tz_id)) +return -EMSGSIZE ; + +return 0 ; +} + +static int thermal_genl_event_threshold_up (struct param *p) +{ +if (nla_put_u32 (p->msg,THERMAL_GENL_ATTR_TZ_ID , p->tz_id) || +nla_put_u32 (p->msg,THERMAL_GENL_ATTR_TZ_PREV_TEMP , p->prev_temp) || +nla_put_u32 (p->msg,THERMAL_GENL_ATTR_TZ_TEMP , p->temp)) +return -EMSGSIZE ; + +return 0 ; +} +int thermal_genl_event_tz_delete (struct param *p) __attribute__((alias ("thermal_genl_event_tz" )));
@@ -246,6 +282,12 @@ int thermal_genl_event_tz_disable(struct param *p)int thermal_genl_event_tz_trip_down (struct param *p) __attribute__((alias ("thermal_genl_event_tz_trip_up" ))); +int thermal_genl_event_threshold_delete (struct param *p) + __attribute__((alias ("thermal_genl_event_threshold_add" ))); + +int thermal_genl_event_threshold_down (struct param *p) + __attribute__((alias ("thermal_genl_event_threshold_up" ))); +static cb_t event_cb[] = { [THERMAL_GENL_EVENT_TZ_CREATE ] = thermal_genl_event_tz_create, [THERMAL_GENL_EVENT_TZ_DELETE ] = thermal_genl_event_tz_delete,
@@ -259,6 +301,11 @@ static cb_t event_cb[] = { [THERMAL_GENL_EVENT_CDEV_STATE_UPDATE] = thermal_genl_event_cdev_state_update, [THERMAL_GENL_EVENT_TZ_GOV_CHANGE] = thermal_genl_event_gov_change, [THERMAL_GENL_EVENT_CPU_CAPABILITY_CHANGE] = thermal_genl_event_cpu_capability_change, + [THERMAL_GENL_EVENT_THRESHOLD_ADD] = thermal_genl_event_threshold_add, + [THERMAL_GENL_EVENT_THRESHOLD_DELETE] = thermal_genl_event_threshold_delete, + [THERMAL_GENL_EVENT_THRESHOLD_FLUSH] = thermal_genl_event_threshold_flush, + [THERMAL_GENL_EVENT_THRESHOLD_DOWN] = thermal_genl_event_threshold_down, + [THERMAL_GENL_EVENT_THRESHOLD_UP] = thermal_genl_event_threshold_up, };/*
@@ -401,6 +448,43 @@ int thermal_genl_cpu_capability_event(int count, }EXPORT_SYMBOL_GPL (thermal_genl_cpu_capability_event); +int thermal_notify_threshold_add (const struct thermal_zone_device *tz, +int temperature,int direction) +{ +struct param p = { .tz_id = tz->id, .temp = temperature, .direction = direction }; + +return thermal_genl_send_event (THERMAL_GENL_EVENT_THRESHOLD_ADD , &p); +} + +int thermal_notify_threshold_delete (const struct thermal_zone_device *tz, +int temperature,int direction) +{ +struct param p = { .tz_id = tz->id, .temp = temperature, .direction = direction }; + +return thermal_genl_send_event (THERMAL_GENL_EVENT_THRESHOLD_DELETE , &p); +} + +int thermal_notify_threshold_flush (const struct thermal_zone_device *tz) +{ +struct param p = { .tz_id = tz->id }; + +return thermal_genl_send_event (THERMAL_GENL_EVENT_THRESHOLD_FLUSH , &p); +} + +int thermal_notify_threshold_down (const struct thermal_zone_device *tz) +{ +struct param p = { .tz_id = tz->id, .temp = tz->temperature, .prev_temp = tz->last_temperature }; + +return thermal_genl_send_event (THERMAL_GENL_EVENT_THRESHOLD_DOWN , &p); +} + +int thermal_notify_threshold_up (const struct thermal_zone_device *tz) +{ +struct param p = { .tz_id = tz->id, .temp = tz->temperature, .prev_temp = tz->last_temperature }; + +return thermal_genl_send_event (THERMAL_GENL_EVENT_THRESHOLD_UP , &p); +} +/*************************** Command encoding ********************************/ static int __thermal_genl_cmd_tz_get_id(struct thermal_zone_device *tz,
@@ -572,12 +656,132 @@ static int thermal_genl_cmd_cdev_get(struct param *p)return ret; } +static int __thermal_genl_cmd_threshold_get (struct user_threshold *threshold,void *arg) +{ +struct sk_buff *msg = arg; + +if (nla_put_u32 (msg,THERMAL_GENL_ATTR_THRESHOLD_TEMP , threshold->temperature) || +nla_put_u32 (msg,THERMAL_GENL_ATTR_THRESHOLD_DIRECTION , threshold->direction)) +return -1 ; + +return 0 ; +} + +static int thermal_genl_cmd_threshold_get (struct param *p) +{ +struct sk_buff *msg = p->msg; +struct nlattr *start_trip; +int id, ret; + +if (!p->attrs[THERMAL_GENL_ATTR_TZ_ID ]) +return -EINVAL ; + + id =nla_get_u32 (p->attrs[THERMAL_GENL_ATTR_TZ_ID ]); + +CLASS (thermal_zone_get_by_id, tz)(id); +if (!tz) +return -EINVAL ; + + start_trip =nla_nest_start (msg,THERMAL_GENL_ATTR_THRESHOLD ); +if (!start_trip) +return -EMSGSIZE ; + + ret =thermal_thresholds_for_each (tz, __thermal_genl_cmd_threshold_get, msg); +if (ret) +return -EMSGSIZE ; + +nla_nest_end (msg, start_trip); + +return 0 ; +} + +static int thermal_genl_cmd_threshold_add (struct param *p) +{ +int id, temp, direction, ret =0 ; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + +if (!p->attrs[THERMAL_GENL_ATTR_TZ_ID ] || + !p->attrs[THERMAL_GENL_ATTR_THRESHOLD_TEMP ] || + !p->attrs[THERMAL_GENL_ATTR_THRESHOLD_DIRECTION ]) +return -EINVAL ; + + id =nla_get_u32 (p->attrs[THERMAL_GENL_ATTR_TZ_ID ]); + temp =nla_get_u32 (p->attrs[THERMAL_GENL_ATTR_THRESHOLD_TEMP ]); + direction =nla_get_u32 (p->attrs[THERMAL_GENL_ATTR_THRESHOLD_DIRECTION ]); + +CLASS (thermal_zone_get_by_id, tz)(id); +if (!tz) +return -EINVAL ; + +mutex_lock (&tz->lock); + ret =thermal_thresholds_add (tz, temp, direction); +mutex_unlock (&tz->lock); + +return ret; +} + +static int thermal_genl_cmd_threshold_delete (struct param *p) +{ +int id, temp, direction, ret =0 ; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + +if (!p->attrs[THERMAL_GENL_ATTR_TZ_ID ] || + !p->attrs[THERMAL_GENL_ATTR_THRESHOLD_TEMP ] || + !p->attrs[THERMAL_GENL_ATTR_THRESHOLD_DIRECTION ]) +return -EINVAL ; + + id =nla_get_u32 (p->attrs[THERMAL_GENL_ATTR_TZ_ID ]); + temp =nla_get_u32 (p->attrs[THERMAL_GENL_ATTR_THRESHOLD_TEMP ]); + direction =nla_get_u32 (p->attrs[THERMAL_GENL_ATTR_THRESHOLD_DIRECTION ]); + +CLASS (thermal_zone_get_by_id, tz)(id); +if (!tz) +return -EINVAL ; + +mutex_lock (&tz->lock); + ret =thermal_thresholds_delete (tz, temp, direction); +mutex_unlock (&tz->lock); + +return ret; +} + +static int thermal_genl_cmd_threshold_flush (struct param *p) +{ +int id; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + +if (!p->attrs[THERMAL_GENL_ATTR_TZ_ID ]) +return -EINVAL ; + + id =nla_get_u32 (p->attrs[THERMAL_GENL_ATTR_TZ_ID ]); + +CLASS (thermal_zone_get_by_id, tz)(id); +if (!tz) +return -EINVAL ; + +mutex_lock (&tz->lock); +thermal_thresholds_flush (tz); +mutex_unlock (&tz->lock); + +return 0 ; +} +static cb_t cmd_cb[] = { - [THERMAL_GENL_CMD_TZ_GET_ID ] = thermal_genl_cmd_tz_get_id, - [THERMAL_GENL_CMD_TZ_GET_TRIP ] = thermal_genl_cmd_tz_get_trip, - [THERMAL_GENL_CMD_TZ_GET_TEMP ] = thermal_genl_cmd_tz_get_temp, - [THERMAL_GENL_CMD_TZ_GET_GOV ] = thermal_genl_cmd_tz_get_gov, - [THERMAL_GENL_CMD_CDEV_GET ] = thermal_genl_cmd_cdev_get, + [THERMAL_GENL_CMD_TZ_GET_ID ] = thermal_genl_cmd_tz_get_id, + [THERMAL_GENL_CMD_TZ_GET_TRIP ] = thermal_genl_cmd_tz_get_trip, + [THERMAL_GENL_CMD_TZ_GET_TEMP ] = thermal_genl_cmd_tz_get_temp, + [THERMAL_GENL_CMD_TZ_GET_GOV ] = thermal_genl_cmd_tz_get_gov, + [THERMAL_GENL_CMD_CDEV_GET ] = thermal_genl_cmd_cdev_get, + [THERMAL_GENL_CMD_THRESHOLD_GET ] = thermal_genl_cmd_threshold_get, + [THERMAL_GENL_CMD_THRESHOLD_ADD ] = thermal_genl_cmd_threshold_add, + [THERMAL_GENL_CMD_THRESHOLD_DELETE ] = thermal_genl_cmd_threshold_delete, + [THERMAL_GENL_CMD_THRESHOLD_FLUSH ] = thermal_genl_cmd_threshold_flush, }; static int thermal_genl_cmd_dumpit(struct sk_buff *skb,
@@ -688,6 +892,26 @@ static const struct genl_small_ops thermal_genl_ops[] = { .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .dumpit = thermal_genl_cmd_dumpit, }, + { + .cmd = THERMAL_GENL_CMD_THRESHOLD_GET, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .doit = thermal_genl_cmd_doit, + }, + { + .cmd = THERMAL_GENL_CMD_THRESHOLD_ADD, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .doit = thermal_genl_cmd_doit, + }, + { + .cmd = THERMAL_GENL_CMD_THRESHOLD_DELETE, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .doit = thermal_genl_cmd_doit, + }, + { + .cmd = THERMAL_GENL_CMD_THRESHOLD_FLUSH, + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, + .doit = thermal_genl_cmd_doit, + }, }; static struct genl_family thermal_genl_family __ro_after_init = {
@@ -700,7 +924,7 @@ static struct genl_family thermal_genl_family __ro_after_init = { .unbind = thermal_genl_unbind, .small_ops = thermal_genl_ops, .n_small_ops = ARRAY_SIZE(thermal_genl_ops), - .resv_start_op = THERMAL_GENL_CMD_CDEV_GET + 1, + .resv_start_op = __THERMAL_GENL_CMD_MAX, .mcgrps = thermal_genl_mcgrps, .n_mcgrps = ARRAY_SIZE(thermal_genl_mcgrps), };
drivers/thermal/thermal_netlink.h +34 -0
@@ -53,6 +53,13 @@ int thermal_notify_tz_gov_change(const struct thermal_zone_device *tz,int thermal_genl_sampling_temp (int id,int temp);int thermal_genl_cpu_capability_event (int count,struct thermal_genl_cpu_caps *caps); +int thermal_notify_threshold_add (const struct thermal_zone_device *tz, +int temperature,int direction); +int thermal_notify_threshold_delete (const struct thermal_zone_device *tz, +int temperature,int direction); +int thermal_notify_threshold_flush (const struct thermal_zone_device *tz); +int thermal_notify_threshold_down (const struct thermal_zone_device *tz); +int thermal_notify_threshold_up (const struct thermal_zone_device *tz);#else static inline int thermal_netlink_init (void ) {
@@ -139,6 +146,33 @@ static inline int thermal_genl_cpu_capability_event(int count, struct thermal_ge return 0; } +static inline int thermal_notify_threshold_add (const struct thermal_zone_device *tz, +int temperature,int direction) +{ +return 0 ; +} + +static inline int thermal_notify_threshold_delete (const struct thermal_zone_device *tz, +int temperature,int direction) +{ +return 0 ; +} + +static inline int thermal_notify_threshold_flush (const struct thermal_zone_device *tz) +{ +return 0 ; +} + +static inline int thermal_notify_threshold_down (const struct thermal_zone_device *tz) +{ +return 0 ; +} + +static inline int thermal_notify_threshold_up (const struct thermal_zone_device *tz) +{ +return 0 ; +} +static inline void __init thermal_netlink_exit (void ) {}#endif /* CONFIG_THERMAL_NETLINK */
drivers/thermal/thermal_thresholds.c +22 -14
@@ -32,6 +32,8 @@ void thermal_thresholds_flush(struct thermal_zone_device *tz)kfree (entry); } +thermal_notify_threshold_flush (tz); +__thermal_zone_device_update (tz,THERMAL_TZ_FLUSH_THRESHOLDS ); }
@@ -122,7 +124,6 @@ void thermal_thresholds_handle(struct thermal_zone_device *tz, int *low, int *hiint temperature = tz->temperature;int last_temperature = tz->last_temperature; -bool notify;lockdep_assert_held (&tz->lock);
@@ -144,19 +145,19 @@ void thermal_thresholds_handle(struct thermal_zone_device *tz, int *low, int *hi* - increased : thresholds are crossed the way up * - decreased : thresholds are crossed the way down */ -if (temperature > last_temperature) - notify =thermal_thresholds_handle_raising (thresholds, temperature, - last_temperature, low, high); -else - notify =thermal_thresholds_handle_dropping (thresholds, temperature, - last_temperature, low, high); - -if (notify) -pr_debug ("A threshold has been crossed the way %s, with a temperature=%d, last_temperature=%d\n" , - temperature > last_temperature ?"up" :"down" , temperature, last_temperature); +if (temperature > last_temperature) { +if (thermal_thresholds_handle_raising (thresholds, temperature, + last_temperature, low, high)) +thermal_notify_threshold_up (tz); + }else { +if (thermal_thresholds_handle_dropping (thresholds, temperature, + last_temperature, low, high)) +thermal_notify_threshold_down (tz); + } } -int thermal_thresholds_add (struct thermal_zone_device *tz,int temperature,int direction) +int thermal_thresholds_add (struct thermal_zone_device *tz, +int temperature,int direction) {struct list_head *thresholds = &tz->user_thresholds;struct user_threshold *t;
@@ -182,12 +183,15 @@ int thermal_thresholds_add(struct thermal_zone_device *tz, int temperature, intlist_sort (NULL , thresholds, __thermal_thresholds_cmp); } +thermal_notify_threshold_add (tz, temperature, direction); +__thermal_zone_device_update (tz,THERMAL_TZ_ADD_THRESHOLD );return 0 ; } -int thermal_thresholds_delete (struct thermal_zone_device *tz,int temperature,int direction) +int thermal_thresholds_delete (struct thermal_zone_device *tz, +int temperature,int direction) {struct list_head *thresholds = &tz->user_thresholds;struct user_threshold *t;
@@ -205,6 +209,8 @@ int thermal_thresholds_delete(struct thermal_zone_device *tz, int temperature, i t->direction &= ~direction; } +thermal_notify_threshold_delete (tz, temperature, direction); +__thermal_zone_device_update (tz,THERMAL_TZ_DEL_THRESHOLD );return 0 ;
@@ -217,7 +223,7 @@ int thermal_thresholds_for_each(struct thermal_zone_device *tz,struct user_threshold *entry;int ret; -lockdep_assert_held (&tz->lock); +mutex_lock (&tz->lock);list_for_each_entry (entry, thresholds, list_node) { ret =cb (entry, arg);
@@ -225,5 +231,7 @@ int thermal_thresholds_for_each(struct thermal_zone_device *tz,return ret; } +mutex_unlock (&tz->lock); +return 0 ; }
drivers/thermal/thermal_thresholds.h +1 -1
@@ -10,8 +10,8 @@ struct user_threshold {int thermal_thresholds_init (struct thermal_zone_device *tz);void thermal_thresholds_exit (struct thermal_zone_device *tz); -void thermal_thresholds_flush (struct thermal_zone_device *tz);void thermal_thresholds_handle (struct thermal_zone_device *tz,int *low,int *high); +void thermal_thresholds_flush (struct thermal_zone_device *tz);int thermal_thresholds_add (struct thermal_zone_device *tz,int temperature,int direction);int thermal_thresholds_delete (struct thermal_zone_device *tz,int temperature,int direction); int thermal_thresholds_for_each(struct thermal_zone_device *tz,
include/uapi/linux/thermal.h +20 -7
@@ -20,7 +20,7 @@ enum thermal_trip_type {/* Adding event notification support elements */ #define THERMAL_GENL_FAMILY_NAME "thermal" -#define THERMAL_GENL_VERSION 0x01 +#define THERMAL_GENL_VERSION 0x02#define THERMAL_GENL_SAMPLING_GROUP_NAME "sampling"#define THERMAL_GENL_EVENT_GROUP_NAME "event"
@@ -30,6 +30,7 @@ enum thermal_genl_attr {THERMAL_GENL_ATTR_TZ ,THERMAL_GENL_ATTR_TZ_ID ,THERMAL_GENL_ATTR_TZ_TEMP , +THERMAL_GENL_ATTR_TZ_PREV_TEMP ,THERMAL_GENL_ATTR_TZ_TRIP ,THERMAL_GENL_ATTR_TZ_TRIP_ID , THERMAL_GENL_ATTR_TZ_TRIP_TYPE,
@@ -50,6 +51,9 @@ enum thermal_genl_attr {THERMAL_GENL_ATTR_CPU_CAPABILITY_ID ,THERMAL_GENL_ATTR_CPU_CAPABILITY_PERFORMANCE ,THERMAL_GENL_ATTR_CPU_CAPABILITY_EFFICIENCY , +THERMAL_GENL_ATTR_THRESHOLD , +THERMAL_GENL_ATTR_THRESHOLD_TEMP , +THERMAL_GENL_ATTR_THRESHOLD_DIRECTION , __THERMAL_GENL_ATTR_MAX, };#define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)
@@ -77,6 +81,11 @@ enum thermal_genl_event {THERMAL_GENL_EVENT_CDEV_STATE_UPDATE ,/* Cdev state updated */ THERMAL_GENL_EVENT_TZ_GOV_CHANGE ,/* Governor policy changed */ THERMAL_GENL_EVENT_CPU_CAPABILITY_CHANGE ,/* CPU capability changed */ +THERMAL_GENL_EVENT_THRESHOLD_ADD ,/* A thresold has been added */ +THERMAL_GENL_EVENT_THRESHOLD_DELETE ,/* A thresold has been deleted */ +THERMAL_GENL_EVENT_THRESHOLD_FLUSH ,/* All thresolds have been deleted */ +THERMAL_GENL_EVENT_THRESHOLD_UP ,/* A thresold has been crossed the way up */ +THERMAL_GENL_EVENT_THRESHOLD_DOWN ,/* A thresold has been crossed the way down */ __THERMAL_GENL_EVENT_MAX, };#define THERMAL_GENL_EVENT_MAX (__THERMAL_GENL_EVENT_MAX - 1)
@@ -84,12 +93,16 @@ enum thermal_genl_event {/* Commands supported by the thermal_genl_family */ enum thermal_genl_cmd {THERMAL_GENL_CMD_UNSPEC , -THERMAL_GENL_CMD_TZ_GET_ID ,/* List of thermal zones id */ -THERMAL_GENL_CMD_TZ_GET_TRIP ,/* List of thermal trips */ -THERMAL_GENL_CMD_TZ_GET_TEMP ,/* Get the thermal zone temperature */ -THERMAL_GENL_CMD_TZ_GET_GOV ,/* Get the thermal zone governor */ -THERMAL_GENL_CMD_TZ_GET_MODE ,/* Get the thermal zone mode */ -THERMAL_GENL_CMD_CDEV_GET ,/* List of cdev id */ +THERMAL_GENL_CMD_TZ_GET_ID ,/* List of thermal zones id */ +THERMAL_GENL_CMD_TZ_GET_TRIP ,/* List of thermal trips */ +THERMAL_GENL_CMD_TZ_GET_TEMP ,/* Get the thermal zone temperature */ +THERMAL_GENL_CMD_TZ_GET_GOV ,/* Get the thermal zone governor */ +THERMAL_GENL_CMD_TZ_GET_MODE ,/* Get the thermal zone mode */ +THERMAL_GENL_CMD_CDEV_GET ,/* List of cdev id */ +THERMAL_GENL_CMD_THRESHOLD_GET ,/* List of thresholds */ +THERMAL_GENL_CMD_THRESHOLD_ADD ,/* Add a threshold */ +THERMAL_GENL_CMD_THRESHOLD_DELETE ,/* Delete a threshold */ +THERMAL_GENL_CMD_THRESHOLD_FLUSH ,/* Flush all the thresholds */ __THERMAL_GENL_CMD_MAX, };#define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
Signature · 1 line
2.43.0
PATCH v6 3/5 tools/lib/thermal: Make more generic the command encoding function
In reply to Daniel LezcanoThe thermal netlink has been extended with more commands which require an encoding with more information. The generic encoding function puts the thermal zone id with the command name. It is the unique parameters.
The next changes will provide more parameters to the command. Set the scene for those new parameters by making the encoding function more generic.
--- tools/lib/thermal/commands.c | 41 ++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 9 deletions(-)
tools/lib/thermal/commands.c +32 -9
@@ -261,8 +261,23 @@ static struct genl_ops thermal_cmd_ops = { .o_ncmds = ARRAY_SIZE(thermal_cmds), }; -static thermal_error_t thermal_genl_auto (struct thermal_handler *th,int id,int cmd, -int flags,void *arg) +struct cmd_param { +int tz_id; +}; + +typedef int (*cmd_cb_t )(struct nl_msg *,struct cmd_param *); + +static int thermal_genl_tz_id_encode (struct nl_msg *msg,struct cmd_param *p) +{ +if (p->tz_id >=0 &&nla_put_u32 (msg,THERMAL_GENL_ATTR_TZ_ID , p->tz_id)) +return -1 ; + +return 0 ; +} + +static thermal_error_t thermal_genl_auto (struct thermal_handler *th,cmd_cb_t cmd_cb, +struct cmd_param *param, +int cmd,int flags,void *arg) {struct nl_msg *msg;void *hdr;
@@ -276,7 +291,7 @@ static thermal_error_t thermal_genl_auto(struct thermal_handler *th, int id, intif (!hdr)return THERMAL_ERROR ; -if (id >=0 &&nla_put_u32 (msg,THERMAL_GENL_ATTR_TZ_ID , id)) +if (cmd_cb &&cmd_cb (msg, param))return THERMAL_ERROR ;if (nl_send_msg (th->sk_cmd, th->cb_cmd, msg, genl_handle_msg, arg))
@@ -289,30 +304,38 @@ static thermal_error_t thermal_genl_auto(struct thermal_handler *th, int id, intthermal_error_t thermal_cmd_get_tz (struct thermal_handler *th,struct thermal_zone **tz) { -return thermal_genl_auto (th,-1 ,THERMAL_GENL_CMD_TZ_GET_ID , +return thermal_genl_auto (th,NULL ,NULL ,THERMAL_GENL_CMD_TZ_GET_ID ,NLM_F_DUMP |NLM_F_ACK , tz); }thermal_error_t thermal_cmd_get_cdev (struct thermal_handler *th,struct thermal_cdev **tc) { -return thermal_genl_auto (th,-1 ,THERMAL_GENL_CMD_CDEV_GET , +return thermal_genl_auto (th,NULL ,NULL ,THERMAL_GENL_CMD_CDEV_GET ,NLM_F_DUMP |NLM_F_ACK , tc); }thermal_error_t thermal_cmd_get_trip (struct thermal_handler *th,struct thermal_zone *tz) { -return thermal_genl_auto (th, tz->id,THERMAL_GENL_CMD_TZ_GET_TRIP , -0 , tz); +struct cmd_param p = { .tz_id = tz->id }; + +return thermal_genl_auto (th, thermal_genl_tz_id_encode, &p, +THERMAL_GENL_CMD_TZ_GET_TRIP ,0 , tz); }thermal_error_t thermal_cmd_get_governor (struct thermal_handler *th,struct thermal_zone *tz) { -return thermal_genl_auto (th, tz->id,THERMAL_GENL_CMD_TZ_GET_GOV ,0 , tz); +struct cmd_param p = { .tz_id = tz->id }; + +return thermal_genl_auto (th, thermal_genl_tz_id_encode, &p, +THERMAL_GENL_CMD_TZ_GET_GOV ,0 , tz); }thermal_error_t thermal_cmd_get_temp (struct thermal_handler *th,struct thermal_zone *tz) { -return thermal_genl_auto (th, tz->id,THERMAL_GENL_CMD_TZ_GET_TEMP ,0 , tz); +struct cmd_param p = { .tz_id = tz->id }; + +return thermal_genl_auto (th, thermal_genl_tz_id_encode, &p, +THERMAL_GENL_CMD_TZ_GET_TEMP ,0 , tz); }thermal_error_t thermal_cmd_exit (struct thermal_handler *th)
Signature · 1 line
2.43.0
PATCH v6 4/5 tools/lib/thermal: Add the threshold netlink ABI
In reply to Daniel LezcanoThe thermal framework supports the thresholds and allows the userspace to create, delete, flush, get the list of the thresholds as well as getting the list of the thresholds set for a specific thermal zone.
Add the netlink abstraction in the thermal library to take full advantage of thresholds for the userspace program.
--- tools/lib/thermal/commands.c | 138 +++++++++++++++++++++++++++- tools/lib/thermal/events.c | 55 ++++++++--- tools/lib/thermal/include/thermal.h | 40 ++++++++ tools/lib/thermal/libthermal.map | 5 + tools/lib/thermal/thermal.c | 17 ++++ tools/thermal/lib/Makefile | 2 +- 6 files changed, 242 insertions(+), 15 deletions(-)
tools/lib/thermal/commands.c +137 -1
@@ -5,6 +5,7 @@#include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <limits.h> #include <thermal.h> #include "thermal_nl.h"
@@ -33,6 +34,11 @@ static struct nla_policy thermal_genl_policy[THERMAL_GENL_ATTR_MAX + 1] = { [THERMAL_GENL_ATTR_CDEV_CUR_STATE] = { .type = NLA_U32 }, [THERMAL_GENL_ATTR_CDEV_MAX_STATE] = { .type = NLA_U32 }, [THERMAL_GENL_ATTR_CDEV_NAME] = { .type = NLA_STRING }, + +/* Thresholds */ + [THERMAL_GENL_ATTR_THRESHOLD] = { .type = NLA_NESTED }, + [THERMAL_GENL_ATTR_THRESHOLD_TEMP] = { .type = NLA_U32 }, + [THERMAL_GENL_ATTR_THRESHOLD_DIRECTION] = { .type = NLA_U32 }, };static int parse_tz_get (struct genl_info *info,struct thermal_zone **tz)
@@ -182,6 +188,48 @@ static int parse_tz_get_gov(struct genl_info *info, struct thermal_zone *tz)return THERMAL_SUCCESS ; } +static int parse_threshold_get (struct genl_info *info,struct thermal_zone *tz) +{ +struct nlattr *attr; +struct thermal_threshold *__tt =NULL ; +size_t size =0 ; +int rem; + +/* +* The size contains the size of the array and we want to +* access the last element, size - 1. +* +* The variable size is initialized to zero but it will be +* then incremented by the first if() statement. The message +* attributes are ordered, so the first if() statement will be +* always called before the second one. If it happens that is +* not the case, then it is a kernel bug. +*/ +nla_for_each_nested (attr, info->attrs[THERMAL_GENL_ATTR_THRESHOLD ], rem) { + +if (nla_type (attr) ==THERMAL_GENL_ATTR_THRESHOLD_TEMP ) { + + size++; + + __tt =realloc (__tt,sizeof (*__tt) * (size +2 )); +if (!__tt) +return THERMAL_ERROR ; + + __tt[size -1 ].temperature =nla_get_u32 (attr); + } + +if (nla_type (attr) ==THERMAL_GENL_ATTR_THRESHOLD_DIRECTION ) + __tt[size -1 ].direction =nla_get_u32 (attr); + } + +if (__tt) + __tt[size].temperature =INT_MAX ; + + tz->thresholds = __tt; + +return THERMAL_SUCCESS ; +} +static int handle_netlink (struct nl_cache_ops *unused,struct genl_cmd *cmd,struct genl_info *info,void *arg)
@@ -210,6 +258,10 @@ static int handle_netlink(struct nl_cache_ops *unused, ret =parse_tz_get_gov (info, arg);break ; +case THERMAL_GENL_CMD_THRESHOLD_GET : + ret =parse_threshold_get (info, arg); +break ; +default :return THERMAL_ERROR ; }
@@ -253,6 +305,34 @@ static struct genl_cmd thermal_cmds[] = { .c_maxattr = THERMAL_GENL_ATTR_MAX, .c_attr_policy = thermal_genl_policy, }, + { + .c_id = THERMAL_GENL_CMD_THRESHOLD_GET, + .c_name = (char *)"Get thresholds list", + .c_msg_parser = handle_netlink, + .c_maxattr = THERMAL_GENL_ATTR_MAX, + .c_attr_policy = thermal_genl_policy, + }, + { + .c_id = THERMAL_GENL_CMD_THRESHOLD_ADD, + .c_name = (char *)"Add a threshold", + .c_msg_parser = handle_netlink, + .c_maxattr = THERMAL_GENL_ATTR_MAX, + .c_attr_policy = thermal_genl_policy, + }, + { + .c_id = THERMAL_GENL_CMD_THRESHOLD_DELETE, + .c_name = (char *)"Delete a threshold", + .c_msg_parser = handle_netlink, + .c_maxattr = THERMAL_GENL_ATTR_MAX, + .c_attr_policy = thermal_genl_policy, + }, + { + .c_id = THERMAL_GENL_CMD_THRESHOLD_FLUSH, + .c_name = (char *)"Flush the thresholds", + .c_msg_parser = handle_netlink, + .c_maxattr = THERMAL_GENL_ATTR_MAX, + .c_attr_policy = thermal_genl_policy, + }, }; static struct genl_ops thermal_cmd_ops = {
@@ -263,13 +343,29 @@ static struct genl_ops thermal_cmd_ops = {struct cmd_param {int tz_id; +int temp; +int direction; };typedef int (*cmd_cb_t )(struct nl_msg *,struct cmd_param *);static int thermal_genl_tz_id_encode (struct nl_msg *msg,struct cmd_param *p) { -if (p->tz_id >=0 &&nla_put_u32 (msg,THERMAL_GENL_ATTR_TZ_ID , p->tz_id)) +if (nla_put_u32 (msg,THERMAL_GENL_ATTR_TZ_ID , p->tz_id)) +return -1 ; + +return 0 ; +} + +static int thermal_genl_threshold_encode (struct nl_msg *msg,struct cmd_param *p) +{ +if (thermal_genl_tz_id_encode (msg, p)) +return -1 ; + +if (nla_put_u32 (msg,THERMAL_GENL_ATTR_THRESHOLD_TEMP , p->temp)) +return -1 ; + +if (nla_put_u32 (msg,THERMAL_GENL_ATTR_THRESHOLD_DIRECTION , p->direction))return -1 ;return 0 ;
@@ -338,6 +434,46 @@ thermal_error_t thermal_cmd_get_temp(struct thermal_handler *th, struct thermal_ THERMAL_GENL_CMD_TZ_GET_TEMP, 0, tz); } +thermal_error_t thermal_cmd_threshold_get (struct thermal_handler *th, +struct thermal_zone *tz) +{ +struct cmd_param p = { .tz_id = tz->id }; + +return thermal_genl_auto (th, thermal_genl_tz_id_encode, &p, +THERMAL_GENL_CMD_THRESHOLD_GET ,0 , tz); +} + +thermal_error_t thermal_cmd_threshold_add (struct thermal_handler *th, +struct thermal_zone *tz, +int temperature, +int direction) +{ +struct cmd_param p = { .tz_id = tz->id, .temp = temperature, .direction = direction }; + +return thermal_genl_auto (th, thermal_genl_threshold_encode, &p, +THERMAL_GENL_CMD_THRESHOLD_ADD ,0 , tz); +} + +thermal_error_t thermal_cmd_threshold_delete (struct thermal_handler *th, +struct thermal_zone *tz, +int temperature, +int direction) +{ +struct cmd_param p = { .tz_id = tz->id, .temp = temperature, .direction = direction }; + +return thermal_genl_auto (th, thermal_genl_threshold_encode, &p, +THERMAL_GENL_CMD_THRESHOLD_DELETE ,0 , tz); +} + +thermal_error_t thermal_cmd_threshold_flush (struct thermal_handler *th, +struct thermal_zone *tz) +{ +struct cmd_param p = { .tz_id = tz->id }; + +return thermal_genl_auto (th, thermal_genl_tz_id_encode, &p, +THERMAL_GENL_CMD_THRESHOLD_FLUSH ,0 , tz); +} +thermal_error_t thermal_cmd_exit (struct thermal_handler *th) {if (genl_unregister_family (&thermal_cmd_ops))
tools/lib/thermal/events.c +42 -13
67 lines not on this page · raw message
tools/lib/thermal/include/thermal.h +40 -0
@@ -4,11 +4,20 @@#define __LIBTHERMAL_H#include <linux/thermal.h> +#include <sys/types.h> #ifndef LIBTHERMAL_API #define LIBTHERMAL_API __attribute__((visibility("default")))#endif +#ifndef THERMAL_THRESHOLD_WAY_UP +#define THERMAL_THRESHOLD_WAY_UP 0x1 +#endif + +#ifndef THERMAL_THRESHOLD_WAY_DOWN +#define THERMAL_THRESHOLD_WAY_DOWN 0x2 +#endif +#ifdef __cplusplusextern "C" {#endif
@@ -31,6 +40,11 @@ struct thermal_events_ops {int (*cdev_delete)(int cdev_id,void *arg);int (*cdev_update)(int cdev_id,int cur_state,void *arg);int (*gov_change)(int tz_id,const char *gov_name,void *arg); +int (*threshold_add)(int tz_id,int temperature,int direction,void *arg); +int (*threshold_delete)(int tz_id,int temperature,int direction,void *arg); +int (*threshold_flush)(int tz_id,void *arg); +int (*threshold_up)(int tz_id,int temp,int prev_temp,void *arg); +int (*threshold_down)(int tz_id,int temp,int prev_temp,void *arg); };struct thermal_ops {
@@ -45,12 +59,18 @@ struct thermal_trip {int hyst; }; +struct thermal_threshold { +int temperature; +int direction; +}; +struct thermal_zone {int id;int temp;char name[THERMAL_NAME_LENGTH ];char governor[THERMAL_NAME_LENGTH ];struct thermal_trip *trip; +struct thermal_threshold *thresholds; };struct thermal_cdev {
@@ -74,12 +94,16 @@ typedef int (*cb_tt_t)(struct thermal_trip *, void *);typedef int (*cb_tc_t )(struct thermal_cdev *,void *); +typedef int (*cb_th_t )(struct thermal_threshold *,void *); + LIBTHERMAL_API int for_each_thermal_zone(struct thermal_zone *tz, cb_tz_t cb, void *arg); LIBTHERMAL_API int for_each_thermal_trip(struct thermal_trip *tt, cb_tt_t cb, void *arg); LIBTHERMAL_API int for_each_thermal_cdev(struct thermal_cdev *cdev, cb_tc_t cb, void *arg); +LIBTHERMAL_API int for_each_thermal_threshold(struct thermal_threshold *th, cb_th_t cb, void *arg); + LIBTHERMAL_API struct thermal_zone *thermal_zone_find_by_name(struct thermal_zone *tz,const char *name);
@@ -124,6 +148,22 @@ LIBTHERMAL_API thermal_error_t thermal_cmd_get_governor(struct thermal_handler * LIBTHERMAL_API thermal_error_t thermal_cmd_get_temp(struct thermal_handler *th,struct thermal_zone *tz); +LIBTHERMAL_API thermal_error_t thermal_cmd_threshold_get(struct thermal_handler *th, +struct thermal_zone *tz); + +LIBTHERMAL_API thermal_error_t thermal_cmd_threshold_add(struct thermal_handler *th, +struct thermal_zone *tz, +int temperature, +int direction); + +LIBTHERMAL_API thermal_error_t thermal_cmd_threshold_delete(struct thermal_handler *th, +struct thermal_zone *tz, +int temperature, +int direction); + +LIBTHERMAL_API thermal_error_t thermal_cmd_threshold_flush(struct thermal_handler *th, +struct thermal_zone *tz); +/* * Netlink thermal samples */
tools/lib/thermal/libthermal.map +5 -0
@@ -4,6 +4,7 @@ LIBTHERMAL_0.0.1 { for_each_thermal_zone; for_each_thermal_trip; for_each_thermal_cdev; + for_each_thermal_threshold; thermal_zone_find_by_name; thermal_zone_find_by_id; thermal_zone_discover;
@@ -17,6 +18,10 @@ LIBTHERMAL_0.0.1 { thermal_cmd_get_trip; thermal_cmd_get_governor; thermal_cmd_get_temp; + thermal_cmd_threshold_get; + thermal_cmd_threshold_add; + thermal_cmd_threshold_delete; + thermal_cmd_threshold_flush; thermal_sampling_init; thermal_sampling_handle; thermal_sampling_fd;
tools/lib/thermal/thermal.c +17 -0
@@ -1,10 +1,24 @@// SPDX-License-Identifier: LGPL-2.1+ // Copyright (C) 2022, Linaro Ltd - Daniel Lezcano <[email protected]> #include <stdio.h> +#include <limits.h> #include <thermal.h> #include "thermal_nl.h" +int for_each_thermal_threshold (struct thermal_threshold *th,cb_th_t cb,void *arg) +{ +int i, ret =0 ; + +if (!th) +return 0 ; + +for (i =0 ; th[i].temperature !=INT_MAX ; i++) + ret |=cb (&th[i], arg); + +return ret; +} +int for_each_thermal_cdev (struct thermal_cdev *cdev,cb_tc_t cb,void *arg) {int i, ret =0 ;
@@ -80,6 +94,9 @@ static int __thermal_zone_discover(struct thermal_zone *tz, void *th)if (thermal_cmd_get_trip (th, tz) <0 )return -1 ; +if (thermal_cmd_threshold_get (th, tz)) +return -1 ; +if (thermal_cmd_get_governor (th, tz))return -1 ;
tools/thermal/lib/Makefile +1 -1
@@ -3,7 +3,7 @@ LIBTHERMAL_TOOLS_VERSION = 0 LIBTHERMAL_TOOLS_PATCHLEVEL = 0 -LIBTHERMAL_TOOLS_EXTRAVERSION = 1 +LIBTHERMAL_TOOLS_EXTRAVERSION = 2 MAKEFLAGS += --no-print-directory
Signature · 1 line
2.43.0
Re: [PATCH v6 4/5] tools/lib/thermal: Add the threshold netlink ABI
Quoted 52 lines · Daniel Lezcano
The thermal framework supports the thresholds and allows the userspace to create, delete, flush, get the list of the thresholds as well as getting the list of the thresholds set for a specific thermal zone.
Add the netlink abstraction in the thermal library to take full advantage of thresholds for the userspace program.
Signed-off-by Daniel Lezcano <[email protected]>--- tools/lib/thermal/commands.c | 138 +++++++++++++++++++++++++++- tools/lib/thermal/events.c | 55 ++++++++--- tools/lib/thermal/include/thermal.h | 40 ++++++++ tools/lib/thermal/libthermal.map | 5 + tools/lib/thermal/thermal.c | 17 ++++ tools/thermal/lib/Makefile | 2 +- 6 files changed, 242 insertions(+), 15 deletions(-)tools/lib/thermal/commands.c +13
-0@@ -5,6 +5,7 @@#include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <limits.h> #include <thermal.h> #include "thermal_nl.h" @@ -33,6 +34,11 @@ static struct nla_policy thermal_genl_policy[THERMAL_GENL_ATTR_MAX + 1] = { [THERMAL_GENL_ATTR_CDEV_CUR_STATE] = { .type = NLA_U32 }, [THERMAL_GENL_ATTR_CDEV_MAX_STATE] = { .type = NLA_U32 }, [THERMAL_GENL_ATTR_CDEV_NAME] = { .type = NLA_STRING }, + +/* Thresholds */ + [THERMAL_GENL_ATTR_THRESHOLD] = { .type = NLA_NESTED }, + [THERMAL_GENL_ATTR_THRESHOLD_TEMP] = { .type = NLA_U32 }, + [THERMAL_GENL_ATTR_THRESHOLD_DIRECTION] = { .type = NLA_U32 }, };static int parse_tz_get (struct genl_info *info,struct thermal_zone **tz)@@ -182,6 +188,48 @@ static int parse_tz_get_gov(struct genl_info *info, struct thermal_zone *tz)return THERMAL_SUCCESS ; } +static int parse_threshold_get (struct genl_info *info,struct thermal_zone *tz) +{ +struct nlattr *attr; +struct thermal_threshold *__tt =NULL ; +size_t size =0 ; +int rem; +
tools/lib/thermal/commands.c static int parse_tz_get_gov(struct genl_info *info, struct thermal_zone *tz) · line 207
Quoted 10 lines
tools/lib/thermal/commands.c +10
-0+/* +* The size contains the size of the array and we want to +* access the last element, size - 1. +* +* The variable size is initialized to zero but it will be +* then incremented by the first if() statement. The message +* attributes are ordered, so the first if() statement will be +* always called before the second one. If it happens that is +* not the case, then it is a kernel bug. +*/
That sounds good, thank you.
Quoted 16 lines
tools/lib/thermal/commands.c +16
-0+nla_for_each_nested (attr, info->attrs[THERMAL_GENL_ATTR_THRESHOLD ], rem) { + +if (nla_type (attr) ==THERMAL_GENL_ATTR_THRESHOLD_TEMP ) { + + size++; + + __tt =realloc (__tt,sizeof (*__tt) * (size +2 )); +if (!__tt) +return THERMAL_ERROR ; + + __tt[size -1 ].temperature =nla_get_u32 (attr); + } + +if (nla_type (attr) ==THERMAL_GENL_ATTR_THRESHOLD_DIRECTION ) + __tt[size -1 ].direction =nla_get_u32 (attr); + }
tools/lib/thermal/commands.c static int parse_tz_get_gov(struct genl_info *info, struct thermal_zone *tz)
Quoted 10 lines
tools/lib/thermal/commands.c +9
-0+ +if (__tt) + __tt[size].temperature =INT_MAX ; + + tz->thresholds = __tt; + +return THERMAL_SUCCESS ; +} +
LGTM,
PATCH v6 5/5 tools/thermal/thermal-engine: Take into account the thresholds API
In reply to Daniel LezcanoEnhance the thermal-engine skeleton with the thresholds added in the kernel and use the API exported by the thermal library.
--- tools/thermal/thermal-engine/thermal-engine.c | 105 +++++++++++++++--- 1 file changed, 92 insertions(+), 13 deletions(-)
tools/thermal/thermal-engine/thermal-engine.c +92 -13
@@ -38,6 +38,14 @@ struct thermal_data {struct thermal_handler *th; }; +static int show_threshold (struct thermal_threshold *th,__maybe_unused void *arg) +{ +INFO ("threshold temp=%d, direction=%d\n" , + th->temperature, th->direction); + +return 0 ; +} +static int show_trip (struct thermal_trip *tt,__maybe_unused void *arg) { INFO("trip id=%d, type=%d, temp=%d, hyst=%d\n",
@@ -70,6 +78,8 @@ static int show_tz(struct thermal_zone *tz, __maybe_unused void *arg)for_each_thermal_trip (tz->trip, show_trip,NULL ); +for_each_thermal_threshold (tz->thresholds, show_threshold,NULL ); +show_temp (tz, arg);show_governor (tz, arg);
@@ -77,6 +87,30 @@ static int show_tz(struct thermal_zone *tz, __maybe_unused void *arg)return 0 ; } +static int set_threshold (struct thermal_zone *tz,__maybe_unused void *arg) +{ +struct thermal_handler *th = arg; +int thresholds[] = {43000 ,65000 ,49000 ,55000 ,57000 }; +size_t i; + +INFO ("Setting threshold for thermal zone '%s', id=%d\n" , tz->name, tz->id); + +if (thermal_cmd_threshold_flush (th, tz)) { +ERROR ("Failed to flush all previous thresholds\n" ); +return -1 ; + } + +for (i =0 ; i <sizeof (thresholds) /sizeof (thresholds[0 ]); i++) +if (thermal_cmd_threshold_add (th, tz, thresholds[i], +THERMAL_THRESHOLD_WAY_UP | +THERMAL_THRESHOLD_WAY_DOWN )) { +ERROR ("Failed to set threshold\n" ); +return -1 ; + } + +return 0 ; +} +static int tz_create (const char *name,int tz_id,__maybe_unused void *arg) {INFO ("Thermal zone '%s'/%d created\n" , name, tz_id);
@@ -197,20 +231,62 @@ static int gov_change(int tz_id, const char *name, __maybe_unused void *arg)return 0 ; } +static int threshold_add (int tz_id,int temp,int direction,__maybe_unused void *arg) +{ +INFO ("Threshold added tz_id=%d: temp=%d, direction=%d\n" , tz_id, temp, direction); + +return 0 ; +} + +static int threshold_delete (int tz_id,int temp,int direction,__maybe_unused void *arg) +{ +INFO ("Threshold deleted tz_id=%d: temp=%d, direction=%d\n" , tz_id, temp, direction); + +return 0 ; +} + +static int threshold_flush (int tz_id,__maybe_unused void *arg) +{ +INFO ("Thresholds flushed tz_id=%d\n" , tz_id); + +return 0 ; +} + +static int threshold_up (int tz_id,int temp,int prev_temp,__maybe_unused void *arg) +{ +INFO ("Threshold crossed way up tz_id=%d: temp=%d, prev_temp=%d\n" , + tz_id, temp, prev_temp); + +return 0 ; +} + +static int threshold_down (int tz_id,int temp,int prev_temp,__maybe_unused void *arg) +{ +INFO ("Threshold crossed way down tz_id=%d: temp=%d, prev_temp=%d\n" , + tz_id, temp, prev_temp); + +return 0 ; +} +static struct thermal_ops ops = { - .events.tz_create = tz_create, - .events.tz_delete = tz_delete, - .events.tz_disable = tz_disable, - .events.tz_enable = tz_enable, - .events.trip_high = trip_high, - .events.trip_low = trip_low, - .events.trip_add = trip_add, - .events.trip_delete = trip_delete, - .events.trip_change = trip_change, - .events.cdev_add = cdev_add, - .events.cdev_delete = cdev_delete, - .events.cdev_update = cdev_update, - .events.gov_change = gov_change + .events.tz_create = tz_create, + .events.tz_delete = tz_delete, + .events.tz_disable = tz_disable, + .events.tz_enable = tz_enable, + .events.trip_high = trip_high, + .events.trip_low = trip_low, + .events.trip_add = trip_add, + .events.trip_delete = trip_delete, + .events.trip_change = trip_change, + .events.cdev_add = cdev_add, + .events.cdev_delete = cdev_delete, + .events.cdev_update = cdev_update, + .events.gov_change = gov_change, + .events.threshold_add = threshold_add, + .events.threshold_delete = threshold_delete, + .events.threshold_flush = threshold_flush, + .events.threshold_up = threshold_up, + .events.threshold_down = threshold_down, };static int thermal_event (__maybe_unused int fd,__maybe_unused void *arg)
@@ -280,6 +356,7 @@ enum {THERMAL_ENGINE_DAEMON_ERROR ,THERMAL_ENGINE_LOG_ERROR ,THERMAL_ENGINE_THERMAL_ERROR , +THERMAL_ENGINE_THRESHOLD_ERROR , THERMAL_ENGINE_MAINLOOP_ERROR, };
@@ -318,6 +395,8 @@ int main(int argc, char *argv[])return THERMAL_ENGINE_THERMAL_ERROR ; } +for_each_thermal_zone (td.tz, set_threshold, td.th); +for_each_thermal_zone (td.tz, show_tz, td.th);if (mainloop_init ()) {
Signature · 1 line
2.43.0
Please note, I did not fixed the locking issue assuming it will be fixed when the series is applied as stated in v5.
As soon as the series is merged, I will send a couple of changes, one to fix the memory leak and the other one to fix the warning reported by syszbot
Thanks
-- D.
Quoted 157 lines · Daniel Lezcano
The trip points are a firmware description of the temperature limits of a specific thermal zone where we associate an action which is done by the kernel. The time resolution is low.
The userspace has to deal with a more complex thermal management based on heuristics from different information coming from different places. The logic is much more complex but based on a bigger time resolution, usually one second based.
The purpose of the userspace is to monitor the temperatures from different places and take actions. However, it can not be constantly reading the temperature to detect when a temperature threshold has been reached. This is especially bad for mobile or embedded system as that will lead to an unacceptable number of wakeup to check the temperature with nothing to do.
On the other side, the sensors are now most of the time interrupt driven. That means the thermal framework will use the temperature trip points to program the sensor to trigger an interrupt when a temperature limit is crossed.
Unfortunately, the userspace can not benefit this feature and current solutions found here and there, iow out-of-tree, are to add fake trip points in the firmware and enable the writable trip points.
This is bad for different reasons, the trip points are for in-kernel actions, the semantic of their types is used by the thermal framework and by adding trip points in the device tree is a way to overcome the current limitation but tampering with how the thermal framework is supposed to work. The writable trip points is a way to adjust a temperature limit given a specific platform if the firmware is not accurate enough and TBH it is more a debug feature from my POV.
The user thresholds mechanism is a way to have the userspace to tell thermal framework to send a notification when a temperature limit is crossed. There is no id, no hysteresis, just the temperature and the direction of the limit crossing. That means we can be notified when a temperature threshold is crossed the way up only, or the way down only or both ways. That allows to create hysteresis values if it is needed.
Those thresholds are refered as user thresholds in order to do the difference with the trip points which are similar.
An user threshold can be added, deleted or flushed. The latter means all user thresholds belonging to a thermal zone will be deleted.
When one or several user thresholds are crossed, an event is sent to the userspace.
All aforementioned actions and events lead to a notification to the userspace.
Along with the kernel changes, the thermal library has been extended to provide the different API to deal with the new user threshold netlink events and commands.
In addition, the thermal-engine skeleton uses these new API by flushing and adding user thresholds as well as getting the notification about these actions.
Overall the series has been tested with the thermal-engine skeleton and some selftests which are not part of this series.
Changelog:
V6:- Added a comment in the
parse_threshold_get()function to clarify how the size is computed (Lukasz)- Changed comparison to check against non zero value in the
__thermal_zone_discover()function (Lukasz)V5:
- AddedCAP_SYS_ADMINneeded capability when adding, deleting and flushing a threshold (Rafael)- Remove the pid information to prevent leaking pid inside containers. Also the information is not really needed (Rafael)
- Renamed "
THERMAL_GENL_ATTR_THRESHOLD_WAY" to "THERMAL_GENL_ATTR_THRESHOLD_DIRECTION". Did not used '*_DIR' as suggested initially because it can be ambiguous with 'directory' (Rafael)- Renamed '
last_temp' to 'prev_temp' (Rafael)- Used CLASS constructor/destructor to get / put the thermal zone's device refcount (Rafael)
- Moved locking inside
thermal_thresholds_for_each()(Rafael)- Reflected the changes above in the thermal library and the thermal engine skeleton
V4:
- Fix missing stubs when THERMAL_NETLINK=n (kernel test robot)V3:
- the first patch of the v2 series has been merged- Modified the description to split the information between the cover letter and the patch 1 description (Rafael)
- Made the thresholds code as part of the core (Rafael)
- Converted the thresholds into a list and directly declared in the thermal zone device structure (Rafael)
- Changed the name of the field in the thermal zone device structure to
user_thresholds(Rafael)- Added #include "
thermal_thresholds.h" (Rafael)- Combined the conditions in the function
__thermal_threshold_is_crossed(Rafael)- Moved the function
thermal_thresholds_flush()beforethermal_thresholds_exit()(Rafael)- Change
thermal_thresholds_handle()to return void (Rafael)- Move the list field on top the of the structure threshold and renamed it
list_node(Rafael)- Changed THERMAL_THRESHOLD_* notifications to THERMAL_TZ_THRESHOLD_* (Rafael)
V2:
- Compute min and max inthermal_zone_device_update()but keep the loop as it is (Rafael)- Include
slab.hto fix compilation warnings on some architectures with kmalloc and kfree (kernel test robot)Daniel Lezcano (5):
thermal: core: Connect the threshold with the core thermal/netlink: Add the commands and the events for the thresholdstools/lib/thermal: Make more generic the command encoding functiontools/lib/thermal: Add the threshold netlink ABItools/thermal/thermal-engine: Take into account the thresholds APIdrivers/thermal/thermal_core.c | 9 + drivers/thermal/thermal_netlink.c | 236 +++++++++++++++++- drivers/thermal/thermal_netlink.h | 34 +++ drivers/thermal/thermal_thresholds.c | 36 +-- drivers/thermal/thermal_thresholds.h | 2 +- include/uapi/linux/thermal.h | 27 +- tools/lib/thermal/commands.c | 177 ++++++++++++- tools/lib/thermal/events.c | 55 +++- tools/lib/thermal/include/thermal.h | 40 +++ tools/lib/thermal/libthermal.map | 5 + tools/lib/thermal/thermal.c | 17 ++ tools/thermal/lib/Makefile | 2 +- tools/thermal/thermal-engine/thermal-engine.c | 105 +++++++- 13 files changed, 681 insertions(+), 64 deletions(-)
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 4 lines · Daniel Lezcano
Please note, I did not fixed the locking issue assuming it will be fixed when the series is applied as stated in v5.
Yes.
Applied now. Note that I have skipped patch [1/5] because it has been applied already before.
It is on my bleeding-edge branch ATM since the commit IDs may still change.
Quoted 2 lines
As soon as the series is merged, I will send a couple of changes, one to fix the memory leak and the other one to fix the warning reported by syszbot
It should get to linux-next and thermal in a couple of days.
Thanks!
Great thanks !
Quoted 20 lines · Rafael J. Wysocki
Quoted 4 lines · Daniel Lezcano
Please note, I did not fixed the locking issue assuming it will be fixed when the series is applied as stated in v5.
Yes.
Applied now. Note that I have skipped patch [1/5] because it has been applied already before.
It is on my bleeding-edge branch ATM since the commit IDs may still change.
Quoted 2 lines
As soon as the series is merged, I will send a couple of changes, one to fix the memory leak and the other one to fix the warning reported by syszbot
It should get to linux-next and thermal in a couple of days.
Thanks!
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