Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CC2F28DB4C for ; Wed, 6 Aug 2025 15:34:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754494491; cv=none; b=Fh7WJ9sbs/hqUXcV0/NFiBoI0KYeO/5WSLZVl9aQCz1BtJQ8NYEDevO/vapyT3U6Fz907MQ8u2UNJwTnVuN7pw6avaMoQqL3rdAiMoAox4lPVWlwLIKES40Pb9p3IPc8pNHdtzT4LvDSrk1ll4MvNNmYJSy4jvkFZluSa6vPSuM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754494491; c=relaxed/simple; bh=mzrgwIHxbxlvPtPZDImGJCNsDA7EqZj4IjtdUKr31dI=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=UIKDMdcEZcLvQNMJzqkH7JtxwNmq4TIsktd0StsBqEdPObJh6uEl4j54iA5xHh7JxBvkhxF07GT76TbqLqpnjuWxAcXzuxxaTTz+fuxIRQfmFxoZT5dP0Lyt4Z4Bz8gycCMOIU3Cs5w7Hiq+H2kPD3Uw5DWe5JgdI1qwyWzH+8w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K5xK8nbS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="K5xK8nbS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7002C4CEF1; Wed, 6 Aug 2025 15:34:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1754494490; bh=mzrgwIHxbxlvPtPZDImGJCNsDA7EqZj4IjtdUKr31dI=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=K5xK8nbS+XM+ipkyXkGEltV59GvAg9yXT0YYhwMVq2qe/AQCBO44bT4VT//H0BabS HsRq4SnZi+WRAsShoEONAO2bw506Xc5F7ar8F/9XbFmmqiUIpnfc64qzyfEKwebjeP hgf+GnDdCWceTdLKhC+EJqfKdLsrKcEenayxdzYbaR4S0JYNMH6S89LB++FyCJ09nm UmW3zpG5O9ORqTvb63knRfqcm1hwxkPoQ89aPoOnmztakTWBHmXpqqgTCYsLU79i6q AA92bXJdjgOh7+ix+GVjXL+r6crcbZNL2uhv/NYXg1dEOq8h84LE0mt4plOkZIg5zQ FPNUFDydhZKIA== Message-ID: Date: Wed, 6 Aug 2025 17:34:44 +0200 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: [PATCH mptcp-next v3 2/3] mptcp: make ADD_ADDR retransmission timeout adaptive Content-Language: en-GB, fr-BE To: Geliang Tang , mptcp@lists.linux.dev Cc: Geliang Tang , Christoph Paasch References: From: Matthieu Baerts Autocrypt: addr=matttbe@kernel.org; keydata= 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 lzVbFe7fduHbABmYz9cefQpO7wDE/Q== Organization: NGI0 Core In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi Geliang, On 06/08/2025 05:17, Geliang Tang wrote: > From: Geliang Tang > > Replace the fixed ADD_ADDR retransmission timeout with an adaptive > mechanism that uses the maximum RTO among existing subflows. This > improves responsiveness when establishing new subflows while maintaining > an upper bound through the configured add_addr_timeout value. > > Key changes: > 1. Compute timeout as min(max_subflow_RTO, configured_max_timeout) > 2. Apply exponential backoff based on retransmission count > 3. Maintain fallback to configured max timeout when no subflows exist > 4. Update documentation to clarify add_addr_timeout is now the maximum > value > > Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/576 > Reviewed-by: Christoph Paasch > Signed-off-by: Geliang Tang > --- > Documentation/networking/mptcp-sysctl.rst | 4 +-- > net/mptcp/pm.c | 30 ++++++++++++++++++++--- > 2 files changed, 29 insertions(+), 5 deletions(-) > > diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/networking/mptcp-sysctl.rst > index 1683c139821e..2b8e8fb99ee2 100644 > --- a/Documentation/networking/mptcp-sysctl.rst > +++ b/Documentation/networking/mptcp-sysctl.rst > @@ -8,8 +8,8 @@ MPTCP Sysfs variables > =============================== > > add_addr_timeout - INTEGER (seconds) > - Set the timeout after which an ADD_ADDR control message will be > - resent to an MPTCP peer that has not acknowledged a previous > + Set the maximum value of timeout after which an ADD_ADDR control message > + will be resent to an MPTCP peer that has not acknowledged a previous > ADD_ADDR message. > > Do not retransmit if set to 0. > diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c > index 1330af6a2154..34cc4f45bc7d 100644 > --- a/net/mptcp/pm.c > +++ b/net/mptcp/pm.c > @@ -268,6 +268,30 @@ int mptcp_pm_mp_prio_send_ack(struct mptcp_sock *msk, > return -EINVAL; > } > > +static unsigned int mptcp_adjust_add_addr_timeout(struct mptcp_sock *msk) > +{ > + struct mptcp_subflow_context *subflow; > + struct sock *sk = (struct sock *)msk; > + unsigned int max_rto = 0; > + unsigned int timeout; > + > + timeout = mptcp_get_add_addr_timeout(sock_net(sk)); > + > + mptcp_for_each_subflow(msk, subflow) { > + struct sock *ssk = mptcp_subflow_tcp_sock(subflow); > + unsigned int subflow_rto; > + > + subflow_rto = __tcp_set_rto(tcp_sk(ssk)) * 2; Why "* 2"? Is it what TCP is doing? (Probably best to add a comment here above, and in the commit message.) (Also, I guess the compiler will do the optimisation, but you could write: ">> 1" instead of "* 2". > + if (subflow_rto > max_rto) > + max_rto = subflow_rto; > + } > + > + if (max_rto && max_rto < timeout) > + timeout = max_rto; > + > + return timeout; > +} > + > static void mptcp_pm_add_timer(struct timer_list *timer) > { > struct mptcp_pm_add_entry *entry = timer_container_of(entry, timer, > @@ -292,7 +316,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) > goto out; > } > > - timeout = mptcp_get_add_addr_timeout(sock_net(sk)); > + timeout = mptcp_adjust_add_addr_timeout(msk); > if (!timeout) > goto out; > > @@ -307,7 +331,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) > > if (entry->retrans_times < ADD_ADDR_RETRANS_MAX) > sk_reset_timer(sk, timer, > - jiffies + timeout); > + jiffies + (timeout << entry->retrans_times)); > > spin_unlock_bh(&msk->pm.lock); > > @@ -373,7 +397,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, > timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0); > out: > sk_reset_timer(sk, &add_entry->add_timer, > - jiffies + mptcp_get_add_addr_timeout(sock_net(sk))); > + jiffies + mptcp_adjust_add_addr_timeout(msk)); > > return true; > } Cheers, Matt -- Sponsored by the NGI0 Core fund.