openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

selftests: bpf: Fix sockmap update nits 

Address review by Yonghong, to bring the new tests in line with the
usual code style.

Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20200824084523.13104-1-lmb@cloudflare.com
This commit is contained in:
Lorenz Bauer 2020-08-24 09:45:23 +01:00 committed by Alexei Starovoitov
parent f872e4bc47
commit 8c3b3d971f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
View File

@ -118,10 +118,8 @@ static void test_sockmap_update(enum bpf_map_type map_type)
return;
skel = test_sockmap_update__open_and_load();
if (CHECK(!skel, "open_and_load", "cannot load skeleton\n")) {
close(sk);
return;
}
if (CHECK(!skel, "open_and_load", "cannot load skeleton\n"))
goto close_sk;
prog = bpf_program__fd(skel->progs.copy_sock_map);
src = bpf_map__fd(skel->maps.src);
@ -158,8 +156,9 @@ static void test_sockmap_update(enum bpf_map_type map_type)
dst_cookie, src_cookie);
out:
close(sk);
test_sockmap_update__destroy(skel);
close_sk:
close(sk);
}
static void test_sockmap_invalid_update(void)
@ -168,8 +167,7 @@ static void test_sockmap_invalid_update(void)
int duration = 0;
skel = test_sockmap_invalid_update__open_and_load();
CHECK(skel, "open_and_load", "verifier accepted map_update\n");
if (skel)
if (CHECK(skel, "open_and_load", "verifier accepted map_update\n"))
test_sockmap_invalid_update__destroy(skel);
}