tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

devlink: rename netlink callback to be aligned with the generated ones

All remaining doit and dumpit netlink callback functions are going to be
used by generated split ops. They expect certain name format. Rename the
callback to be aligned with generated names.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20231021112711.660606-8-jiri@resnulli.us
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Jiri Pirko and committed by
Jakub Kicinski 53590934 e3570f04

+153 -159
+5 -5
net/devlink/dev.c
··· 492 492 return -EMSGSIZE; 493 493 } 494 494 495 - int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info) 495 + int devlink_nl_reload_doit(struct sk_buff *skb, struct genl_info *info) 496 496 { 497 497 struct devlink *devlink = info->user_ptr[0]; 498 498 enum devlink_reload_action action; ··· 658 658 return err; 659 659 } 660 660 661 - int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info) 661 + int devlink_nl_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info) 662 662 { 663 663 struct devlink *devlink = info->user_ptr[0]; 664 664 struct sk_buff *msg; ··· 679 679 return genlmsg_reply(msg, info); 680 680 } 681 681 682 - int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info) 682 + int devlink_nl_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info) 683 683 { 684 684 struct devlink *devlink = info->user_ptr[0]; 685 685 const struct devlink_ops *ops = devlink->ops; ··· 1108 1108 return 0; 1109 1109 } 1110 1110 1111 - int devlink_nl_cmd_flash_update(struct sk_buff *skb, struct genl_info *info) 1111 + int devlink_nl_flash_update_doit(struct sk_buff *skb, struct genl_info *info) 1112 1112 { 1113 1113 struct nlattr *nla_overwrite_mask, *nla_file_name; 1114 1114 struct devlink_flash_update_params params = {}; ··· 1351 1351 [DEVLINK_ATTR_SELFTEST_ID_FLASH] = { .type = NLA_FLAG }, 1352 1352 }; 1353 1353 1354 - int devlink_nl_cmd_selftests_run(struct sk_buff *skb, struct genl_info *info) 1354 + int devlink_nl_selftests_run_doit(struct sk_buff *skb, struct genl_info *info) 1355 1355 { 1356 1356 struct nlattr *tb[DEVLINK_ATTR_SELFTEST_ID_MAX + 1]; 1357 1357 struct devlink *devlink = info->user_ptr[0];
+54 -56
net/devlink/devl_internal.h
··· 229 229 unsigned int devlink_linecard_index(struct devlink_linecard *linecard); 230 230 231 231 /* Devlink nl cmds */ 232 - int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info); 233 - int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info); 234 - int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info); 235 - int devlink_nl_cmd_flash_update(struct sk_buff *skb, struct genl_info *info); 236 - int devlink_nl_cmd_selftests_run(struct sk_buff *skb, struct genl_info *info); 237 - int devlink_nl_cmd_port_set_doit(struct sk_buff *skb, struct genl_info *info); 238 - int devlink_nl_cmd_port_split_doit(struct sk_buff *skb, struct genl_info *info); 239 - int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb, 232 + int devlink_nl_reload_doit(struct sk_buff *skb, struct genl_info *info); 233 + int devlink_nl_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info); 234 + int devlink_nl_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info); 235 + int devlink_nl_flash_update_doit(struct sk_buff *skb, struct genl_info *info); 236 + int devlink_nl_selftests_run_doit(struct sk_buff *skb, struct genl_info *info); 237 + int devlink_nl_port_set_doit(struct sk_buff *skb, struct genl_info *info); 238 + int devlink_nl_port_split_doit(struct sk_buff *skb, struct genl_info *info); 239 + int devlink_nl_port_unsplit_doit(struct sk_buff *skb, struct genl_info *info); 240 + int devlink_nl_port_new_doit(struct sk_buff *skb, struct genl_info *info); 241 + int devlink_nl_port_del_doit(struct sk_buff *skb, struct genl_info *info); 242 + int devlink_nl_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info); 243 + int devlink_nl_sb_port_pool_set_doit(struct sk_buff *skb, 240 244 struct genl_info *info); 241 - int devlink_nl_cmd_port_new_doit(struct sk_buff *skb, struct genl_info *info); 242 - int devlink_nl_cmd_port_del_doit(struct sk_buff *skb, struct genl_info *info); 243 - int devlink_nl_cmd_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info); 244 - int devlink_nl_cmd_sb_port_pool_set_doit(struct sk_buff *skb, 245 - struct genl_info *info); 246 - int devlink_nl_cmd_sb_tc_pool_bind_set_doit(struct sk_buff *skb, 247 - struct genl_info *info); 248 - int devlink_nl_cmd_sb_occ_snapshot_doit(struct sk_buff *skb, 245 + int devlink_nl_sb_tc_pool_bind_set_doit(struct sk_buff *skb, 249 246 struct genl_info *info); 250 - int devlink_nl_cmd_sb_occ_max_clear_doit(struct sk_buff *skb, 251 - struct genl_info *info); 252 - int devlink_nl_cmd_dpipe_table_get(struct sk_buff *skb, struct genl_info *info); 253 - int devlink_nl_cmd_dpipe_entries_get(struct sk_buff *skb, 247 + int devlink_nl_sb_occ_snapshot_doit(struct sk_buff *skb, 248 + struct genl_info *info); 249 + int devlink_nl_sb_occ_max_clear_doit(struct sk_buff *skb, 254 250 struct genl_info *info); 255 - int devlink_nl_cmd_dpipe_headers_get(struct sk_buff *skb, 256 - struct genl_info *info); 257 - int devlink_nl_cmd_dpipe_table_counters_set(struct sk_buff *skb, 258 - struct genl_info *info); 259 - int devlink_nl_cmd_resource_set(struct sk_buff *skb, struct genl_info *info); 260 - int devlink_nl_cmd_resource_dump(struct sk_buff *skb, struct genl_info *info); 261 - int devlink_nl_cmd_param_set_doit(struct sk_buff *skb, struct genl_info *info); 262 - int devlink_nl_cmd_port_param_get_dumpit(struct sk_buff *msg, 263 - struct netlink_callback *cb); 264 - int devlink_nl_cmd_port_param_get_doit(struct sk_buff *skb, 265 - struct genl_info *info); 266 - int devlink_nl_cmd_port_param_set_doit(struct sk_buff *skb, 267 - struct genl_info *info); 268 - int devlink_nl_cmd_region_new(struct sk_buff *skb, struct genl_info *info); 269 - int devlink_nl_cmd_region_del(struct sk_buff *skb, struct genl_info *info); 270 - int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, 271 - struct netlink_callback *cb); 272 - int devlink_nl_cmd_health_reporter_set_doit(struct sk_buff *skb, 273 - struct genl_info *info); 274 - int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb, 275 - struct genl_info *info); 276 - int devlink_nl_cmd_health_reporter_diagnose_doit(struct sk_buff *skb, 277 - struct genl_info *info); 278 - int devlink_nl_cmd_health_reporter_dump_get_dumpit(struct sk_buff *skb, 279 - struct netlink_callback *cb); 280 - int devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb, 281 - struct genl_info *info); 282 - int devlink_nl_cmd_health_reporter_test_doit(struct sk_buff *skb, 251 + int devlink_nl_dpipe_table_get_doit(struct sk_buff *skb, 252 + struct genl_info *info); 253 + int devlink_nl_dpipe_entries_get_doit(struct sk_buff *skb, 254 + struct genl_info *info); 255 + int devlink_nl_dpipe_headers_get_doit(struct sk_buff *skb, 256 + struct genl_info *info); 257 + int devlink_nl_dpipe_table_counters_set_doit(struct sk_buff *skb, 283 258 struct genl_info *info); 284 - int devlink_nl_cmd_trap_set_doit(struct sk_buff *skb, struct genl_info *info); 285 - int devlink_nl_cmd_trap_group_set_doit(struct sk_buff *skb, 286 - struct genl_info *info); 287 - int devlink_nl_cmd_trap_policer_set_doit(struct sk_buff *skb, 259 + int devlink_nl_resource_set_doit(struct sk_buff *skb, struct genl_info *info); 260 + int devlink_nl_resource_dump_doit(struct sk_buff *skb, struct genl_info *info); 261 + int devlink_nl_param_set_doit(struct sk_buff *skb, struct genl_info *info); 262 + int devlink_nl_port_param_get_dumpit(struct sk_buff *msg, 263 + struct netlink_callback *cb); 264 + int devlink_nl_port_param_get_doit(struct sk_buff *skb, 265 + struct genl_info *info); 266 + int devlink_nl_port_param_set_doit(struct sk_buff *skb, 267 + struct genl_info *info); 268 + int devlink_nl_region_new_doit(struct sk_buff *skb, struct genl_info *info); 269 + int devlink_nl_region_del_doit(struct sk_buff *skb, struct genl_info *info); 270 + int devlink_nl_region_read_dumpit(struct sk_buff *skb, 271 + struct netlink_callback *cb); 272 + int devlink_nl_health_reporter_set_doit(struct sk_buff *skb, 273 + struct genl_info *info); 274 + int devlink_nl_health_reporter_recover_doit(struct sk_buff *skb, 275 + struct genl_info *info); 276 + int devlink_nl_health_reporter_diagnose_doit(struct sk_buff *skb, 277 + struct genl_info *info); 278 + int devlink_nl_health_reporter_dump_get_dumpit(struct sk_buff *skb, 279 + struct netlink_callback *cb); 280 + int devlink_nl_health_reporter_dump_clear_doit(struct sk_buff *skb, 281 + struct genl_info *info); 282 + int devlink_nl_health_reporter_test_doit(struct sk_buff *skb, 288 283 struct genl_info *info); 289 - int devlink_nl_cmd_rate_set_doit(struct sk_buff *skb, struct genl_info *info); 290 - int devlink_nl_cmd_rate_new_doit(struct sk_buff *skb, struct genl_info *info); 291 - int devlink_nl_cmd_rate_del_doit(struct sk_buff *skb, struct genl_info *info); 292 - int devlink_nl_cmd_linecard_set_doit(struct sk_buff *skb, 284 + int devlink_nl_trap_set_doit(struct sk_buff *skb, struct genl_info *info); 285 + int devlink_nl_trap_group_set_doit(struct sk_buff *skb, struct genl_info *info); 286 + int devlink_nl_trap_policer_set_doit(struct sk_buff *skb, 293 287 struct genl_info *info); 288 + int devlink_nl_rate_set_doit(struct sk_buff *skb, struct genl_info *info); 289 + int devlink_nl_rate_new_doit(struct sk_buff *skb, struct genl_info *info); 290 + int devlink_nl_rate_del_doit(struct sk_buff *skb, struct genl_info *info); 291 + int devlink_nl_linecard_set_doit(struct sk_buff *skb, struct genl_info *info);
+7 -7
net/devlink/dpipe.c
··· 289 289 return err; 290 290 } 291 291 292 - int devlink_nl_cmd_dpipe_table_get(struct sk_buff *skb, struct genl_info *info) 292 + int devlink_nl_dpipe_table_get_doit(struct sk_buff *skb, struct genl_info *info) 293 293 { 294 294 struct devlink *devlink = info->user_ptr[0]; 295 295 const char *table_name = NULL; ··· 562 562 return genlmsg_reply(dump_ctx.skb, info); 563 563 } 564 564 565 - int devlink_nl_cmd_dpipe_entries_get(struct sk_buff *skb, 566 - struct genl_info *info) 565 + int devlink_nl_dpipe_entries_get_doit(struct sk_buff *skb, 566 + struct genl_info *info) 567 567 { 568 568 struct devlink *devlink = info->user_ptr[0]; 569 569 struct devlink_dpipe_table *table; ··· 712 712 return err; 713 713 } 714 714 715 - int devlink_nl_cmd_dpipe_headers_get(struct sk_buff *skb, 716 - struct genl_info *info) 715 + int devlink_nl_dpipe_headers_get_doit(struct sk_buff *skb, 716 + struct genl_info *info) 717 717 { 718 718 struct devlink *devlink = info->user_ptr[0]; 719 719 ··· 746 746 return 0; 747 747 } 748 748 749 - int devlink_nl_cmd_dpipe_table_counters_set(struct sk_buff *skb, 750 - struct genl_info *info) 749 + int devlink_nl_dpipe_table_counters_set_doit(struct sk_buff *skb, 750 + struct genl_info *info) 751 751 { 752 752 struct devlink *devlink = info->user_ptr[0]; 753 753 const char *table_name;
+12 -12
net/devlink/health.c
··· 452 452 devlink_nl_health_reporter_get_dump_one); 453 453 } 454 454 455 - int devlink_nl_cmd_health_reporter_set_doit(struct sk_buff *skb, 456 - struct genl_info *info) 455 + int devlink_nl_health_reporter_set_doit(struct sk_buff *skb, 456 + struct genl_info *info) 457 457 { 458 458 struct devlink *devlink = info->user_ptr[0]; 459 459 struct devlink_health_reporter *reporter; ··· 655 655 } 656 656 EXPORT_SYMBOL_GPL(devlink_health_reporter_state_update); 657 657 658 - int devlink_nl_cmd_health_reporter_recover_doit(struct sk_buff *skb, 659 - struct genl_info *info) 658 + int devlink_nl_health_reporter_recover_doit(struct sk_buff *skb, 659 + struct genl_info *info) 660 660 { 661 661 struct devlink *devlink = info->user_ptr[0]; 662 662 struct devlink_health_reporter *reporter; ··· 1108 1108 return err; 1109 1109 } 1110 1110 1111 - int devlink_nl_cmd_health_reporter_diagnose_doit(struct sk_buff *skb, 1112 - struct genl_info *info) 1111 + int devlink_nl_health_reporter_diagnose_doit(struct sk_buff *skb, 1112 + struct genl_info *info) 1113 1113 { 1114 1114 struct devlink *devlink = info->user_ptr[0]; 1115 1115 struct devlink_health_reporter *reporter; ··· 1163 1163 return reporter; 1164 1164 } 1165 1165 1166 - int devlink_nl_cmd_health_reporter_dump_get_dumpit(struct sk_buff *skb, 1167 - struct netlink_callback *cb) 1166 + int devlink_nl_health_reporter_dump_get_dumpit(struct sk_buff *skb, 1167 + struct netlink_callback *cb) 1168 1168 { 1169 1169 struct devlink_nl_dump_state *state = devlink_dump_state(cb); 1170 1170 struct devlink_health_reporter *reporter; ··· 1202 1202 return err; 1203 1203 } 1204 1204 1205 - int devlink_nl_cmd_health_reporter_dump_clear_doit(struct sk_buff *skb, 1206 - struct genl_info *info) 1205 + int devlink_nl_health_reporter_dump_clear_doit(struct sk_buff *skb, 1206 + struct genl_info *info) 1207 1207 { 1208 1208 struct devlink *devlink = info->user_ptr[0]; 1209 1209 struct devlink_health_reporter *reporter; ··· 1219 1219 return 0; 1220 1220 } 1221 1221 1222 - int devlink_nl_cmd_health_reporter_test_doit(struct sk_buff *skb, 1223 - struct genl_info *info) 1222 + int devlink_nl_health_reporter_test_doit(struct sk_buff *skb, 1223 + struct genl_info *info) 1224 1224 { 1225 1225 struct devlink *devlink = info->user_ptr[0]; 1226 1226 struct devlink_health_reporter *reporter;
+1 -2
net/devlink/linecard.c
··· 369 369 return err; 370 370 } 371 371 372 - int devlink_nl_cmd_linecard_set_doit(struct sk_buff *skb, 373 - struct genl_info *info) 372 + int devlink_nl_linecard_set_doit(struct sk_buff *skb, struct genl_info *info) 374 373 { 375 374 struct netlink_ext_ack *extack = info->extack; 376 375 struct devlink *devlink = info->user_ptr[0];
+41 -41
net/devlink/netlink.c
··· 291 291 { 292 292 .cmd = DEVLINK_CMD_PORT_SET, 293 293 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 294 - .doit = devlink_nl_cmd_port_set_doit, 294 + .doit = devlink_nl_port_set_doit, 295 295 .flags = GENL_ADMIN_PERM, 296 296 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT, 297 297 }, 298 298 { 299 299 .cmd = DEVLINK_CMD_RATE_SET, 300 - .doit = devlink_nl_cmd_rate_set_doit, 300 + .doit = devlink_nl_rate_set_doit, 301 301 .flags = GENL_ADMIN_PERM, 302 302 }, 303 303 { 304 304 .cmd = DEVLINK_CMD_RATE_NEW, 305 - .doit = devlink_nl_cmd_rate_new_doit, 305 + .doit = devlink_nl_rate_new_doit, 306 306 .flags = GENL_ADMIN_PERM, 307 307 }, 308 308 { 309 309 .cmd = DEVLINK_CMD_RATE_DEL, 310 - .doit = devlink_nl_cmd_rate_del_doit, 310 + .doit = devlink_nl_rate_del_doit, 311 311 .flags = GENL_ADMIN_PERM, 312 312 }, 313 313 { 314 314 .cmd = DEVLINK_CMD_PORT_SPLIT, 315 315 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 316 - .doit = devlink_nl_cmd_port_split_doit, 316 + .doit = devlink_nl_port_split_doit, 317 317 .flags = GENL_ADMIN_PERM, 318 318 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT, 319 319 }, 320 320 { 321 321 .cmd = DEVLINK_CMD_PORT_UNSPLIT, 322 322 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 323 - .doit = devlink_nl_cmd_port_unsplit_doit, 323 + .doit = devlink_nl_port_unsplit_doit, 324 324 .flags = GENL_ADMIN_PERM, 325 325 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT, 326 326 }, 327 327 { 328 328 .cmd = DEVLINK_CMD_PORT_NEW, 329 - .doit = devlink_nl_cmd_port_new_doit, 329 + .doit = devlink_nl_port_new_doit, 330 330 .flags = GENL_ADMIN_PERM, 331 331 }, 332 332 { 333 333 .cmd = DEVLINK_CMD_PORT_DEL, 334 - .doit = devlink_nl_cmd_port_del_doit, 334 + .doit = devlink_nl_port_del_doit, 335 335 .flags = GENL_ADMIN_PERM, 336 336 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT, 337 337 }, 338 338 339 339 { 340 340 .cmd = DEVLINK_CMD_LINECARD_SET, 341 - .doit = devlink_nl_cmd_linecard_set_doit, 341 + .doit = devlink_nl_linecard_set_doit, 342 342 .flags = GENL_ADMIN_PERM, 343 343 }, 344 344 { 345 345 .cmd = DEVLINK_CMD_SB_POOL_SET, 346 346 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 347 - .doit = devlink_nl_cmd_sb_pool_set_doit, 347 + .doit = devlink_nl_sb_pool_set_doit, 348 348 .flags = GENL_ADMIN_PERM, 349 349 }, 350 350 { 351 351 .cmd = DEVLINK_CMD_SB_PORT_POOL_SET, 352 352 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 353 - .doit = devlink_nl_cmd_sb_port_pool_set_doit, 353 + .doit = devlink_nl_sb_port_pool_set_doit, 354 354 .flags = GENL_ADMIN_PERM, 355 355 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT, 356 356 }, 357 357 { 358 358 .cmd = DEVLINK_CMD_SB_TC_POOL_BIND_SET, 359 359 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 360 - .doit = devlink_nl_cmd_sb_tc_pool_bind_set_doit, 360 + .doit = devlink_nl_sb_tc_pool_bind_set_doit, 361 361 .flags = GENL_ADMIN_PERM, 362 362 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT, 363 363 }, 364 364 { 365 365 .cmd = DEVLINK_CMD_SB_OCC_SNAPSHOT, 366 366 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 367 - .doit = devlink_nl_cmd_sb_occ_snapshot_doit, 367 + .doit = devlink_nl_sb_occ_snapshot_doit, 368 368 .flags = GENL_ADMIN_PERM, 369 369 }, 370 370 { 371 371 .cmd = DEVLINK_CMD_SB_OCC_MAX_CLEAR, 372 372 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 373 - .doit = devlink_nl_cmd_sb_occ_max_clear_doit, 373 + .doit = devlink_nl_sb_occ_max_clear_doit, 374 374 .flags = GENL_ADMIN_PERM, 375 375 }, 376 376 { 377 377 .cmd = DEVLINK_CMD_ESWITCH_GET, 378 378 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 379 - .doit = devlink_nl_cmd_eswitch_get_doit, 379 + .doit = devlink_nl_eswitch_get_doit, 380 380 .flags = GENL_ADMIN_PERM, 381 381 }, 382 382 { 383 383 .cmd = DEVLINK_CMD_ESWITCH_SET, 384 384 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 385 - .doit = devlink_nl_cmd_eswitch_set_doit, 385 + .doit = devlink_nl_eswitch_set_doit, 386 386 .flags = GENL_ADMIN_PERM, 387 387 }, 388 388 { 389 389 .cmd = DEVLINK_CMD_DPIPE_TABLE_GET, 390 390 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 391 - .doit = devlink_nl_cmd_dpipe_table_get, 391 + .doit = devlink_nl_dpipe_table_get_doit, 392 392 /* can be retrieved by unprivileged users */ 393 393 }, 394 394 { 395 395 .cmd = DEVLINK_CMD_DPIPE_ENTRIES_GET, 396 396 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 397 - .doit = devlink_nl_cmd_dpipe_entries_get, 397 + .doit = devlink_nl_dpipe_entries_get_doit, 398 398 /* can be retrieved by unprivileged users */ 399 399 }, 400 400 { 401 401 .cmd = DEVLINK_CMD_DPIPE_HEADERS_GET, 402 402 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 403 - .doit = devlink_nl_cmd_dpipe_headers_get, 403 + .doit = devlink_nl_dpipe_headers_get_doit, 404 404 /* can be retrieved by unprivileged users */ 405 405 }, 406 406 { 407 407 .cmd = DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET, 408 408 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 409 - .doit = devlink_nl_cmd_dpipe_table_counters_set, 409 + .doit = devlink_nl_dpipe_table_counters_set_doit, 410 410 .flags = GENL_ADMIN_PERM, 411 411 }, 412 412 { 413 413 .cmd = DEVLINK_CMD_RESOURCE_SET, 414 414 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 415 - .doit = devlink_nl_cmd_resource_set, 415 + .doit = devlink_nl_resource_set_doit, 416 416 .flags = GENL_ADMIN_PERM, 417 417 }, 418 418 { 419 419 .cmd = DEVLINK_CMD_RESOURCE_DUMP, 420 420 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 421 - .doit = devlink_nl_cmd_resource_dump, 421 + .doit = devlink_nl_resource_dump_doit, 422 422 /* can be retrieved by unprivileged users */ 423 423 }, 424 424 { 425 425 .cmd = DEVLINK_CMD_RELOAD, 426 426 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 427 - .doit = devlink_nl_cmd_reload, 427 + .doit = devlink_nl_reload_doit, 428 428 .flags = GENL_ADMIN_PERM, 429 429 }, 430 430 { 431 431 .cmd = DEVLINK_CMD_PARAM_SET, 432 432 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 433 - .doit = devlink_nl_cmd_param_set_doit, 433 + .doit = devlink_nl_param_set_doit, 434 434 .flags = GENL_ADMIN_PERM, 435 435 }, 436 436 { 437 437 .cmd = DEVLINK_CMD_PORT_PARAM_GET, 438 438 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 439 - .doit = devlink_nl_cmd_port_param_get_doit, 440 - .dumpit = devlink_nl_cmd_port_param_get_dumpit, 439 + .doit = devlink_nl_port_param_get_doit, 440 + .dumpit = devlink_nl_port_param_get_dumpit, 441 441 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT, 442 442 /* can be retrieved by unprivileged users */ 443 443 }, 444 444 { 445 445 .cmd = DEVLINK_CMD_PORT_PARAM_SET, 446 446 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 447 - .doit = devlink_nl_cmd_port_param_set_doit, 447 + .doit = devlink_nl_port_param_set_doit, 448 448 .flags = GENL_ADMIN_PERM, 449 449 .internal_flags = DEVLINK_NL_FLAG_NEED_PORT, 450 450 }, 451 451 { 452 452 .cmd = DEVLINK_CMD_REGION_NEW, 453 453 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 454 - .doit = devlink_nl_cmd_region_new, 454 + .doit = devlink_nl_region_new_doit, 455 455 .flags = GENL_ADMIN_PERM, 456 456 }, 457 457 { 458 458 .cmd = DEVLINK_CMD_REGION_DEL, 459 459 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 460 - .doit = devlink_nl_cmd_region_del, 460 + .doit = devlink_nl_region_del_doit, 461 461 .flags = GENL_ADMIN_PERM, 462 462 }, 463 463 { 464 464 .cmd = DEVLINK_CMD_REGION_READ, 465 465 .validate = GENL_DONT_VALIDATE_STRICT | 466 466 GENL_DONT_VALIDATE_DUMP_STRICT, 467 - .dumpit = devlink_nl_cmd_region_read_dumpit, 467 + .dumpit = devlink_nl_region_read_dumpit, 468 468 .flags = GENL_ADMIN_PERM, 469 469 }, 470 470 { 471 471 .cmd = DEVLINK_CMD_HEALTH_REPORTER_SET, 472 472 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 473 - .doit = devlink_nl_cmd_health_reporter_set_doit, 473 + .doit = devlink_nl_health_reporter_set_doit, 474 474 .flags = GENL_ADMIN_PERM, 475 475 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT, 476 476 }, 477 477 { 478 478 .cmd = DEVLINK_CMD_HEALTH_REPORTER_RECOVER, 479 479 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 480 - .doit = devlink_nl_cmd_health_reporter_recover_doit, 480 + .doit = devlink_nl_health_reporter_recover_doit, 481 481 .flags = GENL_ADMIN_PERM, 482 482 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT, 483 483 }, 484 484 { 485 485 .cmd = DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE, 486 486 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 487 - .doit = devlink_nl_cmd_health_reporter_diagnose_doit, 487 + .doit = devlink_nl_health_reporter_diagnose_doit, 488 488 .flags = GENL_ADMIN_PERM, 489 489 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT, 490 490 }, ··· 492 492 .cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET, 493 493 .validate = GENL_DONT_VALIDATE_STRICT | 494 494 GENL_DONT_VALIDATE_DUMP_STRICT, 495 - .dumpit = devlink_nl_cmd_health_reporter_dump_get_dumpit, 495 + .dumpit = devlink_nl_health_reporter_dump_get_dumpit, 496 496 .flags = GENL_ADMIN_PERM, 497 497 }, 498 498 { 499 499 .cmd = DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR, 500 500 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 501 - .doit = devlink_nl_cmd_health_reporter_dump_clear_doit, 501 + .doit = devlink_nl_health_reporter_dump_clear_doit, 502 502 .flags = GENL_ADMIN_PERM, 503 503 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT, 504 504 }, 505 505 { 506 506 .cmd = DEVLINK_CMD_HEALTH_REPORTER_TEST, 507 507 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 508 - .doit = devlink_nl_cmd_health_reporter_test_doit, 508 + .doit = devlink_nl_health_reporter_test_doit, 509 509 .flags = GENL_ADMIN_PERM, 510 510 .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK_OR_PORT, 511 511 }, 512 512 { 513 513 .cmd = DEVLINK_CMD_FLASH_UPDATE, 514 514 .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, 515 - .doit = devlink_nl_cmd_flash_update, 515 + .doit = devlink_nl_flash_update_doit, 516 516 .flags = GENL_ADMIN_PERM, 517 517 }, 518 518 { 519 519 .cmd = DEVLINK_CMD_TRAP_SET, 520 - .doit = devlink_nl_cmd_trap_set_doit, 520 + .doit = devlink_nl_trap_set_doit, 521 521 .flags = GENL_ADMIN_PERM, 522 522 }, 523 523 { 524 524 .cmd = DEVLINK_CMD_TRAP_GROUP_SET, 525 - .doit = devlink_nl_cmd_trap_group_set_doit, 525 + .doit = devlink_nl_trap_group_set_doit, 526 526 .flags = GENL_ADMIN_PERM, 527 527 }, 528 528 { 529 529 .cmd = DEVLINK_CMD_TRAP_POLICER_SET, 530 - .doit = devlink_nl_cmd_trap_policer_set_doit, 530 + .doit = devlink_nl_trap_policer_set_doit, 531 531 .flags = GENL_ADMIN_PERM, 532 532 }, 533 533 { 534 534 .cmd = DEVLINK_CMD_SELFTESTS_RUN, 535 - .doit = devlink_nl_cmd_selftests_run, 535 + .doit = devlink_nl_selftests_run_doit, 536 536 .flags = GENL_ADMIN_PERM, 537 537 }, 538 538 /* -- No new ops here! Use split ops going forward! -- */
+7 -7
net/devlink/param.c
··· 581 581 return 0; 582 582 } 583 583 584 - int devlink_nl_cmd_param_set_doit(struct sk_buff *skb, struct genl_info *info) 584 + int devlink_nl_param_set_doit(struct sk_buff *skb, struct genl_info *info) 585 585 { 586 586 struct devlink *devlink = info->user_ptr[0]; 587 587 ··· 589 589 info, DEVLINK_CMD_PARAM_NEW); 590 590 } 591 591 592 - int devlink_nl_cmd_port_param_get_dumpit(struct sk_buff *msg, 593 - struct netlink_callback *cb) 592 + int devlink_nl_port_param_get_dumpit(struct sk_buff *msg, 593 + struct netlink_callback *cb) 594 594 { 595 595 NL_SET_ERR_MSG(cb->extack, "Port params are not supported"); 596 596 return msg->len; 597 597 } 598 598 599 - int devlink_nl_cmd_port_param_get_doit(struct sk_buff *skb, 600 - struct genl_info *info) 599 + int devlink_nl_port_param_get_doit(struct sk_buff *skb, 600 + struct genl_info *info) 601 601 { 602 602 NL_SET_ERR_MSG(info->extack, "Port params are not supported"); 603 603 return -EINVAL; 604 604 } 605 605 606 - int devlink_nl_cmd_port_param_set_doit(struct sk_buff *skb, 607 - struct genl_info *info) 606 + int devlink_nl_port_param_set_doit(struct sk_buff *skb, 607 + struct genl_info *info) 608 608 { 609 609 NL_SET_ERR_MSG(info->extack, "Port params are not supported"); 610 610 return -EINVAL;
+5 -6
net/devlink/port.c
··· 772 772 return err; 773 773 } 774 774 775 - int devlink_nl_cmd_port_set_doit(struct sk_buff *skb, struct genl_info *info) 775 + int devlink_nl_port_set_doit(struct sk_buff *skb, struct genl_info *info) 776 776 { 777 777 struct devlink_port *devlink_port = info->user_ptr[1]; 778 778 int err; ··· 798 798 return 0; 799 799 } 800 800 801 - int devlink_nl_cmd_port_split_doit(struct sk_buff *skb, struct genl_info *info) 801 + int devlink_nl_port_split_doit(struct sk_buff *skb, struct genl_info *info) 802 802 { 803 803 struct devlink_port *devlink_port = info->user_ptr[1]; 804 804 struct devlink *devlink = info->user_ptr[0]; ··· 829 829 info->extack); 830 830 } 831 831 832 - int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb, 833 - struct genl_info *info) 832 + int devlink_nl_port_unsplit_doit(struct sk_buff *skb, struct genl_info *info) 834 833 { 835 834 struct devlink_port *devlink_port = info->user_ptr[1]; 836 835 struct devlink *devlink = info->user_ptr[0]; ··· 839 840 return devlink_port->ops->port_unsplit(devlink, devlink_port, info->extack); 840 841 } 841 842 842 - int devlink_nl_cmd_port_new_doit(struct sk_buff *skb, struct genl_info *info) 843 + int devlink_nl_port_new_doit(struct sk_buff *skb, struct genl_info *info) 843 844 { 844 845 struct netlink_ext_ack *extack = info->extack; 845 846 struct devlink_port_new_attrs new_attrs = {}; ··· 903 904 return err; 904 905 } 905 906 906 - int devlink_nl_cmd_port_del_doit(struct sk_buff *skb, struct genl_info *info) 907 + int devlink_nl_port_del_doit(struct sk_buff *skb, struct genl_info *info) 907 908 { 908 909 struct devlink_port *devlink_port = info->user_ptr[1]; 909 910 struct netlink_ext_ack *extack = info->extack;
+3 -3
net/devlink/rate.c
··· 458 458 return true; 459 459 } 460 460 461 - int devlink_nl_cmd_rate_set_doit(struct sk_buff *skb, struct genl_info *info) 461 + int devlink_nl_rate_set_doit(struct sk_buff *skb, struct genl_info *info) 462 462 { 463 463 struct devlink *devlink = info->user_ptr[0]; 464 464 struct devlink_rate *devlink_rate; ··· 480 480 return err; 481 481 } 482 482 483 - int devlink_nl_cmd_rate_new_doit(struct sk_buff *skb, struct genl_info *info) 483 + int devlink_nl_rate_new_doit(struct sk_buff *skb, struct genl_info *info) 484 484 { 485 485 struct devlink *devlink = info->user_ptr[0]; 486 486 struct devlink_rate *rate_node; ··· 536 536 return err; 537 537 } 538 538 539 - int devlink_nl_cmd_rate_del_doit(struct sk_buff *skb, struct genl_info *info) 539 + int devlink_nl_rate_del_doit(struct sk_buff *skb, struct genl_info *info) 540 540 { 541 541 struct devlink *devlink = info->user_ptr[0]; 542 542 struct devlink_rate *rate_node;
+4 -4
net/devlink/region.c
··· 588 588 return devlink_nl_dumpit(skb, cb, devlink_nl_region_get_dump_one); 589 589 } 590 590 591 - int devlink_nl_cmd_region_del(struct sk_buff *skb, struct genl_info *info) 591 + int devlink_nl_region_del_doit(struct sk_buff *skb, struct genl_info *info) 592 592 { 593 593 struct devlink *devlink = info->user_ptr[0]; 594 594 struct devlink_snapshot *snapshot; ··· 633 633 return 0; 634 634 } 635 635 636 - int devlink_nl_cmd_region_new(struct sk_buff *skb, struct genl_info *info) 636 + int devlink_nl_region_new_doit(struct sk_buff *skb, struct genl_info *info) 637 637 { 638 638 struct devlink *devlink = info->user_ptr[0]; 639 639 struct devlink_snapshot *snapshot; ··· 863 863 curr_offset, chunk_size, chunk); 864 864 } 865 865 866 - int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, 867 - struct netlink_callback *cb) 866 + int devlink_nl_region_read_dumpit(struct sk_buff *skb, 867 + struct netlink_callback *cb) 868 868 { 869 869 const struct genl_dumpit_info *info = genl_dumpit_info(cb); 870 870 struct devlink_nl_dump_state *state = devlink_dump_state(cb);
+2 -2
net/devlink/resource.c
··· 105 105 return err; 106 106 } 107 107 108 - int devlink_nl_cmd_resource_set(struct sk_buff *skb, struct genl_info *info) 108 + int devlink_nl_resource_set_doit(struct sk_buff *skb, struct genl_info *info) 109 109 { 110 110 struct devlink *devlink = info->user_ptr[0]; 111 111 struct devlink_resource *resource; ··· 285 285 return err; 286 286 } 287 287 288 - int devlink_nl_cmd_resource_dump(struct sk_buff *skb, struct genl_info *info) 288 + int devlink_nl_resource_dump_doit(struct sk_buff *skb, struct genl_info *info) 289 289 { 290 290 struct devlink *devlink = info->user_ptr[0]; 291 291
+8 -9
net/devlink/sb.c
··· 413 413 return -EOPNOTSUPP; 414 414 } 415 415 416 - int devlink_nl_cmd_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info) 416 + int devlink_nl_sb_pool_set_doit(struct sk_buff *skb, struct genl_info *info) 417 417 { 418 418 struct devlink *devlink = info->user_ptr[0]; 419 419 enum devlink_sb_threshold_type threshold_type; ··· 621 621 return -EOPNOTSUPP; 622 622 } 623 623 624 - int devlink_nl_cmd_sb_port_pool_set_doit(struct sk_buff *skb, 625 - struct genl_info *info) 624 + int devlink_nl_sb_port_pool_set_doit(struct sk_buff *skb, 625 + struct genl_info *info) 626 626 { 627 627 struct devlink_port *devlink_port = info->user_ptr[1]; 628 628 struct devlink *devlink = info->user_ptr[0]; ··· 861 861 return -EOPNOTSUPP; 862 862 } 863 863 864 - int devlink_nl_cmd_sb_tc_pool_bind_set_doit(struct sk_buff *skb, 865 - struct genl_info *info) 864 + int devlink_nl_sb_tc_pool_bind_set_doit(struct sk_buff *skb, 865 + struct genl_info *info) 866 866 { 867 867 struct devlink_port *devlink_port = info->user_ptr[1]; 868 868 struct devlink *devlink = info->user_ptr[0]; ··· 900 900 pool_index, threshold, info->extack); 901 901 } 902 902 903 - int devlink_nl_cmd_sb_occ_snapshot_doit(struct sk_buff *skb, 904 - struct genl_info *info) 903 + int devlink_nl_sb_occ_snapshot_doit(struct sk_buff *skb, struct genl_info *info) 905 904 { 906 905 struct devlink *devlink = info->user_ptr[0]; 907 906 const struct devlink_ops *ops = devlink->ops; ··· 915 916 return -EOPNOTSUPP; 916 917 } 917 918 918 - int devlink_nl_cmd_sb_occ_max_clear_doit(struct sk_buff *skb, 919 - struct genl_info *info) 919 + int devlink_nl_sb_occ_max_clear_doit(struct sk_buff *skb, 920 + struct genl_info *info) 920 921 { 921 922 struct devlink *devlink = info->user_ptr[0]; 922 923 const struct devlink_ops *ops = devlink->ops;
+4 -5
net/devlink/trap.c
··· 414 414 info->extack); 415 415 } 416 416 417 - int devlink_nl_cmd_trap_set_doit(struct sk_buff *skb, struct genl_info *info) 417 + int devlink_nl_trap_set_doit(struct sk_buff *skb, struct genl_info *info) 418 418 { 419 419 struct netlink_ext_ack *extack = info->extack; 420 420 struct devlink *devlink = info->user_ptr[0]; ··· 684 684 return 0; 685 685 } 686 686 687 - int devlink_nl_cmd_trap_group_set_doit(struct sk_buff *skb, 688 - struct genl_info *info) 687 + int devlink_nl_trap_group_set_doit(struct sk_buff *skb, struct genl_info *info) 689 688 { 690 689 struct netlink_ext_ack *extack = info->extack; 691 690 struct devlink *devlink = info->user_ptr[0]; ··· 925 926 return 0; 926 927 } 927 928 928 - int devlink_nl_cmd_trap_policer_set_doit(struct sk_buff *skb, 929 - struct genl_info *info) 929 + int devlink_nl_trap_policer_set_doit(struct sk_buff *skb, 930 + struct genl_info *info) 930 931 { 931 932 struct devlink_trap_policer_item *policer_item; 932 933 struct netlink_ext_ack *extack = info->extack;