2020-10-22 05:13:30

by Matthieu Baerts

Subject: [PATCH net] selftests: mptcp: depends on built-in IPv6

Recently, CONFIG_MPTCP_IPV6 no longer selects CONFIG_IPV6. As a
consequence, if CONFIG_MPTCP_IPV6=y is added to the kconfig, it will no
longer ensure CONFIG_IPV6=y. If it is not enabled, CONFIG_MPTCP_IPV6
will stay disabled and selftests will fail.

We also need CONFIG_IPV6 to be built-in. For more details, please see
commit 0ed37ac586c0 ("mptcp: depends on IPV6 but not as a module").

Note that 'make kselftest-merge' will take all 'config' files found in
'tools/testsing/selftests'. Because some of them already set
CONFIG_IPV6=y, MPTCP selftests were still passing. But they will fail if
MPTCP selftests are launched manually after having executed this command
to prepare the kernel config:

./scripts/kconfig/merge_config.sh -m .config \
./tools/testing/selftests/net/mptcp/config

Fixes: 010b430d5df5 ("mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it")
Signed-off-by: Matthieu Baerts <[email protected]>
---
tools/testing/selftests/net/mptcp/config | 1 +
1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selftests/net/mptcp/config
index 8df5cb8f71ff..741a1c4f4ae8 100644
--- a/tools/testing/selftests/net/mptcp/config
+++ b/tools/testing/selftests/net/mptcp/config
@@ -1,4 +1,5 @@
CONFIG_MPTCP=y
+CONFIG_IPV6=y
CONFIG_MPTCP_IPV6=y
CONFIG_INET_DIAG=m
CONFIG_INET_MPTCP_DIAG=m
--
2.27.0

2020-10-22 07:51:35

by Mat Martineau

Subject: Re: [PATCH net] selftests: mptcp: depends on built-in IPv6

On Wed, 21 Oct 2020, Matthieu Baerts wrote:

> Recently, CONFIG_MPTCP_IPV6 no longer selects CONFIG_IPV6. As a
> consequence, if CONFIG_MPTCP_IPV6=y is added to the kconfig, it will no
> longer ensure CONFIG_IPV6=y. If it is not enabled, CONFIG_MPTCP_IPV6
> will stay disabled and selftests will fail.
>
> We also need CONFIG_IPV6 to be built-in. For more details, please see
> commit 0ed37ac586c0 ("mptcp: depends on IPV6 but not as a module").
>
> Note that 'make kselftest-merge' will take all 'config' files found in
> 'tools/testsing/selftests'. Because some of them already set
> CONFIG_IPV6=y, MPTCP selftests were still passing. But they will fail if
> MPTCP selftests are launched manually after having executed this command
> to prepare the kernel config:
>
> ./scripts/kconfig/merge_config.sh -m .config \
> ./tools/testing/selftests/net/mptcp/config
>
> Fixes: 010b430d5df5 ("mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it")
> Signed-off-by: Matthieu Baerts <[email protected]>
> ---
> tools/testing/selftests/net/mptcp/config | 1 +
> 1 file changed, 1 insertion(+)
>

Reviewed-by: Mat Martineau <[email protected]>

--
Mat Martineau
Intel

2020-10-22 14:11:29

by Jakub Kicinski

Subject: Re: [PATCH net] selftests: mptcp: depends on built-in IPv6

On Wed, 21 Oct 2020 17:35:32 -0700 (PDT) Mat Martineau wrote:
> > Recently, CONFIG_MPTCP_IPV6 no longer selects CONFIG_IPV6. As a
> > consequence, if CONFIG_MPTCP_IPV6=y is added to the kconfig, it will no
> > longer ensure CONFIG_IPV6=y. If it is not enabled, CONFIG_MPTCP_IPV6
> > will stay disabled and selftests will fail.
> >
> > We also need CONFIG_IPV6 to be built-in. For more details, please see
> > commit 0ed37ac586c0 ("mptcp: depends on IPV6 but not as a module").
> >
> > Note that 'make kselftest-merge' will take all 'config' files found in
> > 'tools/testsing/selftests'. Because some of them already set
> > CONFIG_IPV6=y, MPTCP selftests were still passing. But they will fail if
> > MPTCP selftests are launched manually after having executed this command
> > to prepare the kernel config:
> >
> > ./scripts/kconfig/merge_config.sh -m .config \
> > ./tools/testing/selftests/net/mptcp/config
> >
> > Fixes: 010b430d5df5 ("mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it")
> > Signed-off-by: Matthieu Baerts <[email protected]>
>
> Reviewed-by: Mat Martineau <[email protected]>

Applied, thank you!