From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88C2FC00528 for ; Thu, 3 Aug 2023 23:40:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232238AbjHCXkv (ORCPT ); Thu, 3 Aug 2023 19:40:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231178AbjHCXku (ORCPT ); Thu, 3 Aug 2023 19:40:50 -0400 X-Greylist: delayed 1198 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 03 Aug 2023 16:40:48 PDT Received: from out-93.mta0.migadu.com (out-93.mta0.migadu.com [91.218.175.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5A803A8C for ; Thu, 3 Aug 2023 16:40:48 -0700 (PDT) Message-ID: <878f7f70-4158-8200-f6ba-852d18b948e0@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1691106046; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=70OOEnQNymTwDBG+D/tQnUGjNUZmioQ7nC9Qtp7Y8Ns=; b=LYJCbLPQw1uc/Dyz1Jb/q2qVDZHI6COnSC+37k/5h6YPulFyJAipEP1dGow4qdyA5j98iJ 7KALLYoQ9BPg8XQJbQpFEmZTT6/g6cqzcYsPZZj+tVfVz0NLKPFcWgK2R0S9KLNrV4BkHA 1Pn2Gs3ta0WvKEKlG5MIBZe4L4mN4mg= Date: Thu, 3 Aug 2023 16:40:33 -0700 MIME-Version: 1.0 Reply-To: yonghong.song@linux.dev Subject: Re: [PATCH bpf-next v9 4/4] selftests/bpf: Add mptcpify test Content-Language: en-US To: Geliang Tang , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Florent Revest , Brendan Jackman , Matthieu Baerts , Mat Martineau , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , John Johansen , Paul Moore , James Morris , "Serge E. Hallyn" , Stephen Smalley , Eric Paris , Mykola Lysenko , Shuah Khan , Simon Horman Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, mptcp@lists.linux.dev, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, linux-kselftest@vger.kernel.org References: <92ee6be5a465601ff3a2df29b6a517086e87ca3c.1691069778.git.geliang.tang@suse.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Yonghong Song In-Reply-To: <92ee6be5a465601ff3a2df29b6a517086e87ca3c.1691069778.git.geliang.tang@suse.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: On 8/3/23 6:41 AM, Geliang Tang wrote: > Implement a new test program mptcpify: if the family is AF_INET or > AF_INET6, the type is SOCK_STREAM, and the protocol ID is 0 or > IPPROTO_TCP, set it to IPPROTO_MPTCP. It will be hooked in > update_socket_protocol(). > > Extend the MPTCP test base, add a selftest test_mptcpify() for the > mptcpify case. Open and load the mptcpify test prog to mptcpify the > TCP sockets dynamically, then use start_server() and connect_to_fd() > to create a TCP socket, but actually what's created is an MPTCP > socket, which can be verified through the outputs of 'ss' and 'nstat' > commands. > > Reviewed-by: Matthieu Baerts > Signed-off-by: Geliang Tang > --- > .../testing/selftests/bpf/prog_tests/mptcp.c | 94 +++++++++++++++++++ > tools/testing/selftests/bpf/progs/mptcpify.c | 25 +++++ > 2 files changed, 119 insertions(+) > create mode 100644 tools/testing/selftests/bpf/progs/mptcpify.c > > diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c > index 4407bd5c9e9a..caab3aa6a162 100644 > --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c > +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c > @@ -6,6 +6,7 @@ > #include "cgroup_helpers.h" > #include "network_helpers.h" > #include "mptcp_sock.skel.h" > +#include "mptcpify.skel.h" > > char NS_TEST[32]; > > @@ -195,8 +196,101 @@ static void test_base(void) > close(cgroup_fd); > } > > +static void send_byte(int fd) > +{ > + char b = 0x55; > + > + ASSERT_EQ(write(fd, &b, sizeof(b)), 1, "send single byte"); > +} > + > +static int verify_mptcpify(void) > +{ > + char cmd[256]; > + int err = 0; > + > + snprintf(cmd, sizeof(cmd), > + "ip netns exec %s ss -tOni | grep -q '%s'", > + NS_TEST, "tcp-ulp-mptcp"); > + if (!ASSERT_OK(system(cmd), "No tcp-ulp-mptcp found!")) > + err++; > + > + snprintf(cmd, sizeof(cmd), > + "ip netns exec %s nstat -asz %s | awk '%s' | grep -q '%s'", > + NS_TEST, "MPTcpExtMPCapableSYNACKRX", > + "NR==1 {next} {print $2}", "1"); > + if (!ASSERT_OK(system(cmd), "No MPTcpExtMPCapableSYNACKRX found!")) > + err++; > + > + return err; > +} > + > +static int run_mptcpify(int cgroup_fd) > +{ > + int server_fd, client_fd, prog_fd, err = 0; > + struct mptcpify *mptcpify_skel; > + > + mptcpify_skel = mptcpify__open_and_load(); > + if (!ASSERT_OK_PTR(mptcpify_skel, "skel_open_load")) > + return -EIO; > + > + err = mptcpify__attach(mptcpify_skel); > + if (!ASSERT_OK(err, "skel_attach")) > + goto out; > + > + prog_fd = bpf_program__fd(mptcpify_skel->progs.mptcpify); > + if (!ASSERT_GE(prog_fd, 0, "bpf_program__fd")) { > + err = -EIO; > + goto out; > + } load success means prog_fd is always valid. So above ASSERT_GE not needed. > + > + /* without MPTCP */ > + server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0); > + if (!ASSERT_GE(server_fd, 0, "start_server")) { > + err = -EIO; > + goto out; > + } > + > + client_fd = connect_to_fd(server_fd, 0); > + if (!ASSERT_GE(client_fd, 0, "connect to fd")) { > + err = -EIO; > + goto close_server; > + } > + > + send_byte(client_fd); > + err += verify_mptcpify(); > + > + close(client_fd); > +close_server: > + close(server_fd); > +out: > + mptcpify__destroy(mptcpify_skel); > + return err; > +} > + > +static void test_mptcpify(void) > +{ > + struct nstoken *nstoken = NULL; > + int cgroup_fd; > + > + cgroup_fd = test__join_cgroup("/mptcpify"); > + if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) > + return; > + > + nstoken = create_netns(); > + if (!ASSERT_OK_PTR(nstoken, "create_netns")) > + goto fail; > + > + ASSERT_OK(run_mptcpify(cgroup_fd), "run_mptcpify"); > + > +fail: > + cleanup_netns(nstoken); > + close(cgroup_fd); > +} > + > void test_mptcp(void) > { > if (test__start_subtest("base")) > test_base(); > + if (test__start_subtest("mptcpify")) > + test_mptcpify(); > } > diff --git a/tools/testing/selftests/bpf/progs/mptcpify.c b/tools/testing/selftests/bpf/progs/mptcpify.c > new file mode 100644 > index 000000000000..9cf1febe982d > --- /dev/null > +++ b/tools/testing/selftests/bpf/progs/mptcpify.c > @@ -0,0 +1,25 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* Copyright (c) 2023, SUSE. */ > + > +#include > +#include > + > +char _license[] SEC("license") = "GPL"; > + > +#define AF_INET 2 > +#define AF_INET6 10 > +#define SOCK_STREAM 1 > +#define IPPROTO_TCP 6 > +#define IPPROTO_MPTCP 262 To avoid the above macros, you can use vmlinux.h and bpf_tracing_net.h. > + > +SEC("fmod_ret/update_socket_protocol") > +int BPF_PROG(mptcpify, int family, int type, int protocol) > +{ > + if ((family == AF_INET || family == AF_INET6) && > + type == SOCK_STREAM && > + (!protocol || protocol == IPPROTO_TCP)) { > + return IPPROTO_MPTCP; > + } > + > + return protocol; > +}