diff mbox series

[bpf-next,v9,07/11] selftests/bpf: Set expect_errno for cgroup_skb_sk_lookup

Message ID 739486ce0d05a999c317ad6b21d3ef02cdca2a5f.1720276189.git.tanggeliang@kylinos.cn
State New
Headers show
Series use network helpers, part 8 | expand

Commit Message

Geliang Tang July 6, 2024, 2:45 p.m. UTC 
From: Geliang Tang <tanggeliang@kylinos.cn>

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 the 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().

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/bpf/network_helpers.c                 | 2 +-
 tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index 062170d6be1c..1403487c5921 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -296,7 +296,7 @@  static int connect_fd_to_addr(int fd,
 			return -1;
 		}
 	} else {
-		if (ret) {
+		if (ret && errno != expect_errno) {
 			log_err("Failed to connect to server");
 			return -1;
 		}
diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c b/tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c
index bcf142779cc6..0ef2e9a6f47c 100644
--- a/tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c
+++ b/tools/testing/selftests/bpf/prog_tests/cgroup_skb_sk_lookup.c
@@ -10,6 +10,7 @@  static void run_lookup_test(__u16 *g_serv_port, int out_sk)
 {
 	struct network_helper_opts opts = {
 		.timeout_ms	= 1000,
+		.expect_errno	= EINPROGRESS,
 	};
 	int serv_sk = -1, in_sk = -1, serv_in_sk = -1, err;
 	struct sockaddr_in6 addr = {};
@@ -28,7 +29,7 @@  static void run_lookup_test(__u16 *g_serv_port, int out_sk)
 
 	/* Client outside of test cgroup should fail to connect by timeout. */
 	err = connect_fd_to_fd(out_sk, serv_sk, &opts);
-	if (CHECK(!err || errno != EINPROGRESS, "connect_fd_to_fd",
+	if (CHECK(err || errno != EINPROGRESS, "connect_fd_to_fd",
 		  "unexpected result err %d errno %d\n", err, errno))
 		goto cleanup;