Skip to content

Commit 2077465

Browse files
geliangtangMartin KaFai Lau
authored andcommitted
selftests/bpf: Fix error checks of mptcp open_and_load
Return libbpf_get_error(), instead of -EIO, for the error from mptcp_sock__open_and_load(). Load success means prog_fd and map_fd are always valid. So drop these unneeded ASSERT_GE checks for them in mptcp run_test(). Acked-by: Yonghong Song <yonghong.song@linux.dev> Signed-off-by: Geliang Tang <geliang.tang@suse.com> Link: https://lore.kernel.org/r/db5fcb93293df9ab173edcbaf8252465b80da6f2.1692147782.git.geliang.tang@suse.com Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
1 parent 97c9c65 commit 2077465

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

  • tools/testing/selftests/bpf/prog_tests

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -118,24 +118,14 @@ static int run_test(int cgroup_fd, int server_fd, bool is_mptcp)
118118

119119
sock_skel = mptcp_sock__open_and_load();
120120
if (!ASSERT_OK_PTR(sock_skel, "skel_open_load"))
121-
return -EIO;
121+
return libbpf_get_error(sock_skel);
122122

123123
err = mptcp_sock__attach(sock_skel);
124124
if (!ASSERT_OK(err, "skel_attach"))
125125
goto out;
126126

127127
prog_fd = bpf_program__fd(sock_skel->progs._sockops);
128-
if (!ASSERT_GE(prog_fd, 0, "bpf_program__fd")) {
129-
err = -EIO;
130-
goto out;
131-
}
132-
133128
map_fd = bpf_map__fd(sock_skel->maps.socket_storage_map);
134-
if (!ASSERT_GE(map_fd, 0, "bpf_map__fd")) {
135-
err = -EIO;
136-
goto out;
137-
}
138-
139129
err = bpf_prog_attach(prog_fd, cgroup_fd, BPF_CGROUP_SOCK_OPS, 0);
140130
if (!ASSERT_OK(err, "bpf_prog_attach"))
141131
goto out;

0 commit comments

Comments
 (0)