-
Notifications
You must be signed in to change notification settings - Fork 103
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Alexander Duyck says:
====================
Move the test functionality from test_tcpbpf_user into the test_progs
framework so that it will be run any time the test_progs framework is run.
This will help to prevent future test escapes as the individual tests, such
as test_tcpbpf_user, are less likely to be run by developers and CI tests.
As a part of moving it over the series goes through and updates the code to
make use of the existing APIs included in the test_progs framework. This is
meant to simplify and streamline the test code and avoid duplication of
effort.
v2: Dropped test_tcpbpf_user from .gitignore
Replaced CHECK_FAIL calls with CHECK calls
Minimized changes in patch 1 when moving the file
Updated stg mail command line to display renames in submission
Added shutdown logic to end of run_test function to guarantee close
Added patch that replaces the two maps with use of global variables
====================
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>- Loading branch information
Showing
8 changed files
with
159 additions
and
371 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 | ||
| #include <inttypes.h> | ||
| #include <test_progs.h> | ||
| #include <network_helpers.h> | ||
|
|
||
| #include "test_tcpbpf.h" | ||
| #include "test_tcpbpf_kern.skel.h" | ||
|
|
||
| #define LO_ADDR6 "::1" | ||
| #define CG_NAME "/tcpbpf-user-test" | ||
|
|
||
| static __u32 duration; | ||
|
|
||
| static void verify_result(struct tcpbpf_globals *result) | ||
| { | ||
| __u32 expected_events = ((1 << BPF_SOCK_OPS_TIMEOUT_INIT) | | ||
| (1 << BPF_SOCK_OPS_RWND_INIT) | | ||
| (1 << BPF_SOCK_OPS_TCP_CONNECT_CB) | | ||
| (1 << BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB) | | ||
| (1 << BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB) | | ||
| (1 << BPF_SOCK_OPS_NEEDS_ECN) | | ||
| (1 << BPF_SOCK_OPS_STATE_CB) | | ||
| (1 << BPF_SOCK_OPS_TCP_LISTEN_CB)); | ||
|
|
||
| /* check global map */ | ||
| CHECK(expected_events != result->event_map, "event_map", | ||
| "unexpected event_map: actual %#" PRIx32" != expected %#" PRIx32 "\n", | ||
| result->event_map, expected_events); | ||
|
|
||
| ASSERT_EQ(result->bytes_received, 501, "bytes_received"); | ||
| ASSERT_EQ(result->bytes_acked, 1002, "bytes_acked"); | ||
| ASSERT_EQ(result->data_segs_in, 1, "data_segs_in"); | ||
| ASSERT_EQ(result->data_segs_out, 1, "data_segs_out"); | ||
| ASSERT_EQ(result->bad_cb_test_rv, 0x80, "bad_cb_test_rv"); | ||
| ASSERT_EQ(result->good_cb_test_rv, 0, "good_cb_test_rv"); | ||
| ASSERT_EQ(result->num_listen, 1, "num_listen"); | ||
|
|
||
| /* 3 comes from one listening socket + both ends of the connection */ | ||
| ASSERT_EQ(result->num_close_events, 3, "num_close_events"); | ||
|
|
||
| /* check setsockopt for SAVE_SYN */ | ||
| ASSERT_EQ(result->tcp_save_syn, 0, "tcp_save_syn"); | ||
|
|
||
| /* check getsockopt for SAVED_SYN */ | ||
| ASSERT_EQ(result->tcp_saved_syn, 1, "tcp_saved_syn"); | ||
| } | ||
|
|
||
| static void run_test(struct tcpbpf_globals *result) | ||
| { | ||
| int listen_fd = -1, cli_fd = -1, accept_fd = -1; | ||
| char buf[1000]; | ||
| int err = -1; | ||
| int i; | ||
|
|
||
| listen_fd = start_server(AF_INET6, SOCK_STREAM, LO_ADDR6, 0, 0); | ||
| if (CHECK(listen_fd == -1, "start_server", "listen_fd:%d errno:%d\n", | ||
| listen_fd, errno)) | ||
| goto done; | ||
|
|
||
| cli_fd = connect_to_fd(listen_fd, 0); | ||
| if (CHECK(cli_fd == -1, "connect_to_fd(listen_fd)", | ||
| "cli_fd:%d errno:%d\n", cli_fd, errno)) | ||
| goto done; | ||
|
|
||
| accept_fd = accept(listen_fd, NULL, NULL); | ||
| if (CHECK(accept_fd == -1, "accept(listen_fd)", | ||
| "accept_fd:%d errno:%d\n", accept_fd, errno)) | ||
| goto done; | ||
|
|
||
| /* Send 1000B of '+'s from cli_fd -> accept_fd */ | ||
| for (i = 0; i < 1000; i++) | ||
| buf[i] = '+'; | ||
|
|
||
| err = send(cli_fd, buf, 1000, 0); | ||
| if (CHECK(err != 1000, "send(cli_fd)", "err:%d errno:%d\n", err, errno)) | ||
| goto done; | ||
|
|
||
| err = recv(accept_fd, buf, 1000, 0); | ||
| if (CHECK(err != 1000, "recv(accept_fd)", "err:%d errno:%d\n", err, errno)) | ||
| goto done; | ||
|
|
||
| /* Send 500B of '.'s from accept_fd ->cli_fd */ | ||
| for (i = 0; i < 500; i++) | ||
| buf[i] = '.'; | ||
|
|
||
| err = send(accept_fd, buf, 500, 0); | ||
| if (CHECK(err != 500, "send(accept_fd)", "err:%d errno:%d\n", err, errno)) | ||
| goto done; | ||
|
|
||
| err = recv(cli_fd, buf, 500, 0); | ||
| if (CHECK(err != 500, "recv(cli_fd)", "err:%d errno:%d\n", err, errno)) | ||
| goto done; | ||
|
|
||
| /* | ||
| * shutdown accept first to guarantee correct ordering for | ||
| * bytes_received and bytes_acked when we go to verify the results. | ||
| */ | ||
| shutdown(accept_fd, SHUT_WR); | ||
| err = recv(cli_fd, buf, 1, 0); | ||
| if (CHECK(err, "recv(cli_fd) for fin", "err:%d errno:%d\n", err, errno)) | ||
| goto done; | ||
|
|
||
| shutdown(cli_fd, SHUT_WR); | ||
| err = recv(accept_fd, buf, 1, 0); | ||
| CHECK(err, "recv(accept_fd) for fin", "err:%d errno:%d\n", err, errno); | ||
| done: | ||
| if (accept_fd != -1) | ||
| close(accept_fd); | ||
| if (cli_fd != -1) | ||
| close(cli_fd); | ||
| if (listen_fd != -1) | ||
| close(listen_fd); | ||
|
|
||
| if (!err) | ||
| verify_result(result); | ||
| } | ||
|
|
||
| void test_tcpbpf_user(void) | ||
| { | ||
| struct test_tcpbpf_kern *skel; | ||
| int cg_fd = -1; | ||
|
|
||
| skel = test_tcpbpf_kern__open_and_load(); | ||
| if (CHECK(!skel, "open and load skel", "failed")) | ||
| return; | ||
|
|
||
| cg_fd = test__join_cgroup(CG_NAME); | ||
| if (CHECK(cg_fd < 0, "test__join_cgroup(" CG_NAME ")", | ||
| "cg_fd:%d errno:%d", cg_fd, errno)) | ||
| goto cleanup_skel; | ||
|
|
||
| skel->links.bpf_testcb = bpf_program__attach_cgroup(skel->progs.bpf_testcb, cg_fd); | ||
| if (ASSERT_OK_PTR(skel->links.bpf_testcb, "attach_cgroup(bpf_testcb)")) | ||
| goto cleanup_namespace; | ||
|
|
||
| run_test(&skel->bss->global); | ||
|
|
||
| cleanup_namespace: | ||
| if (cg_fd != -1) | ||
| close(cg_fd); | ||
| cleanup_skel: | ||
| test_tcpbpf_kern__destroy(skel); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.