Skip to content

Commit eef0532

Browse files
Geliang TangMartin KaFai Lau
Geliang Tang
authored and
Martin KaFai Lau
committed
selftests/bpf: Null checks for links in bpf_tcp_ca
Run bpf_tcp_ca selftests (./test_progs -t bpf_tcp_ca) on a Loongarch platform, some "Segmentation fault" errors occur: ''' test_dctcp:PASS:bpf_dctcp__open_and_load 0 nsec test_dctcp:FAIL:bpf_map__attach_struct_ops unexpected error: -524 #29/1 bpf_tcp_ca/dctcp:FAIL test_cubic:PASS:bpf_cubic__open_and_load 0 nsec test_cubic:FAIL:bpf_map__attach_struct_ops unexpected error: -524 #29/2 bpf_tcp_ca/cubic:FAIL test_dctcp_fallback:PASS:dctcp_skel 0 nsec test_dctcp_fallback:PASS:bpf_dctcp__load 0 nsec test_dctcp_fallback:FAIL:dctcp link unexpected error: -524 #29/4 bpf_tcp_ca/dctcp_fallback:FAIL test_write_sk_pacing:PASS:open_and_load 0 nsec test_write_sk_pacing:FAIL:attach_struct_ops unexpected error: -524 #29/6 bpf_tcp_ca/write_sk_pacing:FAIL test_update_ca:PASS:open 0 nsec test_update_ca:FAIL:attach_struct_ops unexpected error: -524 settcpca:FAIL:setsockopt unexpected setsockopt: \ actual -1 == expected -1 (network_helpers.c:99: errno: No such file or directory) \ Failed to call post_socket_cb start_test:FAIL:start_server_str unexpected start_server_str: \ actual -1 == expected -1 test_update_ca:FAIL:ca1_ca1_cnt unexpected ca1_ca1_cnt: \ actual 0 <= expected 0 #29/9 bpf_tcp_ca/update_ca:FAIL #29 bpf_tcp_ca:FAIL Caught signal #11! Stack trace: ./test_progs(crash_handler+0x28)[0x5555567ed91c] linux-vdso.so.1(__vdso_rt_sigreturn+0x0)[0x7ffffee408b0] ./test_progs(bpf_link__update_map+0x80)[0x555556824a78] ./test_progs(+0x94d68)[0x5555564c4d68] ./test_progs(test_bpf_tcp_ca+0xe8)[0x5555564c6a88] ./test_progs(+0x3bde54)[0x5555567ede54] ./test_progs(main+0x61c)[0x5555567efd54] /usr/lib64/libc.so.6(+0x22208)[0x7ffff2aaa208] /usr/lib64/libc.so.6(__libc_start_main+0xac)[0x7ffff2aaa30c] ./test_progs(_start+0x48)[0x55555646bca8] Segmentation fault ''' This is because BPF trampoline is not implemented on Loongarch yet, "link" returned by bpf_map__attach_struct_ops() is NULL. test_progs crashs when this NULL link passes to bpf_link__update_map(). This patch adds NULL checks for all links in bpf_tcp_ca to fix these errors. If "link" is NULL, goto the newly added label "out" to destroy the skel. v2: - use "goto out" instead of "return" as Eduard suggested. Fixes: 06da9f3 ("selftests/bpf: Test switching TCP Congestion Control algorithms.") Signed-off-by: Geliang Tang <[email protected]> Reviewed-by: Alan Maguire <[email protected]> Link: https://lore.kernel.org/r/b4c841492bd4ed97964e4e61e92827ce51bf1dc9.1720615848.git.tanggeliang@kylinos.cn Signed-off-by: Martin KaFai Lau <[email protected]>
1 parent ec5b8c7 commit eef0532

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c

+12-4
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,8 @@ static void test_update_ca(void)
411411
return;
412412

413413
link = bpf_map__attach_struct_ops(skel->maps.ca_update_1);
414-
ASSERT_OK_PTR(link, "attach_struct_ops");
414+
if (!ASSERT_OK_PTR(link, "attach_struct_ops"))
415+
goto out;
415416

416417
do_test(&opts);
417418
saved_ca1_cnt = skel->bss->ca1_cnt;
@@ -425,6 +426,7 @@ static void test_update_ca(void)
425426
ASSERT_GT(skel->bss->ca2_cnt, 0, "ca2_ca2_cnt");
426427

427428
bpf_link__destroy(link);
429+
out:
428430
tcp_ca_update__destroy(skel);
429431
}
430432

@@ -447,7 +449,8 @@ static void test_update_wrong(void)
447449
return;
448450

449451
link = bpf_map__attach_struct_ops(skel->maps.ca_update_1);
450-
ASSERT_OK_PTR(link, "attach_struct_ops");
452+
if (!ASSERT_OK_PTR(link, "attach_struct_ops"))
453+
goto out;
451454

452455
do_test(&opts);
453456
saved_ca1_cnt = skel->bss->ca1_cnt;
@@ -460,6 +463,7 @@ static void test_update_wrong(void)
460463
ASSERT_GT(skel->bss->ca1_cnt, saved_ca1_cnt, "ca2_ca1_cnt");
461464

462465
bpf_link__destroy(link);
466+
out:
463467
tcp_ca_update__destroy(skel);
464468
}
465469

@@ -481,7 +485,8 @@ static void test_mixed_links(void)
481485
return;
482486

483487
link_nl = bpf_map__attach_struct_ops(skel->maps.ca_no_link);
484-
ASSERT_OK_PTR(link_nl, "attach_struct_ops_nl");
488+
if (!ASSERT_OK_PTR(link_nl, "attach_struct_ops_nl"))
489+
goto out;
485490

486491
link = bpf_map__attach_struct_ops(skel->maps.ca_update_1);
487492
ASSERT_OK_PTR(link, "attach_struct_ops");
@@ -494,6 +499,7 @@ static void test_mixed_links(void)
494499

495500
bpf_link__destroy(link);
496501
bpf_link__destroy(link_nl);
502+
out:
497503
tcp_ca_update__destroy(skel);
498504
}
499505

@@ -536,7 +542,8 @@ static void test_link_replace(void)
536542
bpf_link__destroy(link);
537543

538544
link = bpf_map__attach_struct_ops(skel->maps.ca_update_2);
539-
ASSERT_OK_PTR(link, "attach_struct_ops_2nd");
545+
if (!ASSERT_OK_PTR(link, "attach_struct_ops_2nd"))
546+
goto out;
540547

541548
/* BPF_F_REPLACE with a wrong old map Fd. It should fail!
542549
*
@@ -559,6 +566,7 @@ static void test_link_replace(void)
559566

560567
bpf_link__destroy(link);
561568

569+
out:
562570
tcp_ca_update__destroy(skel);
563571
}
564572

0 commit comments

Comments
 (0)