From patchwork Wed Apr 17 02:38:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 13632816 X-Patchwork-Delegate: matthieu.baerts@tessares.net Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3037C1851 for ; Wed, 17 Apr 2024 02:39:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713321556; cv=none; b=AXoYp2qwDZVat8ScksbRCDAPI8jqbU8cGk3P0TI0ejntmIXoH9PhRi0ipjm0EaW+j/Bjm2d9pCdwmS1NxbW4FAhahQ2gjB2ps3Oi2vw8h93G5CghiXKi2NAev9PCIaOBvrEllGrRQejSW+07Z/dG5xRWcX6+ZG6ZXbZTYJNPhz0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713321556; c=relaxed/simple; bh=QTxG7RcLaNOmJxKmyGqXfK7CJCPt6mK29SEJ02ZkwMQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iVQvbdxHfm38UVcaO/8V2PRB0kKq6FUHtbseUmA5u1PlL3RFLDtRb9K3L4dGEIkUQn4CQClLrSY60QGsiwS81GScq0Pqn4pnqiBJuZEptZltde5xY3Utqe+emF27G5kdZFCCJl2RPuI3QbcbkIhX4qBuux7hikpA8l0RBLWQtnk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ng86ngSt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ng86ngSt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98586C2BD11; Wed, 17 Apr 2024 02:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713321555; bh=QTxG7RcLaNOmJxKmyGqXfK7CJCPt6mK29SEJ02ZkwMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ng86ngStyvkIn0vJDP07F6jo4bucg9Thk9D6BtqJHkWLKM9GYixqaorOseGtUDDEW DG15WaVfZavk6ODoEPSOO7WxM3s8quaWxlQ3QtWLXdE20ivNS8fgX+UDpb3hStsuYt 6/apmCfU52Xl8qQSty4DcXB6qGg2xR+vcJxSuYmFhWGGnT4ox+st7oD+mNkeOw5Hru SXikRo8HHgUnzaP4BEoJZTcSZfcHovyXEeA8QEjMjVOoj/gtjV/kO9Pi88Tf4mDiMs /CWGsdaKXavPc5sqhaFpkfj95zzVgJQqvDIG5lL8zoY8onfG1yVbapsiDlCgbbxDTI c6zq+mZxMhTQQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 4/8] Squash to "selftests/bpf: Add bpf_first scheduler & test" Date: Wed, 17 Apr 2024 10:38:50 +0800 Message-Id: <24d27a057abce37a93d3c43c02665f3399dc13bb.1713321357.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Geliang Tang After squashing into this change, the patch "selftests/bpf: Add bpf_first test" can be merged into the patch "selftests/bpf: Add bpf_first scheduler" appending the following lines into commit log: ''' This patch defines MPTCP_SCHED_TEST macro, a template for all scheduler tests. Every scheduler is identified by argument name, and use sysctl to set net.mptcp.scheduler as "bpf_name" to use this sched. Add two veth net devices to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add the new endpoint ADDR2 to PM netlink. Arguments addr1/add2 means whether the data has been sent on the first/second subflow or not. Send data and check bytes_sent of 'ss' output after it using send_data_and_verify(). Using MPTCP_SCHED_TEST macro to add a new test for this bpf_first scheduler, the arguments "1 0" means data has been only sent on the first subflow ADDR1. Run this test by RUN_MPTCP_TEST macro. ''' And update the subject to "selftests/bpf: Add bpf_first scheduler & test". Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index 1979c685ee24..504e00faf9e0 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -39,6 +39,7 @@ #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 #endif +#define MPTCP_SCHED_NAME_MAX 16 struct __mptcp_info { __u8 mptcpi_subflows; @@ -500,41 +501,45 @@ static void test_default(void) cleanup_netns(nstoken); } -static void test_first(void) +static void test_bpf_sched(struct bpf_object *obj, char *sched, + bool addr1, bool addr2) { - struct mptcp_bpf_first *first_skel; - int server_fd, client_fd; + char bpf_sched[MPTCP_SCHED_NAME_MAX] = "bpf_"; struct nstoken *nstoken; struct bpf_link *link; + struct bpf_map *map; - first_skel = mptcp_bpf_first__open_and_load(); - if (!ASSERT_OK_PTR(first_skel, "bpf_first__open_and_load")) + map = bpf_object__find_map_by_name(obj, sched); + link = bpf_map__attach_struct_ops(map); + if (CHECK(!link, sched, "attach_struct_ops: %d\n", errno)) return; - link = bpf_map__attach_struct_ops(first_skel->maps.first); - if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { - mptcp_bpf_first__destroy(first_skel); - return; - } - - nstoken = sched_init("subflow", "bpf_first"); - if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_first")) + nstoken = sched_init("subflow", strcat(bpf_sched, sched)); + if (CHECK(!nstoken, sched, "sched_init: %d\n", errno)) 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_first"); - ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr_1"); - ASSERT_GT(has_bytes_sent(ADDR_2), 0, "has_bytes_sent addr_2"); + send_data_and_verify(sched, addr1, addr2); - close(client_fd); - close(server_fd); fail: cleanup_netns(nstoken); bpf_link__destroy(link); - mptcp_bpf_first__destroy(first_skel); } +#define MPTCP_SCHED_TEST(sched, addr1, addr2) \ +static void test_##sched(void) \ +{ \ + struct mptcp_bpf_##sched *skel; \ + \ + skel = mptcp_bpf_##sched##__open_and_load(); \ + if (!ASSERT_OK_PTR(skel, "open_and_load:" #sched)) \ + return; \ + \ + test_bpf_sched(skel->obj, #sched, addr1, addr2); \ + mptcp_bpf_##sched##__destroy(skel); \ +} + +MPTCP_SCHED_TEST(first, WITH_DATA, WITHOUT_DATA); + static void test_bkup(void) { struct mptcp_bpf_bkup *bkup_skel; @@ -686,8 +691,7 @@ void test_mptcp(void) RUN_MPTCP_TEST(base); RUN_MPTCP_TEST(mptcpify); RUN_MPTCP_TEST(default); - if (test__start_subtest("first")) - test_first(); + RUN_MPTCP_TEST(first); if (test__start_subtest("bkup")) test_bkup(); if (test__start_subtest("rr"))