[MPTCP] Re: [PATCH 6/6] mptcp: Add IPv6 support

[MPTCP] Re: [PATCH 6/6] mptcp: Add IPv6 support

[Peter Krystad]

[-- Attachment #1: Type: text/plain, Size: 1786 bytes --]

On Thu, 2019-10-31 at 13:32 +0100, Davide Caratti wrote:
> hello Peter!
> 
> On Wed, 2019-10-30 at 16:38 -0700, Peter Krystad wrote:
> > Mimic hooks and option handling for IPv6 as was done for
> > IPv4 MPTCP sockets.
> > 
> > Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
> > ---
> >  include/net/mptcp.h  |   3 ++
> >  net/ipv6/tcp_ipv6.c  |   7 +++
> >  net/mptcp/ctrl.c     |  11 +++++
> >  net/mptcp/protocol.c |  85 ++++++++++++++++++++++++++++++++--
> >  net/mptcp/protocol.h |   3 ++
> >  net/mptcp/subflow.c  | 107 ++++++++++++++++++++++++++++++++++++++++++-
> >  6 files changed, 209 insertions(+), 7 deletions(-)
> > 
> > diff --git a/include/net/mptcp.h b/include/net/mptcp.h
> > index eba39a881767..41225c50aebb 100644
> > --- a/include/net/mptcp.h
> > +++ b/include/net/mptcp.h
> > @@ -53,6 +53,9 @@ struct mptcp_out_options {
> >  #ifdef CONFIG_MPTCP
> >  
> >  void mptcp_init(void);
> > +#if IS_ENABLED(CONFIG_IPV6)
> > +int mptcpv6_init(void);
> > +#endif
> 
> I didn't see a stub version of mptcpv6_init(),
>  
> >  static inline bool sk_is_mptcp(const struct sock *sk)
> >  {
> > diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
> > index 50f6f21bbdb1..10d1c033d458 100644
> > --- a/net/ipv6/tcp_ipv6.c
> > +++ b/net/ipv6/tcp_ipv6.c
> > @@ -2109,9 +2109,16 @@ int __init tcpv6_init(void)
> >  	ret = register_pernet_subsys(&tcpv6_net_ops);
> >  	if (ret)
> >  		goto out_tcpv6_protosw;
> > +
> > +	ret = mptcpv6_init();
> > +	if (ret)
> > +		goto out_tcpv6_pernet_subsys;
> > +
> >  out:
> >  	return ret;
> 
> so probably the above hunk will cause build problems when CONFIG_MPTCP is
> unset. Am I missing something?

Nope, you are right. I will fix this in v2.

Peter.

> 
> thanks!

[MPTCP] Re: [PATCH 6/6] mptcp: Add IPv6 support

[Davide Caratti]

[-- Attachment #1: Type: text/plain, Size: 1580 bytes --]

hello Peter!

On Wed, 2019-10-30 at 16:38 -0700, Peter Krystad wrote:
> Mimic hooks and option handling for IPv6 as was done for
> IPv4 MPTCP sockets.
> 
> Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
> ---
>  include/net/mptcp.h  |   3 ++
>  net/ipv6/tcp_ipv6.c  |   7 +++
>  net/mptcp/ctrl.c     |  11 +++++
>  net/mptcp/protocol.c |  85 ++++++++++++++++++++++++++++++++--
>  net/mptcp/protocol.h |   3 ++
>  net/mptcp/subflow.c  | 107 ++++++++++++++++++++++++++++++++++++++++++-
>  6 files changed, 209 insertions(+), 7 deletions(-)
> 
> diff --git a/include/net/mptcp.h b/include/net/mptcp.h
> index eba39a881767..41225c50aebb 100644
> --- a/include/net/mptcp.h
> +++ b/include/net/mptcp.h
> @@ -53,6 +53,9 @@ struct mptcp_out_options {
>  #ifdef CONFIG_MPTCP
>  
>  void mptcp_init(void);
> +#if IS_ENABLED(CONFIG_IPV6)
> +int mptcpv6_init(void);
> +#endif


I didn't see a stub version of mptcpv6_init(),
 
>  static inline bool sk_is_mptcp(const struct sock *sk)
>  {
> diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
> index 50f6f21bbdb1..10d1c033d458 100644
> --- a/net/ipv6/tcp_ipv6.c
> +++ b/net/ipv6/tcp_ipv6.c
> @@ -2109,9 +2109,16 @@ int __init tcpv6_init(void)
>  	ret = register_pernet_subsys(&tcpv6_net_ops);
>  	if (ret)
>  		goto out_tcpv6_protosw;
> +
> +	ret = mptcpv6_init();
> +	if (ret)
> +		goto out_tcpv6_pernet_subsys;
> +
>  out:
>  	return ret;

so probably the above hunk will cause build problems when CONFIG_MPTCP is
unset. Am I missing something?

thanks!
-- 
davide