Skip to content

Commit d9befb6

Browse files
Geliang TangKernel Patches Daemon
authored andcommitted
selftests/bpf: Set expect_errno for cgroup_skb_sk_lookup
EINPROGRESS is skipped in run_lookup_test() in cgroup_skb_sk_lookup tests, but it is still showed in the log: ./test_progs -t cgroup_skb_sk_lookup -v run_cgroup_bpf_test:PASS:skel_open_load 0 nsec run_cgroup_bpf_test:PASS:cgroup_join 0 nsec run_cgroup_bpf_test:PASS:cgroup_attach 0 nsec run_lookup_test:PASS:start_server 0 nsec run_lookup_test:PASS:getsockname 0 nsec (network_helpers.c:300: errno: Operation now in progress) Failed to \ connect to server run_lookup_test:PASS:connect_fd_to_fd 0 nsec run_lookup_test:PASS:connect_to_fd 0 nsec run_lookup_test:PASS:accept 0 nsec #51 cgroup_skb_sk_lookup:OK To fix this, set EINPROGRESS as "expect_errno" of network_helper_opts and pass it to connect_fd_to_fd(). Skip this expect_errno when must_fail is false too in connect_fd_to_addr(). connect_fd_to_fd() returns "0" when connect() fails but "expect_errno" matched. So "err" is "0" after invoking connect_fd_to_fd() in run_lookup_test(). "err = -errno" is needed to get the real error number before checking value of "err". Signed-off-by: Geliang Tang <[email protected]>
1 parent cf338f8 commit d9befb6

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

tools/testing/selftests/bpf/network_helpers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ static int connect_fd_to_addr(int fd,
296296
return -1;
297297
}
298298
} else {
299-
if (ret) {
299+
if (ret && errno != expect_errno) {
300300
log_err("Failed to connect to server");
301301
return -1;
302302
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ static void run_lookup_test(__u16 *g_serv_port, int out_sk)
1010
{
1111
struct network_helper_opts opts = {
1212
.timeout_ms = 1000,
13+
.expect_errno = EINPROGRESS,
1314
};
1415
int serv_sk = -1, in_sk = -1, serv_in_sk = -1, err;
1516
struct sockaddr_in6 addr = {};
@@ -28,6 +29,8 @@ static void run_lookup_test(__u16 *g_serv_port, int out_sk)
2829

2930
/* Client outside of test cgroup should fail to connect by timeout. */
3031
err = connect_fd_to_fd(out_sk, serv_sk, &opts);
32+
if (!err)
33+
err = -errno;
3134
if (CHECK(!err || errno != EINPROGRESS, "connect_fd_to_fd",
3235
"unexpected result err %d errno %d\n", err, errno))
3336
goto cleanup;

0 commit comments

Comments
 (0)