Skip to content

Commit

Permalink
Merge branch 'move-sockopt-tests'
Browse files Browse the repository at this point in the history 
Stanislav Fomichev says:

====================
Now that test_progs is shaping into more generic test framework,
let's convert sockopt tests to it. This requires adding
a helper to create and join a cgroup first (test__join_cgroup).
Since we already hijack stdout/stderr that shouldn't be
a problem (cgroup helpers log to stderr).

The rest of the patches just move sockopt tests files under prog_tests/
and do the required small adjustments.
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  • Loading branch information
Alexei Starovoitov committed Sep 6, 2019
2 parents 618916a + 1f4f80f commit 8f6e19a
Show file tree
Hide file tree
Showing 9 changed files with 142 additions and 274 deletions.
5 changes: 0 additions & 5 deletions tools/testing/selftests/bpf/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,3 @@ libbpf.so.*
test_hashmap
test_btf_dump
xdping
test_sockopt
test_sockopt_sk
test_sockopt_multi
test_sockopt_inherit
test_tcp_rtt
12 changes: 3 additions & 9 deletions tools/testing/selftests/bpf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +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_sockopt test_sockopt_sk \
test_sockopt_multi test_sockopt_inherit 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)
Expand Down Expand Up @@ -106,18 +105,13 @@ $(OUTPUT)/test_socket_cookie: cgroup_helpers.c
$(OUTPUT)/test_sockmap: cgroup_helpers.c
$(OUTPUT)/test_tcpbpf_user: cgroup_helpers.c
$(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c
$(OUTPUT)/test_progs: trace_helpers.c
$(OUTPUT)/test_progs: cgroup_helpers.c trace_helpers.c
$(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c
$(OUTPUT)/test_cgroup_storage: cgroup_helpers.c
$(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_sockopt: cgroup_helpers.c
$(OUTPUT)/test_sockopt_sk: cgroup_helpers.c
$(OUTPUT)/test_sockopt_multi: cgroup_helpers.c
$(OUTPUT)/test_sockopt_inherit: cgroup_helpers.c
$(OUTPUT)/test_tcp_rtt: cgroup_helpers.c

.PHONY: force

Expand Down Expand Up @@ -200,7 +194,7 @@ $(ALU32_BUILD_DIR)/test_progs_32: test_progs.c $(OUTPUT)/libbpf.a\
| $(ALU32_BUILD_DIR)
$(CC) $(TEST_PROGS_CFLAGS) $(CFLAGS) \
-o $(ALU32_BUILD_DIR)/test_progs_32 \
test_progs.c test_stub.c trace_helpers.c prog_tests/*.c \
test_progs.c test_stub.c cgroup_helpers.c trace_helpers.c prog_tests/*.c \
$(OUTPUT)/libbpf.a $(LDLIBS)

$(ALU32_BUILD_DIR)/test_progs_32: $(PROG_TESTS_H)
Expand Down
50 changes: 7 additions & 43 deletions tools/testing/selftests/bpf/test_sockopt.c → ...esting/selftests/bpf/prog_tests/sockopt.c
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,7 @@
// SPDX-License-Identifier: GPL-2.0

#include <errno.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.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 "/sockopt"

static char bpf_log_buf[4096];
static bool verbose;

Expand Down Expand Up @@ -983,39 +968,18 @@ static int run_test(int cgroup_fd, struct sockopt_test *test)
return ret;
}

int main(int args, char **argv)
void test_sockopt(void)
{
int err = EXIT_FAILURE, error_cnt = 0;
int cgroup_fd, i;

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("/sockopt");
if (CHECK_FAIL(cgroup_fd < 0))
return;

for (i = 0; i < ARRAY_SIZE(tests); i++) {
int err = run_test(cgroup_fd, &tests[i]);

if (err)
error_cnt++;

printf("#%d %s: %s\n", i, err ? "FAIL" : "PASS",
tests[i].descr);
test__start_subtest(tests[i].descr);
CHECK_FAIL(run_test(cgroup_fd, &tests[i]));
}

printf("Summary: %ld PASSED, %d FAILED\n",
ARRAY_SIZE(tests) - error_cnt, error_cnt);
err = error_cnt ? EXIT_FAILURE : EXIT_SUCCESS;

cleanup_cgroup:
close(cgroup_fd);
cleanup_cgroup_env:
cleanup_cgroup_environment();
cleanup_obj:
return err;
}
102 changes: 42 additions & 60 deletions ...ting/selftests/bpf/test_sockopt_inherit.c → ...elftests/bpf/prog_tests/sockopt_inherit.c
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,7 @@
// 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 <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 "/sockopt_inherit"
#define SOL_CUSTOM 0xdeadbeef
#define CUSTOM_INHERIT1 0
#define CUSTOM_INHERIT2 1
Expand Down Expand Up @@ -74,6 +59,9 @@ static int verify_sockopt(int fd, int optname, const char *msg, char expected)
return 0;
}

static pthread_mutex_t server_started_mtx = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t server_started = PTHREAD_COND_INITIALIZER;

static void *server_thread(void *arg)
{
struct sockaddr_storage addr;
Expand All @@ -82,16 +70,26 @@ static void *server_thread(void *arg)
int client_fd;
int err = 0;

if (listen(fd, 1) < 0)
error(1, errno, "Failed to listed on socket");
err = listen(fd, 1);

pthread_mutex_lock(&server_started_mtx);
pthread_cond_signal(&server_started);
pthread_mutex_unlock(&server_started_mtx);

if (CHECK_FAIL(err < 0)) {
perror("Failed to listed on socket");
return NULL;
}

err += verify_sockopt(fd, CUSTOM_INHERIT1, "listen", 1);
err += verify_sockopt(fd, CUSTOM_INHERIT2, "listen", 1);
err += verify_sockopt(fd, CUSTOM_LISTENER, "listen", 1);

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;
}

err += verify_sockopt(client_fd, CUSTOM_INHERIT1, "accept", 1);
err += verify_sockopt(client_fd, CUSTOM_INHERIT2, "accept", 1);
Expand Down Expand Up @@ -167,7 +165,7 @@ static int prog_attach(struct bpf_object *obj, int cgroup_fd, const char *title)
return 0;
}

static int run_test(int cgroup_fd)
static void run_test(int cgroup_fd)
{
struct bpf_prog_load_attr attr = {
.file = "./sockopt_inherit.o",
Expand All @@ -180,74 +178,58 @@ static int run_test(int cgroup_fd)
int err;

err = bpf_prog_load_xattr(&attr, &obj, &ignored);
if (err) {
log_err("Failed to load BPF object");
return -1;
}
if (CHECK_FAIL(err))
return;

err = prog_attach(obj, cgroup_fd, "cgroup/getsockopt");
if (err)
if (CHECK_FAIL(err))
goto close_bpf_object;

err = prog_attach(obj, cgroup_fd, "cgroup/setsockopt");
if (err)
if (CHECK_FAIL(err))
goto close_bpf_object;

server_fd = start_server();
if (server_fd < 0) {
err = -1;
if (CHECK_FAIL(server_fd < 0))
goto close_bpf_object;

if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread,
(void *)&server_fd)))
goto close_bpf_object;
}

pthread_create(&tid, NULL, server_thread, (void *)&server_fd);
pthread_mutex_lock(&server_started_mtx);
pthread_cond_wait(&server_started, &server_started_mtx);
pthread_mutex_unlock(&server_started_mtx);

client_fd = connect_to_server(server_fd);
if (client_fd < 0) {
err = -1;
if (CHECK_FAIL(client_fd < 0))
goto close_server_fd;
}

err += verify_sockopt(client_fd, CUSTOM_INHERIT1, "connect", 0);
err += verify_sockopt(client_fd, CUSTOM_INHERIT2, "connect", 0);
err += verify_sockopt(client_fd, CUSTOM_LISTENER, "connect", 0);
CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_INHERIT1, "connect", 0));
CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_INHERIT2, "connect", 0));
CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_LISTENER, "connect", 0));

pthread_join(tid, &server_err);

err += (int)(long)server_err;
err = (int)(long)server_err;
CHECK_FAIL(err);

close(client_fd);

close_server_fd:
close(server_fd);
close_bpf_object:
bpf_object__close(obj);
return err;
}

int main(int args, char **argv)
void test_sockopt_inherit(void)
{
int cgroup_fd;
int err = EXIT_SUCCESS;

if (setup_cgroup_environment())
return err;

cgroup_fd = create_and_get_cgroup(CG_PATH);
if (cgroup_fd < 0)
goto cleanup_cgroup_env;

if (join_cgroup(CG_PATH))
goto cleanup_cgroup;

if (run_test(cgroup_fd))
err = EXIT_FAILURE;

printf("test_sockopt_inherit: %s\n",
err == EXIT_SUCCESS ? "PASSED" : "FAILED");
cgroup_fd = test__join_cgroup("/sockopt_inherit");
if (CHECK_FAIL(cgroup_fd < 0))
return;

cleanup_cgroup:
run_test(cgroup_fd);
close(cgroup_fd);
cleanup_cgroup_env:
cleanup_cgroup_environment();
return err;
}
62 changes: 10 additions & 52 deletions ...esting/selftests/bpf/test_sockopt_multi.c → .../selftests/bpf/prog_tests/sockopt_multi.c
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
// 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 <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"

static int prog_attach(struct bpf_object *obj, int cgroup_fd, const char *title)
Expand Down Expand Up @@ -308,7 +294,7 @@ static int run_setsockopt_test(struct bpf_object *obj, int cg_parent,
return err;
}

int main(int argc, char **argv)
void test_sockopt_multi(void)
{
struct bpf_prog_load_attr attr = {
.file = "./sockopt_multi.o",
Expand All @@ -319,56 +305,28 @@ int main(int argc, char **argv)
int err = -1;
int ignored;

if (setup_cgroup_environment()) {
log_err("Failed to setup cgroup environment\n");
goto out;
}

cg_parent = create_and_get_cgroup("/parent");
if (cg_parent < 0) {
log_err("Failed to create cgroup /parent\n");
goto out;
}

cg_child = create_and_get_cgroup("/parent/child");
if (cg_child < 0) {
log_err("Failed to create cgroup /parent/child\n");
cg_parent = test__join_cgroup("/parent");
if (CHECK_FAIL(cg_parent < 0))
goto out;
}

if (join_cgroup("/parent/child")) {
log_err("Failed to join cgroup /parent/child\n");
cg_child = test__join_cgroup("/parent/child");
if (CHECK_FAIL(cg_child < 0))
goto out;
}

err = bpf_prog_load_xattr(&attr, &obj, &ignored);
if (err) {
log_err("Failed to load BPF object");
if (CHECK_FAIL(err))
goto out;
}

sock_fd = socket(AF_INET, SOCK_STREAM, 0);
if (sock_fd < 0) {
log_err("Failed to create socket");
if (CHECK_FAIL(sock_fd < 0))
goto out;
}

if (run_getsockopt_test(obj, cg_parent, cg_child, sock_fd))
err = -1;
printf("test_sockopt_multi: getsockopt %s\n",
err ? "FAILED" : "PASSED");

if (run_setsockopt_test(obj, cg_parent, cg_child, sock_fd))
err = -1;
printf("test_sockopt_multi: setsockopt %s\n",
err ? "FAILED" : "PASSED");
CHECK_FAIL(run_getsockopt_test(obj, cg_parent, cg_child, sock_fd));
CHECK_FAIL(run_setsockopt_test(obj, cg_parent, cg_child, sock_fd));

out:
close(sock_fd);
bpf_object__close(obj);
close(cg_child);
close(cg_parent);

printf("test_sockopt_multi: %s\n", err ? "FAILED" : "PASSED");
return err ? EXIT_FAILURE : EXIT_SUCCESS;
}
Loading

0 comments on commit 8f6e19a

Please sign in to comment.