From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (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 6737017CA for ; Fri, 4 Aug 2023 04:43:29 +0000 (UTC) X-Greylist: delayed 19528 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 03 Aug 2023 21:43:26 PDT Received: from out-95.mta1.migadu.com (out-95.mta1.migadu.com [IPv6:2001:41d0:203:375::5f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A070049D4 for ; Thu, 3 Aug 2023 21:43:19 -0700 (PDT) Message-ID: <57615016-a7a5-3ba5-4124-084b7d01f2bd@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1691124197; 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=2oqYRixqJSQOjAdmBaMhIIt6Nwo1HIOOcWGBh2+E0m0=; b=EB7c50o6hLwly8prdcAMJ485EDqHTQFuZ76yko2ReEDV68av2IAD8gHSHMgJBzRCcTCW8V lldMP9f0RDgiQbh2KGICRvBI9BFQ19DHHFoSEjLkg4cAWydoD7BiHgCUuNQaulLSrLxVB2 YBunvRucwB4mzS4UQwRIfak1oQYcPdo= Date: Thu, 3 Aug 2023 21:43:07 -0700 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reply-To: yonghong.song@linux.dev Subject: Re: [PATCH bpf-next v10 5/5] 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: X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Yonghong Song In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net On 8/3/23 6:55 PM, 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 Ack with a minor nit below. Acked-by: Yonghong Song > --- > .../testing/selftests/bpf/prog_tests/mptcp.c | 88 +++++++++++++++++++ > tools/testing/selftests/bpf/progs/mptcpify.c | 20 +++++ > 2 files changed, 108 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 3dc0ba2e7590..e5ac2c3aab7d 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]; > > @@ -185,8 +186,95 @@ 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, 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; > + > + /* 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(); The above code essentially equals to err = verify_mptcpify() since err must be 0 before the above code. I think it is worthwhile to change the above to err = verify_mptcpify(); Otherwise, people may confuse that maybe err could be non-zero before send_byte(client_fd)? If this is the case, why we did not return earlier? The code err = verify_mptcpify() will make it clear that all previous error conditions have been handled properly. > + > + close(client_fd); > +close_server: > + close(server_fd); > +out: > + mptcpify__destroy(mptcpify_skel); > + return err; > +} > + [...]