[mptcp-next] Squash to "selftests/bpf: Add mptcp_userspace_pm_addr bpf_iter subtest"

Commit Message

Geliang Tang Nov. 8, 2024, 8:51 a.m. UTC

From: Geliang Tang <[e-mail]>

Enable CONFIG_MPTCP_IPV6 in bpf config.

Based-on: <[e-mail]>

Signed-off-by: Geliang Tang <[e-mail]>
---
 tools/testing/selftests/bpf/config | 1 +
 1 file changed, 1 insertion(+)

Comments

MPTCP CI Nov. 8, 2024, 9:14 a.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/11739236566

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

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 Nov. 8, 2024, 10:04 a.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-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/11739236551

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


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)

Matthieu Baerts Nov. 8, 2024, 10:41 a.m. UTC | #3

Hi Geliang,

On 08/11/2024 09:51, Geliang Tang wrote:
> From: Geliang Tang <[e-mail]>
> 
> Enable CONFIG_MPTCP_IPV6 in bpf config.

Why do you need this? Is it "just in case", or did you see an error
somewhere?

Because if MPTCP and IPV6 are enabled, then MPTCP_IPV6 should be enabled
by default as well, no?

Cheers,
Matt

Geliang Tang Nov. 9, 2024, 8:15 a.m. UTC | #4

Hi Matt,

On Fri, 2024-11-08 at 11:41 +0100, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 08/11/2024 09:51, Geliang Tang wrote:
> > From: Geliang Tang <[e-mail]>
> > 
> > Enable CONFIG_MPTCP_IPV6CONFIG_MPTCP_IPV6 in bpf config.
> 
> Why do you need this? Is it "just in case", or did you see an error
> somewhere?

I didn't see any error anywhere. I just notice that CONFIG_MPTCP_IPV6
is in mptcp selftests config, but not in bpf selftests config: 

$ cat tools/testing/selftests/net/mptcp/config | grep MPTCP
CONFIG_MPTCP=y
CONFIG_MPTCP_IPV6=y
CONFIG_INET_MPTCP_DIAG=m

$ cat tools/testing/selftests/bpf/config | grep MPTCP
CONFIG_MPTCP=y
CONFIG_MPTCP_IPV6=y

> 
> Because if MPTCP and IPV6 are enabled, then MPTCP_IPV6 should be
> enabled
> by default as well, no?

Yes, you are right. CONFIG_MPTCP_IPV6 is indeed already enabled in bpf
selftests ci, no need to add it.

I downloaded vmlinux image "vmlinux-x86_64-gcc" of "bpf: Add
mptcp_subflow bpf_iter support #4095" at:

https://github.com/kernel-patches/bpf/actions/runs/11745455465

Unzip it and check the kconfigs:

$ cat vmlinux-x86_64-gcc/kbuild-output/.config | grep MPTCP
CONFIG_MPTCP=y
CONFIG_INET_MPTCP_DIAG=y
CONFIG_MPTCP_IPV6=y

$ cat vmlinux-x86_64-gcc/kbuild-output/include/config/auto.conf | grep
MPTCP
CONFIG_INET_MPTCP_DIAG=y
CONFIG_MPTCP_IPV6=y
CONFIG_MPTCP=y

CONFIG_MPTCP_IPV6 is enabled.

Let's drop this squash-to patch. I changed it as "Rejected".

Thanks,
-Geliang

> 
> Cheers,
> Matt

Patch

diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config
index 4ca84c8d9116..278d62c4a16b 100644
--- a/tools/testing/selftests/bpf/config
+++ b/tools/testing/selftests/bpf/config
@@ -58,6 +58,7 @@  CONFIG_MPLS=y
 CONFIG_MPLS_IPTUNNEL=y
 CONFIG_MPLS_ROUTING=y
 CONFIG_MPTCP=y
+CONFIG_MPTCP_IPV6=y
 CONFIG_NET_ACT_SKBMOD=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_ACT=y