Skip to content

Commit 0f4d44f

Browse files
Jiri Pirkokuba-moo
Jiri Pirko
authored and
kuba-moo
committed
netlink: specs: devlink: fix reply command values
Make sure that the command values used for replies are correct. This is only affecting generated userspace helpers, no change on kernel code. Fixes: 7199c86 ("netlink: specs: devlink: add commands that do per-instance dump") Signed-off-by: Jiri Pirko <jiri@nvidia.com> Link: https://lore.kernel.org/r/20231012115811.298129-1-jiri@resnulli.us Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent c68681a commit 0f4d44f

2 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎Documentation/netlink/specs/devlink.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ operations:
323323
- dev-name
324324
- sb-index
325325
reply: &sb-get-reply
326-
value: 11
326+
value: 13
327327
attributes: *sb-id-attrs
328328
dump:
329329
request:
@@ -350,7 +350,7 @@ operations:
350350
- sb-index
351351
- sb-pool-index
352352
reply: &sb-pool-get-reply
353-
value: 15
353+
value: 17
354354
attributes: *sb-pool-id-attrs
355355
dump:
356356
request:
@@ -378,7 +378,7 @@ operations:
378378
- sb-index
379379
- sb-pool-index
380380
reply: &sb-port-pool-get-reply
381-
value: 19
381+
value: 21
382382
attributes: *sb-port-pool-id-attrs
383383
dump:
384384
request:
@@ -407,7 +407,7 @@ operations:
407407
- sb-pool-type
408408
- sb-tc-index
409409
reply: &sb-tc-pool-bind-get-reply
410-
value: 23
410+
value: 25
411411
attributes: *sb-tc-pool-bind-id-attrs
412412
dump:
413413
request:
@@ -538,7 +538,7 @@ operations:
538538
- dev-name
539539
- trap-name
540540
reply: &trap-get-reply
541-
value: 61
541+
value: 63
542542
attributes: *trap-id-attrs
543543
dump:
544544
request:
@@ -564,7 +564,7 @@ operations:
564564
- dev-name
565565
- trap-group-name
566566
reply: &trap-group-get-reply
567-
value: 65
567+
value: 67
568568
attributes: *trap-group-id-attrs
569569
dump:
570570
request:
@@ -590,7 +590,7 @@ operations:
590590
- dev-name
591591
- trap-policer-id
592592
reply: &trap-policer-get-reply
593-
value: 69
593+
value: 71
594594
attributes: *trap-policer-id-attrs
595595
dump:
596596
request:
@@ -617,7 +617,7 @@ operations:
617617
- port-index
618618
- rate-node-name
619619
reply: &rate-get-reply
620-
value: 74
620+
value: 76
621621
attributes: *rate-id-attrs
622622
dump:
623623
request:
@@ -643,7 +643,7 @@ operations:
643643
- dev-name
644644
- linecard-index
645645
reply: &linecard-get-reply
646-
value: 78
646+
value: 80
647647
attributes: *linecard-id-attrs
648648
dump:
649649
request:

‎tools/net/ynl/generated/devlink-user.c‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616
static const char * const devlink_op_strmap[] = {
1717
[3] = "get",
1818
[7] = "port-get",
19-
[DEVLINK_CMD_SB_GET] = "sb-get",
20-
[DEVLINK_CMD_SB_POOL_GET] = "sb-pool-get",
21-
[DEVLINK_CMD_SB_PORT_POOL_GET] = "sb-port-pool-get",
22-
[DEVLINK_CMD_SB_TC_POOL_BIND_GET] = "sb-tc-pool-bind-get",
19+
[13] = "sb-get",
20+
[17] = "sb-pool-get",
21+
[21] = "sb-port-pool-get",
22+
[25] = "sb-tc-pool-bind-get",
2323
[DEVLINK_CMD_PARAM_GET] = "param-get",
2424
[DEVLINK_CMD_REGION_GET] = "region-get",
2525
[DEVLINK_CMD_INFO_GET] = "info-get",
2626
[DEVLINK_CMD_HEALTH_REPORTER_GET] = "health-reporter-get",
27-
[DEVLINK_CMD_TRAP_GET] = "trap-get",
28-
[DEVLINK_CMD_TRAP_GROUP_GET] = "trap-group-get",
29-
[DEVLINK_CMD_TRAP_POLICER_GET] = "trap-policer-get",
30-
[DEVLINK_CMD_RATE_GET] = "rate-get",
31-
[DEVLINK_CMD_LINECARD_GET] = "linecard-get",
27+
[63] = "trap-get",
28+
[67] = "trap-group-get",
29+
[71] = "trap-policer-get",
30+
[76] = "rate-get",
31+
[80] = "linecard-get",
3232
[DEVLINK_CMD_SELFTESTS_GET] = "selftests-get",
3333
};
3434

@@ -838,7 +838,7 @@ devlink_sb_get(struct ynl_sock *ys, struct devlink_sb_get_req *req)
838838
rsp = calloc(1, sizeof(*rsp));
839839
yrs.yarg.data = rsp;
840840
yrs.cb = devlink_sb_get_rsp_parse;
841-
yrs.rsp_cmd = DEVLINK_CMD_SB_GET;
841+
yrs.rsp_cmd = 13;
842842

843843
err = ynl_exec(ys, nlh, &yrs);
844844
if (err < 0)
@@ -876,7 +876,7 @@ devlink_sb_get_dump(struct ynl_sock *ys, struct devlink_sb_get_req_dump *req)
876876
yds.ys = ys;
877877
yds.alloc_sz = sizeof(struct devlink_sb_get_list);
878878
yds.cb = devlink_sb_get_rsp_parse;
879-
yds.rsp_cmd = DEVLINK_CMD_SB_GET;
879+
yds.rsp_cmd = 13;
880880
yds.rsp_policy = &devlink_nest;
881881

882882
nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_SB_GET, 1);
@@ -987,7 +987,7 @@ devlink_sb_pool_get(struct ynl_sock *ys, struct devlink_sb_pool_get_req *req)
987987
rsp = calloc(1, sizeof(*rsp));
988988
yrs.yarg.data = rsp;
989989
yrs.cb = devlink_sb_pool_get_rsp_parse;
990-
yrs.rsp_cmd = DEVLINK_CMD_SB_POOL_GET;
990+
yrs.rsp_cmd = 17;
991991

992992
err = ynl_exec(ys, nlh, &yrs);
993993
if (err < 0)
@@ -1026,7 +1026,7 @@ devlink_sb_pool_get_dump(struct ynl_sock *ys,
10261026
yds.ys = ys;
10271027
yds.alloc_sz = sizeof(struct devlink_sb_pool_get_list);
10281028
yds.cb = devlink_sb_pool_get_rsp_parse;
1029-
yds.rsp_cmd = DEVLINK_CMD_SB_POOL_GET;
1029+
yds.rsp_cmd = 17;
10301030
yds.rsp_policy = &devlink_nest;
10311031

10321032
nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_SB_POOL_GET, 1);
@@ -1147,7 +1147,7 @@ devlink_sb_port_pool_get(struct ynl_sock *ys,
11471147
rsp = calloc(1, sizeof(*rsp));
11481148
yrs.yarg.data = rsp;
11491149
yrs.cb = devlink_sb_port_pool_get_rsp_parse;
1150-
yrs.rsp_cmd = DEVLINK_CMD_SB_PORT_POOL_GET;
1150+
yrs.rsp_cmd = 21;
11511151

11521152
err = ynl_exec(ys, nlh, &yrs);
11531153
if (err < 0)
@@ -1187,7 +1187,7 @@ devlink_sb_port_pool_get_dump(struct ynl_sock *ys,
11871187
yds.ys = ys;
11881188
yds.alloc_sz = sizeof(struct devlink_sb_port_pool_get_list);
11891189
yds.cb = devlink_sb_port_pool_get_rsp_parse;
1190-
yds.rsp_cmd = DEVLINK_CMD_SB_PORT_POOL_GET;
1190+
yds.rsp_cmd = 21;
11911191
yds.rsp_policy = &devlink_nest;
11921192

11931193
nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_SB_PORT_POOL_GET, 1);
@@ -1316,7 +1316,7 @@ devlink_sb_tc_pool_bind_get(struct ynl_sock *ys,
13161316
rsp = calloc(1, sizeof(*rsp));
13171317
yrs.yarg.data = rsp;
13181318
yrs.cb = devlink_sb_tc_pool_bind_get_rsp_parse;
1319-
yrs.rsp_cmd = DEVLINK_CMD_SB_TC_POOL_BIND_GET;
1319+
yrs.rsp_cmd = 25;
13201320

13211321
err = ynl_exec(ys, nlh, &yrs);
13221322
if (err < 0)
@@ -1356,7 +1356,7 @@ devlink_sb_tc_pool_bind_get_dump(struct ynl_sock *ys,
13561356
yds.ys = ys;
13571357
yds.alloc_sz = sizeof(struct devlink_sb_tc_pool_bind_get_list);
13581358
yds.cb = devlink_sb_tc_pool_bind_get_rsp_parse;
1359-
yds.rsp_cmd = DEVLINK_CMD_SB_TC_POOL_BIND_GET;
1359+
yds.rsp_cmd = 25;
13601360
yds.rsp_policy = &devlink_nest;
13611361

13621362
nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_SB_TC_POOL_BIND_GET, 1);
@@ -2183,7 +2183,7 @@ devlink_trap_get(struct ynl_sock *ys, struct devlink_trap_get_req *req)
21832183
rsp = calloc(1, sizeof(*rsp));
21842184
yrs.yarg.data = rsp;
21852185
yrs.cb = devlink_trap_get_rsp_parse;
2186-
yrs.rsp_cmd = DEVLINK_CMD_TRAP_GET;
2186+
yrs.rsp_cmd = 63;
21872187

21882188
err = ynl_exec(ys, nlh, &yrs);
21892189
if (err < 0)
@@ -2223,7 +2223,7 @@ devlink_trap_get_dump(struct ynl_sock *ys,
22232223
yds.ys = ys;
22242224
yds.alloc_sz = sizeof(struct devlink_trap_get_list);
22252225
yds.cb = devlink_trap_get_rsp_parse;
2226-
yds.rsp_cmd = DEVLINK_CMD_TRAP_GET;
2226+
yds.rsp_cmd = 63;
22272227
yds.rsp_policy = &devlink_nest;
22282228

22292229
nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_TRAP_GET, 1);
@@ -2336,7 +2336,7 @@ devlink_trap_group_get(struct ynl_sock *ys,
23362336
rsp = calloc(1, sizeof(*rsp));
23372337
yrs.yarg.data = rsp;
23382338
yrs.cb = devlink_trap_group_get_rsp_parse;
2339-
yrs.rsp_cmd = DEVLINK_CMD_TRAP_GROUP_GET;
2339+
yrs.rsp_cmd = 67;
23402340

23412341
err = ynl_exec(ys, nlh, &yrs);
23422342
if (err < 0)
@@ -2376,7 +2376,7 @@ devlink_trap_group_get_dump(struct ynl_sock *ys,
23762376
yds.ys = ys;
23772377
yds.alloc_sz = sizeof(struct devlink_trap_group_get_list);
23782378
yds.cb = devlink_trap_group_get_rsp_parse;
2379-
yds.rsp_cmd = DEVLINK_CMD_TRAP_GROUP_GET;
2379+
yds.rsp_cmd = 67;
23802380
yds.rsp_policy = &devlink_nest;
23812381

23822382
nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_TRAP_GROUP_GET, 1);
@@ -2483,7 +2483,7 @@ devlink_trap_policer_get(struct ynl_sock *ys,
24832483
rsp = calloc(1, sizeof(*rsp));
24842484
yrs.yarg.data = rsp;
24852485
yrs.cb = devlink_trap_policer_get_rsp_parse;
2486-
yrs.rsp_cmd = DEVLINK_CMD_TRAP_POLICER_GET;
2486+
yrs.rsp_cmd = 71;
24872487

24882488
err = ynl_exec(ys, nlh, &yrs);
24892489
if (err < 0)
@@ -2523,7 +2523,7 @@ devlink_trap_policer_get_dump(struct ynl_sock *ys,
25232523
yds.ys = ys;
25242524
yds.alloc_sz = sizeof(struct devlink_trap_policer_get_list);
25252525
yds.cb = devlink_trap_policer_get_rsp_parse;
2526-
yds.rsp_cmd = DEVLINK_CMD_TRAP_POLICER_GET;
2526+
yds.rsp_cmd = 71;
25272527
yds.rsp_policy = &devlink_nest;
25282528

25292529
nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_TRAP_POLICER_GET, 1);
@@ -2642,7 +2642,7 @@ devlink_rate_get(struct ynl_sock *ys, struct devlink_rate_get_req *req)
26422642
rsp = calloc(1, sizeof(*rsp));
26432643
yrs.yarg.data = rsp;
26442644
yrs.cb = devlink_rate_get_rsp_parse;
2645-
yrs.rsp_cmd = DEVLINK_CMD_RATE_GET;
2645+
yrs.rsp_cmd = 76;
26462646

26472647
err = ynl_exec(ys, nlh, &yrs);
26482648
if (err < 0)
@@ -2682,7 +2682,7 @@ devlink_rate_get_dump(struct ynl_sock *ys,
26822682
yds.ys = ys;
26832683
yds.alloc_sz = sizeof(struct devlink_rate_get_list);
26842684
yds.cb = devlink_rate_get_rsp_parse;
2685-
yds.rsp_cmd = DEVLINK_CMD_RATE_GET;
2685+
yds.rsp_cmd = 76;
26862686
yds.rsp_policy = &devlink_nest;
26872687

26882688
nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_RATE_GET, 1);
@@ -2786,7 +2786,7 @@ devlink_linecard_get(struct ynl_sock *ys, struct devlink_linecard_get_req *req)
27862786
rsp = calloc(1, sizeof(*rsp));
27872787
yrs.yarg.data = rsp;
27882788
yrs.cb = devlink_linecard_get_rsp_parse;
2789-
yrs.rsp_cmd = DEVLINK_CMD_LINECARD_GET;
2789+
yrs.rsp_cmd = 80;
27902790

27912791
err = ynl_exec(ys, nlh, &yrs);
27922792
if (err < 0)
@@ -2825,7 +2825,7 @@ devlink_linecard_get_dump(struct ynl_sock *ys,
28252825
yds.ys = ys;
28262826
yds.alloc_sz = sizeof(struct devlink_linecard_get_list);
28272827
yds.cb = devlink_linecard_get_rsp_parse;
2828-
yds.rsp_cmd = DEVLINK_CMD_LINECARD_GET;
2828+
yds.rsp_cmd = 80;
28292829
yds.rsp_policy = &devlink_nest;
28302830

28312831
nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_LINECARD_GET, 1);

0 commit comments

Comments
 (0)