From: Martin KaFai Lau <martin.lau@linux•dev>
To: Geliang Tang <geliang.tang@suse•com>
Cc: bpf@vger•kernel.org, netdev@vger•kernel.org,
mptcp@lists•linux.dev, linux-security-module@vger•kernel.org,
selinux@vger•kernel.org, linux-kselftest@vger•kernel.org,
Yonghong Song <yonghong.song@linux•dev>,
Alexei Starovoitov <ast@kernel•org>,
Daniel Borkmann <daniel@iogearbox•net>,
Andrii Nakryiko <andrii@kernel•org>, Song Liu <song@kernel•org>,
Yonghong Song <yhs@fb•com>,
John Fastabend <john.fastabend@gmail•com>,
KP Singh <kpsingh@kernel•org>,
Stanislav Fomichev <sdf@google•com>, Hao Luo <haoluo@google•com>,
Jiri Olsa <jolsa@kernel•org>,
Florent Revest <revest@chromium•org>,
Brendan Jackman <jackmanb@chromium•org>,
Matthieu Baerts <matthieu.baerts@tessares•net>,
Mat Martineau <martineau@kernel•org>,
"David S. Miller" <davem@davemloft•net>,
Eric Dumazet <edumazet@google•com>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
John Johansen <john.johansen@canonical•com>,
Paul Moore <paul@paul-moore•com>,
James Morris <jmorris@namei•org>,
"Serge E. Hallyn" <serge@hallyn•com>,
Stephen Smalley <stephen.smalley.work@gmail•com>,
Eric Paris <eparis@parisplace•org>,
Mykola Lysenko <mykolal@fb•com>, Shuah Khan <shuah@kernel•org>,
Simon Horman <horms@kernel•org>
Subject: Re: [PATCH bpf-next v14 4/4] selftests/bpf: Add mptcpify test
Date: Wed, 16 Aug 2023 11:59:12 -0700 [thread overview]
Message-ID: <3590084f-bc61-b2c7-ed1b-dd4caa85fdcd@linux.dev> (raw)
In-Reply-To: <364e72f307e7bb38382ec7442c182d76298a9c41.1692147782.git.geliang.tang@suse.com>
On 8/15/23 6:11 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 'getsockopt(SOL_PROTOCOL)'
> and 'getsockopt(MPTCP_INFO)'.
>
> Acked-by: Yonghong Song <yonghong.song@linux•dev>
> Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares•net>
> Signed-off-by: Geliang Tang <geliang.tang@suse•com>
> ---
> .../testing/selftests/bpf/prog_tests/mptcp.c | 116 ++++++++++++++++++
> tools/testing/selftests/bpf/progs/mptcpify.c | 20 +++
> 2 files changed, 136 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 3d3999067e27..68ebf9735e16 100644
> --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> @@ -2,13 +2,30 @@
> /* Copyright (c) 2020, Tessares SA. */
> /* Copyright (c) 2022, SUSE. */
>
> +#include <linux/mptcp.h>
bpf CI failed
(https://github.com/kernel-patches/bpf/actions/runs/5882006207/job/15951617063):
/tmp/work/bpf/bpf/tools/testing/selftests/bpf/prog_tests/mptcp.c:5:10: fatal
error: 'linux/mptcp.h' file not found
#include <linux/mptcp.h>
I fixed that by copying the 'struct mptcp_info' but renamed to 'struct
__mptcp_info' just in case any fallout in the future.
My environment also does not have SOL_MPTCP, so I do an ifndef for it also.
> +#include <netinet/in.h>
> #include <test_progs.h>
> #include "cgroup_helpers.h"
> #include "network_helpers.h"
> #include "mptcp_sock.skel.h"
> +#include "mptcpify.skel.h"
>
> #define NS_TEST "mptcp_ns"
>
> +#ifndef IPPROTO_MPTCP
> +#define IPPROTO_MPTCP 262
> +#endif
> +
> +#ifndef MPTCP_INFO
> +#define MPTCP_INFO 1
> +#endif
> +#ifndef MPTCP_INFO_FLAG_FALLBACK
> +#define MPTCP_INFO_FLAG_FALLBACK _BITUL(0)
I have to add '#include <linux/const.h>' for the _BITUL() here also....
The set is applied. Please follow up if I make mistake on those fixes.
next prev parent reply other threads:[~2023-08-16 18:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-16 1:11 [PATCH bpf-next v14 0/4] bpf: Force to MPTCP Geliang Tang
2023-08-16 1:11 ` [PATCH bpf-next v14 1/4] bpf: Add update_socket_protocol hook Geliang Tang
2023-08-18 8:24 ` Geliang Tang
2023-08-18 15:26 ` Yonghong Song
2023-08-16 1:11 ` [PATCH bpf-next v14 2/4] selftests/bpf: Add two mptcp netns helpers Geliang Tang
2023-08-16 1:11 ` [PATCH bpf-next v14 3/4] selftests/bpf: Fix error checks of mptcp open_and_load Geliang Tang
2023-08-16 1:11 ` [PATCH bpf-next v14 4/4] selftests/bpf: Add mptcpify test Geliang Tang
2023-08-16 18:59 ` Martin KaFai Lau [this message]
2023-08-16 19:00 ` [PATCH bpf-next v14 0/4] bpf: Force to MPTCP patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3590084f-bc61-b2c7-ed1b-dd4caa85fdcd@linux.dev \
--to=martin.lau@linux$(echo .)dev \
--cc=andrii@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=eparis@parisplace$(echo .)org \
--cc=geliang.tang@suse$(echo .)com \
--cc=haoluo@google$(echo .)com \
--cc=horms@kernel$(echo .)org \
--cc=jackmanb@chromium$(echo .)org \
--cc=jmorris@namei$(echo .)org \
--cc=john.fastabend@gmail$(echo .)com \
--cc=john.johansen@canonical$(echo .)com \
--cc=jolsa@kernel$(echo .)org \
--cc=kpsingh@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kselftest@vger$(echo .)kernel.org \
--cc=linux-security-module@vger$(echo .)kernel.org \
--cc=martineau@kernel$(echo .)org \
--cc=matthieu.baerts@tessares$(echo .)net \
--cc=mptcp@lists$(echo .)linux.dev \
--cc=mykolal@fb$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=paul@paul-moore$(echo .)com \
--cc=revest@chromium$(echo .)org \
--cc=sdf@google$(echo .)com \
--cc=selinux@vger$(echo .)kernel.org \
--cc=serge@hallyn$(echo .)com \
--cc=shuah@kernel$(echo .)org \
--cc=song@kernel$(echo .)org \
--cc=stephen.smalley.work@gmail$(echo .)com \
--cc=yhs@fb$(echo .)com \
--cc=yonghong.song@linux$(echo .)dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox