| Message ID | 20241014094309.1430126-4-daniel.lezcano@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v5,1/4] thermal/netlink: Add the commands and the events for the thresholds | expand |
On 10/14/24 10:43, Daniel Lezcano wrote: > 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 <daniel.lezcano@linaro.org> > --- > tools/lib/thermal/commands.c | 128 +++++++++++++++++++++++++++- > 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, 232 insertions(+), 15 deletions(-) > > diff --git a/tools/lib/thermal/commands.c b/tools/lib/thermal/commands.c > index a9223df91dcf..9d5e3e891628 100644 > --- a/tools/lib/thermal/commands.c > +++ b/tools/lib/thermal/commands.c > @@ -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,38 @@ 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; why not simply 'int' ? also: size=0 which has some impact mentioned below. > + int rem; I would make them a descending order, those lines. > + > + 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); We probably relay on some order here, because the 'size -1' needs to be done after first 'size++'. If that the case then maybe it's worth a comment. Or if it wasn't intended and there are no strong guarantees, then this needs a fix. > + } > + > + if (__tt) > + __tt[size].temperature = INT_MAX; > + > + tz->thresholds = __tt; I wonder what would happen to the previous 'tz->thresholds' when we just put new one here... I cannot find other place when it's set. Since we have '*__tt = NULL' then one of the solutions would be to simply call: free(tz->thresholds); tz->thresholds = __tt; Am I missing something, when it might be cleaned in different place? > + > + return THERMAL_SUCCESS; > +} > + > static int handle_netlink(struct nl_cache_ops *unused, > struct genl_cmd *cmd, > struct genl_info *info, void *arg) > @@ -210,6 +248,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; > + I can see in the kernel part in the funciton: thermal_genl_cmd_doit() that there add, delete, flush also send a response message. Shouldn't be handled here gently, otherwise > default: > return THERMAL_ERROR; that 'default' might capture them? > } > @@ -253,6 +295,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 +333,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 +424,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)) > diff --git a/tools/lib/thermal/events.c b/tools/lib/thermal/events.c > index a7a55d1a0c4c..bd851c869029 100644 > --- a/tools/lib/thermal/events.c > +++ b/tools/lib/thermal/events.c > @@ -94,6 +94,30 @@ static int handle_thermal_event(struct nl_msg *n, void *arg) > case THERMAL_GENL_EVENT_TZ_GOV_CHANGE: > return ops->gov_change(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), > nla_get_string(attrs[THERMAL_GENL_ATTR_GOV_NAME]), arg); > + > + case THERMAL_GENL_EVENT_THRESHOLD_ADD: > + return ops->threshold_add(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), > + nla_get_u32(attrs[THERMAL_GENL_ATTR_THRESHOLD_TEMP]), > + nla_get_u32(attrs[THERMAL_GENL_ATTR_THRESHOLD_DIRECTION]), arg); > + > + case THERMAL_GENL_EVENT_THRESHOLD_DELETE: > + return ops->threshold_delete(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), > + nla_get_u32(attrs[THERMAL_GENL_ATTR_THRESHOLD_TEMP]), > + nla_get_u32(attrs[THERMAL_GENL_ATTR_THRESHOLD_DIRECTION]), arg); > + > + case THERMAL_GENL_EVENT_THRESHOLD_FLUSH: > + return ops->threshold_flush(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), arg); > + > + case THERMAL_GENL_EVENT_THRESHOLD_UP: > + return ops->threshold_up(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), > + nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_TEMP]), > + nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_PREV_TEMP]), arg); > + > + case THERMAL_GENL_EVENT_THRESHOLD_DOWN: > + return ops->threshold_down(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), > + nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_TEMP]), > + nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_PREV_TEMP]), arg); > + > default: > return -1; > } > @@ -101,19 +125,24 @@ static int handle_thermal_event(struct nl_msg *n, void *arg) > > static void thermal_events_ops_init(struct thermal_events_ops *ops) > { > - enabled_ops[THERMAL_GENL_EVENT_TZ_CREATE] = !!ops->tz_create; > - enabled_ops[THERMAL_GENL_EVENT_TZ_DELETE] = !!ops->tz_delete; > - enabled_ops[THERMAL_GENL_EVENT_TZ_DISABLE] = !!ops->tz_disable; > - enabled_ops[THERMAL_GENL_EVENT_TZ_ENABLE] = !!ops->tz_enable; > - enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_UP] = !!ops->trip_high; > - enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_DOWN] = !!ops->trip_low; > - enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_CHANGE] = !!ops->trip_change; > - enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_ADD] = !!ops->trip_add; > - enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_DELETE] = !!ops->trip_delete; > - enabled_ops[THERMAL_GENL_EVENT_CDEV_ADD] = !!ops->cdev_add; > - enabled_ops[THERMAL_GENL_EVENT_CDEV_DELETE] = !!ops->cdev_delete; > - enabled_ops[THERMAL_GENL_EVENT_CDEV_STATE_UPDATE] = !!ops->cdev_update; > - enabled_ops[THERMAL_GENL_EVENT_TZ_GOV_CHANGE] = !!ops->gov_change; > + enabled_ops[THERMAL_GENL_EVENT_TZ_CREATE] = !!ops->tz_create; > + enabled_ops[THERMAL_GENL_EVENT_TZ_DELETE] = !!ops->tz_delete; > + enabled_ops[THERMAL_GENL_EVENT_TZ_DISABLE] = !!ops->tz_disable; > + enabled_ops[THERMAL_GENL_EVENT_TZ_ENABLE] = !!ops->tz_enable; > + enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_UP] = !!ops->trip_high; > + enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_DOWN] = !!ops->trip_low; > + enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_CHANGE] = !!ops->trip_change; > + enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_ADD] = !!ops->trip_add; > + enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_DELETE] = !!ops->trip_delete; > + enabled_ops[THERMAL_GENL_EVENT_CDEV_ADD] = !!ops->cdev_add; > + enabled_ops[THERMAL_GENL_EVENT_CDEV_DELETE] = !!ops->cdev_delete; > + enabled_ops[THERMAL_GENL_EVENT_CDEV_STATE_UPDATE] = !!ops->cdev_update; > + enabled_ops[THERMAL_GENL_EVENT_TZ_GOV_CHANGE] = !!ops->gov_change; > + enabled_ops[THERMAL_GENL_EVENT_THRESHOLD_ADD] = !!ops->threshold_add; > + enabled_ops[THERMAL_GENL_EVENT_THRESHOLD_DELETE] = !!ops->threshold_delete; > + enabled_ops[THERMAL_GENL_EVENT_THRESHOLD_FLUSH] = !!ops->threshold_flush; > + enabled_ops[THERMAL_GENL_EVENT_THRESHOLD_UP] = !!ops->threshold_up; > + enabled_ops[THERMAL_GENL_EVENT_THRESHOLD_DOWN] = !!ops->threshold_down; > } > > thermal_error_t thermal_events_handle(struct thermal_handler *th, void *arg) > diff --git a/tools/lib/thermal/include/thermal.h b/tools/lib/thermal/include/thermal.h > index 1abc560602cf..818ecdfb46e5 100644 > --- a/tools/lib/thermal/include/thermal.h > +++ b/tools/lib/thermal/include/thermal.h > @@ -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 __cplusplus > extern "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 > */ > diff --git a/tools/lib/thermal/libthermal.map b/tools/lib/thermal/libthermal.map > index d5e77738c7a4..d657176aa47f 100644 > --- a/tools/lib/thermal/libthermal.map > +++ b/tools/lib/thermal/libthermal.map > @@ -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; > diff --git a/tools/lib/thermal/thermal.c b/tools/lib/thermal/thermal.c > index 72a76dc205bc..8dddf5cde302 100644 > --- a/tools/lib/thermal/thermal.c > +++ b/tools/lib/thermal/thermal.c > @@ -1,10 +1,24 @@ > // SPDX-License-Identifier: LGPL-2.1+ > // Copyright (C) 2022, Linaro Ltd - Daniel Lezcano <daniel.lezcano@linaro.org> > #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) < 0) There are only 2 definitions in the enum thermal_error_t. I would just simply checked if it's not 0: if (thermal_cmd_threshold_get(th, tz)) return -1; Although, it's a minor thing, not affecting the end result. > + return -1; > + > if (thermal_cmd_get_governor(th, tz)) > return -1; > > diff --git a/tools/thermal/lib/Makefile b/tools/thermal/lib/Makefile > index 82db451935c5..f2552f73a64c 100644 > --- a/tools/thermal/lib/Makefile > +++ b/tools/thermal/lib/Makefile > @@ -3,7 +3,7 @@ > > LIBTHERMAL_TOOLS_VERSION = 0 > LIBTHERMAL_TOOLS_PATCHLEVEL = 0 > -LIBTHERMAL_TOOLS_EXTRAVERSION = 1 > +LIBTHERMAL_TOOLS_EXTRAVERSION = 2 > > MAKEFLAGS += --no-print-directory >
On 10/22/24 08:49, Daniel Lezcano wrote: > On 21/10/2024 22:47, Lukasz Luba wrote: >> >> >> On 10/14/24 10:43, Daniel Lezcano wrote: >>> 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 <daniel.lezcano@linaro.org> >>> --- >>> tools/lib/thermal/commands.c | 128 +++++++++++++++++++++++++++- >>> 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, 232 insertions(+), 15 deletions(-) >>> >>> diff --git a/tools/lib/thermal/commands.c b/tools/lib/thermal/commands.c >>> index a9223df91dcf..9d5e3e891628 100644 >>> --- a/tools/lib/thermal/commands.c >>> +++ b/tools/lib/thermal/commands.c >>> @@ -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,38 @@ 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; >> >> why not simply 'int' ? > > Because it is used with realloc where the function definition is: > > void *realloc(void *_Nullable ptr, size_t size); > > and sizeof() return a size_t type. > > So in order to not mix the types, size_t is used which I believe is a > good practice :) > >> also: size=0 which has some impact mentioned below. >> >>> + int rem; >> >> I would make them a descending order, those lines. >> >>> + >>> + 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); >> >> We probably relay on some order here, because the 'size -1' needs to be >> done after first 'size++'. >> If that the case then maybe it's worth a comment. Or if it wasn't >> intended and there are no strong guarantees, then this needs a fix. > > The size contains the size of the array and we want to access the last > element, size - 1 > > I will add this sentence above as a comment if it is ok for you Yes, please add some comment e.g. that size=0 will be then first modified by the 1st 'if()' so 'size++' will happen and there is no way that the 2nd 'if()' will trigger before that. Those 2 'if()' are kind of independent in the code and it's not obvious from that part of code, why the 2nd 'if()' won't run at the beginning. The dangerous situation would be: '__tt[0 - 1].direction = ' assignment, which is due to 'size=0' init value. > >>> + } >>> + >>> + if (__tt) >>> + __tt[size].temperature = INT_MAX; >>> + >>> + tz->thresholds = __tt; >> >> I wonder what would happen to the previous 'tz->thresholds' when >> we just put new one here... I cannot find other place when it's set. >> >> Since we have '*__tt = NULL' then one of the solutions would be >> to simply call: >> free(tz->thresholds); >> tz->thresholds = __tt; >> >> Am I missing something, when it might be cleaned in different place? > > The caller is supposed to pass a clean empty structure. > > Usually, this function is to discover the current configuration, so it > is a one shot call keeping the structure in memory for the libthermal > lifecycle. > > The events sends updates of the thermal zones. So with the events and > the initial configuration from the discovery, the userspace is always > up-to-date with the thermal setup. So we cannot receive that we have new thresholds? I thought we will get that information, even in runtime, so the old memory should be just freed. > > >>> + >>> + return THERMAL_SUCCESS; >>> +} >>> + >>> static int handle_netlink(struct nl_cache_ops *unused, >>> struct genl_cmd *cmd, >>> struct genl_info *info, void *arg) >>> @@ -210,6 +248,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; >>> + >> >> I can see in the kernel part in the funciton: >> thermal_genl_cmd_doit() >> that there add, delete, flush also send a response >> message. Shouldn't be handled here gently, otherwise > > No, those are commands and the transaction is done at the netlink level > to say if the command was successful or not. Thanks, I see. > >>> default: >>> return THERMAL_ERROR; >> >> that 'default' might capture them? > > [ ... ] > >>> 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) < 0) >> >> There are only 2 definitions in the enum thermal_error_t. >> I would just simply checked if it's not 0: > > > Ok > > Thanks for the review > We're welcome.
On 22/10/2024 11:50, Lukasz Luba wrote: > > > On 10/22/24 08:49, Daniel Lezcano wrote: >> On 21/10/2024 22:47, Lukasz Luba wrote: >>> >>> >>> On 10/14/24 10:43, Daniel Lezcano wrote: >>>> 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 <daniel.lezcano@linaro.org> >>>> --- [ ... ] >>>> + 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); >>> >>> We probably relay on some order here, because the 'size -1' needs to be >>> done after first 'size++'. >>> If that the case then maybe it's worth a comment. Or if it wasn't >>> intended and there are no strong guarantees, then this needs a fix. >> >> The size contains the size of the array and we want to access the last >> element, size - 1 >> >> I will add this sentence above as a comment if it is ok for you > > Yes, please add some comment e.g. that size=0 will be then > first modified by the 1st 'if()' so 'size++' will happen > and there is no way that the 2nd 'if()' will trigger before that. > Those 2 'if()' are kind of independent in the code and it's > not obvious from that part of code, why the 2nd 'if()' won't > run at the beginning. The dangerous situation would be: > '__tt[0 - 1].direction = ' assignment, which is due to > 'size=0' init value. > >> >>>> + } >>>> + >>>> + if (__tt) >>>> + __tt[size].temperature = INT_MAX; >>>> + >>>> + tz->thresholds = __tt; >>> >>> I wonder what would happen to the previous 'tz->thresholds' when >>> we just put new one here... I cannot find other place when it's set. >>> >>> Since we have '*__tt = NULL' then one of the solutions would be >>> to simply call: >>> free(tz->thresholds); >>> tz->thresholds = __tt; >>> >>> Am I missing something, when it might be cleaned in different place? >> >> The caller is supposed to pass a clean empty structure. >> >> Usually, this function is to discover the current configuration, so it >> is a one shot call keeping the structure in memory for the libthermal >> lifecycle. >> >> The events sends updates of the thermal zones. So with the events and >> the initial configuration from the discovery, the userspace is always >> up-to-date with the thermal setup. > > So we cannot receive that we have new thresholds? > I thought we will get that information, even in runtime, so the old > memory should be just freed. Sorry may be I was unclear. I meant we will have the list of thresholds and we will then receive event when they are created, deleted, etc ...
diff --git a/tools/lib/thermal/commands.c b/tools/lib/thermal/commands.c index a9223df91dcf..9d5e3e891628 100644 --- a/tools/lib/thermal/commands.c +++ b/tools/lib/thermal/commands.c @@ -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,38 @@ 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; + + 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 +248,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 +295,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 +333,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 +424,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)) diff --git a/tools/lib/thermal/events.c b/tools/lib/thermal/events.c index a7a55d1a0c4c..bd851c869029 100644 --- a/tools/lib/thermal/events.c +++ b/tools/lib/thermal/events.c @@ -94,6 +94,30 @@ static int handle_thermal_event(struct nl_msg *n, void *arg) case THERMAL_GENL_EVENT_TZ_GOV_CHANGE: return ops->gov_change(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), nla_get_string(attrs[THERMAL_GENL_ATTR_GOV_NAME]), arg); + + case THERMAL_GENL_EVENT_THRESHOLD_ADD: + return ops->threshold_add(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), + nla_get_u32(attrs[THERMAL_GENL_ATTR_THRESHOLD_TEMP]), + nla_get_u32(attrs[THERMAL_GENL_ATTR_THRESHOLD_DIRECTION]), arg); + + case THERMAL_GENL_EVENT_THRESHOLD_DELETE: + return ops->threshold_delete(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), + nla_get_u32(attrs[THERMAL_GENL_ATTR_THRESHOLD_TEMP]), + nla_get_u32(attrs[THERMAL_GENL_ATTR_THRESHOLD_DIRECTION]), arg); + + case THERMAL_GENL_EVENT_THRESHOLD_FLUSH: + return ops->threshold_flush(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), arg); + + case THERMAL_GENL_EVENT_THRESHOLD_UP: + return ops->threshold_up(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), + nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_TEMP]), + nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_PREV_TEMP]), arg); + + case THERMAL_GENL_EVENT_THRESHOLD_DOWN: + return ops->threshold_down(nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_ID]), + nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_TEMP]), + nla_get_u32(attrs[THERMAL_GENL_ATTR_TZ_PREV_TEMP]), arg); + default: return -1; } @@ -101,19 +125,24 @@ static int handle_thermal_event(struct nl_msg *n, void *arg) static void thermal_events_ops_init(struct thermal_events_ops *ops) { - enabled_ops[THERMAL_GENL_EVENT_TZ_CREATE] = !!ops->tz_create; - enabled_ops[THERMAL_GENL_EVENT_TZ_DELETE] = !!ops->tz_delete; - enabled_ops[THERMAL_GENL_EVENT_TZ_DISABLE] = !!ops->tz_disable; - enabled_ops[THERMAL_GENL_EVENT_TZ_ENABLE] = !!ops->tz_enable; - enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_UP] = !!ops->trip_high; - enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_DOWN] = !!ops->trip_low; - enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_CHANGE] = !!ops->trip_change; - enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_ADD] = !!ops->trip_add; - enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_DELETE] = !!ops->trip_delete; - enabled_ops[THERMAL_GENL_EVENT_CDEV_ADD] = !!ops->cdev_add; - enabled_ops[THERMAL_GENL_EVENT_CDEV_DELETE] = !!ops->cdev_delete; - enabled_ops[THERMAL_GENL_EVENT_CDEV_STATE_UPDATE] = !!ops->cdev_update; - enabled_ops[THERMAL_GENL_EVENT_TZ_GOV_CHANGE] = !!ops->gov_change; + enabled_ops[THERMAL_GENL_EVENT_TZ_CREATE] = !!ops->tz_create; + enabled_ops[THERMAL_GENL_EVENT_TZ_DELETE] = !!ops->tz_delete; + enabled_ops[THERMAL_GENL_EVENT_TZ_DISABLE] = !!ops->tz_disable; + enabled_ops[THERMAL_GENL_EVENT_TZ_ENABLE] = !!ops->tz_enable; + enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_UP] = !!ops->trip_high; + enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_DOWN] = !!ops->trip_low; + enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_CHANGE] = !!ops->trip_change; + enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_ADD] = !!ops->trip_add; + enabled_ops[THERMAL_GENL_EVENT_TZ_TRIP_DELETE] = !!ops->trip_delete; + enabled_ops[THERMAL_GENL_EVENT_CDEV_ADD] = !!ops->cdev_add; + enabled_ops[THERMAL_GENL_EVENT_CDEV_DELETE] = !!ops->cdev_delete; + enabled_ops[THERMAL_GENL_EVENT_CDEV_STATE_UPDATE] = !!ops->cdev_update; + enabled_ops[THERMAL_GENL_EVENT_TZ_GOV_CHANGE] = !!ops->gov_change; + enabled_ops[THERMAL_GENL_EVENT_THRESHOLD_ADD] = !!ops->threshold_add; + enabled_ops[THERMAL_GENL_EVENT_THRESHOLD_DELETE] = !!ops->threshold_delete; + enabled_ops[THERMAL_GENL_EVENT_THRESHOLD_FLUSH] = !!ops->threshold_flush; + enabled_ops[THERMAL_GENL_EVENT_THRESHOLD_UP] = !!ops->threshold_up; + enabled_ops[THERMAL_GENL_EVENT_THRESHOLD_DOWN] = !!ops->threshold_down; } thermal_error_t thermal_events_handle(struct thermal_handler *th, void *arg) diff --git a/tools/lib/thermal/include/thermal.h b/tools/lib/thermal/include/thermal.h index 1abc560602cf..818ecdfb46e5 100644 --- a/tools/lib/thermal/include/thermal.h +++ b/tools/lib/thermal/include/thermal.h @@ -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 __cplusplus extern "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 */ diff --git a/tools/lib/thermal/libthermal.map b/tools/lib/thermal/libthermal.map index d5e77738c7a4..d657176aa47f 100644 --- a/tools/lib/thermal/libthermal.map +++ b/tools/lib/thermal/libthermal.map @@ -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; diff --git a/tools/lib/thermal/thermal.c b/tools/lib/thermal/thermal.c index 72a76dc205bc..8dddf5cde302 100644 --- a/tools/lib/thermal/thermal.c +++ b/tools/lib/thermal/thermal.c @@ -1,10 +1,24 @@ // SPDX-License-Identifier: LGPL-2.1+ // Copyright (C) 2022, Linaro Ltd - Daniel Lezcano <daniel.lezcano@linaro.org> #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) < 0) + return -1; + if (thermal_cmd_get_governor(th, tz)) return -1; diff --git a/tools/thermal/lib/Makefile b/tools/thermal/lib/Makefile index 82db451935c5..f2552f73a64c 100644 --- a/tools/thermal/lib/Makefile +++ b/tools/thermal/lib/Makefile @@ -3,7 +3,7 @@ LIBTHERMAL_TOOLS_VERSION = 0 LIBTHERMAL_TOOLS_PATCHLEVEL = 0 -LIBTHERMAL_TOOLS_EXTRAVERSION = 1 +LIBTHERMAL_TOOLS_EXTRAVERSION = 2 MAKEFLAGS += --no-print-directory
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 <daniel.lezcano@linaro.org> --- tools/lib/thermal/commands.c | 128 +++++++++++++++++++++++++++- 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, 232 insertions(+), 15 deletions(-)