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

Configure Feed

Select the types of activity you want to include in your feed.

selftests/bpf: Use program name for skel load/destroy functions

In preparation to migrate tests from bpf/test_sock_addr.c to
sock_addr.c, update BPF_SKEL_FUNCS so that it generates functions
based on prog_name instead of skel_name. This allows us to differentiate
between programs in the same skeleton.

Signed-off-by: Jordan Rife <jrife@google.com>
Link: https://lore.kernel.org/r/20240510190246.3247730-3-jrife@google.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Jordan Rife and committed by
Alexei Starovoitov 86b65c6d 73964e90

+50 -46
+50 -46
tools/testing/selftests/bpf/prog_tests/sock_addr.c
··· 357 357 }; 358 358 359 359 #define BPF_SKEL_FUNCS(skel_name, prog_name) \ 360 - static void *skel_name##_load(int cgroup_fd) \ 360 + static void *prog_name##_load(int cgroup_fd) \ 361 361 { \ 362 362 struct skel_name *skel; \ 363 363 skel = skel_name##__open_and_load(); \ ··· 372 372 skel_name##__destroy(skel); \ 373 373 return NULL; \ 374 374 } \ 375 - static void skel_name##_destroy(void *skel) \ 375 + static void prog_name##_destroy(void *skel) \ 376 376 { \ 377 377 skel_name##__destroy(skel); \ 378 378 } ··· 396 396 { 397 397 SOCK_ADDR_TEST_BIND, 398 398 "bind4: bind (stream)", 399 - bind4_prog_load, 400 - bind4_prog_destroy, 399 + bind_v4_prog_load, 400 + bind_v4_prog_destroy, 401 401 &user_ops, 402 402 AF_INET, 403 403 SOCK_STREAM, ··· 405 405 SERV4_PORT, 406 406 SERV4_REWRITE_IP, 407 407 SERV4_REWRITE_PORT, 408 + NULL, 408 409 }, 409 410 { 410 411 SOCK_ADDR_TEST_BIND, 411 412 "bind4: bind (dgram)", 412 - bind4_prog_load, 413 - bind4_prog_destroy, 413 + bind_v4_prog_load, 414 + bind_v4_prog_destroy, 414 415 &user_ops, 415 416 AF_INET, 416 417 SOCK_DGRAM, ··· 419 418 SERV4_PORT, 420 419 SERV4_REWRITE_IP, 421 420 SERV4_REWRITE_PORT, 421 + NULL, 422 422 }, 423 423 { 424 424 SOCK_ADDR_TEST_BIND, 425 425 "bind6: bind (stream)", 426 - bind6_prog_load, 427 - bind6_prog_destroy, 426 + bind_v6_prog_load, 427 + bind_v6_prog_destroy, 428 428 &user_ops, 429 429 AF_INET6, 430 430 SOCK_STREAM, ··· 433 431 SERV6_PORT, 434 432 SERV6_REWRITE_IP, 435 433 SERV6_REWRITE_PORT, 434 + NULL, 436 435 }, 437 436 { 438 437 SOCK_ADDR_TEST_BIND, 439 438 "bind6: bind (dgram)", 440 - bind6_prog_load, 441 - bind6_prog_destroy, 439 + bind_v6_prog_load, 440 + bind_v6_prog_destroy, 442 441 &user_ops, 443 442 AF_INET6, 444 443 SOCK_DGRAM, ··· 447 444 SERV6_PORT, 448 445 SERV6_REWRITE_IP, 449 446 SERV6_REWRITE_PORT, 447 + NULL, 450 448 }, 451 449 452 450 /* bind - kernel calls */ 453 451 { 454 452 SOCK_ADDR_TEST_BIND, 455 453 "bind4: kernel_bind (stream)", 456 - bind4_prog_load, 457 - bind4_prog_destroy, 454 + bind_v4_prog_load, 455 + bind_v4_prog_destroy, 458 456 &kern_ops_sock_sendmsg, 459 457 AF_INET, 460 458 SOCK_STREAM, ··· 467 463 { 468 464 SOCK_ADDR_TEST_BIND, 469 465 "bind4: kernel_bind (dgram)", 470 - bind4_prog_load, 471 - bind4_prog_destroy, 466 + bind_v4_prog_load, 467 + bind_v4_prog_destroy, 472 468 &kern_ops_sock_sendmsg, 473 469 AF_INET, 474 470 SOCK_DGRAM, ··· 480 476 { 481 477 SOCK_ADDR_TEST_BIND, 482 478 "bind6: kernel_bind (stream)", 483 - bind6_prog_load, 484 - bind6_prog_destroy, 479 + bind_v6_prog_load, 480 + bind_v6_prog_destroy, 485 481 &kern_ops_sock_sendmsg, 486 482 AF_INET6, 487 483 SOCK_STREAM, ··· 493 489 { 494 490 SOCK_ADDR_TEST_BIND, 495 491 "bind6: kernel_bind (dgram)", 496 - bind6_prog_load, 497 - bind6_prog_destroy, 492 + bind_v6_prog_load, 493 + bind_v6_prog_destroy, 498 494 &kern_ops_sock_sendmsg, 499 495 AF_INET6, 500 496 SOCK_DGRAM, ··· 508 504 { 509 505 SOCK_ADDR_TEST_CONNECT, 510 506 "connect4: connect (stream)", 511 - connect4_prog_load, 512 - connect4_prog_destroy, 507 + connect_v4_prog_load, 508 + connect_v4_prog_destroy, 513 509 &user_ops, 514 510 AF_INET, 515 511 SOCK_STREAM, ··· 522 518 { 523 519 SOCK_ADDR_TEST_CONNECT, 524 520 "connect4: connect (dgram)", 525 - connect4_prog_load, 526 - connect4_prog_destroy, 521 + connect_v4_prog_load, 522 + connect_v4_prog_destroy, 527 523 &user_ops, 528 524 AF_INET, 529 525 SOCK_DGRAM, ··· 536 532 { 537 533 SOCK_ADDR_TEST_CONNECT, 538 534 "connect6: connect (stream)", 539 - connect6_prog_load, 540 - connect6_prog_destroy, 535 + connect_v6_prog_load, 536 + connect_v6_prog_destroy, 541 537 &user_ops, 542 538 AF_INET6, 543 539 SOCK_STREAM, ··· 550 546 { 551 547 SOCK_ADDR_TEST_CONNECT, 552 548 "connect6: connect (dgram)", 553 - connect6_prog_load, 554 - connect6_prog_destroy, 549 + connect_v6_prog_load, 550 + connect_v6_prog_destroy, 555 551 &user_ops, 556 552 AF_INET6, 557 553 SOCK_DGRAM, ··· 580 576 { 581 577 SOCK_ADDR_TEST_CONNECT, 582 578 "connect4: kernel_connect (stream)", 583 - connect4_prog_load, 584 - connect4_prog_destroy, 579 + connect_v4_prog_load, 580 + connect_v4_prog_destroy, 585 581 &kern_ops_sock_sendmsg, 586 582 AF_INET, 587 583 SOCK_STREAM, ··· 594 590 { 595 591 SOCK_ADDR_TEST_CONNECT, 596 592 "connect4: kernel_connect (dgram)", 597 - connect4_prog_load, 598 - connect4_prog_destroy, 593 + connect_v4_prog_load, 594 + connect_v4_prog_destroy, 599 595 &kern_ops_sock_sendmsg, 600 596 AF_INET, 601 597 SOCK_DGRAM, ··· 608 604 { 609 605 SOCK_ADDR_TEST_CONNECT, 610 606 "connect6: kernel_connect (stream)", 611 - connect6_prog_load, 612 - connect6_prog_destroy, 607 + connect_v6_prog_load, 608 + connect_v6_prog_destroy, 613 609 &kern_ops_sock_sendmsg, 614 610 AF_INET6, 615 611 SOCK_STREAM, ··· 622 618 { 623 619 SOCK_ADDR_TEST_CONNECT, 624 620 "connect6: kernel_connect (dgram)", 625 - connect6_prog_load, 626 - connect6_prog_destroy, 621 + connect_v6_prog_load, 622 + connect_v6_prog_destroy, 627 623 &kern_ops_sock_sendmsg, 628 624 AF_INET6, 629 625 SOCK_DGRAM, ··· 652 648 { 653 649 SOCK_ADDR_TEST_SENDMSG, 654 650 "sendmsg4: sendmsg (dgram)", 655 - sendmsg4_prog_load, 656 - sendmsg4_prog_destroy, 651 + sendmsg_v4_prog_load, 652 + sendmsg_v4_prog_destroy, 657 653 &user_ops, 658 654 AF_INET, 659 655 SOCK_DGRAM, ··· 666 662 { 667 663 SOCK_ADDR_TEST_SENDMSG, 668 664 "sendmsg6: sendmsg (dgram)", 669 - sendmsg6_prog_load, 670 - sendmsg6_prog_destroy, 665 + sendmsg_v6_prog_load, 666 + sendmsg_v6_prog_destroy, 671 667 &user_ops, 672 668 AF_INET6, 673 669 SOCK_DGRAM, ··· 696 692 { 697 693 SOCK_ADDR_TEST_SENDMSG, 698 694 "sendmsg4: sock_sendmsg (dgram)", 699 - sendmsg4_prog_load, 700 - sendmsg4_prog_destroy, 695 + sendmsg_v4_prog_load, 696 + sendmsg_v4_prog_destroy, 701 697 &kern_ops_sock_sendmsg, 702 698 AF_INET, 703 699 SOCK_DGRAM, ··· 710 706 { 711 707 SOCK_ADDR_TEST_SENDMSG, 712 708 "sendmsg6: sock_sendmsg (dgram)", 713 - sendmsg6_prog_load, 714 - sendmsg6_prog_destroy, 709 + sendmsg_v6_prog_load, 710 + sendmsg_v6_prog_destroy, 715 711 &kern_ops_sock_sendmsg, 716 712 AF_INET6, 717 713 SOCK_DGRAM, ··· 740 736 { 741 737 SOCK_ADDR_TEST_SENDMSG, 742 738 "sendmsg4: kernel_sendmsg (dgram)", 743 - sendmsg4_prog_load, 744 - sendmsg4_prog_destroy, 739 + sendmsg_v4_prog_load, 740 + sendmsg_v4_prog_destroy, 745 741 &kern_ops_kernel_sendmsg, 746 742 AF_INET, 747 743 SOCK_DGRAM, ··· 754 750 { 755 751 SOCK_ADDR_TEST_SENDMSG, 756 752 "sendmsg6: kernel_sendmsg (dgram)", 757 - sendmsg6_prog_load, 758 - sendmsg6_prog_destroy, 753 + sendmsg_v6_prog_load, 754 + sendmsg_v6_prog_destroy, 759 755 &kern_ops_kernel_sendmsg, 760 756 AF_INET6, 761 757 SOCK_DGRAM,