Skip to content

Commit 86b65c6

Browse files
jrifeAlexei Starovoitov
jrife
authored and
Alexei Starovoitov
committed
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>
1 parent 73964e9 commit 86b65c6

1 file changed

Lines changed: 50 additions & 46 deletions

File tree

‎tools/testing/selftests/bpf/prog_tests/sock_addr.c‎

Lines changed: 50 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ struct sock_addr_test {
357357
};
358358

359359
#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) \
361361
{ \
362362
struct skel_name *skel; \
363363
skel = skel_name##__open_and_load(); \
@@ -372,7 +372,7 @@ cleanup: \
372372
skel_name##__destroy(skel); \
373373
return NULL; \
374374
} \
375-
static void skel_name##_destroy(void *skel) \
375+
static void prog_name##_destroy(void *skel) \
376376
{ \
377377
skel_name##__destroy(skel); \
378378
}
@@ -396,62 +396,66 @@ static struct sock_addr_test tests[] = {
396396
{
397397
SOCK_ADDR_TEST_BIND,
398398
"bind4: bind (stream)",
399-
bind4_prog_load,
400-
bind4_prog_destroy,
399+
bind_v4_prog_load,
400+
bind_v4_prog_destroy,
401401
&user_ops,
402402
AF_INET,
403403
SOCK_STREAM,
404404
SERV4_IP,
405405
SERV4_PORT,
406406
SERV4_REWRITE_IP,
407407
SERV4_REWRITE_PORT,
408+
NULL,
408409
},
409410
{
410411
SOCK_ADDR_TEST_BIND,
411412
"bind4: bind (dgram)",
412-
bind4_prog_load,
413-
bind4_prog_destroy,
413+
bind_v4_prog_load,
414+
bind_v4_prog_destroy,
414415
&user_ops,
415416
AF_INET,
416417
SOCK_DGRAM,
417418
SERV4_IP,
418419
SERV4_PORT,
419420
SERV4_REWRITE_IP,
420421
SERV4_REWRITE_PORT,
422+
NULL,
421423
},
422424
{
423425
SOCK_ADDR_TEST_BIND,
424426
"bind6: bind (stream)",
425-
bind6_prog_load,
426-
bind6_prog_destroy,
427+
bind_v6_prog_load,
428+
bind_v6_prog_destroy,
427429
&user_ops,
428430
AF_INET6,
429431
SOCK_STREAM,
430432
SERV6_IP,
431433
SERV6_PORT,
432434
SERV6_REWRITE_IP,
433435
SERV6_REWRITE_PORT,
436+
NULL,
434437
},
435438
{
436439
SOCK_ADDR_TEST_BIND,
437440
"bind6: bind (dgram)",
438-
bind6_prog_load,
439-
bind6_prog_destroy,
441+
bind_v6_prog_load,
442+
bind_v6_prog_destroy,
440443
&user_ops,
441444
AF_INET6,
442445
SOCK_DGRAM,
443446
SERV6_IP,
444447
SERV6_PORT,
445448
SERV6_REWRITE_IP,
446449
SERV6_REWRITE_PORT,
450+
NULL,
447451
},
448452

449453
/* bind - kernel calls */
450454
{
451455
SOCK_ADDR_TEST_BIND,
452456
"bind4: kernel_bind (stream)",
453-
bind4_prog_load,
454-
bind4_prog_destroy,
457+
bind_v4_prog_load,
458+
bind_v4_prog_destroy,
455459
&kern_ops_sock_sendmsg,
456460
AF_INET,
457461
SOCK_STREAM,
@@ -463,8 +467,8 @@ static struct sock_addr_test tests[] = {
463467
{
464468
SOCK_ADDR_TEST_BIND,
465469
"bind4: kernel_bind (dgram)",
466-
bind4_prog_load,
467-
bind4_prog_destroy,
470+
bind_v4_prog_load,
471+
bind_v4_prog_destroy,
468472
&kern_ops_sock_sendmsg,
469473
AF_INET,
470474
SOCK_DGRAM,
@@ -476,8 +480,8 @@ static struct sock_addr_test tests[] = {
476480
{
477481
SOCK_ADDR_TEST_BIND,
478482
"bind6: kernel_bind (stream)",
479-
bind6_prog_load,
480-
bind6_prog_destroy,
483+
bind_v6_prog_load,
484+
bind_v6_prog_destroy,
481485
&kern_ops_sock_sendmsg,
482486
AF_INET6,
483487
SOCK_STREAM,
@@ -489,8 +493,8 @@ static struct sock_addr_test tests[] = {
489493
{
490494
SOCK_ADDR_TEST_BIND,
491495
"bind6: kernel_bind (dgram)",
492-
bind6_prog_load,
493-
bind6_prog_destroy,
496+
bind_v6_prog_load,
497+
bind_v6_prog_destroy,
494498
&kern_ops_sock_sendmsg,
495499
AF_INET6,
496500
SOCK_DGRAM,
@@ -504,8 +508,8 @@ static struct sock_addr_test tests[] = {
504508
{
505509
SOCK_ADDR_TEST_CONNECT,
506510
"connect4: connect (stream)",
507-
connect4_prog_load,
508-
connect4_prog_destroy,
511+
connect_v4_prog_load,
512+
connect_v4_prog_destroy,
509513
&user_ops,
510514
AF_INET,
511515
SOCK_STREAM,
@@ -518,8 +522,8 @@ static struct sock_addr_test tests[] = {
518522
{
519523
SOCK_ADDR_TEST_CONNECT,
520524
"connect4: connect (dgram)",
521-
connect4_prog_load,
522-
connect4_prog_destroy,
525+
connect_v4_prog_load,
526+
connect_v4_prog_destroy,
523527
&user_ops,
524528
AF_INET,
525529
SOCK_DGRAM,
@@ -532,8 +536,8 @@ static struct sock_addr_test tests[] = {
532536
{
533537
SOCK_ADDR_TEST_CONNECT,
534538
"connect6: connect (stream)",
535-
connect6_prog_load,
536-
connect6_prog_destroy,
539+
connect_v6_prog_load,
540+
connect_v6_prog_destroy,
537541
&user_ops,
538542
AF_INET6,
539543
SOCK_STREAM,
@@ -546,8 +550,8 @@ static struct sock_addr_test tests[] = {
546550
{
547551
SOCK_ADDR_TEST_CONNECT,
548552
"connect6: connect (dgram)",
549-
connect6_prog_load,
550-
connect6_prog_destroy,
553+
connect_v6_prog_load,
554+
connect_v6_prog_destroy,
551555
&user_ops,
552556
AF_INET6,
553557
SOCK_DGRAM,
@@ -576,8 +580,8 @@ static struct sock_addr_test tests[] = {
576580
{
577581
SOCK_ADDR_TEST_CONNECT,
578582
"connect4: kernel_connect (stream)",
579-
connect4_prog_load,
580-
connect4_prog_destroy,
583+
connect_v4_prog_load,
584+
connect_v4_prog_destroy,
581585
&kern_ops_sock_sendmsg,
582586
AF_INET,
583587
SOCK_STREAM,
@@ -590,8 +594,8 @@ static struct sock_addr_test tests[] = {
590594
{
591595
SOCK_ADDR_TEST_CONNECT,
592596
"connect4: kernel_connect (dgram)",
593-
connect4_prog_load,
594-
connect4_prog_destroy,
597+
connect_v4_prog_load,
598+
connect_v4_prog_destroy,
595599
&kern_ops_sock_sendmsg,
596600
AF_INET,
597601
SOCK_DGRAM,
@@ -604,8 +608,8 @@ static struct sock_addr_test tests[] = {
604608
{
605609
SOCK_ADDR_TEST_CONNECT,
606610
"connect6: kernel_connect (stream)",
607-
connect6_prog_load,
608-
connect6_prog_destroy,
611+
connect_v6_prog_load,
612+
connect_v6_prog_destroy,
609613
&kern_ops_sock_sendmsg,
610614
AF_INET6,
611615
SOCK_STREAM,
@@ -618,8 +622,8 @@ static struct sock_addr_test tests[] = {
618622
{
619623
SOCK_ADDR_TEST_CONNECT,
620624
"connect6: kernel_connect (dgram)",
621-
connect6_prog_load,
622-
connect6_prog_destroy,
625+
connect_v6_prog_load,
626+
connect_v6_prog_destroy,
623627
&kern_ops_sock_sendmsg,
624628
AF_INET6,
625629
SOCK_DGRAM,
@@ -648,8 +652,8 @@ static struct sock_addr_test tests[] = {
648652
{
649653
SOCK_ADDR_TEST_SENDMSG,
650654
"sendmsg4: sendmsg (dgram)",
651-
sendmsg4_prog_load,
652-
sendmsg4_prog_destroy,
655+
sendmsg_v4_prog_load,
656+
sendmsg_v4_prog_destroy,
653657
&user_ops,
654658
AF_INET,
655659
SOCK_DGRAM,
@@ -662,8 +666,8 @@ static struct sock_addr_test tests[] = {
662666
{
663667
SOCK_ADDR_TEST_SENDMSG,
664668
"sendmsg6: sendmsg (dgram)",
665-
sendmsg6_prog_load,
666-
sendmsg6_prog_destroy,
669+
sendmsg_v6_prog_load,
670+
sendmsg_v6_prog_destroy,
667671
&user_ops,
668672
AF_INET6,
669673
SOCK_DGRAM,
@@ -692,8 +696,8 @@ static struct sock_addr_test tests[] = {
692696
{
693697
SOCK_ADDR_TEST_SENDMSG,
694698
"sendmsg4: sock_sendmsg (dgram)",
695-
sendmsg4_prog_load,
696-
sendmsg4_prog_destroy,
699+
sendmsg_v4_prog_load,
700+
sendmsg_v4_prog_destroy,
697701
&kern_ops_sock_sendmsg,
698702
AF_INET,
699703
SOCK_DGRAM,
@@ -706,8 +710,8 @@ static struct sock_addr_test tests[] = {
706710
{
707711
SOCK_ADDR_TEST_SENDMSG,
708712
"sendmsg6: sock_sendmsg (dgram)",
709-
sendmsg6_prog_load,
710-
sendmsg6_prog_destroy,
713+
sendmsg_v6_prog_load,
714+
sendmsg_v6_prog_destroy,
711715
&kern_ops_sock_sendmsg,
712716
AF_INET6,
713717
SOCK_DGRAM,
@@ -736,8 +740,8 @@ static struct sock_addr_test tests[] = {
736740
{
737741
SOCK_ADDR_TEST_SENDMSG,
738742
"sendmsg4: kernel_sendmsg (dgram)",
739-
sendmsg4_prog_load,
740-
sendmsg4_prog_destroy,
743+
sendmsg_v4_prog_load,
744+
sendmsg_v4_prog_destroy,
741745
&kern_ops_kernel_sendmsg,
742746
AF_INET,
743747
SOCK_DGRAM,
@@ -750,8 +754,8 @@ static struct sock_addr_test tests[] = {
750754
{
751755
SOCK_ADDR_TEST_SENDMSG,
752756
"sendmsg6: kernel_sendmsg (dgram)",
753-
sendmsg6_prog_load,
754-
sendmsg6_prog_destroy,
757+
sendmsg_v6_prog_load,
758+
sendmsg_v6_prog_destroy,
755759
&kern_ops_kernel_sendmsg,
756760
AF_INET6,
757761
SOCK_DGRAM,

0 commit comments

Comments
 (0)