Skip to content

Commit

Permalink
Squash to "selftests/bpf: Add bpf_red test"
Browse files Browse the repository at this point in the history
Use SCHED_TEST and RUN_MPTCP_TEST.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Message-Id: <4390947889df9abe8e22846c2807484eb6999f4a.1711529752.git.tanggeliang@kylinos.cn>
  • Loading branch information
Geliang Tang authored and Patchew Applier committed Mar 27, 2024
1 parent bec139a commit 1f69b59
Showing 1 changed file with 2 additions and 37 deletions.
39 changes: 2 additions & 37 deletions tools/testing/selftests/bpf/prog_tests/mptcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -606,41 +606,7 @@ fail: \
SCHED_TEST(first, 0);
SCHED_TEST(bkup, 0);
SCHED_TEST(rr, 1);

static void test_red(void)
{
struct mptcp_bpf_red *red_skel;
int server_fd, client_fd;
struct nstoken *nstoken;
struct bpf_link *link;

red_skel = mptcp_bpf_red__open_and_load();
if (!ASSERT_OK_PTR(red_skel, "bpf_red__open_and_load"))
return;

link = bpf_map__attach_struct_ops(red_skel->maps.red);
if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) {
mptcp_bpf_red__destroy(red_skel);
return;
}

nstoken = sched_init("subflow", "bpf_red");
if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_red"))
goto fail;
server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
client_fd = connect_to_fd(server_fd, 0);

send_data(server_fd, client_fd, "bpf_red");
ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1");
ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2");

close(client_fd);
close(server_fd);
fail:
cleanup_netns(nstoken);
bpf_link__destroy(link);
mptcp_bpf_red__destroy(red_skel);
}
SCHED_TEST(red, 1);

static void test_burst(void)
{
Expand Down Expand Up @@ -692,8 +658,7 @@ void test_mptcp(void)
RUN_MPTCP_TEST(first);
RUN_MPTCP_TEST(bkup);
RUN_MPTCP_TEST(rr);
if (test__start_subtest("red"))
test_red();
RUN_MPTCP_TEST(red);
if (test__start_subtest("burst"))
test_burst();
}

0 comments on commit 1f69b59

Please sign in to comment.