From nobody Sun Nov 10 01:24:51 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 AAB52140E5F for ; Tue, 10 Sep 2024 09:10:35 +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=1725959435; cv=none; b=r+1ZAA3MJ/QuiYZeESIlijvkb5hdoysFpnRDPm8FJFWItViB/1MVufhSHPZfHX7oGeLW+hEq91XPT0VJDG4gU3UiXvoKMTI+tnMfQA5Ot9XAn1tKg8k5SIrwoEiYPliQP5ACo4Ppby341YZTpa20dbWzqu+4/Az+WHbBneArpHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725959435; c=relaxed/simple; bh=wgj8qg8WdOgLP0+lnd7pO7YSbw7j3DUjE/5n+KXSQmw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hjHSMii5ME5AM13sNB11NfTn7eJb7K1n8TCTj79u9q5hl16AQfdpJWB1wRbYBoCxM4tIrBGn/tdW5D9zZTaom1GHt8IqmkRQyL8LD3yNI3YwXVr0T86NTf1ZhYwPVKizCvoCzwaWIcZzpwMnhz23O4CXDuVO/vcaWy6ww8NlcnI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dbZOVxqc; 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="dbZOVxqc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17771C4CEC3; Tue, 10 Sep 2024 09:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725959435; bh=wgj8qg8WdOgLP0+lnd7pO7YSbw7j3DUjE/5n+KXSQmw=; h=From:To:Cc:Subject:Date:From; b=dbZOVxqcLjWyoKvj281yr0weqO4iNFUUbwXbtUEhTLhTwNgpz4KuVGwZk6ZIEgWrJ z9tbkT/pKNEAIDmlEi0z1ULU0H9xQVM0U5qPO3vXlh8r2UoVYrFCeLNcfkBkjUQmEi HPsWJxUZmVrOJBiivnDmnoWgVlGPQeS5V2gF8HGIU6XnST93H6wlSoaQ1RxdBfF7pz Wv0iyloRZcXyYsjCq5x1xQzKrQNMpmaPZFLlqZM0Z5+/SF+TdRISpeMvekQDgn7aI6 fDZphBsN/3G+CeTGyYZ4bdgpWCx2ihXofY4nZC96n/VDWs8wW13Jq+PUEiFbULz9si 2lNPTmtPttWHQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2] Squash to "selftests/bpf: Add bpf scheduler test" - drop has_bytes_sent Date: Tue, 10 Sep 2024 17:10:28 +0800 Message-ID: X-Mailer: git-send-email 2.43.0 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 Drop ss_search() and has_bytes_sent(), add a new bpf program to check the bytes_sent. Signed-off-by: Geliang Tang --- v2: - address Matt's comments. (thanks) --- .../testing/selftests/bpf/prog_tests/mptcp.c | 48 ++++++++++--------- .../selftests/bpf/progs/mptcp_bpf_bytes.c | 36 ++++++++++++++ 2 files changed, 62 insertions(+), 22 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 2476f0a083bc..273039ecd7ac 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -10,6 +10,7 @@ #include "mptcp_sock.skel.h" #include "mptcpify.skel.h" #include "mptcp_subflow.skel.h" +#include "mptcp_bpf_bytes.skel.h" #include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" #include "mptcp_bpf_rr.skel.h" @@ -489,56 +490,59 @@ static struct nstoken *sched_init(char *flags, char *= sched) return NULL; } =20 -static int ss_search(char *src, char *dst, char *port, char *keyword) -{ - return SYS_NOFAIL("ip netns exec %s ss -enita src %s dst %s %s %d | grep = -q '%s'", - NS_TEST, src, dst, port, PORT_1, keyword); -} - -static int has_bytes_sent(char *dst) -{ - return ss_search(ADDR_1, dst, "sport", "bytes_sent:"); -} - static void send_data_and_verify(char *sched, bool addr1, bool addr2) { + int server_fd, client_fd, err; + struct mptcp_bpf_bytes *skel; struct timespec start, end; - int server_fd, client_fd; unsigned int delta_ms; =20 + skel =3D mptcp_bpf_bytes__open_and_load(); + if (!ASSERT_OK_PTR(skel, "open_and_load: bytes")) + return; + + skel->bss->pid =3D getpid(); + + err =3D mptcp_bpf_bytes__attach(skel); + if (!ASSERT_OK(err, "skel_attach: bytes")) + goto skel_destroy; + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); if (!ASSERT_OK_FD(server_fd, "start_mptcp_server")) - return; + goto skel_destroy; =20 client_fd =3D connect_to_fd(server_fd, 0); if (!ASSERT_OK_FD(client_fd, "connect_to_fd")) - goto fail; + goto close_server; =20 if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) - goto fail; + goto close_client; =20 if (!ASSERT_OK(send_recv_data(server_fd, client_fd, total_bytes), "send_recv_data")) - goto fail; + goto close_client; =20 if (clock_gettime(CLOCK_MONOTONIC, &end) < 0) - goto fail; + goto close_client; =20 delta_ms =3D (end.tv_sec - start.tv_sec) * 1000 + (end.tv_nsec - start.tv= _nsec) / 1000000; printf("%s: %u ms\n", sched, delta_ms); =20 if (addr1) - CHECK(has_bytes_sent(ADDR_1), sched, "should have bytes_sent on addr1\n"= ); + ASSERT_GT(skel->bss->bytes_sent_1, 0, "should have bytes_sent on addr1"); else - CHECK(!has_bytes_sent(ADDR_1), sched, "shouldn't have bytes_sent on addr= 1\n"); + ASSERT_EQ(skel->bss->bytes_sent_1, 0, "shouldn't have bytes_sent on addr= 1"); if (addr2) - CHECK(has_bytes_sent(ADDR_2), sched, "should have bytes_sent on addr2\n"= ); + ASSERT_GT(skel->bss->bytes_sent_2, 0, "should have bytes_sent on addr2"); else - CHECK(!has_bytes_sent(ADDR_2), sched, "shouldn't have bytes_sent on addr= 2\n"); + ASSERT_EQ(skel->bss->bytes_sent_2, 0, "shouldn't have bytes_sent on addr= 2"); =20 +close_client: close(client_fd); -fail: +close_server: close(server_fd); +skel_destroy: + mptcp_bpf_bytes__destroy(skel); } =20 static void test_default(void) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_bytes.c new file mode 100644 index 000000000000..aa84b137f344 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bytes.c @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2024, Kylin Software */ + +/* vmlinux.h, bpf_helpers.h and other 'define' */ +#include "bpf_tracing_net.h" +#include "mptcp_bpf.h" + +char _license[] SEC("license") =3D "GPL"; +u64 bytes_sent_1 =3D 0; +u64 bytes_sent_2 =3D 0; +int pid; + +SEC("fexit/mptcp_sched_get_send") +int BPF_PROG(trace_mptcp_sched_get_send, struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + + if (bpf_get_current_pid_tgid() >> 32 !=3D pid) + return 0; + + mptcp_for_each_subflow(msk, subflow) { + struct tcp_sock *tp; + struct sock *ssk; + + subflow =3D bpf_core_cast(subflow, struct mptcp_subflow_context); + ssk =3D mptcp_subflow_tcp_sock(subflow); + tp =3D bpf_core_cast(ssk, struct tcp_sock); + + if (subflow->subflow_id =3D=3D 1) + bytes_sent_1 =3D tp->bytes_sent; + else if (subflow->subflow_id =3D=3D 2) + bytes_sent_2 =3D tp->bytes_sent; + } + + return 0; +} --=20 2.43.0