netlink: specs: devlink: fix reply command values

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Make sure that the command values used for replies are correct. This is
only affecting generated userspace helpers, no change on kernel code.

Fixes: 7199c86247e9 ("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>

authored by

Jiri Pirko and committed by

Jakub Kicinski 2 years ago 0f4d44f6 c68681ae

+36 -36

2 changed files

expand all

Documentation

netlink

specs

devlink.yaml

tools

net

ynl

generated

devlink-user.c

+9 -9

Documentation/netlink/specs/devlink.yaml

··· 323 323 - dev-name 324 324 - sb-index 325 325 reply: &sb-get-reply 326 - value: 11 326 + value: 13 327 327 attributes: *sb-id-attrs 328 328 dump: 329 329 request: ··· 350 350 - sb-index 351 351 - sb-pool-index 352 352 reply: &sb-pool-get-reply 353 - value: 15 353 + value: 17 354 354 attributes: *sb-pool-id-attrs 355 355 dump: 356 356 request: ··· 378 378 - sb-index 379 379 - sb-pool-index 380 380 reply: &sb-port-pool-get-reply 381 - value: 19 381 + value: 21 382 382 attributes: *sb-port-pool-id-attrs 383 383 dump: 384 384 request: ··· 407 407 - sb-pool-type 408 408 - sb-tc-index 409 409 reply: &sb-tc-pool-bind-get-reply 410 - value: 23 410 + value: 25 411 411 attributes: *sb-tc-pool-bind-id-attrs 412 412 dump: 413 413 request: ··· 538 538 - dev-name 539 539 - trap-name 540 540 reply: &trap-get-reply 541 - value: 61 541 + value: 63 542 542 attributes: *trap-id-attrs 543 543 dump: 544 544 request: ··· 564 564 - dev-name 565 565 - trap-group-name 566 566 reply: &trap-group-get-reply 567 - value: 65 567 + value: 67 568 568 attributes: *trap-group-id-attrs 569 569 dump: 570 570 request: ··· 590 590 - dev-name 591 591 - trap-policer-id 592 592 reply: &trap-policer-get-reply 593 - value: 69 593 + value: 71 594 594 attributes: *trap-policer-id-attrs 595 595 dump: 596 596 request: ··· 617 617 - port-index 618 618 - rate-node-name 619 619 reply: &rate-get-reply 620 - value: 74 620 + value: 76 621 621 attributes: *rate-id-attrs 622 622 dump: 623 623 request: ··· 643 643 - dev-name 644 644 - linecard-index 645 645 reply: &linecard-get-reply 646 - value: 78 646 + value: 80 647 647 attributes: *linecard-id-attrs 648 648 dump: 649 649 request:

+27 -27

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

··· 16 16 static const char * const devlink_op_strmap[] = { 17 17 [3] = "get", 18 18 [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", 23 23 [DEVLINK_CMD_PARAM_GET] = "param-get", 24 24 [DEVLINK_CMD_REGION_GET] = "region-get", 25 25 [DEVLINK_CMD_INFO_GET] = "info-get", 26 26 [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", 32 32 [DEVLINK_CMD_SELFTESTS_GET] = "selftests-get", 33 33 }; 34 34 ··· 838 838 rsp = calloc(1, sizeof(*rsp)); 839 839 yrs.yarg.data = rsp; 840 840 yrs.cb = devlink_sb_get_rsp_parse; 841 - yrs.rsp_cmd = DEVLINK_CMD_SB_GET; 841 + yrs.rsp_cmd = 13; 842 842 843 843 err = ynl_exec(ys, nlh, &yrs); 844 844 if (err < 0) ··· 876 876 yds.ys = ys; 877 877 yds.alloc_sz = sizeof(struct devlink_sb_get_list); 878 878 yds.cb = devlink_sb_get_rsp_parse; 879 - yds.rsp_cmd = DEVLINK_CMD_SB_GET; 879 + yds.rsp_cmd = 13; 880 880 yds.rsp_policy = &devlink_nest; 881 881 882 882 nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_SB_GET, 1); ··· 987 987 rsp = calloc(1, sizeof(*rsp)); 988 988 yrs.yarg.data = rsp; 989 989 yrs.cb = devlink_sb_pool_get_rsp_parse; 990 - yrs.rsp_cmd = DEVLINK_CMD_SB_POOL_GET; 990 + yrs.rsp_cmd = 17; 991 991 992 992 err = ynl_exec(ys, nlh, &yrs); 993 993 if (err < 0) ··· 1026 1026 yds.ys = ys; 1027 1027 yds.alloc_sz = sizeof(struct devlink_sb_pool_get_list); 1028 1028 yds.cb = devlink_sb_pool_get_rsp_parse; 1029 - yds.rsp_cmd = DEVLINK_CMD_SB_POOL_GET; 1029 + yds.rsp_cmd = 17; 1030 1030 yds.rsp_policy = &devlink_nest; 1031 1031 1032 1032 nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_SB_POOL_GET, 1); ··· 1147 1147 rsp = calloc(1, sizeof(*rsp)); 1148 1148 yrs.yarg.data = rsp; 1149 1149 yrs.cb = devlink_sb_port_pool_get_rsp_parse; 1150 - yrs.rsp_cmd = DEVLINK_CMD_SB_PORT_POOL_GET; 1150 + yrs.rsp_cmd = 21; 1151 1151 1152 1152 err = ynl_exec(ys, nlh, &yrs); 1153 1153 if (err < 0) ··· 1187 1187 yds.ys = ys; 1188 1188 yds.alloc_sz = sizeof(struct devlink_sb_port_pool_get_list); 1189 1189 yds.cb = devlink_sb_port_pool_get_rsp_parse; 1190 - yds.rsp_cmd = DEVLINK_CMD_SB_PORT_POOL_GET; 1190 + yds.rsp_cmd = 21; 1191 1191 yds.rsp_policy = &devlink_nest; 1192 1192 1193 1193 nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_SB_PORT_POOL_GET, 1); ··· 1316 1316 rsp = calloc(1, sizeof(*rsp)); 1317 1317 yrs.yarg.data = rsp; 1318 1318 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; 1320 1320 1321 1321 err = ynl_exec(ys, nlh, &yrs); 1322 1322 if (err < 0) ··· 1356 1356 yds.ys = ys; 1357 1357 yds.alloc_sz = sizeof(struct devlink_sb_tc_pool_bind_get_list); 1358 1358 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; 1360 1360 yds.rsp_policy = &devlink_nest; 1361 1361 1362 1362 nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_SB_TC_POOL_BIND_GET, 1); ··· 2183 2183 rsp = calloc(1, sizeof(*rsp)); 2184 2184 yrs.yarg.data = rsp; 2185 2185 yrs.cb = devlink_trap_get_rsp_parse; 2186 - yrs.rsp_cmd = DEVLINK_CMD_TRAP_GET; 2186 + yrs.rsp_cmd = 63; 2187 2187 2188 2188 err = ynl_exec(ys, nlh, &yrs); 2189 2189 if (err < 0) ··· 2223 2223 yds.ys = ys; 2224 2224 yds.alloc_sz = sizeof(struct devlink_trap_get_list); 2225 2225 yds.cb = devlink_trap_get_rsp_parse; 2226 - yds.rsp_cmd = DEVLINK_CMD_TRAP_GET; 2226 + yds.rsp_cmd = 63; 2227 2227 yds.rsp_policy = &devlink_nest; 2228 2228 2229 2229 nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_TRAP_GET, 1); ··· 2336 2336 rsp = calloc(1, sizeof(*rsp)); 2337 2337 yrs.yarg.data = rsp; 2338 2338 yrs.cb = devlink_trap_group_get_rsp_parse; 2339 - yrs.rsp_cmd = DEVLINK_CMD_TRAP_GROUP_GET; 2339 + yrs.rsp_cmd = 67; 2340 2340 2341 2341 err = ynl_exec(ys, nlh, &yrs); 2342 2342 if (err < 0) ··· 2376 2376 yds.ys = ys; 2377 2377 yds.alloc_sz = sizeof(struct devlink_trap_group_get_list); 2378 2378 yds.cb = devlink_trap_group_get_rsp_parse; 2379 - yds.rsp_cmd = DEVLINK_CMD_TRAP_GROUP_GET; 2379 + yds.rsp_cmd = 67; 2380 2380 yds.rsp_policy = &devlink_nest; 2381 2381 2382 2382 nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_TRAP_GROUP_GET, 1); ··· 2483 2483 rsp = calloc(1, sizeof(*rsp)); 2484 2484 yrs.yarg.data = rsp; 2485 2485 yrs.cb = devlink_trap_policer_get_rsp_parse; 2486 - yrs.rsp_cmd = DEVLINK_CMD_TRAP_POLICER_GET; 2486 + yrs.rsp_cmd = 71; 2487 2487 2488 2488 err = ynl_exec(ys, nlh, &yrs); 2489 2489 if (err < 0) ··· 2523 2523 yds.ys = ys; 2524 2524 yds.alloc_sz = sizeof(struct devlink_trap_policer_get_list); 2525 2525 yds.cb = devlink_trap_policer_get_rsp_parse; 2526 - yds.rsp_cmd = DEVLINK_CMD_TRAP_POLICER_GET; 2526 + yds.rsp_cmd = 71; 2527 2527 yds.rsp_policy = &devlink_nest; 2528 2528 2529 2529 nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_TRAP_POLICER_GET, 1); ··· 2642 2642 rsp = calloc(1, sizeof(*rsp)); 2643 2643 yrs.yarg.data = rsp; 2644 2644 yrs.cb = devlink_rate_get_rsp_parse; 2645 - yrs.rsp_cmd = DEVLINK_CMD_RATE_GET; 2645 + yrs.rsp_cmd = 76; 2646 2646 2647 2647 err = ynl_exec(ys, nlh, &yrs); 2648 2648 if (err < 0) ··· 2682 2682 yds.ys = ys; 2683 2683 yds.alloc_sz = sizeof(struct devlink_rate_get_list); 2684 2684 yds.cb = devlink_rate_get_rsp_parse; 2685 - yds.rsp_cmd = DEVLINK_CMD_RATE_GET; 2685 + yds.rsp_cmd = 76; 2686 2686 yds.rsp_policy = &devlink_nest; 2687 2687 2688 2688 nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_RATE_GET, 1); ··· 2786 2786 rsp = calloc(1, sizeof(*rsp)); 2787 2787 yrs.yarg.data = rsp; 2788 2788 yrs.cb = devlink_linecard_get_rsp_parse; 2789 - yrs.rsp_cmd = DEVLINK_CMD_LINECARD_GET; 2789 + yrs.rsp_cmd = 80; 2790 2790 2791 2791 err = ynl_exec(ys, nlh, &yrs); 2792 2792 if (err < 0) ··· 2825 2825 yds.ys = ys; 2826 2826 yds.alloc_sz = sizeof(struct devlink_linecard_get_list); 2827 2827 yds.cb = devlink_linecard_get_rsp_parse; 2828 - yds.rsp_cmd = DEVLINK_CMD_LINECARD_GET; 2828 + yds.rsp_cmd = 80; 2829 2829 yds.rsp_policy = &devlink_nest; 2830 2830 2831 2831 nlh = ynl_gemsg_start_dump(ys, ys->family_id, DEVLINK_CMD_LINECARD_GET, 1);