devlink: Add port-specific option to resource dump doit

Allow querying devlink resources per-port via the resource-dump doit
handler. When a port-index attribute is provided, only that port's
resources are returned. When no port-index is given, only device-level
resources are returned, preserving backward compatibility.

Signed-off-by: Or Har-Toov <ohartoov@nvidia.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20260407194107.148063-8-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/Documentation/netlink/specs/devlink.yaml b/Documentation/netlink/specs/devlink.yaml
index c423e049c7bdedb6fac3ab12078e5dc49ba9a635..34aa81ba689e2cf641b11417cdc12cd8a09ecead 100644 (file)
--- a/Documentation/netlink/specs/devlink.yaml
+++ b/Documentation/netlink/specs/devlink.yaml
@@ -1757,19 +1757,21 @@ operations:
       attribute-set: devlink
       dont-validate: [strict]
       do:
-        pre: devlink-nl-pre-doit
+        pre: devlink-nl-pre-doit-port-optional
         post: devlink-nl-post-doit
         request:
           attributes:
             - bus-name
             - dev-name
             - index
+            - port-index
         reply: &resource-dump-reply
           value: 36
           attributes:
             - bus-name
             - dev-name
             - index
+            - port-index
             - resource-list
       dump:
         request:

diff --git a/net/devlink/netlink_gen.c b/net/devlink/netlink_gen.c
index a5a47a4c6de84ba4b619e0177e61fbbbc9d1ebb1..9cc372d9ee413b0c81c6dacf4f83f5dd856ce36a 100644 (file)
--- a/net/devlink/netlink_gen.c
+++ b/net/devlink/netlink_gen.c
@@ -309,6 +309,7 @@ static const struct nla_policy devlink_resource_dump_do_nl_policy[DEVLINK_ATTR_I
        [DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },
        [DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },
        [DEVLINK_ATTR_INDEX] = NLA_POLICY_FULL_RANGE(NLA_UINT, &devlink_attr_index_range),
+       [DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },
 };
 
 /* DEVLINK_CMD_RESOURCE_DUMP - dump */
@@ -962,7 +963,7 @@ const struct genl_split_ops devlink_nl_ops[75] = {
        {
                .cmd            = DEVLINK_CMD_RESOURCE_DUMP,
                .validate       = GENL_DONT_VALIDATE_STRICT,
-               .pre_doit       = devlink_nl_pre_doit,
+               .pre_doit       = devlink_nl_pre_doit_port_optional,
                .doit           = devlink_nl_resource_dump_doit,
                .post_doit      = devlink_nl_post_doit,
                .policy         = devlink_resource_dump_do_nl_policy,

diff --git a/net/devlink/netlink_gen.h b/net/devlink/netlink_gen.h
index d79f6a0888f6f5231a08fda3ca8cb64ac7b6c31e..20034b0929a8250832fef9aa7079b6512dc9c04d 100644 (file)
--- a/net/devlink/netlink_gen.h
+++ b/net/devlink/netlink_gen.h
@@ -24,11 +24,11 @@ int devlink_nl_pre_doit(const struct genl_split_ops *ops, struct sk_buff *skb,
                        struct genl_info *info);
 int devlink_nl_pre_doit_port(const struct genl_split_ops *ops,
                             struct sk_buff *skb, struct genl_info *info);
-int devlink_nl_pre_doit_dev_lock(const struct genl_split_ops *ops,
-                                struct sk_buff *skb, struct genl_info *info);
 int devlink_nl_pre_doit_port_optional(const struct genl_split_ops *ops,
                                      struct sk_buff *skb,
                                      struct genl_info *info);
+int devlink_nl_pre_doit_dev_lock(const struct genl_split_ops *ops,
+                                struct sk_buff *skb, struct genl_info *info);
 void
 devlink_nl_post_doit(const struct genl_split_ops *ops, struct sk_buff *skb,
                     struct genl_info *info);

diff --git a/net/devlink/resource.c b/net/devlink/resource.c
index 7984eda63eb6b24f187531cecdef18611030b55d..bf5221fb3e6428942ee799a7a674df5d54a38fdf 100644 (file)
--- a/net/devlink/resource.c
+++ b/net/devlink/resource.c
@@ -251,8 +251,10 @@ static int devlink_resource_list_fill(struct sk_buff *skb,
 static int devlink_resource_fill(struct genl_info *info,
                                 enum devlink_command cmd, int flags)
 {
+       struct devlink_port *devlink_port = info->user_ptr[1];
        struct devlink *devlink = info->user_ptr[0];
        struct devlink_resource *resource;
+       struct list_head *resource_list;
        struct nlattr *resources_attr;
        struct sk_buff *skb = NULL;
        struct nlmsghdr *nlh;
@@ -261,7 +263,9 @@ static int devlink_resource_fill(struct genl_info *info,
        int i;
        int err;
 
-       resource = list_first_entry(&devlink->resource_list,
+       resource_list = devlink_port ?
+               &devlink_port->resource_list : &devlink->resource_list;
+       resource = list_first_entry(resource_list,
                                    struct devlink_resource, list);
 start_again:
        err = devlink_nl_msg_reply_and_new(&skb, info);
@@ -277,6 +281,9 @@ start_again:
 
        if (devlink_nl_put_handle(skb, devlink))
                goto nla_put_failure;
+       if (devlink_port &&
+           nla_put_u32(skb, DEVLINK_ATTR_PORT_INDEX, devlink_port->index))
+               goto nla_put_failure;
 
        resources_attr = nla_nest_start_noflag(skb,
                                               DEVLINK_ATTR_RESOURCE_LIST);
@@ -285,7 +292,7 @@ start_again:
 
        incomplete = false;
        i = 0;
-       list_for_each_entry_from(resource, &devlink->resource_list, list) {
+       list_for_each_entry_from(resource, resource_list, list) {
                err = devlink_resource_put(devlink, skb, resource);
                if (err) {
                        if (!i)
@@ -319,9 +326,16 @@ err_resource_put:
 
 int devlink_nl_resource_dump_doit(struct sk_buff *skb, struct genl_info *info)
 {
+       struct devlink_port *devlink_port = info->user_ptr[1];
        struct devlink *devlink = info->user_ptr[0];
+       struct list_head *resource_list;
+
+       if (info->attrs[DEVLINK_ATTR_PORT_INDEX] && !devlink_port)
+               return -ENODEV;
 
-       if (list_empty(&devlink->resource_list))
+       resource_list = devlink_port ?
+               &devlink_port->resource_list : &devlink->resource_list;
+       if (list_empty(resource_list))
                return -EOPNOTSUPP;
 
        return devlink_resource_fill(info, DEVLINK_CMD_RESOURCE_DUMP, 0);