[PATCH mptcp-next] Squash to "bpf: add bpf_skc_to_mptcp_sock_proto"

[PATCH mptcp-next] Squash to "bpf: add bpf_skc_to_mptcp_sock_proto"

[Geliang Tang]

Drop EXPORT_SYMBOL. (Martin)

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 net/mptcp/bpf.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c
index 535602ba2582..5a0a84ad94af 100644
--- a/net/mptcp/bpf.c
+++ b/net/mptcp/bpf.c
@@ -19,4 +19,3 @@ struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk)
 
 	return NULL;
 }
-EXPORT_SYMBOL(bpf_mptcp_sock_from_subflow);
-- 
2.34.1

[PATCH mptcp-next] Squash to "selftests/bpf: add MPTCP test base"

[Geliang Tang]

Drop connect_to_mptcp_fd (Martin)
Use BPF test skeleton (Andrii)
Use ASSERT_EQ (Andrii)

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/network_helpers.c | 19 +++-----
 tools/testing/selftests/bpf/network_helpers.h |  2 -
 .../testing/selftests/bpf/prog_tests/mptcp.c  | 44 +++++--------------
 3 files changed, 17 insertions(+), 48 deletions(-)

diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/selftests/bpf/network_helpers.c
index c9a2e39e34fc..59cf81ec55af 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -264,7 +264,7 @@ int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts)
 	struct sockaddr_storage addr;
 	struct sockaddr_in *addr_in;
 	socklen_t addrlen, optlen;
-	int fd, type;
+	int fd, type, protocol;
 
 	if (!opts)
 		opts = &default_opts;
@@ -275,6 +275,11 @@ int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts)
 		return -1;
 	}
 
+	if (getsockopt(server_fd, SOL_SOCKET, SO_PROTOCOL, &protocol, &optlen)) {
+		log_err("getsockopt(SOL_PROTOCOL)");
+		return -1;
+	}
+
 	addrlen = sizeof(addr);
 	if (getsockname(server_fd, (struct sockaddr *)&addr, &addrlen)) {
 		log_err("Failed to get server addr");
@@ -282,7 +287,7 @@ int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts)
 	}
 
 	addr_in = (struct sockaddr_in *)&addr;
-	fd = socket(addr_in->sin_family, type, opts->protocol);
+	fd = socket(addr_in->sin_family, type, protocol);
 	if (fd < 0) {
 		log_err("Failed to create client socket");
 		return -1;
@@ -315,16 +320,6 @@ int connect_to_fd(int server_fd, int timeout_ms)
 	return connect_to_fd_opts(server_fd, &opts);
 }
 
-int connect_to_mptcp_fd(int server_fd, int timeout_ms)
-{
-	struct network_helper_opts opts = {
-		.timeout_ms = timeout_ms,
-		.protocol = IPPROTO_MPTCP,
-	};
-
-	return connect_to_fd_opts(server_fd, &opts);
-}
-
 int connect_fd_to_fd(int client_fd, int server_fd, int timeout_ms)
 {
 	struct sockaddr_storage addr;
diff --git a/tools/testing/selftests/bpf/network_helpers.h b/tools/testing/selftests/bpf/network_helpers.h
index e0feb115b2ae..f882c691b790 100644
--- a/tools/testing/selftests/bpf/network_helpers.h
+++ b/tools/testing/selftests/bpf/network_helpers.h
@@ -21,7 +21,6 @@ struct network_helper_opts {
 	const char *cc;
 	int timeout_ms;
 	bool must_fail;
-	int protocol;
 };
 
 /* ipv4 test vector */
@@ -50,7 +49,6 @@ int *start_reuseport_server(int family, int type, const char *addr_str,
 			    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
index 301f19375811..59113eb982e0 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -5,6 +5,7 @@
 #include <test_progs.h>
 #include "cgroup_helpers.h"
 #include "network_helpers.h"
+#include "mptcp_sock.skel.h"
 
 struct mptcp_storage {
 	__u32 invoked;
@@ -23,17 +24,11 @@ static int verify_sk(int map_fd, int client_fd, const char *msg, __u32 is_mptcp)
 	if (!ASSERT_OK(err, "bpf_map_lookup_elem"))
 		return err;
 
-	if (val.invoked != 1) {
-		log_err("%s: unexpected invoked count %d != 1",
-			msg, val.invoked);
+	if (!ASSERT_EQ(val.invoked, 1, "unexpected invoked count"))
 		err++;
-	}
 
-	if (val.is_mptcp != 0) {
-		log_err("%s: unexpected bpf_tcp_sock.is_mptcp %d != 0",
-			msg, val.is_mptcp);
+	if (!ASSERT_EQ(val.is_mptcp, 0, "unexpected is_mptcp"))
 		err++;
-	}
 
 	return err;
 }
@@ -41,37 +36,19 @@ static int verify_sk(int map_fd, int client_fd, const char *msg, __u32 is_mptcp)
 static int run_test(int cgroup_fd, int server_fd, bool is_mptcp)
 {
 	int client_fd, prog_fd, map_fd, err;
-	struct bpf_program *prog;
-	struct bpf_object *obj;
-	struct bpf_map *map;
+	struct mptcp_sock *sock_skel;
 
-	obj = bpf_object__open("./mptcp_sock.o");
-	if (libbpf_get_error(obj))
+	sock_skel = mptcp_sock__open_and_load();
+	if (!ASSERT_OK_PTR(sock_skel, "skel_open_load"))
 		return -EIO;
 
-	err = bpf_object__load(obj);
-	if (!ASSERT_OK(err, "bpf_object__load"))
-		goto out;
-
-	prog = bpf_object__find_program_by_name(obj, "_sockops");
-	if (!ASSERT_OK_PTR(prog, "bpf_object__find_program_by_name")) {
-		err = -EIO;
-		goto out;
-	}
-
-	prog_fd = bpf_program__fd(prog);
+	prog_fd = bpf_program__fd(sock_skel->progs._sockops);
 	if (!ASSERT_GE(prog_fd, 0, "bpf_program__fd")) {
 		err = -EIO;
 		goto out;
 	}
 
-	map = bpf_object__find_map_by_name(obj, "socket_storage_map");
-	if (!ASSERT_OK_PTR(map, "bpf_object__find_map_by_name")) {
-		err = -EIO;
-		goto out;
-	}
-
-	map_fd = bpf_map__fd(map);
+	map_fd = bpf_map__fd(sock_skel->maps.socket_storage_map);
 	if (!ASSERT_GE(map_fd, 0, "bpf_map__fd")) {
 		err = -EIO;
 		goto out;
@@ -81,8 +58,7 @@ static int run_test(int cgroup_fd, int server_fd, bool is_mptcp)
 	if (!ASSERT_OK(err, "bpf_prog_attach"))
 		goto out;
 
-	client_fd = is_mptcp ? connect_to_mptcp_fd(server_fd, 0) :
-			       connect_to_fd(server_fd, 0);
+	client_fd = connect_to_fd(server_fd, 0);
 	if (!ASSERT_GE(client_fd, 0, "connect to fd")) {
 		err = -EIO;
 		goto out;
@@ -94,7 +70,7 @@ static int run_test(int cgroup_fd, int server_fd, bool is_mptcp)
 	close(client_fd);
 
 out:
-	bpf_object__close(obj);
+	mptcp_sock__destroy(sock_skel);
 	return err;
 }
 
-- 
2.34.1

[PATCH mptcp-next] Squash to "selftests/bpf: test bpf_skc_to_mptcp_sock"

[Geliang Tang]

Drop CONFIG_MPTCP (Martin)
Use ASSERT_EQ (Andrii)

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 ++----------
 tools/testing/selftests/bpf/progs/mptcp_sock.c |  4 ----
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 6cfb29399989..6f333e3aba9c 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -14,7 +14,6 @@ struct mptcp_storage {
 
 static int verify_tsk(int map_fd, int client_fd)
 {
-	char *msg = "plain TCP socket";
 	int err, cfd = client_fd;
 	struct mptcp_storage val;
 
@@ -33,7 +32,6 @@ static int verify_tsk(int map_fd, int client_fd)
 
 static int verify_msk(int map_fd, int client_fd)
 {
-	char *msg = "MPTCP subflow socket";
 	int err, cfd = client_fd;
 	struct mptcp_storage val;
 
@@ -41,17 +39,11 @@ static int verify_msk(int map_fd, int client_fd)
 	if (!ASSERT_OK(err, "bpf_map_lookup_elem"))
 		return err;
 
-	if (val.invoked != 1) {
-		log_err("%s: unexpected invoked count %d != 1",
-			msg, val.invoked);
+	if (!ASSERT_EQ(val.invoked, 1, "unexpected invoked count"))
 		err++;
-	}
 
-	if (val.is_mptcp != 1) {
-		log_err("%s: unexpected bpf_tcp_sock.is_mptcp %d != 1",
-			msg, val.is_mptcp);
+	if (!ASSERT_EQ(val.is_mptcp, 1, "unexpected is_mptcp"))
 		err++;
-	}
 
 	return err;
 }
diff --git a/tools/testing/selftests/bpf/progs/mptcp_sock.c b/tools/testing/selftests/bpf/progs/mptcp_sock.c
index 3feb7ff578e2..dc73b3fbb50b 100644
--- a/tools/testing/selftests/bpf/progs/mptcp_sock.c
+++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c
@@ -7,7 +7,6 @@
 #include "bpf_tcp_helpers.h"
 
 char _license[] SEC("license") = "GPL";
-extern bool CONFIG_MPTCP __kconfig;
 
 struct mptcp_storage {
 	__u32 invoked;
@@ -49,9 +48,6 @@ int _sockops(struct bpf_sock_ops *ctx)
 		if (!storage)
 			return 1;
 	} else {
-		if (!CONFIG_MPTCP)
-			return 1;
-
 		msk = bpf_skc_to_mptcp_sock(sk);
 		if (!msk)
 			return 1;
-- 
2.34.1

[PATCH mptcp-next] Squash to "selftests/bpf: verify token of struct mptcp_sock"

[Geliang Tang]

Use ASSERT_EQ and cleanups.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 2015a6c93a99..f41336e41f04 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -50,17 +50,15 @@ static __u32 get_msk_token(void)
 	sync();
 
 	fd = open(monitor_log_path, O_RDONLY);
-	if (!ASSERT_GE(fd, 0, "Failed to open monitor_log_path"))
+	if (!ASSERT_GE(fd, 0, "failed to open monitor_log_path"))
 		return token;
 
 	len = read(fd, buf, sizeof(buf));
-	if (!ASSERT_GT(len, 0, "Failed to read monitor_log_path"))
+	if (!ASSERT_GT(len, 0, "failed to read monitor_log_path"))
 		goto err;
 
-	if (strncmp(buf, prefix, strlen(prefix))) {
-		log_err("Invalid prefix %s", buf);
+	if (!ASSERT_STRNEQ(buf, prefix, strlen(prefix), "invalid prefix"))
 		goto err;
-	}
 
 	token = strtol(buf + strlen(prefix), NULL, 16);
 
@@ -76,7 +74,7 @@ static int verify_msk(int map_fd, int client_fd)
 	__u32 token;
 
 	token = get_msk_token();
-	if (!ASSERT_GT(token, 0, "Unexpected token"))
+	if (!ASSERT_GT(token, 0, "invalid token"))
 		return -1;
 
 	err = bpf_map_lookup_elem(map_fd, &cfd, &val);
@@ -89,11 +87,8 @@ static int verify_msk(int map_fd, int client_fd)
 	if (!ASSERT_EQ(val.is_mptcp, 1, "unexpected is_mptcp"))
 		err++;
 
-	if (val.token != token) {
-		log_err("Unexpected mptcp_sock.token %x != %x",
-			val.token, token);
+	if (!ASSERT_EQ(val.token, token, "unexpected token"))
 		err++;
-	}
 
 	return err;
 }
-- 
2.34.1

[PATCH mptcp-next] Squash to "selftests/bpf: verify ca_name of struct mptcp_sock"

[Geliang Tang]

Use ASSERT_STRNEQ and cleanups.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index d90ac3620635..3050655d71d6 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -78,11 +78,11 @@ void get_msk_ca_name(char ca_name[])
 	int fd;
 
 	fd = open("/proc/sys/net/ipv4/tcp_congestion_control", O_RDONLY);
-	if (!ASSERT_GE(fd, 0, "Failed to open tcp_congestion_control"))
+	if (!ASSERT_GE(fd, 0, "failed to open tcp_congestion_control"))
 		return;
 
 	len = read(fd, ca_name, TCP_CA_NAME_MAX);
-	if (!ASSERT_GT(len, 0, "Failed to read ca_name"))
+	if (!ASSERT_GT(len, 0, "failed to read ca_name"))
 		goto err;
 
 	if (len > 0 && ca_name[len - 1] == '\n')
@@ -118,11 +118,8 @@ static int verify_msk(int map_fd, int client_fd)
 	if (!ASSERT_EQ(val.token, token, "unexpected token"))
 		err++;
 
-	if (strncmp(val.ca_name, ca_name, TCP_CA_NAME_MAX)) {
-		log_err("Unexpected mptcp_sock.ca_name %s != %s",
-			val.ca_name, ca_name);
+	if (!ASSERT_STRNEQ(val.ca_name, ca_name, TCP_CA_NAME_MAX, "unexpected ca_name"))
 		err++;
-	}
 
 	return err;
 }
-- 
2.34.1

[PATCH mptcp-next] Squash to "selftests/bpf: verify first of struct mptcp_sock"

[Geliang Tang]

Use ASSERT_EQ.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 913ece278ffa..4106e0b8e407 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -120,11 +120,8 @@ static int verify_msk(int map_fd, int client_fd)
 	if (!ASSERT_EQ(val.token, token, "unexpected token"))
 		err++;
 
-	if (val.first != val.sk) {
-		log_err("Unexpected mptcp_sock.first %p != %p",
-			val.first, val.sk);
+	if (!ASSERT_EQ(val.first, val.sk, "unexpected first"))
 		err++;
-	}
 
 	if (!ASSERT_STRNEQ(val.ca_name, ca_name, TCP_CA_NAME_MAX, "unexpected ca_name"))
 		err++;
-- 
2.34.1

[PATCH mptcp-next] Squash to "selftests/bpf: add bpf_first test"

[Geliang Tang]

Drop connect_to_mptcp_fd

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index d9e6dec32bfe..fd42e22d5e7d 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -315,7 +315,7 @@ static void test_first(void)
 
 	system("sysctl -qw net.mptcp.scheduler=bpf_first");
 	server_fd = start_mptcp_server(AF_INET, NULL, 0, 0);
-	client_fd = connect_to_mptcp_fd(server_fd, 0);
+	client_fd = connect_to_fd(server_fd, 0);
 
 	send_data(server_fd, client_fd);
 
-- 
2.34.1

Re: Squash to "selftests/bpf: add bpf_first test": Tests Results

[MPTCP CI]

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: Script error! ❓:
  - :
  - Task: https://cirrus-ci.com/task/5549153072709632
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5549153072709632/summary/summary.txt

- KVM Validation: Script error! ❓:
  - :
  - Task: https://cirrus-ci.com/task/6675052979552256
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6675052979552256/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/4eee192e015b


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-debug

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)

Re: Squash to "bpf: add bpf_skc_to_mptcp_sock_proto": Tests Results

[MPTCP CI]

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: Script error! ❓:
  - :
  - Task: https://cirrus-ci.com/task/6492176627531776
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6492176627531776/summary/summary.txt

- KVM Validation: Script error! ❓:
  - :
  - Task: https://cirrus-ci.com/task/4662589278912512
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/4662589278912512/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/9260fa883442


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-debug

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)

Re: Squash to "bpf: add bpf_skc_to_mptcp_sock_proto": Tests Results

[MPTCP CI]

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal:
  - Unstable: 1 failed test(s): selftest_simult_flows 🔴:
  - Task: https://cirrus-ci.com/task/5696628827881472
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5696628827881472/summary/summary.txt

- KVM Validation: debug:
  - Unstable: 2 failed test(s): selftest_diag selftest_simult_flows 🔴:
  - Task: https://cirrus-ci.com/task/5133678874460160
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5133678874460160/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/a16226877702


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-debug

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)