Skip to content

Commit 8f6e19a

Browse files
author
Alexei Starovoitov
committed
Merge branch 'move-sockopt-tests'
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>
2 parents 618916a + 1f4f80f commit 8f6e19a

File tree

9 files changed

+142
-274
lines changed

9 files changed

+142
-274
lines changed

‎tools/testing/selftests/bpf/.gitignore‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,3 @@ libbpf.so.*
3939
test_hashmap
4040
test_btf_dump
4141
xdping
42-
test_sockopt
43-
test_sockopt_sk
44-
test_sockopt_multi
45-
test_sockopt_inherit
46-
test_tcp_rtt

‎tools/testing/selftests/bpf/Makefile‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test
2828
test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \
2929
test_cgroup_storage test_select_reuseport test_section_names \
3030
test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \
31-
test_btf_dump test_cgroup_attach xdping test_sockopt test_sockopt_sk \
32-
test_sockopt_multi test_sockopt_inherit test_tcp_rtt
31+
test_btf_dump test_cgroup_attach xdping
3332

3433
BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
3534
TEST_GEN_FILES = $(BPF_OBJ_FILES)
@@ -106,18 +105,13 @@ $(OUTPUT)/test_socket_cookie: cgroup_helpers.c
106105
$(OUTPUT)/test_sockmap: cgroup_helpers.c
107106
$(OUTPUT)/test_tcpbpf_user: cgroup_helpers.c
108107
$(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c
109-
$(OUTPUT)/test_progs: trace_helpers.c
108+
$(OUTPUT)/test_progs: cgroup_helpers.c trace_helpers.c
110109
$(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c
111110
$(OUTPUT)/test_cgroup_storage: cgroup_helpers.c
112111
$(OUTPUT)/test_netcnt: cgroup_helpers.c
113112
$(OUTPUT)/test_sock_fields: cgroup_helpers.c
114113
$(OUTPUT)/test_sysctl: cgroup_helpers.c
115114
$(OUTPUT)/test_cgroup_attach: cgroup_helpers.c
116-
$(OUTPUT)/test_sockopt: cgroup_helpers.c
117-
$(OUTPUT)/test_sockopt_sk: cgroup_helpers.c
118-
$(OUTPUT)/test_sockopt_multi: cgroup_helpers.c
119-
$(OUTPUT)/test_sockopt_inherit: cgroup_helpers.c
120-
$(OUTPUT)/test_tcp_rtt: cgroup_helpers.c
121115

122116
.PHONY: force
123117

@@ -200,7 +194,7 @@ $(ALU32_BUILD_DIR)/test_progs_32: test_progs.c $(OUTPUT)/libbpf.a\
200194
| $(ALU32_BUILD_DIR)
201195
$(CC) $(TEST_PROGS_CFLAGS) $(CFLAGS) \
202196
-o $(ALU32_BUILD_DIR)/test_progs_32 \
203-
test_progs.c test_stub.c trace_helpers.c prog_tests/*.c \
197+
test_progs.c test_stub.c cgroup_helpers.c trace_helpers.c prog_tests/*.c \
204198
$(OUTPUT)/libbpf.a $(LDLIBS)
205199

206200
$(ALU32_BUILD_DIR)/test_progs_32: $(PROG_TESTS_H)

‎tools/testing/selftests/bpf/test_sockopt.c‎ renamed to ‎tools/testing/selftests/bpf/prog_tests/sockopt.c‎

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
3-
#include <errno.h>
4-
#include <stdio.h>
5-
#include <unistd.h>
6-
#include <sys/types.h>
7-
#include <sys/socket.h>
8-
#include <netinet/in.h>
9-
10-
#include <linux/filter.h>
11-
#include <bpf/bpf.h>
12-
#include <bpf/libbpf.h>
13-
14-
#include "bpf_rlimit.h"
15-
#include "bpf_util.h"
2+
#include <test_progs.h>
163
#include "cgroup_helpers.h"
174

18-
#define CG_PATH "/sockopt"
19-
205
static char bpf_log_buf[4096];
216
static bool verbose;
227

@@ -983,39 +968,18 @@ static int run_test(int cgroup_fd, struct sockopt_test *test)
983968
return ret;
984969
}
985970

986-
int main(int args, char **argv)
971+
void test_sockopt(void)
987972
{
988-
int err = EXIT_FAILURE, error_cnt = 0;
989973
int cgroup_fd, i;
990974

991-
if (setup_cgroup_environment())
992-
goto cleanup_obj;
993-
994-
cgroup_fd = create_and_get_cgroup(CG_PATH);
995-
if (cgroup_fd < 0)
996-
goto cleanup_cgroup_env;
997-
998-
if (join_cgroup(CG_PATH))
999-
goto cleanup_cgroup;
975+
cgroup_fd = test__join_cgroup("/sockopt");
976+
if (CHECK_FAIL(cgroup_fd < 0))
977+
return;
1000978

1001979
for (i = 0; i < ARRAY_SIZE(tests); i++) {
1002-
int err = run_test(cgroup_fd, &tests[i]);
1003-
1004-
if (err)
1005-
error_cnt++;
1006-
1007-
printf("#%d %s: %s\n", i, err ? "FAIL" : "PASS",
1008-
tests[i].descr);
980+
test__start_subtest(tests[i].descr);
981+
CHECK_FAIL(run_test(cgroup_fd, &tests[i]));
1009982
}
1010983

1011-
printf("Summary: %ld PASSED, %d FAILED\n",
1012-
ARRAY_SIZE(tests) - error_cnt, error_cnt);
1013-
err = error_cnt ? EXIT_FAILURE : EXIT_SUCCESS;
1014-
1015-
cleanup_cgroup:
1016984
close(cgroup_fd);
1017-
cleanup_cgroup_env:
1018-
cleanup_cgroup_environment();
1019-
cleanup_obj:
1020-
return err;
1021985
}

‎tools/testing/selftests/bpf/test_sockopt_inherit.c‎ renamed to ‎tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c‎

Lines changed: 42 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
#include <error.h>
3-
#include <errno.h>
4-
#include <stdio.h>
5-
#include <unistd.h>
6-
#include <sys/types.h>
7-
#include <sys/socket.h>
8-
#include <netinet/in.h>
9-
#include <pthread.h>
10-
11-
#include <linux/filter.h>
12-
#include <bpf/bpf.h>
13-
#include <bpf/libbpf.h>
14-
15-
#include "bpf_rlimit.h"
16-
#include "bpf_util.h"
2+
#include <test_progs.h>
173
#include "cgroup_helpers.h"
184

19-
#define CG_PATH "/sockopt_inherit"
205
#define SOL_CUSTOM 0xdeadbeef
216
#define CUSTOM_INHERIT1 0
227
#define CUSTOM_INHERIT2 1
@@ -74,6 +59,9 @@ static int verify_sockopt(int fd, int optname, const char *msg, char expected)
7459
return 0;
7560
}
7661

62+
static pthread_mutex_t server_started_mtx = PTHREAD_MUTEX_INITIALIZER;
63+
static pthread_cond_t server_started = PTHREAD_COND_INITIALIZER;
64+
7765
static void *server_thread(void *arg)
7866
{
7967
struct sockaddr_storage addr;
@@ -82,16 +70,26 @@ static void *server_thread(void *arg)
8270
int client_fd;
8371
int err = 0;
8472

85-
if (listen(fd, 1) < 0)
86-
error(1, errno, "Failed to listed on socket");
73+
err = listen(fd, 1);
74+
75+
pthread_mutex_lock(&server_started_mtx);
76+
pthread_cond_signal(&server_started);
77+
pthread_mutex_unlock(&server_started_mtx);
78+
79+
if (CHECK_FAIL(err < 0)) {
80+
perror("Failed to listed on socket");
81+
return NULL;
82+
}
8783

8884
err += verify_sockopt(fd, CUSTOM_INHERIT1, "listen", 1);
8985
err += verify_sockopt(fd, CUSTOM_INHERIT2, "listen", 1);
9086
err += verify_sockopt(fd, CUSTOM_LISTENER, "listen", 1);
9187

9288
client_fd = accept(fd, (struct sockaddr *)&addr, &len);
93-
if (client_fd < 0)
94-
error(1, errno, "Failed to accept client");
89+
if (CHECK_FAIL(client_fd < 0)) {
90+
perror("Failed to accept client");
91+
return NULL;
92+
}
9593

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

170-
static int run_test(int cgroup_fd)
168+
static void run_test(int cgroup_fd)
171169
{
172170
struct bpf_prog_load_attr attr = {
173171
.file = "./sockopt_inherit.o",
@@ -180,74 +178,58 @@ static int run_test(int cgroup_fd)
180178
int err;
181179

182180
err = bpf_prog_load_xattr(&attr, &obj, &ignored);
183-
if (err) {
184-
log_err("Failed to load BPF object");
185-
return -1;
186-
}
181+
if (CHECK_FAIL(err))
182+
return;
187183

188184
err = prog_attach(obj, cgroup_fd, "cgroup/getsockopt");
189-
if (err)
185+
if (CHECK_FAIL(err))
190186
goto close_bpf_object;
191187

192188
err = prog_attach(obj, cgroup_fd, "cgroup/setsockopt");
193-
if (err)
189+
if (CHECK_FAIL(err))
194190
goto close_bpf_object;
195191

196192
server_fd = start_server();
197-
if (server_fd < 0) {
198-
err = -1;
193+
if (CHECK_FAIL(server_fd < 0))
194+
goto close_bpf_object;
195+
196+
if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread,
197+
(void *)&server_fd)))
199198
goto close_bpf_object;
200-
}
201199

202-
pthread_create(&tid, NULL, server_thread, (void *)&server_fd);
200+
pthread_mutex_lock(&server_started_mtx);
201+
pthread_cond_wait(&server_started, &server_started_mtx);
202+
pthread_mutex_unlock(&server_started_mtx);
203203

204204
client_fd = connect_to_server(server_fd);
205-
if (client_fd < 0) {
206-
err = -1;
205+
if (CHECK_FAIL(client_fd < 0))
207206
goto close_server_fd;
208-
}
209207

210-
err += verify_sockopt(client_fd, CUSTOM_INHERIT1, "connect", 0);
211-
err += verify_sockopt(client_fd, CUSTOM_INHERIT2, "connect", 0);
212-
err += verify_sockopt(client_fd, CUSTOM_LISTENER, "connect", 0);
208+
CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_INHERIT1, "connect", 0));
209+
CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_INHERIT2, "connect", 0));
210+
CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_LISTENER, "connect", 0));
213211

214212
pthread_join(tid, &server_err);
215213

216-
err += (int)(long)server_err;
214+
err = (int)(long)server_err;
215+
CHECK_FAIL(err);
217216

218217
close(client_fd);
219218

220219
close_server_fd:
221220
close(server_fd);
222221
close_bpf_object:
223222
bpf_object__close(obj);
224-
return err;
225223
}
226224

227-
int main(int args, char **argv)
225+
void test_sockopt_inherit(void)
228226
{
229227
int cgroup_fd;
230-
int err = EXIT_SUCCESS;
231-
232-
if (setup_cgroup_environment())
233-
return err;
234-
235-
cgroup_fd = create_and_get_cgroup(CG_PATH);
236-
if (cgroup_fd < 0)
237-
goto cleanup_cgroup_env;
238-
239-
if (join_cgroup(CG_PATH))
240-
goto cleanup_cgroup;
241-
242-
if (run_test(cgroup_fd))
243-
err = EXIT_FAILURE;
244228

245-
printf("test_sockopt_inherit: %s\n",
246-
err == EXIT_SUCCESS ? "PASSED" : "FAILED");
229+
cgroup_fd = test__join_cgroup("/sockopt_inherit");
230+
if (CHECK_FAIL(cgroup_fd < 0))
231+
return;
247232

248-
cleanup_cgroup:
233+
run_test(cgroup_fd);
249234
close(cgroup_fd);
250-
cleanup_cgroup_env:
251-
cleanup_cgroup_environment();
252-
return err;
253235
}

‎tools/testing/selftests/bpf/test_sockopt_multi.c‎ renamed to ‎tools/testing/selftests/bpf/prog_tests/sockopt_multi.c‎

Lines changed: 10 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
3-
#include <error.h>
4-
#include <errno.h>
5-
#include <stdio.h>
6-
#include <unistd.h>
7-
#include <sys/types.h>
8-
#include <sys/socket.h>
9-
#include <netinet/in.h>
10-
11-
#include <linux/filter.h>
12-
#include <bpf/bpf.h>
13-
#include <bpf/libbpf.h>
14-
15-
#include "bpf_rlimit.h"
16-
#include "bpf_util.h"
2+
#include <test_progs.h>
173
#include "cgroup_helpers.h"
184

195
static int prog_attach(struct bpf_object *obj, int cgroup_fd, const char *title)
@@ -308,7 +294,7 @@ static int run_setsockopt_test(struct bpf_object *obj, int cg_parent,
308294
return err;
309295
}
310296

311-
int main(int argc, char **argv)
297+
void test_sockopt_multi(void)
312298
{
313299
struct bpf_prog_load_attr attr = {
314300
.file = "./sockopt_multi.o",
@@ -319,56 +305,28 @@ int main(int argc, char **argv)
319305
int err = -1;
320306
int ignored;
321307

322-
if (setup_cgroup_environment()) {
323-
log_err("Failed to setup cgroup environment\n");
324-
goto out;
325-
}
326-
327-
cg_parent = create_and_get_cgroup("/parent");
328-
if (cg_parent < 0) {
329-
log_err("Failed to create cgroup /parent\n");
330-
goto out;
331-
}
332-
333-
cg_child = create_and_get_cgroup("/parent/child");
334-
if (cg_child < 0) {
335-
log_err("Failed to create cgroup /parent/child\n");
308+
cg_parent = test__join_cgroup("/parent");
309+
if (CHECK_FAIL(cg_parent < 0))
336310
goto out;
337-
}
338311

339-
if (join_cgroup("/parent/child")) {
340-
log_err("Failed to join cgroup /parent/child\n");
312+
cg_child = test__join_cgroup("/parent/child");
313+
if (CHECK_FAIL(cg_child < 0))
341314
goto out;
342-
}
343315

344316
err = bpf_prog_load_xattr(&attr, &obj, &ignored);
345-
if (err) {
346-
log_err("Failed to load BPF object");
317+
if (CHECK_FAIL(err))
347318
goto out;
348-
}
349319

350320
sock_fd = socket(AF_INET, SOCK_STREAM, 0);
351-
if (sock_fd < 0) {
352-
log_err("Failed to create socket");
321+
if (CHECK_FAIL(sock_fd < 0))
353322
goto out;
354-
}
355323

356-
if (run_getsockopt_test(obj, cg_parent, cg_child, sock_fd))
357-
err = -1;
358-
printf("test_sockopt_multi: getsockopt %s\n",
359-
err ? "FAILED" : "PASSED");
360-
361-
if (run_setsockopt_test(obj, cg_parent, cg_child, sock_fd))
362-
err = -1;
363-
printf("test_sockopt_multi: setsockopt %s\n",
364-
err ? "FAILED" : "PASSED");
324+
CHECK_FAIL(run_getsockopt_test(obj, cg_parent, cg_child, sock_fd));
325+
CHECK_FAIL(run_setsockopt_test(obj, cg_parent, cg_child, sock_fd));
365326

366327
out:
367328
close(sock_fd);
368329
bpf_object__close(obj);
369330
close(cg_child);
370331
close(cg_parent);
371-
372-
printf("test_sockopt_multi: %s\n", err ? "FAILED" : "PASSED");
373-
return err ? EXIT_FAILURE : EXIT_SUCCESS;
374332
}

0 commit comments

Comments
 (0)