renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
Code

selftests/bpf: Make tcp_rtt test more robust to failures

Browse Source 
Switch to non-blocking accept and wait for server thread to exit before
proceeding. I noticed that sometimes tcp_rtt server thread failure would
"spill over" into other tests (that would run after tcp_rtt), probably just
because server thread exits much later and tcp_rtt doesn't wait for it.

v1->v2:
  - add usleep() while waiting on initial non-blocking accept() (Stanislav);

Fixes: 8a03222f50 ("selftests/bpf: test_progs: fix client/server race in tcp_rtt")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Reviewed-by: Stanislav Fomichev <sdf@google.com>
Link: https://lore.kernel.org/bpf/20200311222749.458015-1-andriin@fb.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Andrii Nakryiko 2020-03-11 15:27:49 -07:00 committed by Alexei Starovoitov
parent 2b5cf9fb74
commit 4cd729fa02
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
View File

@ -188,7 +188,7 @@ static int start_server(void)
}; };
int fd; int fd;
fd = socket(AF_INET, SOCK_STREAM, 0); fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
if (fd < 0) { if (fd < 0) {
log_err("Failed to create server socket"); log_err("Failed to create server socket");
return -1; return -1;
@ -205,6 +205,7 @@ static int start_server(void)
static pthread_mutex_t server_started_mtx = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t server_started_mtx = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t server_started = PTHREAD_COND_INITIALIZER; static pthread_cond_t server_started = PTHREAD_COND_INITIALIZER;
static volatile bool server_done = false;
static void *server_thread(void *arg) static void *server_thread(void *arg)
{ {
@ -222,23 +223,24 @@ static void *server_thread(void *arg)
if (CHECK_FAIL(err < 0)) { if (CHECK_FAIL(err < 0)) {
perror("Failed to listed on socket"); perror("Failed to listed on socket");
return NULL; return ERR_PTR(err);
} }
client_fd = accept(fd, (struct sockaddr *)&addr, &len); while (!server_done) {
client_fd = accept(fd, (struct sockaddr *)&addr, &len);
if (client_fd == -1 && errno == EAGAIN) {
usleep(50);
continue;
}
break;
}
if (CHECK_FAIL(client_fd < 0)) { if (CHECK_FAIL(client_fd < 0)) {
perror("Failed to accept client"); perror("Failed to accept client");
return NULL; return ERR_PTR(err);
} }
/* Wait for the next connection (that never arrives) while (!server_done)
* to keep this thread alive to prevent calling usleep(50);
* close() on client_fd.
*/
if (CHECK_FAIL(accept(fd, (struct sockaddr *)&addr, &len) >= 0)) {
perror("Unexpected success in second accept");
return NULL;
}
close(client_fd); close(client_fd);
@ -249,6 +251,7 @@ void test_tcp_rtt(void)
{ {
int server_fd, cgroup_fd; int server_fd, cgroup_fd;
pthread_t tid; pthread_t tid;
void *server_res;
cgroup_fd = test__join_cgroup("/tcp_rtt"); cgroup_fd = test__join_cgroup("/tcp_rtt");
if (CHECK_FAIL(cgroup_fd < 0)) if (CHECK_FAIL(cgroup_fd < 0))
@ -267,6 +270,11 @@ void test_tcp_rtt(void)
pthread_mutex_unlock(&server_started_mtx); pthread_mutex_unlock(&server_started_mtx);
CHECK_FAIL(run_test(cgroup_fd, server_fd)); CHECK_FAIL(run_test(cgroup_fd, server_fd));
server_done = true;
pthread_join(tid, &server_res);
CHECK_FAIL(IS_ERR(server_res));
close_server_fd: close_server_fd:
close(server_fd); close(server_fd);
close_cgroup_fd: close_cgroup_fd: