Current devlink resources are designed as a thing that user could limit, but there is not much otherwise that could be done with them. Perhaps that's the reason there is not much adoption despite API being there for multiple years. Add new mode of operation, where user could allocate/assign resources (from a common pool) to specific devices. That requires a new .occ_set() driver callback, called on DEVLINK_CMD_RESOURCE_SET with the requested DEVLINK_ATTR_RESOURCE_SIZE, instead of staging the size until the next reload. Driver registers it together with .occ_get() by devl_resource_occ_set_get_register(). For such resources the getter value is reported as DEVLINK_ATTR_RESOURCE_SIZE, as opposed to DEVLINK_ATTR_RESOURCE_OCC (current occupation) in the "legacy" mode, and there is no DEVLINK_ATTR_RESOURCE_SIZE_NEW. Signed-off-by: Przemek Kitszel --- RFC, Feb '25 https://lore.kernel.org/intel-wired-lan/20250219164410.35665-3-przemyslaw.kitszel@intel.com I have structured code to just choose "the mode" of operation based on the presence of .occ_set callback, instead of naming the mode, what, even if not the most clear code, avoids the need of naming the modes. v2: * avoid setting DEVLINK_ATTR_RESOURCE_SIZE_VALID for leaf resources (Sashiko) * minor kdoc update (Sashiko) * add more WARN_ONs (Sashiko) * document the occ_set mode in devlink-resource.rst * commit message: describe the .occ_set() callback and how the reported attributes differ from the "legacy" mode --- .../networking/devlink/devlink-resource.rst | 5 ++ include/net/devlink.h | 7 ++ net/devlink/resource.c | 88 +++++++++++++++---- 3 files changed, 84 insertions(+), 16 deletions(-) diff --git a/Documentation/networking/devlink/devlink-resource.rst b/Documentation/networking/devlink/devlink-resource.rst index 47eec8f875b4..dad7a6d7bdcf 100644 --- a/Documentation/networking/devlink/devlink-resource.rst +++ b/Documentation/networking/devlink/devlink-resource.rst @@ -75,6 +75,11 @@ attribute, which represents the pending change in size. For example: Note that changes in resource size may require a device reload to properly take effect. +Resources registered with ``devl_resource_occ_set_get_register()`` behave +differently: the new size is passed to the driver and applies immediately, +there is neither ``size_new`` nor ``occ`` reported, and ``size`` is the value +returned by the driver's getter. + Port-level Resources and Full Dump ================================== diff --git a/include/net/devlink.h b/include/net/devlink.h index 98bdde4f72ca..d01128ef393d 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -420,6 +420,8 @@ devlink_resource_size_params_init(struct devlink_resource_size_params *size_para } typedef u64 devlink_resource_occ_get_t(void *priv); +typedef int devlink_resource_occ_set_t(u64 size, struct netlink_ext_ack *extack, + void *priv); #define DEVLINK_RESOURCE_ID_PARENT_TOP 0 @@ -1959,6 +1961,11 @@ void devl_resource_occ_get_register(struct devlink *devlink, void *occ_get_priv); void devl_resource_occ_get_unregister(struct devlink *devlink, u64 resource_id); +void devl_resource_occ_set_get_register(struct devlink *devlink, + u64 resource_id, + devlink_resource_occ_set_t *occ_set, + devlink_resource_occ_get_t *occ_get, + void *occ_priv); int devl_params_register(struct devlink *devlink, const struct devlink_param *params, size_t params_count); diff --git a/net/devlink/resource.c b/net/devlink/resource.c index c3cfda7ea070..a13fdaddcb19 100644 --- a/net/devlink/resource.c +++ b/net/devlink/resource.c @@ -19,7 +19,8 @@ * @list: parent list * @resource_list: list of child resources * @occ_get: occupancy getter callback - * @occ_get_priv: occupancy getter callback priv + * @occ_set: occupancy setter callback + * @occ_priv: occupancy callbacks priv */ struct devlink_resource { const char *name; @@ -32,7 +33,8 @@ struct devlink_resource { struct list_head list; struct list_head resource_list; devlink_resource_occ_get_t *occ_get; - void *occ_get_priv; + devlink_resource_occ_set_t *occ_set; + void *occ_priv; }; static struct devlink_resource * @@ -137,6 +139,9 @@ int devlink_nl_resource_set_doit(struct sk_buff *skb, struct genl_info *info) if (err) return err; + if (resource->occ_set) + return resource->occ_set(size, info->extack, resource->occ_priv); + resource->size_new = size; devlink_resource_validate_children(resource); if (resource->parent) @@ -162,13 +167,34 @@ devlink_resource_size_params_put(struct devlink_resource *resource, return 0; } -static int devlink_resource_occ_put(struct devlink_resource *resource, - struct sk_buff *skb) +static int +devlink_resource_occ_size_put_legacy(struct devlink_resource *resource, + struct sk_buff *skb) { - if (!resource->occ_get) - return 0; - return devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_OCC, - resource->occ_get(resource->occ_get_priv)); + if (devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE, resource->size)) + goto err; + if (resource->size != resource->size_new && + devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE_NEW, + resource->size_new)) + goto err; + if (resource->occ_get && + devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_OCC, + resource->occ_get(resource->occ_priv))) + goto err; + + return 0; +err: + return -EMSGSIZE; +} + +static int devlink_resource_occ_size_put(struct devlink_resource *resource, + struct sk_buff *skb) +{ + if (!resource->occ_get || !resource->occ_set) + return devlink_resource_occ_size_put_legacy(resource, skb); + + return devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE, + resource->occ_get(resource->occ_priv)); } static int devlink_resource_put(struct devlink *devlink, struct sk_buff *skb, @@ -183,14 +209,9 @@ static int devlink_resource_put(struct devlink *devlink, struct sk_buff *skb, return -EMSGSIZE; if (nla_put_string(skb, DEVLINK_ATTR_RESOURCE_NAME, resource->name) || - devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE, resource->size) || devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_ID, resource->id)) goto nla_put_failure; - if (resource->size != resource->size_new && - devlink_nl_put_u64(skb, DEVLINK_ATTR_RESOURCE_SIZE_NEW, - resource->size_new)) - goto nla_put_failure; - if (devlink_resource_occ_put(resource, skb)) + if (devlink_resource_occ_size_put(resource, skb)) goto nla_put_failure; if (devlink_resource_size_params_put(resource, skb)) goto nla_put_failure; @@ -640,6 +661,39 @@ int devl_resource_size_get(struct devlink *devlink, } EXPORT_SYMBOL_GPL(devl_resource_size_get); +/** + * devl_resource_occ_set_get_register - register occupancy getter and setter + * + * @devlink: devlink + * @resource_id: resource id + * @occ_set: occupancy setter callback + * @occ_get: occupancy getter callback + * @occ_priv: occupancy callbacks priv + * + * Setter will be called when the user wants to change the resource size, + * getter is called to show the user what is current size of the resource. + */ +void devl_resource_occ_set_get_register(struct devlink *devlink, + u64 resource_id, + devlink_resource_occ_set_t *occ_set, + devlink_resource_occ_get_t *occ_get, + void *occ_priv) +{ + struct devlink_resource *resource; + + lockdep_assert_held(&devlink->lock); + + resource = devlink_resource_find(devlink, NULL, resource_id); + if (WARN_ON(!resource)) + return; + WARN_ON(resource->occ_get || resource->occ_set); + + resource->occ_set = occ_set; + resource->occ_get = occ_get; + resource->occ_priv = occ_priv; +} +EXPORT_SYMBOL_GPL(devl_resource_occ_set_get_register); + /** * devl_resource_occ_get_register - register occupancy getter * @@ -661,9 +715,10 @@ void devl_resource_occ_get_register(struct devlink *devlink, if (WARN_ON(!resource)) return; WARN_ON(resource->occ_get); + WARN_ON(resource->occ_set); resource->occ_get = occ_get; - resource->occ_get_priv = occ_get_priv; + resource->occ_priv = occ_get_priv; } EXPORT_SYMBOL_GPL(devl_resource_occ_get_register); @@ -684,9 +739,10 @@ void devl_resource_occ_get_unregister(struct devlink *devlink, if (WARN_ON(!resource)) return; WARN_ON(!resource->occ_get); + WARN_ON(resource->occ_set); resource->occ_get = NULL; - resource->occ_get_priv = NULL; + resource->occ_priv = NULL; } EXPORT_SYMBOL_GPL(devl_resource_occ_get_unregister); -- 2.51.1