From nobody Wed Dec 4 08:42:07 2024 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 D0596BA2D for ; Thu, 7 Nov 2024 04:29:28 +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=1730953768; cv=none; b=oiPGi36/LHtKfFhtkSj6z2NNlUOxLSONvpxVwq+L3LXzPMeQiCn1vIUsAutGFASDFSVR1Ez9FtSO5+CaIvOMZy5dik6tuewbkjfuL2PqmHgFPupzZlT6Im7kIiBhdZUAs1P0aJP7SXSi+I3MXKnwbtxaaNJGMRPkS53Mr0AG360= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730953768; c=relaxed/simple; bh=OkfOcIb3bTjV6XfpqwH1xOOM0bVvW01KPjBrTa6niSQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DKY5AQze5uFaS9lFeAtZqEr3LF7NANdw2ecWoGwaslVSox78sQ9oB/9ml+HutaR5v1zXXAHtA3EHJx0WWPwEZdqaZAzXRrz9HpHypa9PacujwNwVwudOxsvJUpY38TdraG12odWI9rnNcJiTeU4ledO55bm/j8i/YqvedIbHRGs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ChwcJdB3; 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="ChwcJdB3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5715BC4CECE; Thu, 7 Nov 2024 04:29:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730953768; bh=OkfOcIb3bTjV6XfpqwH1xOOM0bVvW01KPjBrTa6niSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ChwcJdB31YoSCjir+2Smm+Ihq53N3nGwd5kZLQCioDgxhACnhlzn/8yqtS1c0ZCTU Nj5hbzuWwq915gi7NxidAZwQnLP1/1xVJQMWN20lkniy7VIMXZbWMyqaFBwPZdt2fm tbqxCIGfFD6kXWOMD3eSn39yiBkxOA1RXgc+ef6RcUZ+BSiweuM0LIT30kiCcVvSAk BPKAOly6gJZAxRtRWBeU6ZmZ+eA2MK+89J+VXwt/sUBWToJ1in/sey5EULr4wtvuky nEEn11H2Y1z7TDqpNopknn/xNdx+xYOvLVpBmeoQ09TRFWtnYCs8SvHlHdT8lu5BEV zf2cl8oBBGOkg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 5/5] selftests/bpf: Add mptcp_userspace_pm_addr bpf_iter subtest Date: Thu, 7 Nov 2024 12:29:10 +0800 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch adds a test program for the newly added mptcp_userspace_pm_addr bpf_iter in SEC "cgroup/getsockopt". This test iterates over all address entries on the local address list of userspace PM and check whether each one is an IPv4mapped address. Export mptcp_userspace_pm_addr helpers _new/_next/_destroy into bpf_experimental.h. Use bpf_mptcp_sock_acquire() to acquire the msk, then lock the msk pm lock and use bpf_for_each(mptcp_userspace_pm_addr) to walk the local address list of this msk. Invoke bpf_ipv6_addr_v4mapped() in the loop to check whether the address is an IPv4mapped one. Then Add the address ID of each entry to local veriable local_ids. Out of the loop, unlock the msk pm lock and use bpf_mptcp_sock_release() to release the msk. Finally, assign local_ids to global variable ids so that the application can obtain this value. Add a subtest named test_iters_address to load and verify the newly added mptcp_userspace_pm_addr type bpf_iter example in test_mptcp. Since mptcp_userspace_pm_addr bpf_iter iterates over all address entries on the local address list of userspace PM. A set of userspace PM helpers are added. Set pm_type and start "pm_nl_ctl events" command to save pm events into the log file /tmp/bpf_userspace_pm_events in userspace_pm_init(). Kill "pm_nl_ctl" command and remove the log file in userspace_pm_cleanup(). Parse the log file in userspace_pm_add_subflow() to get the token, sport and dport values, then use "pm_nl_ctl csf" command to create a subflow. Use the helper userspace_pm_add_subflow() to add 3 new subflow endpoints. Send a byte of message to start the mptcp connection, and receive the message. getsockopt() is invoked to trigger the "cgroup/getsockopt" test program. Check if skel->bss->ids equals 60 to verify whether the program loops three times as expected. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/bpf_experimental.h | 8 + .../testing/selftests/bpf/prog_tests/mptcp.c | 214 ++++++++++++++++++ tools/testing/selftests/bpf/progs/mptcp_bpf.h | 5 + .../selftests/bpf/progs/mptcp_bpf_iters.c | 39 ++++ 4 files changed, 266 insertions(+) diff --git a/tools/testing/selftests/bpf/bpf_experimental.h b/tools/testing= /selftests/bpf/bpf_experimental.h index 08eaa431aafd..b4ccb58a0577 100644 --- a/tools/testing/selftests/bpf/bpf_experimental.h +++ b/tools/testing/selftests/bpf/bpf_experimental.h @@ -583,6 +583,14 @@ bpf_iter_mptcp_subflow_next(struct bpf_iter_mptcp_subf= low *it) __weak __ksym; extern void bpf_iter_mptcp_subflow_destroy(struct bpf_iter_mptcp_subflow *it) __weak _= _ksym; =20 +struct bpf_iter_mptcp_userspace_pm_addr; +extern int bpf_iter_mptcp_userspace_pm_addr_new(struct bpf_iter_mptcp_user= space_pm_addr *it, + struct mptcp_sock *msk) __weak __ksym; +extern struct mptcp_pm_addr_entry * +bpf_iter_mptcp_userspace_pm_addr_next(struct bpf_iter_mptcp_userspace_pm_a= ddr *it) __weak __ksym; +extern void +bpf_iter_mptcp_userspace_pm_addr_destroy(struct bpf_iter_mptcp_userspace_p= m_addr *it) __weak __ksym; + extern int bpf_wq_init(struct bpf_wq *wq, void *p__map, unsigned int flags= ) __weak __ksym; extern int bpf_wq_start(struct bpf_wq *wq, unsigned int flags) __weak __ks= ym; extern int bpf_wq_set_callback_impl(struct bpf_wq *wq, diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 5cab0aa8fb27..151fe31a9473 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -29,6 +29,7 @@ #define ADDR6_4 "dead:beef:4::1" #define PORT_1 10001 #define PM_CTL "./mptcp_pm_nl_ctl" +#define PM_EVENTS "/tmp/bpf_userspace_pm_events" #define WITH_DATA true #define WITHOUT_DATA false =20 @@ -57,6 +58,14 @@ #endif #define MPTCP_SCHED_NAME_MAX 16 =20 +enum mptcp_pm_type { + MPTCP_PM_TYPE_KERNEL =3D 0, + MPTCP_PM_TYPE_USERSPACE, + + __MPTCP_PM_TYPE_NR, + __MPTCP_PM_TYPE_MAX =3D __MPTCP_PM_TYPE_NR - 1, +}; + static const unsigned int total_bytes =3D 10 * 1024 * 1024; static int duration; =20 @@ -252,6 +261,19 @@ static void send_byte(int fd) ASSERT_EQ(write(fd, &b, sizeof(b)), 1, "send single byte"); } =20 +static int recv_byte(int fd) +{ + char buf[1]; + ssize_t n; + + n =3D recv(fd, buf, sizeof(buf), 0); + if (CHECK(n <=3D 0, "recv_byte", "recv")) { + log_err("failed/partial recv"); + return -1; + } + return 0; +} + static int verify_mptcpify(int server_fd, int client_fd) { struct __mptcp_info info; @@ -567,6 +589,196 @@ static void test_iters_subflow(void) close(cgroup_fd); } =20 +static int userspace_pm_init(enum mptcp_pm_type pm_type) +{ + if (address_init()) + goto fail; + + SYS(fail, "ip netns exec %s sysctl -qw net.mptcp.pm_type=3D%u", + NS_TEST, pm_type); + SYS(fail, "ip netns exec %s %s limits 4 4", + NS_TEST, PM_CTL); + SYS(fail, "ip netns exec %s %s events >> %s 2>&1 &", + NS_TEST, PM_CTL, PM_EVENTS); + + return 0; +fail: + return -1; +} + +static void userspace_pm_cleanup(void) +{ + SYS_NOFAIL("ip netns exec %s killall %s > /dev/null 2>&1", + NS_TEST, PM_CTL); + SYS_NOFAIL("ip netns exec %s rm -rf %s", NS_TEST, PM_EVENTS); +} + +static int userspace_pm_get_events_line(char *type, char *line) +{ + char buf[BUFSIZ], *str; + size_t len; + int fd; + + fd =3D open(PM_EVENTS, O_RDONLY); + if (fd < 0) { + log_err("failed to open pm events\n"); + return -1; + } + + len =3D read(fd, buf, sizeof(buf)); + close(fd); + if (len <=3D 0) { + log_err("failed to read pm events\n"); + return -1; + } + + str =3D strstr(buf, type); + if (!str) { + log_err("failed to get type %s pm event\n", type); + return -1; + } + + strcpy(line, str); + return 0; +} + +static int userspace_pm_get_token(int fd) +{ + char line[1024], *str; + __u32 token; + int i; + + /* Wait max 2 sec for the connection to be established */ + for (i =3D 0; i < 10; i++) { + usleep(200000); /* 0.2s */ + send_byte(fd); + + sync(); + if (userspace_pm_get_events_line("type:2", line)) + continue; + str =3D strstr(line, "token"); + if (!str) + continue; + if (sscanf(str, "token:%u,", &token) !=3D 1) + continue; + return token; + } + + return 0; +} + +static int userspace_pm_add_subflow(__u32 token, char *addr, __u8 id) +{ + bool ipv6 =3D strstr(addr, ":"); + char line[1024], *str; + __u32 sport, dport; + + if (userspace_pm_get_events_line("type:2", line)) + return -1; + + str =3D strstr(line, "sport"); + if (!str || sscanf(str, "sport:%u,dport:%u,", &sport, &dport) !=3D 2) { + log_err("add_subflow error, str=3D%s\n", str); + return -1; + } + + str =3D ipv6 ? (strstr(addr, ".") ? "::ffff:"ADDR_1 : ADDR6_1) : ADDR_1; + SYS_NOFAIL("ip netns exec %s %s csf lip %s lid %u rip %s rport %u token %= u", + NS_TEST, PM_CTL, addr, id, str, dport, token); + + return 0; +} + +static void run_iters_address(void) +{ + int server_fd, client_fd, accept_fd; + int is_mptcp, err; + socklen_t len; + __u32 token; + + server_fd =3D start_mptcp_server(AF_INET6, "::ffff:"ADDR_1, PORT_1, 0); + if (!ASSERT_OK_FD(server_fd, "start_mptcp_server")) + return; + + client_fd =3D connect_to_fd(server_fd, 0); + if (!ASSERT_OK_FD(client_fd, "connect_to_fd")) + goto close_server; + + accept_fd =3D accept(server_fd, NULL, NULL); + if (!ASSERT_OK_FD(accept_fd, "accept")) + goto close_client; + + token =3D userspace_pm_get_token(client_fd); + if (!token) + goto close_client; + recv_byte(accept_fd); + usleep(200000); /* 0.2s */ + + err =3D userspace_pm_add_subflow(token, "::ffff:"ADDR_2, 10); + err =3D err ?: userspace_pm_add_subflow(token, "::ffff:"ADDR_3, 20); + err =3D err ?: userspace_pm_add_subflow(token, "::ffff:"ADDR_4, 30); + if (!ASSERT_OK(err, "userspace_pm_add_subflow")) + goto close_accept; + + send_byte(accept_fd); + recv_byte(client_fd); + + len =3D sizeof(is_mptcp); + /* mainly to trigger the BPF program */ + err =3D getsockopt(client_fd, SOL_TCP, TCP_IS_MPTCP, &is_mptcp, &len); + if (ASSERT_OK(err, "getsockopt(client_fd, TCP_IS_MPTCP)")) + ASSERT_EQ(is_mptcp, 1, "is_mptcp"); + +close_accept: + close(accept_fd); +close_client: + close(client_fd); +close_server: + close(server_fd); +} + +static void test_iters_address(void) +{ + struct mptcp_bpf_iters *skel; + struct netns_obj *netns; + int cgroup_fd; + int err; + + cgroup_fd =3D test__join_cgroup("/iters_address"); + if (!ASSERT_OK_FD(cgroup_fd, "join_cgroup: iters_address")) + return; + + skel =3D mptcp_bpf_iters__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_open_load: iters_address")) + goto close_cgroup; + + skel->links.iters_address =3D bpf_program__attach_cgroup(skel->progs.iter= s_address, + cgroup_fd); + if (!ASSERT_OK_PTR(skel->links.iters_address, "attach getsockopt")) + goto skel_destroy; + + netns =3D netns_new(NS_TEST, true); + if (!ASSERT_OK_PTR(netns, "netns_new")) + goto skel_destroy; + + err =3D userspace_pm_init(MPTCP_PM_TYPE_USERSPACE); + if (!ASSERT_OK(err, "userspace_pm_init: iters_address")) + goto close_netns; + + run_iters_address(); + + /* 10 + 20 + 30 =3D 60 */ + ASSERT_EQ(skel->bss->ids, 60, "address ids"); + + userspace_pm_cleanup(); +close_netns: + netns_free(netns); +skel_destroy: + mptcp_bpf_iters__destroy(skel); +close_cgroup: + close(cgroup_fd); +} + static struct netns_obj *sched_init(char *flags, char *sched) { struct netns_obj *netns; @@ -750,6 +962,8 @@ void test_mptcp(void) test_subflow(); if (test__start_subtest("iters_subflow")) test_iters_subflow(); + if (test__start_subtest("iters_address")) + test_iters_address(); if (test__start_subtest("default")) test_default(); if (test__start_subtest("first")) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf.h b/tools/testing/= selftests/bpf/progs/mptcp_bpf.h index 3b20cfd44505..f4952e489628 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf.h +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf.h @@ -58,4 +58,9 @@ extern void mptcp_subflow_set_scheduled(struct mptcp_subf= low_context *subflow, extern struct mptcp_subflow_context * bpf_mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned= int pos) __ksym; =20 +extern void bpf_spin_lock_bh(spinlock_t *lock) __ksym; +extern void bpf_spin_unlock_bh(spinlock_t *lock) __ksym; + +extern bool bpf_ipv6_addr_v4mapped(const struct mptcp_addr_info *a) __ksym; + #endif diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_iters.c index 1bede22a7e3d..41227de36cc1 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_iters.c @@ -62,3 +62,42 @@ int iters_subflow(struct bpf_sockopt *ctx) bpf_mptcp_sock_release(msk); return 1; } + +SEC("cgroup/getsockopt") +int iters_address(struct bpf_sockopt *ctx) +{ + struct mptcp_pm_addr_entry *entry; + struct bpf_sock *sk =3D ctx->sk; + struct mptcp_sock *msk; + int local_ids =3D 0; + + if (!sk || sk->protocol !=3D IPPROTO_MPTCP || + ctx->level !=3D SOL_TCP || ctx->optname !=3D TCP_IS_MPTCP) + return 1; + + msk =3D bpf_mptcp_sk((struct sock *)sk); + if (msk->pm.server_side) + return 1; + + msk =3D bpf_mptcp_sock_acquire(msk); + if (!msk) + return 1; + bpf_spin_lock_bh(&msk->pm.lock); + bpf_for_each(mptcp_userspace_pm_addr, entry, msk) { + /* Here MPTCP-specific path manager kfunc can be called: + * this test is not doing anything really useful, only to + * verify the iteration works. + */ + + if (!bpf_ipv6_addr_v4mapped(&entry->addr)) + break; + + local_ids +=3D entry->addr.id; + } + bpf_spin_unlock_bh(&msk->pm.lock); + bpf_mptcp_sock_release(msk); + + ids =3D local_ids; + + return 1; +} --=20 2.45.2