Skip to contentSkip to conversation

mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it

PATCH Applied Geert Uytterhoeven 3 participants 7 messages Oct 20, 2020 – Oct 21, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it

MPTCP_IPV6 selects IPV6, thus enabling an optional feature the user may not want to enable. Fix this by making MPTCP_IPV6 depend on IPV6, like is done for all other IPv6 features.

Fixes f870fa0b5768842c ("mptcp: Add MPTCP socket stubs")
Signed-off-by Geert Uytterhoeven <geert(a)linux-m68k.org>
---
 net/mptcp/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/mptcp/Kconfig +1 -1
index abb0a992d4a0855a..8936604b3bf9d76d 100644
@@ -19,7 +19,7 @@ config INET_MPTCP_DIAG
 
 config MPTCP_IPV6
 	bool "MPTCP: IPv6 support for Multipath TCP"
-	select IPV6
+	depends on IPV6
 	default y
 
 config MPTCP_KUNIT_TESTS
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw

Hi Geert,

Thank you for the patch!

Quoted 3 lines · Geert Uytterhoeven

MPTCP_IPV6 selects IPV6, thus enabling an optional feature the user may not want to enable. Fix this by making MPTCP_IPV6 depend on IPV6, like is done for all other IPv6 features.

Here again, the intension was to select IPv6 from MPTCP but I understand the issue: if we enable MPTCP, we will select IPV6 as well by default. Maybe not what we want on some embedded devices with very limited memory where IPV6 is already off. We should instead enable MPTCP_IPV6 only if IPV6=y. LGTM then!

Reviewed-by Matthieu Baerts <matthieu.baerts(a)tessares.net>

Cheers,
Matt

Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
maintainer Applied
#2 lore raw
Quoted 5 lines · On Tue, 20 Oct 2020 11:26:34 +0200 Matthieu Baerts wrote:
Quoted 3 lines · Geert Uytterhoeven

MPTCP_IPV6 selects IPV6, thus enabling an optional feature the user may not want to enable. Fix this by making MPTCP_IPV6 depend on IPV6, like is done for all other IPv6 features.

Quoted 7 lines

Here again, the intension was to select IPv6 from MPTCP but I understand the issue: if we enable MPTCP, we will select IPV6 as well by default. Maybe not what we want on some embedded devices with very limited memory where IPV6 is already off. We should instead enable MPTCP_IPV6 only if IPV6=y. LGTM then!

Reviewed-by Matthieu Baerts <matthieu.baerts(a)tessares.net>

Applied, thanks!

#3 lore raw

Hi Jakub,

Quoted 12 lines · Jakub Kicinski
Quoted 11 lines · On Tue, 20 Oct 2020 11:26:34 +0200 Matthieu Baerts wrote:
Quoted 3 lines · Geert Uytterhoeven

MPTCP_IPV6 selects IPV6, thus enabling an optional feature the user may not want to enable. Fix this by making MPTCP_IPV6 depend on IPV6, like is done for all other IPv6 features.

Here again, the intension was to select IPv6 from MPTCP but I understand the issue: if we enable MPTCP, we will select IPV6 as well by default. Maybe not what we want on some embedded devices with very limited memory where IPV6 is already off. We should instead enable MPTCP_IPV6 only if IPV6=y. LGTM then!

Quoted 3 lines
Quoted 1 line
Reviewed-by Matthieu Baerts <matthieu.baerts(a)tessares.net>

Applied, thanks!

My apologies, this fails for the CONFIG_IPV6=m and CONFIG_MPTCP=y case:
+ error: net/mptcp/protocol.o: undefined reference to
`inet6_getname': => .rodata+0x19c)
+ error: net/mptcp/protocol.o: undefined reference to `inet6_ioctl':
=> .rodata+0x1a4)
+ error: net/mptcp/protocol.o: undefined reference to
`inet6_recvmsg': => .rodata+0x1c4)
+ error: net/mptcp/protocol.o: undefined reference to
`inet6_release': => .rodata+0x188)
+ error: net/mptcp/protocol.o: undefined reference to
`inet6_sendmsg': => .rodata+0x1c0)
+ error: protocol.c: undefined reference to `inet6_destroy_sock':
=> .text+0x4994)
+ error: protocol.c: undefined reference to
`inet6_register_protosw': => .init.text+0xc6)
+ error: protocol.c: undefined reference to `inet6_stream_ops': =>
.text+0x2bb0)
+ error: protocol.c: undefined reference to `tcpv6_prot': => .text+0x2ba8)
+ error: subflow.c: undefined reference to
`tcp_request_sock_ipv6_ops': => .text+0x8e2)
+ error: undefined reference to `ipv6_specific': => (.init.text+0xea)
+ error: undefined reference to `tcp_request_sock_ipv6_ops': =>
(.init.text+0xc4)

So those issues have to be fixed first

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
#4 lore raw

Hi Geert,

Quoted 15 lines · Geert Uytterhoeven

Hi Jakub,

Quoted 12 lines · Jakub Kicinski
Quoted 11 lines · On Tue, 20 Oct 2020 11:26:34 +0200 Matthieu Baerts wrote:
Quoted 3 lines · Geert Uytterhoeven

MPTCP_IPV6 selects IPV6, thus enabling an optional feature the user may not want to enable. Fix this by making MPTCP_IPV6 depend on IPV6, like is done for all other IPv6 features.

Here again, the intension was to select IPv6 from MPTCP but I understand the issue: if we enable MPTCP, we will select IPV6 as well by default. Maybe not what we want on some embedded devices with very limited memory where IPV6 is already off. We should instead enable MPTCP_IPV6 only if IPV6=y. LGTM then!

Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Reviewed-by Matthieu Baerts <matthieu.baerts(a)tessares.net>

Applied, thanks!

My apologies, this fails for the CONFIG_IPV6=m and CONFIG_MPTCP=y case:

Good point, MPTCP cannot be compiled as a module (like TCP). It should then depends on IPV6=y. I thought it would be the case.

Do you want me to send a patch or do you already have one?

Cheers,
Matt

Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
#5 lore raw

Hi Matthieu,

Quoted 18 lines · Matthieu Baerts
Quoted 17 lines · Geert Uytterhoeven
Quoted 15 lines · Jakub Kicinski
Quoted 5 lines · On Tue, 20 Oct 2020 11:26:34 +0200 Matthieu Baerts wrote:
Quoted 3 lines · Geert Uytterhoeven

MPTCP_IPV6 selects IPV6, thus enabling an optional feature the user may not want to enable. Fix this by making MPTCP_IPV6 depend on IPV6, like is done for all other IPv6 features.

Quoted 7 lines

Here again, the intension was to select IPv6 from MPTCP but I understand the issue: if we enable MPTCP, we will select IPV6 as well by default. Maybe not what we want on some embedded devices with very limited memory where IPV6 is already off. We should instead enable MPTCP_IPV6 only if IPV6=y. LGTM then!

Reviewed-by Matthieu Baerts <matthieu.baerts(a)tessares.net>

Applied, thanks!

Quoted 7 lines
Quoted 2 lines

My apologies, this fails for the CONFIG_IPV6=m and CONFIG_MPTCP=y case:

Good point, MPTCP cannot be compiled as a module (like TCP). It should then depends on IPV6=y. I thought it would be the case.

Do you want me to send a patch or do you already have one?

I don't have a patch yet, so feel free to send one.

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
#6 lore raw

Hi Geert,

Quoted 25 lines · Geert Uytterhoeven

Hi Matthieu,

Quoted 21 lines · Matthieu Baerts
Quoted 19 lines · Geert Uytterhoeven
Quoted 12 lines · Jakub Kicinski
Quoted 11 lines · On Tue, 20 Oct 2020 11:26:34 +0200 Matthieu Baerts wrote:
Quoted 3 lines · Geert Uytterhoeven

MPTCP_IPV6 selects IPV6, thus enabling an optional feature the user may not want to enable. Fix this by making MPTCP_IPV6 depend on IPV6, like is done for all other IPv6 features.

Here again, the intension was to select IPv6 from MPTCP but I understand the issue: if we enable MPTCP, we will select IPV6 as well by default. Maybe not what we want on some embedded devices with very limited memory where IPV6 is already off. We should instead enable MPTCP_IPV6 only if IPV6=y. LGTM then!

Quoted 3 lines
Quoted 1 line
Reviewed-by Matthieu Baerts <matthieu.baerts(a)tessares.net>

Applied, thanks!

My apologies, this fails for the CONFIG_IPV6=m and CONFIG_MPTCP=y case:

Quoted 6 lines
Quoted 4 lines

Good point, MPTCP cannot be compiled as a module (like TCP). It should then depends on IPV6=y. I thought it would be the case.

Do you want me to send a patch or do you already have one?

I don't have a patch yet, so feel free to send one.

Just did:

https://lore.kernel.org/netdev/20201021105154.628257-1-matthieu.baerts(a)tessares.net/

Groetjes,
Matt

Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net