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

Commit Message

Geliang Tang Oct. 14, 2024, 1:19 p.m. UTC

From: Geliang Tang <[e-mail]>

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: <[e-mail]>

Signed-off-by: Geliang Tang <[e-mail]>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

MPTCP CI Oct. 14, 2024, 1:44 p.m. UTC | #1

Hi Geliang,

Thank you for your modifications, that's great!

But sadly, our CI spotted some issues with it when trying to build it.

You can find more details there:

  https://github.com/multipath-tcp/mptcp_net-next/actions/runs/11328728635

Status: failure
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/645e77d4357c
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=898896

Feel free to reply to this email if you cannot access logs, if you need
some support to fix the error, if this doesn't seem to be caused by your
modifications or if the error is a false positive one.

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

MPTCP CI Oct. 14, 2024, 2:31 p.m. UTC | #2

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Success! ✅
- KVM Validation: btf (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/11328728606

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/645e77d4357c
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=898896


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-normal

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 (NGI0 Core)

Patch

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;