Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Or Har-Toov
and committed by
Jakub Kicinski
7511ff14
810b7639
+24
-7
+3
-1
Documentation/netlink/specs/devlink.yaml
+3
-1
Documentation/netlink/specs/devlink.yaml
···
1757
1757
attribute-set: devlink
1758
1758
dont-validate: [strict]
1759
1759
do:
1760
-
pre: devlink-nl-pre-doit
1760
+
pre: devlink-nl-pre-doit-port-optional
1761
1761
post: devlink-nl-post-doit
1762
1762
request:
1763
1763
attributes:
1764
1764
- bus-name
1765
1765
- dev-name
1766
1766
- index
1767
+
- port-index
1767
1768
reply: &resource-dump-reply
1768
1769
value: 36
1769
1770
attributes:
1770
1771
- bus-name
1771
1772
- dev-name
1772
1773
- index
1774
+
- port-index
1773
1775
- resource-list
1774
1776
dump:
1775
1777
request:
+2
-1
net/devlink/netlink_gen.c
+2
-1
net/devlink/netlink_gen.c
···
309
309
[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },
310
310
[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },
311
311
[DEVLINK_ATTR_INDEX] = NLA_POLICY_FULL_RANGE(NLA_UINT, &devlink_attr_index_range),
312
+
[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },
312
313
};
313
314
314
315
/* DEVLINK_CMD_RESOURCE_DUMP - dump */
···
963
962
{
964
963
.cmd = DEVLINK_CMD_RESOURCE_DUMP,
965
964
.validate = GENL_DONT_VALIDATE_STRICT,
966
-
.pre_doit = devlink_nl_pre_doit,
965
+
.pre_doit = devlink_nl_pre_doit_port_optional,
967
966
.doit = devlink_nl_resource_dump_doit,
968
967
.post_doit = devlink_nl_post_doit,
969
968
.policy = devlink_resource_dump_do_nl_policy,
+2
-2
net/devlink/netlink_gen.h
+2
-2
net/devlink/netlink_gen.h
···
24
24
struct genl_info *info);
25
25
int devlink_nl_pre_doit_port(const struct genl_split_ops *ops,
26
26
struct sk_buff *skb, struct genl_info *info);
27
-
int devlink_nl_pre_doit_dev_lock(const struct genl_split_ops *ops,
28
-
struct sk_buff *skb, struct genl_info *info);
29
27
int devlink_nl_pre_doit_port_optional(const struct genl_split_ops *ops,
30
28
struct sk_buff *skb,
31
29
struct genl_info *info);
30
+
int devlink_nl_pre_doit_dev_lock(const struct genl_split_ops *ops,
31
+
struct sk_buff *skb, struct genl_info *info);
32
32
void
33
33
devlink_nl_post_doit(const struct genl_split_ops *ops, struct sk_buff *skb,
34
34
struct genl_info *info);
+17
-3
net/devlink/resource.c
+17
-3
net/devlink/resource.c
···
251
251
static int devlink_resource_fill(struct genl_info *info,
252
252
enum devlink_command cmd, int flags)
253
253
{
254
+
struct devlink_port *devlink_port = info->user_ptr[1];
254
255
struct devlink *devlink = info->user_ptr[0];
255
256
struct devlink_resource *resource;
257
+
struct list_head *resource_list;
256
258
struct nlattr *resources_attr;
257
259
struct sk_buff *skb = NULL;
258
260
struct nlmsghdr *nlh;
···
263
261
int i;
264
262
int err;
265
263
266
-
resource = list_first_entry(&devlink->resource_list,
264
+
resource_list = devlink_port ?
265
+
&devlink_port->resource_list : &devlink->resource_list;
266
+
resource = list_first_entry(resource_list,
267
267
struct devlink_resource, list);
268
268
start_again:
269
269
err = devlink_nl_msg_reply_and_new(&skb, info);
···
281
277
282
278
if (devlink_nl_put_handle(skb, devlink))
283
279
goto nla_put_failure;
280
+
if (devlink_port &&
281
+
nla_put_u32(skb, DEVLINK_ATTR_PORT_INDEX, devlink_port->index))
282
+
goto nla_put_failure;
284
283
285
284
resources_attr = nla_nest_start_noflag(skb,
286
285
DEVLINK_ATTR_RESOURCE_LIST);
···
292
285
293
286
incomplete = false;
294
287
i = 0;
295
-
list_for_each_entry_from(resource, &devlink->resource_list, list) {
288
+
list_for_each_entry_from(resource, resource_list, list) {
296
289
err = devlink_resource_put(devlink, skb, resource);
297
290
if (err) {
298
291
if (!i)
···
326
319
327
320
int devlink_nl_resource_dump_doit(struct sk_buff *skb, struct genl_info *info)
328
321
{
322
+
struct devlink_port *devlink_port = info->user_ptr[1];
329
323
struct devlink *devlink = info->user_ptr[0];
324
+
struct list_head *resource_list;
330
325
331
-
if (list_empty(&devlink->resource_list))
326
+
if (info->attrs[DEVLINK_ATTR_PORT_INDEX] && !devlink_port)
327
+
return -ENODEV;
328
+
329
+
resource_list = devlink_port ?
330
+
&devlink_port->resource_list : &devlink->resource_list;
331
+
if (list_empty(resource_list))
332
332
return -EOPNOTSUPP;
333
333
334
334
return devlink_resource_fill(info, DEVLINK_CMD_RESOURCE_DUMP, 0);