| Message ID | 20240212161615.161935-3-stanislaw.gruszka@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | thermal/netlink/intel_hfi: Enable HFI feature only when required | expand |
On Mon, Feb 12, 2024 at 5:16 PM Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> wrote: > > Introduce a new feature to the thermal netlink framework, enabling the > registration of sub drivers to receive events via a notifier mechanism. > Specifically, implement genetlink family bind and unbind callbacks to send > BIND and UNBIND events. > > The primary purpose of this enhancement is to facilitate the tracking of > user-space consumers by the intel_hif driver. This should be intel_hfi. Or better, Intel HFI. > By leveraging these > notifications, the driver can determine when consumers are present > or absent. > > Suggested-by: Jakub Kicinski <kuba@kernel.org> > Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> > --- > drivers/thermal/thermal_netlink.c | 40 +++++++++++++++++++++++++++---- > drivers/thermal/thermal_netlink.h | 26 ++++++++++++++++++++ > 2 files changed, 61 insertions(+), 5 deletions(-) > > diff --git a/drivers/thermal/thermal_netlink.c b/drivers/thermal/thermal_netlink.c > index 76a231a29654..86c7653a9530 100644 > --- a/drivers/thermal/thermal_netlink.c > +++ b/drivers/thermal/thermal_netlink.c > @@ -7,17 +7,13 @@ > * Generic netlink for thermal management framework > */ > #include <linux/module.h> > +#include <linux/notifier.h> > #include <linux/kernel.h> > #include <net/genetlink.h> > #include <uapi/linux/thermal.h> > > #include "thermal_core.h" > > -enum thermal_genl_multicast_groups { > - THERMAL_GENL_SAMPLING_GROUP = 0, > - THERMAL_GENL_EVENT_GROUP = 1, > -}; > - > static const struct genl_multicast_group thermal_genl_mcgrps[] = { There are enough characters per code line to spell "multicast_groups" here (and analogously below). > [THERMAL_GENL_SAMPLING_GROUP] = { .name = THERMAL_GENL_SAMPLING_GROUP_NAME, }, > [THERMAL_GENL_EVENT_GROUP] = { .name = THERMAL_GENL_EVENT_GROUP_NAME, }, > @@ -75,6 +71,7 @@ struct param { > typedef int (*cb_t)(struct param *); > > static struct genl_family thermal_gnl_family; > +static BLOCKING_NOTIFIER_HEAD(thermal_gnl_chain); thermal_genl_chain ? It would be more consistent with the rest of the naming. > > static int thermal_group_has_listeners(enum thermal_genl_multicast_groups group) > { > @@ -645,6 +642,27 @@ static int thermal_genl_cmd_doit(struct sk_buff *skb, > return ret; > } > > +static int thermal_genl_bind(int mcgrp) > +{ > + struct thermal_genl_notify n = { .mcgrp = mcgrp }; > + > + if (WARN_ON_ONCE(mcgrp > THERMAL_GENL_MAX_GROUP)) > + return -EINVAL; pr_warn_once() would be better IMO. At least it would not crash the kernel configured with "panic on warn". > + > + blocking_notifier_call_chain(&thermal_gnl_chain, THERMAL_NOTIFY_BIND, &n); > + return 0; > +} > + > +static void thermal_genl_unbind(int mcgrp) > +{ > + struct thermal_genl_notify n = { .mcgrp = mcgrp }; > + > + if (WARN_ON_ONCE(mcgrp > THERMAL_GENL_MAX_GROUP)) > + return; > + > + blocking_notifier_call_chain(&thermal_gnl_chain, THERMAL_NOTIFY_UNBIND, &n); > +} > + > static const struct genl_small_ops thermal_genl_ops[] = { > { > .cmd = THERMAL_GENL_CMD_TZ_GET_ID, > @@ -679,6 +697,8 @@ static struct genl_family thermal_gnl_family __ro_after_init = { > .version = THERMAL_GENL_VERSION, > .maxattr = THERMAL_GENL_ATTR_MAX, > .policy = thermal_genl_policy, > + .bind = thermal_genl_bind, > + .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, > @@ -686,6 +706,16 @@ static struct genl_family thermal_gnl_family __ro_after_init = { > .n_mcgrps = ARRAY_SIZE(thermal_genl_mcgrps), > }; > > +int thermal_genl_register_notifier(struct notifier_block *nb) > +{ > + return blocking_notifier_chain_register(&thermal_gnl_chain, nb); > +} > + > +int thermal_genl_unregister_notifier(struct notifier_block *nb) > +{ > + return blocking_notifier_chain_unregister(&thermal_gnl_chain, nb); > +} > + > int __init thermal_netlink_init(void) > { > return genl_register_family(&thermal_gnl_family); > diff --git a/drivers/thermal/thermal_netlink.h b/drivers/thermal/thermal_netlink.h > index 93a927e144d5..e01221e8816b 100644 > --- a/drivers/thermal/thermal_netlink.h > +++ b/drivers/thermal/thermal_netlink.h > @@ -10,6 +10,19 @@ struct thermal_genl_cpu_caps { > int efficiency; > }; > > +enum thermal_genl_multicast_groups { > + THERMAL_GENL_SAMPLING_GROUP = 0, > + THERMAL_GENL_EVENT_GROUP = 1, > + THERMAL_GENL_MAX_GROUP = THERMAL_GENL_EVENT_GROUP, > +}; > + > +#define THERMAL_NOTIFY_BIND 0 > +#define THERMAL_NOTIFY_UNBIND 1 > + > +struct thermal_genl_notify { > + int mcgrp; > +}; > + > struct thermal_zone_device; > struct thermal_trip; > struct thermal_cooling_device; > @@ -18,6 +31,9 @@ struct thermal_cooling_device; > #ifdef CONFIG_THERMAL_NETLINK > int __init thermal_netlink_init(void); > void __init thermal_netlink_exit(void); > +int thermal_genl_register_notifier(struct notifier_block *nb); > +int thermal_genl_unregister_notifier(struct notifier_block *nb); > + > int thermal_notify_tz_create(const struct thermal_zone_device *tz); > int thermal_notify_tz_delete(const struct thermal_zone_device *tz); > int thermal_notify_tz_enable(const struct thermal_zone_device *tz); > @@ -48,6 +64,16 @@ static inline int thermal_notify_tz_create(const struct thermal_zone_device *tz) > return 0; > } > > +static inline int thermal_genl_register_notifier(struct notifier_block *nb) > +{ > + return 0; > +} > + > +static inline int thermal_genl_unregister_notifier(struct notifier_block *nb) > +{ > + return 0; > +} > + > static inline int thermal_notify_tz_delete(const struct thermal_zone_device *tz) > { > return 0; > --
On Thu, Feb 22, 2024 at 4:47 PM Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> wrote: > > On Tue, Feb 13, 2024 at 02:24:56PM +0100, Rafael J. Wysocki wrote: > > On Mon, Feb 12, 2024 at 5:16 PM Stanislaw Gruszka > > <stanislaw.gruszka@linux.intel.com> wrote: > > > > > > Introduce a new feature to the thermal netlink framework, enabling the > > > registration of sub drivers to receive events via a notifier mechanism. > > > Specifically, implement genetlink family bind and unbind callbacks to send > > > BIND and UNBIND events. > > > > > > The primary purpose of this enhancement is to facilitate the tracking of > > > user-space consumers by the intel_hif driver. > > > > This should be intel_hfi. Or better, Intel HFI. > > Will change in next revision. > > > > By leveraging these > > > notifications, the driver can determine when consumers are present > > > or absent. > > > > > > Suggested-by: Jakub Kicinski <kuba@kernel.org> > > > Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> > > > --- > > > drivers/thermal/thermal_netlink.c | 40 +++++++++++++++++++++++++++---- > > > drivers/thermal/thermal_netlink.h | 26 ++++++++++++++++++++ > > > 2 files changed, 61 insertions(+), 5 deletions(-) > > > > > > diff --git a/drivers/thermal/thermal_netlink.c b/drivers/thermal/thermal_netlink.c > > > index 76a231a29654..86c7653a9530 100644 > > > --- a/drivers/thermal/thermal_netlink.c > > > +++ b/drivers/thermal/thermal_netlink.c > > > @@ -7,17 +7,13 @@ > > > * Generic netlink for thermal management framework > > > */ > > > #include <linux/module.h> > > > +#include <linux/notifier.h> > > > #include <linux/kernel.h> > > > #include <net/genetlink.h> > > > #include <uapi/linux/thermal.h> > > > > > > #include "thermal_core.h" > > > > > > -enum thermal_genl_multicast_groups { > > > - THERMAL_GENL_SAMPLING_GROUP = 0, > > > - THERMAL_GENL_EVENT_GROUP = 1, > > > -}; > > > - > > > static const struct genl_multicast_group thermal_genl_mcgrps[] = { > > > > There are enough characters per code line to spell "multicast_groups" > > here (and analogously below). > > Not sure what you mean, change thermal_genl_mcgrps to thermal_genl_multicast_groups ? > > I could change that, but it's not really related to the changes in this patch, > so perhaps in separate patch. > > Additionally "mcgrps" are more consistent with genl_family fields i.e: > > .mcgrps = thermal_genl_mcgrps, > .n_mcgrps = ARRAY_SIZE(thermal_genl_mcgrps), OK, never mind. > > > [THERMAL_GENL_SAMPLING_GROUP] = { .name = THERMAL_GENL_SAMPLING_GROUP_NAME, }, > > > [THERMAL_GENL_EVENT_GROUP] = { .name = THERMAL_GENL_EVENT_GROUP_NAME, }, > > > @@ -75,6 +71,7 @@ struct param { > > > typedef int (*cb_t)(struct param *); > > > > > > static struct genl_family thermal_gnl_family; > > > +static BLOCKING_NOTIFIER_HEAD(thermal_gnl_chain); > > > > thermal_genl_chain ? > > > > It would be more consistent with the rest of the naming. > > Ok, will change. Additionally in separate patch thermal_gnl_family for consistency. > > > > static int thermal_group_has_listeners(enum thermal_genl_multicast_groups group) > > > { > > > @@ -645,6 +642,27 @@ static int thermal_genl_cmd_doit(struct sk_buff *skb, > > > return ret; > > > } > > > > > > +static int thermal_genl_bind(int mcgrp) > > > +{ > > > + struct thermal_genl_notify n = { .mcgrp = mcgrp }; > > > + > > > + if (WARN_ON_ONCE(mcgrp > THERMAL_GENL_MAX_GROUP)) > > > + return -EINVAL; > > > > pr_warn_once() would be better IMO. At least it would not crash the > > kernel configured with "panic on warn". > > "panic on warn" is generic WARN_* issue at any place where WARN_* are used. > And I would say, crash is desired behaviour for those who use the option > to catch bugs. And mcgrp bigger than THERMAL_GENL_MAX_GROUP is definitely > a bug. Additionally pr_warn_once() does not print call trace, so I think > WARN_ON_ONCE() is more proper. But if really you prefer pr_warn_once() > I can change. Fair enough.
diff --git a/drivers/thermal/thermal_netlink.c b/drivers/thermal/thermal_netlink.c index 76a231a29654..86c7653a9530 100644 --- a/drivers/thermal/thermal_netlink.c +++ b/drivers/thermal/thermal_netlink.c @@ -7,17 +7,13 @@ * Generic netlink for thermal management framework */ #include <linux/module.h> +#include <linux/notifier.h> #include <linux/kernel.h> #include <net/genetlink.h> #include <uapi/linux/thermal.h> #include "thermal_core.h" -enum thermal_genl_multicast_groups { - THERMAL_GENL_SAMPLING_GROUP = 0, - THERMAL_GENL_EVENT_GROUP = 1, -}; - static const struct genl_multicast_group thermal_genl_mcgrps[] = { [THERMAL_GENL_SAMPLING_GROUP] = { .name = THERMAL_GENL_SAMPLING_GROUP_NAME, }, [THERMAL_GENL_EVENT_GROUP] = { .name = THERMAL_GENL_EVENT_GROUP_NAME, }, @@ -75,6 +71,7 @@ struct param { typedef int (*cb_t)(struct param *); static struct genl_family thermal_gnl_family; +static BLOCKING_NOTIFIER_HEAD(thermal_gnl_chain); static int thermal_group_has_listeners(enum thermal_genl_multicast_groups group) { @@ -645,6 +642,27 @@ static int thermal_genl_cmd_doit(struct sk_buff *skb, return ret; } +static int thermal_genl_bind(int mcgrp) +{ + struct thermal_genl_notify n = { .mcgrp = mcgrp }; + + if (WARN_ON_ONCE(mcgrp > THERMAL_GENL_MAX_GROUP)) + return -EINVAL; + + blocking_notifier_call_chain(&thermal_gnl_chain, THERMAL_NOTIFY_BIND, &n); + return 0; +} + +static void thermal_genl_unbind(int mcgrp) +{ + struct thermal_genl_notify n = { .mcgrp = mcgrp }; + + if (WARN_ON_ONCE(mcgrp > THERMAL_GENL_MAX_GROUP)) + return; + + blocking_notifier_call_chain(&thermal_gnl_chain, THERMAL_NOTIFY_UNBIND, &n); +} + static const struct genl_small_ops thermal_genl_ops[] = { { .cmd = THERMAL_GENL_CMD_TZ_GET_ID, @@ -679,6 +697,8 @@ static struct genl_family thermal_gnl_family __ro_after_init = { .version = THERMAL_GENL_VERSION, .maxattr = THERMAL_GENL_ATTR_MAX, .policy = thermal_genl_policy, + .bind = thermal_genl_bind, + .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, @@ -686,6 +706,16 @@ static struct genl_family thermal_gnl_family __ro_after_init = { .n_mcgrps = ARRAY_SIZE(thermal_genl_mcgrps), }; +int thermal_genl_register_notifier(struct notifier_block *nb) +{ + return blocking_notifier_chain_register(&thermal_gnl_chain, nb); +} + +int thermal_genl_unregister_notifier(struct notifier_block *nb) +{ + return blocking_notifier_chain_unregister(&thermal_gnl_chain, nb); +} + int __init thermal_netlink_init(void) { return genl_register_family(&thermal_gnl_family); diff --git a/drivers/thermal/thermal_netlink.h b/drivers/thermal/thermal_netlink.h index 93a927e144d5..e01221e8816b 100644 --- a/drivers/thermal/thermal_netlink.h +++ b/drivers/thermal/thermal_netlink.h @@ -10,6 +10,19 @@ struct thermal_genl_cpu_caps { int efficiency; }; +enum thermal_genl_multicast_groups { + THERMAL_GENL_SAMPLING_GROUP = 0, + THERMAL_GENL_EVENT_GROUP = 1, + THERMAL_GENL_MAX_GROUP = THERMAL_GENL_EVENT_GROUP, +}; + +#define THERMAL_NOTIFY_BIND 0 +#define THERMAL_NOTIFY_UNBIND 1 + +struct thermal_genl_notify { + int mcgrp; +}; + struct thermal_zone_device; struct thermal_trip; struct thermal_cooling_device; @@ -18,6 +31,9 @@ struct thermal_cooling_device; #ifdef CONFIG_THERMAL_NETLINK int __init thermal_netlink_init(void); void __init thermal_netlink_exit(void); +int thermal_genl_register_notifier(struct notifier_block *nb); +int thermal_genl_unregister_notifier(struct notifier_block *nb); + int thermal_notify_tz_create(const struct thermal_zone_device *tz); int thermal_notify_tz_delete(const struct thermal_zone_device *tz); int thermal_notify_tz_enable(const struct thermal_zone_device *tz); @@ -48,6 +64,16 @@ static inline int thermal_notify_tz_create(const struct thermal_zone_device *tz) return 0; } +static inline int thermal_genl_register_notifier(struct notifier_block *nb) +{ + return 0; +} + +static inline int thermal_genl_unregister_notifier(struct notifier_block *nb) +{ + return 0; +} + static inline int thermal_notify_tz_delete(const struct thermal_zone_device *tz) { return 0;
Introduce a new feature to the thermal netlink framework, enabling the registration of sub drivers to receive events via a notifier mechanism. Specifically, implement genetlink family bind and unbind callbacks to send BIND and UNBIND events. The primary purpose of this enhancement is to facilitate the tracking of user-space consumers by the intel_hif driver. By leveraging these notifications, the driver can determine when consumers are present or absent. Suggested-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com> --- drivers/thermal/thermal_netlink.c | 40 +++++++++++++++++++++++++++---- drivers/thermal/thermal_netlink.h | 26 ++++++++++++++++++++ 2 files changed, 61 insertions(+), 5 deletions(-)