Commit 94c2f50b authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann

selftests/bpf: Fix race in tcp_rtt test

Previous attempt to make tcp_rtt more robust introduced a new race, in which
server_done might be set to true before server can actually accept any
connection. Fix this by unconditionally waiting for accept(). Given socket is
non-blocking, if there are any problems with client side, it should eventually
close listening FD and let server thread exit with failure.

Fixes: 4cd729fa ("selftests/bpf: Make tcp_rtt test more robust to failures")
Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200314013932.4035712-1-andriin@fb.com
parent 41078907
...@@ -226,7 +226,7 @@ static void *server_thread(void *arg) ...@@ -226,7 +226,7 @@ static void *server_thread(void *arg)
return ERR_PTR(err); return ERR_PTR(err);
} }
while (!server_done) { while (true) {
client_fd = accept(fd, (struct sockaddr *)&addr, &len); client_fd = accept(fd, (struct sockaddr *)&addr, &len);
if (client_fd == -1 && errno == EAGAIN) { if (client_fd == -1 && errno == EAGAIN) {
usleep(50); usleep(50);
...@@ -272,7 +272,7 @@ void test_tcp_rtt(void) ...@@ -272,7 +272,7 @@ void test_tcp_rtt(void)
CHECK_FAIL(run_test(cgroup_fd, server_fd)); CHECK_FAIL(run_test(cgroup_fd, server_fd));
server_done = true; server_done = true;
pthread_join(tid, &server_res); CHECK_FAIL(pthread_join(tid, &server_res));
CHECK_FAIL(IS_ERR(server_res)); CHECK_FAIL(IS_ERR(server_res));
close_server_fd: close_server_fd:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment