[PATCH mptcp-next] Squash to "selftests/bpf: More endpoints for endpoint_init"

Geliang Tang posted 1 patch 1 year, 3 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/9cde7341aac14f85ba9741e70e2d542edae5a1ad.1728911803.git.tanggeliang@kylinos.cn
tools/testing/selftests/bpf/prog_tests/mptcp.c | 8 ++++++++
1 file changed, 8 insertions(+)
[PATCH mptcp-next] Squash to "selftests/bpf: More endpoints for endpoint_init"
Posted by Geliang Tang 1 year, 3 months ago
From: Geliang Tang <tanggeliang@kylinos.cn>

IPv6 addresses will be used in BPF path manager tests, add them in
address_init().

Please update the commit log:

'''
This patch adds two more IPv4 test addresses ADDR_3 - ADDR_4, and four
IPv6 addresses ADDR6_1 - ADDR6_4. Add a new helper address_init() to
initialize all these addresses.

Add a new parameter "endpoints" for endpoint_init() to control how many
endpoints are used for the tests. This makes it more flexible. Update the
parameters of endpoint_init() in test_subflow().
'''

Depends on:
 - "add mptcp_subflow bpf_iter" v9

Based-on: <cover.1728466623.git.tanggeliang@kylinos.cn>

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 2738951842f6..161459ba6194 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -23,6 +23,10 @@
 #define ADDR_2	"10.0.1.2"
 #define ADDR_3	"10.0.1.3"
 #define ADDR_4	"10.0.1.4"
+#define ADDR6_1	"dead:beef:1::1"
+#define ADDR6_2	"dead:beef:1::2"
+#define ADDR6_3	"dead:beef:1::3"
+#define ADDR6_4	"dead:beef:1::4"
 #define PORT_1	10001
 #define WITH_DATA	true
 #define WITHOUT_DATA	false
@@ -378,14 +382,18 @@ static int address_init(void)
 {
 	SYS(fail, "ip -net %s link add veth1 type veth peer name veth2", NS_TEST);
 	SYS(fail, "ip -net %s addr add %s/24 dev veth1", NS_TEST, ADDR_1);
+	SYS(fail, "ip -net %s addr add %s/64 dev veth1 nodad", NS_TEST, ADDR6_1);
 	SYS(fail, "ip -net %s link set dev veth1 up", NS_TEST);
 	SYS(fail, "ip -net %s addr add %s/24 dev veth2", NS_TEST, ADDR_2);
+	SYS(fail, "ip -net %s addr add %s/64 dev veth2 nodad", NS_TEST, ADDR6_2);
 	SYS(fail, "ip -net %s link set dev veth2 up", NS_TEST);
 
 	SYS(fail, "ip -net %s link add veth3 type veth peer name veth4", NS_TEST);
 	SYS(fail, "ip -net %s addr add %s/24 dev veth3", NS_TEST, ADDR_3);
+	SYS(fail, "ip -net %s addr add %s/64 dev veth3 nodad", NS_TEST, ADDR6_3);
 	SYS(fail, "ip -net %s link set dev veth3 up", NS_TEST);
 	SYS(fail, "ip -net %s addr add %s/24 dev veth4", NS_TEST, ADDR_4);
+	SYS(fail, "ip -net %s addr add %s/64 dev veth4 nodad", NS_TEST, ADDR6_4);
 	SYS(fail, "ip -net %s link set dev veth4 up", NS_TEST);
 
 	return 0;
-- 
2.43.0