On Mon, May 2, 2022 at 2:12 PM Mat Martineau
<mathew.j.martineau@xxxxxxxxxxxxxxx> wrote:
>
> From: Nicolas Rybowski <nicolas.rybowski@xxxxxxxxxxxx>
>
> This patch adds a base for MPTCP specific tests.
>
> It is currently limited to the is_mptcp field in case of plain TCP
> connection because there is no easy way to get the subflow sk from a msk
> in userspace. This implies that we cannot lookup the sk_storage attached
> to the subflow sk in the sockops program.
>
> Acked-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
> Co-developed-by: Geliang Tang <geliang.tang@xxxxxxxx>
> Signed-off-by: Geliang Tang <geliang.tang@xxxxxxxx>
> Signed-off-by: Nicolas Rybowski <nicolas.rybowski@xxxxxxxxxxxx>
> Signed-off-by: Mat Martineau <mathew.j.martineau@xxxxxxxxxxxxxxx>
> ---
> MAINTAINERS | 1 +
> tools/testing/selftests/bpf/config | 1 +
> tools/testing/selftests/bpf/network_helpers.c | 43 ++++--
> tools/testing/selftests/bpf/network_helpers.h | 4 +
> .../testing/selftests/bpf/prog_tests/mptcp.c | 136 ++++++++++++++++++
> .../testing/selftests/bpf/progs/mptcp_sock.c | 50 +++++++
> 6 files changed, 227 insertions(+), 8 deletions(-)
> create mode 100644 tools/testing/selftests/bpf/prog_tests/mptcp.c
> create mode 100644 tools/testing/selftests/bpf/progs/mptcp_sock.c
>
[...]
> /* ipv4 test vector */
> @@ -42,11 +43,14 @@ extern struct ipv6_packet pkt_v6;
> int settimeo(int fd, int timeout_ms);
> int start_server(int family, int type, const char *addr, __u16 port,
> int timeout_ms);
> +int start_mptcp_server(int family, const char *addr, __u16 port,
> + int timeout_ms);
> int *start_reuseport_server(int family, int type, const char *addr_str,
> __u16 port, int timeout_ms,
> unsigned int nr_listens);
> void free_fds(int *fds, unsigned int nr_close_fds);
> int connect_to_fd(int server_fd, int timeout_ms);
> +int connect_to_mptcp_fd(int server_fd, int timeout_ms);
> int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts);
> int connect_fd_to_fd(int client_fd, int server_fd, int timeout_ms);
> int fastopen_connect(int server_fd, const char *data, unsigned int data_len,
> diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> new file mode 100644
> index 000000000000..cd548bb2828f
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> @@ -0,0 +1,136 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (c) 2020, Tessares SA. */
2022?
> +
> +#include <test_progs.h>
> +#include "cgroup_helpers.h"
> +#include "network_helpers.h"
> +
> +struct mptcp_storage {
> + __u32 invoked;
> + __u32 is_mptcp;
> +};
> +
> +static int verify_sk(int map_fd, int client_fd, const char *msg, __u32 is_mptcp)
> +{
> + int err = 0, cfd = client_fd;
> + struct mptcp_storage val;
> +
> + if (is_mptcp == 1)
> + return 0;
> +
> + if (CHECK_FAIL(bpf_map_lookup_elem(map_fd, &cfd, &val) < 0)) {
don't use CHECK and especially CHECK_FAIL, please use ASSERT_xxx()
macros instead
> + perror("Failed to read socket storage");
> + return -1;
> + }
> +
[...]
> diff --git a/tools/testing/selftests/bpf/progs/mptcp_sock.c b/tools/testing/selftests/bpf/progs/mptcp_sock.c
> new file mode 100644
> index 000000000000..0d65fb889d03
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c
> @@ -0,0 +1,50 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (c) 2020, Tessares SA. */
> +
> +#include <linux/bpf.h>
> +#include <bpf/bpf_helpers.h>
> +
> +char _license[] SEC("license") = "GPL";
> +__u32 _version SEC("version") = 1;
version is not needed, please drop
> +
> +struct mptcp_storage {
> + __u32 invoked;
> + __u32 is_mptcp;
> +};
[...]
