[MPTCP] Re: [MPTCP][PATCH v3 mptcp-next] mptcp: send ack for every add_addr

[MPTCP] Re: [MPTCP][PATCH v3 mptcp-next] mptcp: send ack for every add_addr

[Matthieu Baerts]

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

Hi Geliang, Paolo,

On 22/01/2021 12:25, Geliang Tang wrote:
> This patch changes the sending ACK conditions for the ADD_ADDR, send an ACK
> packet for any ADD_ADDR, not just when ipv6 addresses or port numbers
> are included.
> 
> Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/139
> Signed-off-by: Geliang Tang <geliangtang(a)gmail.com>

Thank you for this patch, the Closes tag and the reviews! I added this 
patch in the "mptcp: create subflow for newly added address" series. I 
had a conflict with one patch from Florian I recently applied, should be OK.

- 581ac7207e9c: mptcp: send ack for every add_addr
- 2ee1a4d633eb: conflict in t/mptcp-pm-add-lockdep-assertions
- Results: 1f3c95152e38..61cbfacafedc

Tests + export are in progress!

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

[MPTCP] Re: [MPTCP][PATCH v3 mptcp-next] mptcp: send ack for every add_addr

[Paolo Abeni]

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

On Fri, 2021-01-22 at 19:25 +0800, Geliang Tang wrote:
> This patch changes the sending ACK conditions for the ADD_ADDR, send an ACK
> packet for any ADD_ADDR, not just when ipv6 addresses or port numbers
> are included.
> 
> Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/139
> Signed-off-by: Geliang Tang <geliangtang(a)gmail.com>
> ---
>  v3:
>   - drop the duplicate mptcp_pm_should_add_signal(msk) check in v2.
>  v2:
>   - print out the debug output on one line.
> ---
>  net/mptcp/pm.c         |  3 +--
>  net/mptcp/pm_netlink.c | 10 ++++------
>  2 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
> index 01a846b25771..3a22e73220b9 100644
> --- a/net/mptcp/pm.c
> +++ b/net/mptcp/pm.c
> @@ -191,8 +191,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
>  
>  void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk)
>  {
> -	if (!mptcp_pm_should_add_signal_ipv6(msk) &&
> -	    !mptcp_pm_should_add_signal_port(msk))
> +	if (!mptcp_pm_should_add_signal(msk))
>  		return;
>  
>  	mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_SEND_ACK);
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 39998c521133..37b4c9068f8d 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -496,8 +496,7 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk)
>  {
>  	struct mptcp_subflow_context *subflow;
>  
> -	if (!mptcp_pm_should_add_signal_ipv6(msk) &&
> -	    !mptcp_pm_should_add_signal_port(msk))
> +	if (!mptcp_pm_should_add_signal(msk))
>  		return;
>  
>  	__mptcp_flush_join_list(msk);
> @@ -507,10 +506,9 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk)
>  		u8 add_addr;
>  
>  		spin_unlock_bh(&msk->pm.lock);
> -		if (mptcp_pm_should_add_signal_ipv6(msk))
> -			pr_debug("send ack for add_addr6");
> -		if (mptcp_pm_should_add_signal_port(msk))
> -			pr_debug("send ack for add_addr_port");
> +		pr_debug("send ack for add_addr%s%s",
> +			 mptcp_pm_should_add_signal_ipv6(msk) ? " [ipv6]" : "",
> +			 mptcp_pm_should_add_signal_port(msk) ? " [port]" : "");
>  
>  		lock_sock(ssk);
>  		tcp_send_ack(ssk);

This version LGTM!

Acked-by: Paolo Abeni <pabeni(a)redhat.com>