Squash to "selftests/bpf: Add mptcp_userspace_pm_addr bpf_iter subtest"

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

Posted by Geliang Tang 1 month ago

From: Geliang Tang <tanggeliang@kylinos.cn>

Enable CONFIG_MPTCP_IPV6 in bpf config.

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

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/bpf/config | 1 +
 1 file changed, 1 insertion(+)

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

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

Posted by Matthieu Baerts 1 month ago

Hi Geliang,

On 08/11/2024 09:51, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> 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
-- 
Sponsored by the NGI0 Core fund.

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

Posted by Geliang Tang 4 weeks, 1 day ago

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 <tanggeliang@kylinos.cn>
> > 
> > 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