Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f4f80fe authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Alexei Starovoitov
Browse files

selftests/bpf: test_progs: convert test_tcp_rtt 



Move the files, adjust includes, remove entry from Makefile & .gitignore

Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent e3e02e1d

tools/testing/selftests/bpf/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -39,4 +39,3 @@ libbpf.so.* 
test_hashmap

test_btf_dump

xdping
 
test_tcp_rtt

tools/testing/selftests/bpf/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test 
	test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \

	test_cgroup_storage test_select_reuseport test_section_names \

	test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \

	test_btf_dump test_cgroup_attach xdping test_tcp_rtt

	test_btf_dump test_cgroup_attach xdping



BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))

TEST_GEN_FILES = $(BPF_OBJ_FILES)
@@ -112,7 +112,6 @@ $(OUTPUT)/test_netcnt: cgroup_helpers.c 
$(OUTPUT)/test_sock_fields: cgroup_helpers.c

$(OUTPUT)/test_sysctl: cgroup_helpers.c

$(OUTPUT)/test_cgroup_attach: cgroup_helpers.c

$(OUTPUT)/test_tcp_rtt: cgroup_helpers.c



.PHONY: force

tools/testing/selftests/bpf/test_tcp_rtt.c→tools/testing/selftests/bpf/prog_tests/tcp_rtt.c

+27 −56
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <error.h>

#include <errno.h>

#include <stdio.h>

#include <unistd.h>

#include <sys/types.h>

#include <sys/socket.h>

#include <netinet/in.h>

#include <netinet/tcp.h>

#include <pthread.h>



#include <linux/filter.h>

#include <bpf/bpf.h>

#include <bpf/libbpf.h>



#include "bpf_rlimit.h"

#include "bpf_util.h"

#include <test_progs.h>

#include "cgroup_helpers.h"



#define CG_PATH                                "/tcp_rtt"



struct tcp_rtt_storage {

	__u32 invoked;

	__u32 dsack_dups;
@@ -31,8 +14,8 @@ static void send_byte(int fd) 
{

	char b = 0x55;



	if (write(fd, &b, sizeof(b)) != 1)

		error(1, errno, "Failed to send single byte");

	if (CHECK_FAIL(write(fd, &b, sizeof(b)) != 1))

		perror("Failed to send single byte");

}



static int wait_for_ack(int fd, int retries)
@@ -66,8 +49,10 @@ static int verify_sk(int map_fd, int client_fd, const char *msg, __u32 invoked, 
	int err = 0;

	struct tcp_rtt_storage val;



	if (bpf_map_lookup_elem(map_fd, &client_fd, &val) < 0)

		error(1, errno, "Failed to read socket storage");

	if (CHECK_FAIL(bpf_map_lookup_elem(map_fd, &client_fd, &val) < 0)) {

		perror("Failed to read socket storage");

		return -1;

	}



	if (val.invoked != invoked) {

		log_err("%s: unexpected bpf_tcp_sock.invoked %d != %d",
@@ -225,61 +210,47 @@ static void *server_thread(void *arg) 
	int fd = *(int *)arg;

	int client_fd;



	if (listen(fd, 1) < 0)

		error(1, errno, "Failed to listed on socket");

	if (CHECK_FAIL(listen(fd, 1)) < 0) {

		perror("Failed to listed on socket");

		return NULL;

	}



	client_fd = accept(fd, (struct sockaddr *)&addr, &len);

	if (client_fd < 0)

		error(1, errno, "Failed to accept client");

	if (CHECK_FAIL(client_fd < 0)) {

		perror("Failed to accept client");

		return NULL;

	}



	/* Wait for the next connection (that never arrives)

	 * to keep this thread alive to prevent calling

	 * close() on client_fd.

	 */

	if (accept(fd, (struct sockaddr *)&addr, &len) >= 0)

		error(1, errno, "Unexpected success in second accept");

	if (CHECK_FAIL(accept(fd, (struct sockaddr *)&addr, &len) >= 0)) {

		perror("Unexpected success in second accept");

		return NULL;

	}



	close(client_fd);



	return NULL;

}



int main(int args, char **argv)

void test_tcp_rtt(void)

{

	int server_fd, cgroup_fd;

	int err = EXIT_SUCCESS;

	pthread_t tid;



	if (setup_cgroup_environment())

		goto cleanup_obj;



	cgroup_fd = create_and_get_cgroup(CG_PATH);

	if (cgroup_fd < 0)

		goto cleanup_cgroup_env;



	if (join_cgroup(CG_PATH))

		goto cleanup_cgroup;

	cgroup_fd = test__join_cgroup("/tcp_rtt");

	if (CHECK_FAIL(cgroup_fd < 0))

		return;



	server_fd = start_server();

	if (server_fd < 0) {

		err = EXIT_FAILURE;

		goto cleanup_cgroup;

	}

	if (CHECK_FAIL(server_fd < 0))

		goto close_cgroup_fd;



	pthread_create(&tid, NULL, server_thread, (void *)&server_fd);



	if (run_test(cgroup_fd, server_fd))

		err = EXIT_FAILURE;



	CHECK_FAIL(run_test(cgroup_fd, server_fd));

	close(server_fd);



	printf("test_sockopt_sk: %s\n",

	       err == EXIT_SUCCESS ? "PASSED" : "FAILED");



cleanup_cgroup:

close_cgroup_fd:

	close(cgroup_fd);

cleanup_cgroup_env:

	cleanup_cgroup_environment();

cleanup_obj:

	return err;

}