* [PATCH bpf-next v8 1/4] bpf: Add update_socket_protocol hook
2023-08-03 7:30 [PATCH bpf-next v8 0/4] bpf: Force to MPTCP Geliang Tang
@ 2023-08-03 7:30 ` Geliang Tang
2023-08-03 8:02 ` Matthieu Baerts
2023-08-03 12:53 ` Simon Horman
2023-08-03 7:30 ` [PATCH bpf-next v8 2/4] selftests/bpf: Use random netns name for mptcp Geliang Tang
` (2 subsequent siblings)
3 siblings, 2 replies; 9+ messages in thread
From: Geliang Tang @ 2023-08-03 7:30 UTC (permalink / raw)
To: 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
Cc: Geliang Tang, bpf, netdev, mptcp, apparmor, linux-security-module,
selinux, linux-kselftest
Add a hook named update_socket_protocol in __sys_socket(), for bpf
progs to attach to and update socket protocol. One user case is to
force legacy TCP apps to create and use MPTCP sockets instead of
TCP ones.
Define a mod_ret set named bpf_mptcp_fmodret_ids, add the hook
update_socket_protocol into this set, and register it in
bpf_mptcp_kfunc_init().
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
net/mptcp/bpf.c | 17 +++++++++++++++++
net/socket.c | 25 +++++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
index 5a0a84ad94af..c43aee31014d 100644
--- a/net/mptcp/bpf.c
+++ b/net/mptcp/bpf.c
@@ -12,6 +12,23 @@
#include <linux/bpf.h>
#include "protocol.h"
+#ifdef CONFIG_BPF_JIT
+BTF_SET8_START(bpf_mptcp_fmodret_ids)
+BTF_ID_FLAGS(func, update_socket_protocol)
+BTF_SET8_END(bpf_mptcp_fmodret_ids)
+
+static const struct btf_kfunc_id_set bpf_mptcp_fmodret_set = {
+ .owner = THIS_MODULE,
+ .set = &bpf_mptcp_fmodret_ids,
+};
+
+static int __init bpf_mptcp_kfunc_init(void)
+{
+ return register_btf_fmodret_id_set(&bpf_mptcp_fmodret_set);
+}
+late_initcall(bpf_mptcp_kfunc_init);
+#endif /* CONFIG_BPF_JIT */
+
struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk)
{
if (sk && sk_fullsock(sk) && sk->sk_protocol == IPPROTO_TCP && sk_is_mptcp(sk))
diff --git a/net/socket.c b/net/socket.c
index 2b0e54b2405c..586a437d7a5e 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1644,11 +1644,36 @@ struct file *__sys_socket_file(int family, int type, int protocol)
return sock_alloc_file(sock, flags, NULL);
}
+/**
+ * A hook for bpf progs to attach to and update socket protocol.
+ *
+ * A static noinline declaration here could cause the compiler to
+ * optimize away the function. A global noinline declaration will
+ * keep the definition, but may optimize away the callsite.
+ * Therefore, __weak is needed to ensure that the call is still
+ * emitted, by telling the compiler that we don't know what the
+ * function might eventually be.
+ *
+ * __diag_* below are needed to dismiss the missing prototype warning.
+ */
+
+__diag_push();
+__diag_ignore_all("-Wmissing-prototypes",
+ "kfuncs which will be used in BPF programs");
+
+__weak noinline int update_socket_protocol(int family, int type, int protocol)
+{
+ return protocol;
+}
+
+__diag_pop();
+
int __sys_socket(int family, int type, int protocol)
{
struct socket *sock;
int flags;
+ protocol = update_socket_protocol(family, type, protocol);
sock = __sys_socket_create(family, type, protocol);
if (IS_ERR(sock))
return PTR_ERR(sock);
--
2.35.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH bpf-next v8 1/4] bpf: Add update_socket_protocol hook
2023-08-03 7:30 ` [PATCH bpf-next v8 1/4] bpf: Add update_socket_protocol hook Geliang Tang
@ 2023-08-03 8:02 ` Matthieu Baerts
2023-08-03 12:53 ` Simon Horman
1 sibling, 0 replies; 9+ messages in thread
From: Matthieu Baerts @ 2023-08-03 8:02 UTC (permalink / raw)
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, 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
Cc: bpf, netdev, mptcp, apparmor, linux-security-module, selinux,
linux-kselftest
Hi Geliang,
On 03/08/2023 09:30, Geliang Tang wrote:
> Add a hook named update_socket_protocol in __sys_socket(), for bpf
> progs to attach to and update socket protocol. One user case is to
> force legacy TCP apps to create and use MPTCP sockets instead of
> TCP ones.
>
> Define a mod_ret set named bpf_mptcp_fmodret_ids, add the hook
> update_socket_protocol into this set, and register it in
> bpf_mptcp_kfunc_init().
Thank you for having looked at that!
Because it is related to MPTCP:
Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
I don't know if your scripts to apply patches support the "Closes" tag
but just in case:
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/79
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH bpf-next v8 1/4] bpf: Add update_socket_protocol hook
2023-08-03 7:30 ` [PATCH bpf-next v8 1/4] bpf: Add update_socket_protocol hook Geliang Tang
2023-08-03 8:02 ` Matthieu Baerts
@ 2023-08-03 12:53 ` Simon Horman
2023-08-03 13:05 ` Geliang Tang
1 sibling, 1 reply; 9+ messages in thread
From: Simon Horman @ 2023-08-03 12:53 UTC (permalink / raw)
To: Geliang Tang
Cc: 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, bpf, netdev, mptcp,
apparmor, linux-security-module, selinux, linux-kselftest
On Thu, Aug 03, 2023 at 03:30:39PM +0800, Geliang Tang wrote:
> Add a hook named update_socket_protocol in __sys_socket(), for bpf
> progs to attach to and update socket protocol. One user case is to
> force legacy TCP apps to create and use MPTCP sockets instead of
> TCP ones.
>
> Define a mod_ret set named bpf_mptcp_fmodret_ids, add the hook
> update_socket_protocol into this set, and register it in
> bpf_mptcp_kfunc_init().
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
...
> diff --git a/net/socket.c b/net/socket.c
> index 2b0e54b2405c..586a437d7a5e 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -1644,11 +1644,36 @@ struct file *__sys_socket_file(int family, int type, int protocol)
> return sock_alloc_file(sock, flags, NULL);
> }
>
> +/**
Hi Geliang Tang,
nit: The format of the text below is not in kernel doc format,
so it is probably better if the comment begins with '/*'
rather than '/**'.
> + * A hook for bpf progs to attach to and update socket protocol.
> + *
> + * A static noinline declaration here could cause the compiler to
> + * optimize away the function. A global noinline declaration will
> + * keep the definition, but may optimize away the callsite.
> + * Therefore, __weak is needed to ensure that the call is still
> + * emitted, by telling the compiler that we don't know what the
> + * function might eventually be.
> + *
> + * __diag_* below are needed to dismiss the missing prototype warning.
> + */
...
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH bpf-next v8 1/4] bpf: Add update_socket_protocol hook
2023-08-03 12:53 ` Simon Horman
@ 2023-08-03 13:05 ` Geliang Tang
0 siblings, 0 replies; 9+ messages in thread
From: Geliang Tang @ 2023-08-03 13:05 UTC (permalink / raw)
To: Simon Horman
Cc: 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, bpf, netdev, mptcp,
apparmor, linux-security-module, selinux, linux-kselftest
On Thu, Aug 03, 2023 at 02:53:38PM +0200, Simon Horman wrote:
> On Thu, Aug 03, 2023 at 03:30:39PM +0800, Geliang Tang wrote:
> > Add a hook named update_socket_protocol in __sys_socket(), for bpf
> > progs to attach to and update socket protocol. One user case is to
> > force legacy TCP apps to create and use MPTCP sockets instead of
> > TCP ones.
> >
> > Define a mod_ret set named bpf_mptcp_fmodret_ids, add the hook
> > update_socket_protocol into this set, and register it in
> > bpf_mptcp_kfunc_init().
> >
> > Signed-off-by: Geliang Tang <geliang.tang@suse.com>
>
> ...
>
> > diff --git a/net/socket.c b/net/socket.c
> > index 2b0e54b2405c..586a437d7a5e 100644
> > --- a/net/socket.c
> > +++ b/net/socket.c
> > @@ -1644,11 +1644,36 @@ struct file *__sys_socket_file(int family, int type, int protocol)
> > return sock_alloc_file(sock, flags, NULL);
> > }
> >
> > +/**
>
> Hi Geliang Tang,
>
> nit: The format of the text below is not in kernel doc format,
> so it is probably better if the comment begins with '/*'
> rather than '/**'.
I do use '/*' here first, but got a checkpatch.pl warning:
./scripts/checkpatch.pl v8-0001-bpf-Add-update_socket_protocol-hook.patch
WARNING: networking block comments don't use an empty /* line, use /* Comment...
#63: FILE: net/socket.c:1648:
+/*
+ * A hook for bpf progs to attach to and update socket protocol.
total: 0 errors, 1 warnings, 0 checks, 59 lines checked
And I found that other comments in net/socket.c all begins with '/**'.
So I use '/**' here too.
Thanks,
-Geliang
>
> > + * A hook for bpf progs to attach to and update socket protocol.
> > + *
> > + * A static noinline declaration here could cause the compiler to
> > + * optimize away the function. A global noinline declaration will
> > + * keep the definition, but may optimize away the callsite.
> > + * Therefore, __weak is needed to ensure that the call is still
> > + * emitted, by telling the compiler that we don't know what the
> > + * function might eventually be.
> > + *
> > + * __diag_* below are needed to dismiss the missing prototype warning.
> > + */
>
> ...
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH bpf-next v8 2/4] selftests/bpf: Use random netns name for mptcp
2023-08-03 7:30 [PATCH bpf-next v8 0/4] bpf: Force to MPTCP Geliang Tang
2023-08-03 7:30 ` [PATCH bpf-next v8 1/4] bpf: Add update_socket_protocol hook Geliang Tang
@ 2023-08-03 7:30 ` Geliang Tang
2023-08-03 7:30 ` [PATCH bpf-next v8 3/4] selftests/bpf: Add two mptcp netns helpers Geliang Tang
2023-08-03 7:30 ` [PATCH bpf-next v8 4/4] selftests/bpf: Add mptcpify test Geliang Tang
3 siblings, 0 replies; 9+ messages in thread
From: Geliang Tang @ 2023-08-03 7:30 UTC (permalink / raw)
To: 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
Cc: Geliang Tang, bpf, netdev, mptcp, apparmor, linux-security-module,
selinux, linux-kselftest
Use rand() to generate a random netns name instead of using the fixed
name "mptcp_ns" for every test.
By doing that, we can re-launch the test even if there was an issue
removing the previous netns or if by accident, a netns with this generic
name already existed on the system.
Note that using a different name each will also help adding more
subtests in future commits.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
tools/testing/selftests/bpf/prog_tests/mptcp.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index cd0c42fff7c0..4ccca3d39a8f 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -7,7 +7,7 @@
#include "network_helpers.h"
#include "mptcp_sock.skel.h"
-#define NS_TEST "mptcp_ns"
+char NS_TEST[32];
#ifndef TCP_CA_NAME_MAX
#define TCP_CA_NAME_MAX 16
@@ -147,6 +147,8 @@ static void test_base(void)
if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))
return;
+ srand(time(NULL));
+ snprintf(NS_TEST, sizeof(NS_TEST), "mptcp_ns_%d", rand());
SYS(fail, "ip netns add %s", NS_TEST);
SYS(fail, "ip -net %s link set dev lo up", NS_TEST);
--
2.35.3
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH bpf-next v8 3/4] selftests/bpf: Add two mptcp netns helpers
2023-08-03 7:30 [PATCH bpf-next v8 0/4] bpf: Force to MPTCP Geliang Tang
2023-08-03 7:30 ` [PATCH bpf-next v8 1/4] bpf: Add update_socket_protocol hook Geliang Tang
2023-08-03 7:30 ` [PATCH bpf-next v8 2/4] selftests/bpf: Use random netns name for mptcp Geliang Tang
@ 2023-08-03 7:30 ` Geliang Tang
2023-08-03 7:30 ` [PATCH bpf-next v8 4/4] selftests/bpf: Add mptcpify test Geliang Tang
3 siblings, 0 replies; 9+ messages in thread
From: Geliang Tang @ 2023-08-03 7:30 UTC (permalink / raw)
To: 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
Cc: Geliang Tang, bpf, netdev, mptcp, apparmor, linux-security-module,
selinux, linux-kselftest
Add two netns helpers for mptcp tests: create_netns() and
cleanup_netns(). Use them in test_base().
These new helpers will be re-used in the following commits introducing
new tests.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
.../testing/selftests/bpf/prog_tests/mptcp.c | 35 ++++++++++++-------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 4ccca3d39a8f..4407bd5c9e9a 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -22,6 +22,26 @@ struct mptcp_storage {
char ca_name[TCP_CA_NAME_MAX];
};
+static struct nstoken *create_netns(void)
+{
+ srand(time(NULL));
+ snprintf(NS_TEST, sizeof(NS_TEST), "mptcp_ns_%d", rand());
+ SYS(fail, "ip netns add %s", NS_TEST);
+ SYS(fail, "ip -net %s link set dev lo up", NS_TEST);
+
+ return open_netns(NS_TEST);
+fail:
+ return NULL;
+}
+
+static void cleanup_netns(struct nstoken *nstoken)
+{
+ if (nstoken)
+ close_netns(nstoken);
+
+ SYS_NOFAIL("ip netns del %s &> /dev/null", NS_TEST);
+}
+
static int verify_tsk(int map_fd, int client_fd)
{
int err, cfd = client_fd;
@@ -147,13 +167,8 @@ static void test_base(void)
if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))
return;
- srand(time(NULL));
- snprintf(NS_TEST, sizeof(NS_TEST), "mptcp_ns_%d", rand());
- SYS(fail, "ip netns add %s", NS_TEST);
- SYS(fail, "ip -net %s link set dev lo up", NS_TEST);
-
- nstoken = open_netns(NS_TEST);
- if (!ASSERT_OK_PTR(nstoken, "open_netns"))
+ nstoken = create_netns();
+ if (!ASSERT_OK_PTR(nstoken, "create_netns"))
goto fail;
/* without MPTCP */
@@ -176,11 +191,7 @@ static void test_base(void)
close(server_fd);
fail:
- if (nstoken)
- close_netns(nstoken);
-
- SYS_NOFAIL("ip netns del " NS_TEST " &> /dev/null");
-
+ cleanup_netns(nstoken);
close(cgroup_fd);
}
--
2.35.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH bpf-next v8 4/4] selftests/bpf: Add mptcpify test
2023-08-03 7:30 [PATCH bpf-next v8 0/4] bpf: Force to MPTCP Geliang Tang
` (2 preceding siblings ...)
2023-08-03 7:30 ` [PATCH bpf-next v8 3/4] selftests/bpf: Add two mptcp netns helpers Geliang Tang
@ 2023-08-03 7:30 ` Geliang Tang
2023-08-03 8:03 ` Matthieu Baerts
3 siblings, 1 reply; 9+ messages in thread
From: Geliang Tang @ 2023-08-03 7:30 UTC (permalink / raw)
To: 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
Cc: Geliang Tang, bpf, netdev, mptcp, apparmor, linux-security-module,
selinux, linux-kselftest
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.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
.../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;
+ }
+
+ /* 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 <linux/bpf.h>
+#include <bpf/bpf_tracing.h>
+
+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
+
+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;
+}
--
2.35.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH bpf-next v8 4/4] selftests/bpf: Add mptcpify test
2023-08-03 7:30 ` [PATCH bpf-next v8 4/4] selftests/bpf: Add mptcpify test Geliang Tang
@ 2023-08-03 8:03 ` Matthieu Baerts
0 siblings, 0 replies; 9+ messages in thread
From: Matthieu Baerts @ 2023-08-03 8:03 UTC (permalink / raw)
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, 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
Cc: bpf, netdev, mptcp, apparmor, linux-security-module, selinux,
linux-kselftest
Hi Geliang,
On 03/08/2023 09:30, 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.
Thank you for the modifications!
For MPTCP related code, it looks good to me:
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 9+ messages in thread