From nobody Thu Nov 27 12:35:29 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 712D33207 for ; Fri, 7 Nov 2025 08:32:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504347; cv=none; b=MKaE/yrfZuR5wXp9XmBtg4OI+rZ1mwB02hs+VokTB8diGPEREx6KsVpdj3dxN7DQwJgHahWkiEubI7OFqddSmjcnIEwO1oPkZqvIaCDbW8AwgQc1Mavamn2Q8ANwSXF4bTQxLSWlTXLPMzcEhO/T94C+kgUDXG0YtLvkpv6WZyA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504347; c=relaxed/simple; bh=1Hc3kX7b2Qjds4E4ckHMY39pjKPgKFWB7eAnh624kWA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=cCRg0nCBoXad/oCJ7Glie4YoPLDiIipPEmgAkrSlvRGpbIT8DYViMHcDfabpD/vHlBO5A7GOfo3kPPvksBeE5+PtQc7bRQmtX7FVepNODJ33W6akg5C+I4/91WZwYOtojjc5VuDn61HPEp5rZc7km1wwKXGS3B5MZGxx5lzxrKg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=hGYteB58; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hGYteB58" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762504344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/7hG/sIcv2TRPO8epr0Cjoy4xYUJ8nqYOJ7PH6xjFFI=; b=hGYteB58h6dJUpm2oGSCGd6Pamc+i55qrgllY146gBuupRSiR2gJwH8eKbnhnVKjMSLqnx 3brKNRDv5hYZlZm2oo87KaOaOH7F7yxDRQcmZgeIAElKmDhWw5dLNVbh3agiAthqPQjjuG ntAvi4l7qN7Gmi44xq7DqtFKxTSCo2w= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-bi-k44q5OOy2H8jfJ5FZKw-1; Fri, 07 Nov 2025 03:32:23 -0500 X-MC-Unique: bi-k44q5OOy2H8jfJ5FZKw-1 X-Mimecast-MFC-AGG-ID: bi-k44q5OOy2H8jfJ5FZKw_1762504342 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 525A819560B2; Fri, 7 Nov 2025 08:32:22 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.44.32.157]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2674018002A6; Fri, 7 Nov 2025 08:32:20 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH v3 mptcp-next 1/7] trace: mptcp: add mptcp_rcvbuf_grow tracepoint Date: Fri, 7 Nov 2025 09:32:05 +0100 Message-ID: <58467c663646d2ee937e6c2fde18439971efa49c.1762504059.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: kC7t3me49z7wLMAR_spLcUUgqDdvyzG1dOW7L9sjnic_1762504342 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" Similar to tcp, provide a new tracepoint to better understand mptcp_rcv_space_adjust() behavior, which presents many artifacts. Note that the used format string is so long that I preferred wrap it, contrary to guidance for quoted strings. Signed-off-by: Paolo Abeni --- v2 -> v3: - use __entry->family; note that its value is show as raw number instead of string, as show_family_name is available only to net/core/ trace and I preferred not moving the mptcp traces there as we need mptcp-specific helpers, too. --- include/trace/events/mptcp.h | 77 ++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.c | 3 ++ 2 files changed, 80 insertions(+) diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h index 085b749cdd97..0f24ec65cea6 100644 --- a/include/trace/events/mptcp.h +++ b/include/trace/events/mptcp.h @@ -5,7 +5,13 @@ #if !defined(_TRACE_MPTCP_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_MPTCP_H =20 +#include +#include #include +#include +#include +#include +#include =20 #define show_mapping_status(status) \ __print_symbolic(status, \ @@ -178,6 +184,77 @@ TRACE_EVENT(subflow_check_data_avail, __entry->skb) ); =20 +#include + +TRACE_EVENT(mptcp_rcvbuf_grow, + + TP_PROTO(struct sock *sk, int time), + + TP_ARGS(sk, time), + + TP_STRUCT__entry( + __field(int, time) + __field(__u32, rtt_us) + __field(__u32, copied) + __field(__u32, inq) + __field(__u32, space) + __field(__u32, ooo_space) + __field(__u32, rcvbuf) + __field(__u32, rcv_wnd) + __field(__u8, scaling_ratio) + __field(__u16, sport) + __field(__u16, dport) + __field(__u16, family) + __array(__u8, saddr, 4) + __array(__u8, daddr, 4) + __array(__u8, saddr_v6, 16) + __array(__u8, daddr_v6, 16) + __field(const void *, skaddr) + ), + + TP_fast_assign( + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct inet_sock *inet =3D inet_sk(sk); + __be32 *p32; + + __entry->time =3D time; + __entry->rtt_us =3D msk->rcvq_space.rtt_us >> 3; + __entry->copied =3D msk->rcvq_space.copied; + __entry->inq =3D mptcp_inq_hint(sk); + __entry->space =3D msk->rcvq_space.space; + __entry->ooo_space =3D RB_EMPTY_ROOT(&msk->out_of_order_queue) ? 0 : + MPTCP_SKB_CB(msk->ooo_last_skb)->end_seq - + msk->ack_seq; + + __entry->rcvbuf =3D sk->sk_rcvbuf; + __entry->rcv_wnd =3D atomic64_read(&msk->rcv_wnd_sent) - msk->ack_seq; + __entry->scaling_ratio =3D msk->scaling_ratio; + __entry->sport =3D ntohs(inet->inet_sport); + __entry->dport =3D ntohs(inet->inet_dport); + __entry->family =3D sk->sk_family; + + p32 =3D (__be32 *) __entry->saddr; + *p32 =3D inet->inet_saddr; + + p32 =3D (__be32 *) __entry->daddr; + *p32 =3D inet->inet_daddr; + + TP_STORE_ADDRS(__entry, inet->inet_saddr, inet->inet_daddr, + sk->sk_v6_rcv_saddr, sk->sk_v6_daddr); + + __entry->skaddr =3D sk; + ), + + TP_printk("time=3D%u rtt_us=3D%u copied=3D%u inq=3D%u space=3D%u ooo=3D%u= scaling_ratio=3D%u " + "rcvbuf=3D%u rcv_wnd=3D%u family=3D%d sport=3D%hu dport=3D%hu saddr=3D= %pI4 " + "daddr=3D%pI4 saddrv6=3D%pI6c daddrv6=3D%pI6c skaddr=3D%p", + __entry->time, __entry->rtt_us, __entry->copied, + __entry->inq, __entry->space, __entry->ooo_space, + __entry->scaling_ratio, __entry->rcvbuf, __entry->rcv_wnd, + __entry->family, __entry->sport, + __entry->dport, __entry->saddr, __entry->daddr, + __entry->saddr_v6, __entry->daddr_v6, __entry->skaddr) +); #endif /* _TRACE_MPTCP_H */ =20 /* This part must be outside protection */ diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 24d4fa8227b7..31154e2df5ee 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -28,6 +28,8 @@ #include "protocol.h" #include "mib.h" =20 +static unsigned int mptcp_inq_hint(const struct sock *sk); + #define CREATE_TRACE_POINTS #include =20 @@ -2101,6 +2103,7 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock = *msk, int copied) if (msk->rcvq_space.copied <=3D msk->rcvq_space.space) goto new_measure; =20 + trace_mptcp_rcvbuf_grow(sk, time); if (mptcp_rcvbuf_grow(sk, msk->rcvq_space.copied)) { /* Make subflows follow along. If we do not do this, we * get drops at subflow level if skbs can't be moved to --=20 2.51.0 From nobody Thu Nov 27 12:35:29 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 1D2233207 for ; Fri, 7 Nov 2025 08:32:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504351; cv=none; b=B6aPOVRwC8LnL39DZukN6/4pxiH5/2xNqcHlaJuR8Bx5k+UaS9mrYoMKyh3eOB1s6rkgcfuCMRRZdgjYENLiXnEmOrMnAuSnWf2nfOE5UYqdwYM9GH2ttvSCVIkjXI/lb5oIl18rXX2iJxkJQgiI0732LDmqz0PUyuBLTva5EP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504351; c=relaxed/simple; bh=NwbEEdj/AkproEAao//DBLfh3z4kJOZmrZToxZxcHsY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=k9A0V660WQblJmL1OoOq2GiNdxDvIn2jNXUe+QUfG6Al5fppEwuHv3sYJXwhN2rnGUh/lxq3AaNq9CuNMlXkIGER0d7RHXdkr2sE41CwDg84BYFXI9G6Gbk8KHsWY/mieONdnqXsG9dCPLEsNr3ohhbnBv/oe4qhyPa2IHztkew= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=DkXxhLnd; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DkXxhLnd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762504348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Li1+Jv7qbUgUpuvaSFhubFLy6xlkszRtVs8/yb6nvAU=; b=DkXxhLndP7Yf7RLGJ/XUHCwObS7P9KnUWLSX0tDCqCIlqSzcmXmkIlCK2I+DIK0dLPCJQa HWvtyX1N3O5twbUmvsPs5P5Sltu13CSKBkC/LtWcm8jEHyXakuagBG2CipKWtX7Ewq7iHe Tiw7K6N9Qm0zg1ekysVgyW6usG0wy0g= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-543-BHSv_RyvNOG1p4ulY9so8Q-1; Fri, 07 Nov 2025 03:32:24 -0500 X-MC-Unique: BHSv_RyvNOG1p4ulY9so8Q-1 X-Mimecast-MFC-AGG-ID: BHSv_RyvNOG1p4ulY9so8Q_1762504344 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1B7CB195608F; Fri, 7 Nov 2025 08:32:24 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.44.32.157]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E69D21800361; Fri, 7 Nov 2025 08:32:22 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH v3 mptcp-next 2/7] mptcp: avoid unneeded subflow-level drops. Date: Fri, 7 Nov 2025 09:32:06 +0100 Message-ID: <6af807a4d56bcac85d0908e30251ffa6d28ea38f.1762504059.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NBw-SMoZM7YgAPGiuu16PDwZz6YiF-F2lqt8Cc2Gi_k_1762504344 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" The rcv window is shared among all the subflows. Currently, MPTCP sync the TCP-level rcv window with the MPTCP one at tcp_transmit_skb() time. The above means that incoming data may sporadically observe outdated TCP-level rcv window and being wrongly dropped by TCP. Address the issue checking for the edge condition before queuing the data at TCP level, and eventually syncing the rcv window as needed. Note that the issue is actually present from the very first MPTCP implementation, but backports older than the blamed commit below will range from impossible to useless. Before: nstat >/dev/null ;sleep 1; nstat -z TcpExtBeyondWindow TcpExtBeyondWindow 14 0.0 After: nstat >/dev/null ;sleep 1; nstat -z TcpExtBeyondWindow TcpExtBeyondWindow 0 0.0 Fixes: fa3fe2b15031 ("mptcp: track window announced to peer") Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) --- net/mptcp/options.c | 31 +++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 1 + 2 files changed, 32 insertions(+) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index cf531f2d815c..ad51dcf18984 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1042,6 +1042,31 @@ static void __mptcp_snd_una_update(struct mptcp_sock= *msk, u64 new_snd_una) WRITE_ONCE(msk->snd_una, new_snd_una); } =20 +static void rwin_update(struct mptcp_sock *msk, struct sock *ssk, + struct sk_buff *skb) +{ + struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); + struct tcp_sock *tp =3D tcp_sk(ssk); + u64 mptcp_rcv_wnd; + + /* Avoid touching extra cachelines if TCP is going to accept this + * skb without filling the TCP-level window even with a possibly + * outdated mptcp-level rwin. + */ + if (!skb->len || skb->len < tcp_receive_window(tp)) + return; + + mptcp_rcv_wnd =3D atomic64_read(&msk->rcv_wnd_sent); + if (!after64(mptcp_rcv_wnd, subflow->rcv_wnd_sent)) + return; + + /* Some other subflow grew the mptcp-level rwin since rcv_wup, + * resync. + */ + tp->rcv_wnd +=3D mptcp_rcv_wnd - subflow->rcv_wnd_sent; + subflow->rcv_wnd_sent =3D mptcp_rcv_wnd; +} + static void ack_update_msk(struct mptcp_sock *msk, struct sock *ssk, struct mptcp_options_received *mp_opt) @@ -1209,6 +1234,7 @@ bool mptcp_incoming_options(struct sock *sk, struct s= k_buff *skb) */ if (mp_opt.use_ack) ack_update_msk(msk, sk, &mp_opt); + rwin_update(msk, sk, skb); =20 /* Zero-data-length packets are dropped by the caller and not * propagated to the MPTCP layer, so the skb extension does not @@ -1295,6 +1321,10 @@ static void mptcp_set_rwin(struct tcp_sock *tp, stru= ct tcphdr *th) =20 if (rcv_wnd_new !=3D rcv_wnd_old) { raise_win: + /* The msk-level rcv wnd is after the tcp level one, + * sync the latter. + */ + rcv_wnd_new =3D rcv_wnd_old; win =3D rcv_wnd_old - ack_seq; tp->rcv_wnd =3D min_t(u64, win, U32_MAX); new_win =3D tp->rcv_wnd; @@ -1318,6 +1348,7 @@ static void mptcp_set_rwin(struct tcp_sock *tp, struc= t tcphdr *th) =20 update_wspace: WRITE_ONCE(msk->old_wspace, tp->rcv_wnd); + subflow->rcv_wnd_sent =3D rcv_wnd_new; } =20 __sum16 __mptcp_make_csum(u64 data_seq, u32 subflow_seq, u16 data_len, __w= sum sum) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index d0881db16b12..f14eeb4fd884 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -513,6 +513,7 @@ struct mptcp_subflow_context { u64 remote_key; u64 idsn; u64 map_seq; + u64 rcv_wnd_sent; u32 snd_isn; u32 token; u32 rel_write_seq; --=20 2.51.0 From nobody Thu Nov 27 12:35:29 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 1D2A52D73B6 for ; Fri, 7 Nov 2025 08:32:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504350; cv=none; b=rpAubZ/m4sbmXiBO0/88efl5RJ/Lw5cbiGmH3W/oVmYhxfBNezw0Sq3tFumqY7n7AXIn7uqrMZpXMRcMpcs7MMK6SCp2H84/+ZxmKs5zxW1U02kVu/zh4dJLr58r6oxszUwzvFHfakOBNvdzo+NrzIhOvRvlW5QAH366hM+lKPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504350; c=relaxed/simple; bh=9GgvoNJAko9m/bAY2RU5JPF7twA5GR8qde2GD/FiiI0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=oQJTWsRKm6I220JovKdOTMCR6+9ZImF58iiUA/P0zRJcDAaCh3DsLmrGSvK0eITlEGkg7DlCHyqTBFpnwvhflfpV56BxrED9rIPN89l5uXzs28drEMSqlsVnSSQXVu5FwHKjyLBuNd9B/z8S1pN2D3e+g3GvYsCkrx48wQtlfRg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=MM3LoiZE; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MM3LoiZE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762504348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P5NEjoAU12ZmrZhsw0hzA7Ve9AZaP0CQ+SAYHceHQ7M=; b=MM3LoiZEPjZVCvrQ7Sv8IQqRbKvnNig6pwVPbo3XrP0ggn2lv52zk7RaIH/Xd3owCvuyrJ hXE/ialUHOrb6WYnaJuGbSG3NGzfTNU/YOgyFYow4sK2bpzBVQm1WROqjFhDmOzPzVYNKL wN0vSxunrp9CyjARkZEkrL2GI+QfZYo= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-NswogssvP-yYWWVhHBjONQ-1; Fri, 07 Nov 2025 03:32:26 -0500 X-MC-Unique: NswogssvP-yYWWVhHBjONQ-1 X-Mimecast-MFC-AGG-ID: NswogssvP-yYWWVhHBjONQ_1762504345 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C6A5C1956088; Fri, 7 Nov 2025 08:32:25 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.44.32.157]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9CAEE1800361; Fri, 7 Nov 2025 08:32:24 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH v3 mptcp-next 3/7] mptcp: fix receive space timestamp initialization. Date: Fri, 7 Nov 2025 09:32:07 +0100 Message-ID: <9840629a42a01472c2a9d41d03bae15d4dc506c3.1762504059.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 7nFJXjeLjobIaNaKP59Kxo1zPAc3Vulym5M08WS5qkU_1762504345 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" MPTCP initialize the receive buffer stamp in mptcp_rcv_space_init(), using the provided subflow stamp. Such helper is invoked in several places; for passive sockets, space init happened at clone time. In such scenario, MPTCP ends-up accesses the subflow stamp before its initialization, leading to quite randomic timing for the first receive buffer auto-tune event, as the timestamp for newly created subflow is not refreshed there. Fix the issue moving the stamp initialization of the mentioned helper, as soon at the data transfer start, and always using a fresh timestamp. This will also make the next patch cleaner. Fixes: 013e3179dbd2 ("mptcp: fix rcv space initialization") Signed-off-by: Paolo Abeni --- v1 -> v2: -- factor out only the tstamp change for better reviewability --- net/mptcp/protocol.c | 7 ++++--- net/mptcp/protocol.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 31154e2df5ee..9dfec22694cc 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2072,8 +2072,8 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock = *msk, int copied) =20 msk->rcvq_space.copied +=3D copied; =20 - mstamp =3D div_u64(tcp_clock_ns(), NSEC_PER_USEC); - time =3D tcp_stamp_us_delta(mstamp, msk->rcvq_space.time); + mstamp =3D mptcp_stamp(); + time =3D tcp_stamp_us_delta(mstamp, READ_ONCE(msk->rcvq_space.time)); =20 rtt_us =3D msk->rcvq_space.rtt_us; if (rtt_us && time < (rtt_us >> 3)) @@ -3505,7 +3505,7 @@ struct sock *mptcp_sk_clone_init(const struct sock *s= k, mptcp_copy_inaddrs(nsk, ssk); __mptcp_propagate_sndbuf(nsk, ssk); =20 - mptcp_rcv_space_init(msk, ssk); + msk->rcvq_space.time =3D mptcp_stamp(); =20 if (mp_opt->suboptions & OPTION_MPTCP_MPC_ACK) __mptcp_subflow_fully_established(msk, subflow, mp_opt); @@ -3720,6 +3720,7 @@ void mptcp_finish_connect(struct sock *ssk) * accessing the field below */ WRITE_ONCE(msk->local_key, subflow->local_key); + WRITE_ONCE(msk->rcvq_space.time, mptcp_stamp()); =20 mptcp_pm_new_connection(msk, ssk, 0); } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index f14eeb4fd884..49f211e427bf 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -913,6 +913,11 @@ static inline bool mptcp_is_fully_established(struct s= ock *sk) READ_ONCE(mptcp_sk(sk)->fully_established); } =20 +static inline u64 mptcp_stamp(void) +{ + return div_u64(tcp_clock_ns(), NSEC_PER_USEC); +} + void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock *ssk); void mptcp_data_ready(struct sock *sk, struct sock *ssk); bool mptcp_finish_join(struct sock *sk); --=20 2.51.0 From nobody Thu Nov 27 12:35:29 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 D31153207 for ; Fri, 7 Nov 2025 08:32:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504355; cv=none; b=JKkbzd4rjPLiYVNKIKgscHW+lY2za61DrDkvmAYA5UNCUaCTPHMH1nwzyCAygM6mMEFPV5V+BDkZARr28TWXXBxjg0UqasDfXvhlaqOdEwSZAlzAASlpAkhecJgpO06WZfyR3g37eHLaWUPvcaqGK8rqr7386oRJwtZjcjS4j1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504355; c=relaxed/simple; bh=5ZZ42pkvcFTNUCJkKAzkbA7MlC6IBkdCEii7uKaEnFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=XqclXjq9Df5aD2GpElr08ov2U/zJVbTnMQd7vX/CgwOOxFzvWd+S/27Mb1WjT273SA72WDClrSwOMQbjg9F7YVJD9G1L0dgr/MmSPfl3nYNB6CY/puUV6ICDltNl7oeTWmZ3zHIG1T4/6+MqlABW4x4ugdVDaBaGQU8qm2rI1eg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=NpfjXURB; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NpfjXURB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762504352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l4jfUAc1QqIDF2/Y+3vzjkYbK3ZKCq9FCzVU8+iI2Bo=; b=NpfjXURBtgJD5ubENd1vj7M1uewsAQN9WadSjeRMIO2P3I8/ZCH+3UjKpipzw2lXd3kIhv i1eZsJauYn0vwecFlC5viL75s4/cyCPie4P3OzuDxV1pgldYSA1P2in8o2PCjanVHdw9Be N00FF07mRPZIcwWSXxO0KUK82SVKh50= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-247-UFGeTjHVO-2btPC8PeDpPA-1; Fri, 07 Nov 2025 03:32:28 -0500 X-MC-Unique: UFGeTjHVO-2btPC8PeDpPA-1 X-Mimecast-MFC-AGG-ID: UFGeTjHVO-2btPC8PeDpPA_1762504348 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 78A3018001FE; Fri, 7 Nov 2025 08:32:27 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.44.32.157]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5119B18002A6; Fri, 7 Nov 2025 08:32:26 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH v3 mptcp-next 4/7] mptcp: consolidate rcv space init Date: Fri, 7 Nov 2025 09:32:08 +0100 Message-ID: <4f0905e86d18d95bfbd99fb83e9c329dd8c41840.1762504059.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QFPDEZ44M47B47QsxZ5yFLWnMQ3LlhUYmPedgSWzAec_1762504348 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" MPTCP uses several calls of the mptcp_rcv_space_init() helper to initialize the receive space, with a catch-up call in mptcp_rcv_space_adjust(). Drop all the other strictly not needed invocations and move constant fields initialization at socket init/reset time. This removes a bit of complexity and will simplify the following patches. No functional changes intended. Signed-off-by: Paolo Abeni --- v1 -> v2: - split helper consolidation out of v1 patch - additionally move 'copied' and 'rtt_us' initialization out of mptcp_rcv_space_init() --- net/mptcp/protocol.c | 34 +++++++++++++++++----------------- net/mptcp/protocol.h | 1 - net/mptcp/subflow.c | 2 -- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 9dfec22694cc..0bdb86ed8e5e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2050,6 +2050,19 @@ static int __mptcp_recvmsg_mskq(struct sock *sk, str= uct msghdr *msg, return copied; } =20 +static void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock= *ssk) +{ + const struct tcp_sock *tp =3D tcp_sk(ssk); + + msk->rcvspace_init =3D 1; + + /* initial rcv_space offering made to peer */ + msk->rcvq_space.space =3D min_t(u32, tp->rcv_wnd, + TCP_INIT_CWND * tp->advmss); + if (msk->rcvq_space.space =3D=3D 0) + msk->rcvq_space.space =3D TCP_INIT_CWND * TCP_MSS_DEFAULT; +} + /* receive buffer autotuning. See tcp_rcv_space_adjust for more informati= on. * * Only difference: Use highest rtt estimate of the subflows in use. @@ -2935,6 +2948,8 @@ static void __mptcp_init_sock(struct sock *sk) msk->timer_ival =3D TCP_RTO_MIN; msk->scaling_ratio =3D TCP_DEFAULT_SCALING_RATIO; msk->backlog_len =3D 0; + msk->rcvq_space.copied =3D 0; + msk->rcvq_space.rtt_us =3D 0; =20 WRITE_ONCE(msk->first, NULL); inet_csk(sk)->icsk_sync_mss =3D mptcp_sync_mss; @@ -3378,6 +3393,8 @@ static int mptcp_disconnect(struct sock *sk, int flag= s) msk->bytes_sent =3D 0; msk->bytes_retrans =3D 0; msk->rcvspace_init =3D 0; + msk->rcvq_space.copied =3D 0; + msk->rcvq_space.rtt_us =3D 0; =20 /* for fallback's sake */ WRITE_ONCE(msk->ack_seq, 0); @@ -3515,23 +3532,6 @@ struct sock *mptcp_sk_clone_init(const struct sock *= sk, return nsk; } =20 -void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock *ssk) -{ - const struct tcp_sock *tp =3D tcp_sk(ssk); - - msk->rcvspace_init =3D 1; - msk->rcvq_space.copied =3D 0; - msk->rcvq_space.rtt_us =3D 0; - - msk->rcvq_space.time =3D tp->tcp_mstamp; - - /* initial rcv_space offering made to peer */ - msk->rcvq_space.space =3D min_t(u32, tp->rcv_wnd, - TCP_INIT_CWND * tp->advmss); - if (msk->rcvq_space.space =3D=3D 0) - msk->rcvq_space.space =3D TCP_INIT_CWND * TCP_MSS_DEFAULT; -} - static void mptcp_destroy(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 49f211e427bf..7c9e143c0fb5 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -918,7 +918,6 @@ static inline u64 mptcp_stamp(void) return div_u64(tcp_clock_ns(), NSEC_PER_USEC); } =20 -void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock *ssk); void mptcp_data_ready(struct sock *sk, struct sock *ssk); bool mptcp_finish_join(struct sock *sk); bool mptcp_schedule_work(struct sock *sk); diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 7eef4aaf78e2..caf6772d43e4 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -462,8 +462,6 @@ void __mptcp_sync_state(struct sock *sk, int state) =20 subflow =3D mptcp_subflow_ctx(ssk); __mptcp_propagate_sndbuf(sk, ssk); - if (!msk->rcvspace_init) - mptcp_rcv_space_init(msk, ssk); =20 if (sk->sk_state =3D=3D TCP_SYN_SENT) { /* subflow->idsn is always available is TCP_SYN_SENT state, --=20 2.51.0 From nobody Thu Nov 27 12:35:29 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 681662DAFC7 for ; Fri, 7 Nov 2025 08:32:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504354; cv=none; b=hHCqN7BP9zUiBUyaAl3sbpidVTS0k/eE9oP2bMSeX2mhfTg6D9kCBt63sZKfm/uVy/ZkhZPQdQNLPRU6vUPRYcg0E3FhFv6AWKDr2k2+JPKGq+bQwM1y7WimIqwBeneOE1tdXMAQDeB1H5wX6DdGE8kveYiNzL9+kGksuCGjMaM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504354; c=relaxed/simple; bh=uaEshOoKSylP+KBWhJU4z37YTaskvCcc/ubWBaFarc4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=iw1VPlDkQPMaj3nka/EIDQtOxCsK7+xOt3gPW8fNZL9cGFhGoQ0vif6xkZuriOL5ScWPllnYILbNDwILLSyByoFxD79nDKdkLTTB0LyrzGM1l9wZnDh3W6E6/EQVG7reyy9yXnzKlh0YEYtZRuqaWyqQNffIou6SCAYt6GV3iFE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Kso0cngu; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Kso0cngu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762504351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HrkaT20UtKfszZTgejrXwMqoOF6rv/HYwSel8Na6J2Q=; b=Kso0cnguHh1cbYDRQbUriTj315CKiTnvR6XnNtgTzcCw0IiXgcOsGa/YkhfPW8fwWuiuNm cw0JvCyqyiCsPi4Qxc8hQMNtMeednUZcqaMlyz9T+tG0F3Fmq5i8nZGfwFDQ2kR9hTKm35 ZTDDgnBQWiMcVEDuILAIaP8hrRc7cJg= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-114-4yKLclXzNqitTBCu36Dmhg-1; Fri, 07 Nov 2025 03:32:30 -0500 X-MC-Unique: 4yKLclXzNqitTBCu36Dmhg-1 X-Mimecast-MFC-AGG-ID: 4yKLclXzNqitTBCu36Dmhg_1762504349 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2367C1956050; Fri, 7 Nov 2025 08:32:29 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.44.32.157]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 040C61800361; Fri, 7 Nov 2025 08:32:27 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH v3 mptcp-next 5/7] mptcp: better rcv space initialization Date: Fri, 7 Nov 2025 09:32:09 +0100 Message-ID: <738bbfbee66c7973a48b00a819d0db7d18ecf76c.1762504059.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 1mZmRpQIdWlNkSNsUuGs_5g1Nwokpf4d4MNu1Hup4h8_1762504349 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" Each additional subflow can overshot the rcv space by a full rcv wnd, as the TCP socket at creation time will announce such window even if the MPTCP-level window is closed. Underestimating the initial real rcv space can overshot the initial rcv win increase significantly. Keep track explicitly of the rcv space contribution by newly created subflow, updating rcvq_space.space accordingly for every successfully completed subflow handshake. Signed-off-by: Paolo Abeni --- net/mptcp/protocol.c | 44 ++++++++++++++++++++++++++++++-------------- net/mptcp/protocol.h | 30 ++++++++++++++++++++++++++++++ net/mptcp/subflow.c | 3 +++ 3 files changed, 63 insertions(+), 14 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0bdb86ed8e5e..97c4f1ee25e0 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -923,6 +923,7 @@ static bool __mptcp_finish_join(struct mptcp_sock *msk,= struct sock *ssk) mptcp_sockopt_sync_locked(msk, ssk); mptcp_stop_tout_timer(sk); __mptcp_propagate_sndbuf(sk, ssk); + __mptcp_propagate_rcvspace(sk, ssk); return true; } =20 @@ -2050,17 +2051,21 @@ static int __mptcp_recvmsg_mskq(struct sock *sk, st= ruct msghdr *msg, return copied; } =20 -static void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock= *ssk) +static void mptcp_rcv_space_init(struct mptcp_sock *msk) { - const struct tcp_sock *tp =3D tcp_sk(ssk); + struct sock *sk =3D (struct sock *)msk; =20 msk->rcvspace_init =3D 1; =20 - /* initial rcv_space offering made to peer */ - msk->rcvq_space.space =3D min_t(u32, tp->rcv_wnd, - TCP_INIT_CWND * tp->advmss); - if (msk->rcvq_space.space =3D=3D 0) + mptcp_data_lock(sk); + __mptcp_sync_rcvspace(sk); + + /* Paranoid check: at least one subflow pushed data to the msk. */ + if (msk->rcvq_space.space =3D=3D 0) { + DEBUG_NET_WARN_ON_ONCE(1); msk->rcvq_space.space =3D TCP_INIT_CWND * TCP_MSS_DEFAULT; + } + mptcp_data_unlock(sk); } =20 /* receive buffer autotuning. See tcp_rcv_space_adjust for more informati= on. @@ -2081,7 +2086,7 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock = *msk, int copied) return; =20 if (!msk->rcvspace_init) - mptcp_rcv_space_init(msk, msk->first); + mptcp_rcv_space_init(msk); =20 msk->rcvq_space.copied +=3D copied; =20 @@ -3521,6 +3526,7 @@ struct sock *mptcp_sk_clone_init(const struct sock *s= k, */ mptcp_copy_inaddrs(nsk, ssk); __mptcp_propagate_sndbuf(nsk, ssk); + __mptcp_propagate_rcvspace(nsk, ssk); =20 msk->rcvq_space.time =3D mptcp_stamp(); =20 @@ -3620,8 +3626,10 @@ static void mptcp_release_cb(struct sock *sk) __mptcp_sync_state(sk, msk->pending_state); if (__test_and_clear_bit(MPTCP_ERROR_REPORT, &msk->cb_flags)) __mptcp_error_report(sk); - if (__test_and_clear_bit(MPTCP_SYNC_SNDBUF, &msk->cb_flags)) + if (__test_and_clear_bit(MPTCP_SYNC_SNDBUF, &msk->cb_flags)) { __mptcp_sync_sndbuf(sk); + __mptcp_sync_rcvspace(sk); + } } } =20 @@ -3737,13 +3745,13 @@ bool mptcp_finish_join(struct sock *ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); struct mptcp_sock *msk =3D mptcp_sk(subflow->conn); - struct sock *parent =3D (void *)msk; + struct sock *sk =3D (void *)msk; bool ret =3D true; =20 pr_debug("msk=3D%p, subflow=3D%p\n", msk, subflow); =20 /* mptcp socket already closing? */ - if (!mptcp_is_fully_established(parent)) { + if (!mptcp_is_fully_established(sk)) { subflow->reset_reason =3D MPTCP_RST_EMPTCP; return false; } @@ -3757,7 +3765,15 @@ bool mptcp_finish_join(struct sock *ssk) } mptcp_subflow_joined(msk, ssk); spin_unlock_bh(&msk->fallback_lock); - mptcp_propagate_sndbuf(parent, ssk); + mptcp_data_lock(sk); + if (!sock_owned_by_user(sk)) { + __mptcp_propagate_sndbuf(sk, ssk); + __mptcp_propagate_rcvspace(sk, ssk); + } else { + __mptcp_bl_rcvspace(sk, ssk); + __set_bit(MPTCP_SYNC_SNDBUF, &mptcp_sk(sk)->cb_flags); + } + mptcp_data_unlock(sk); return true; } =20 @@ -3769,8 +3785,8 @@ bool mptcp_finish_join(struct sock *ssk) /* If we can't acquire msk socket lock here, let the release callback * handle it */ - mptcp_data_lock(parent); - if (!sock_owned_by_user(parent)) { + mptcp_data_lock(sk); + if (!sock_owned_by_user(sk)) { ret =3D __mptcp_finish_join(msk, ssk); if (ret) { sock_hold(ssk); @@ -3781,7 +3797,7 @@ bool mptcp_finish_join(struct sock *ssk) list_add_tail(&subflow->node, &msk->join_list); __set_bit(MPTCP_FLUSH_JOIN_LIST, &msk->cb_flags); } - mptcp_data_unlock(parent); + mptcp_data_unlock(sk); =20 if (!ret) { err_prohibited: diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 7c9e143c0fb5..adc0851bad69 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -360,6 +360,7 @@ struct mptcp_sock { =20 struct list_head backlog_list; /* protected by the data lock */ u32 backlog_len; + u32 bl_space; /* rcvspace propagation via bl */ }; =20 #define mptcp_data_lock(sk) spin_lock_bh(&(sk)->sk_lock.slock) @@ -976,6 +977,35 @@ static inline void mptcp_write_space(struct sock *sk) sk_stream_write_space(sk); } =20 +static inline void __mptcp_sync_rcvspace(struct sock *sk) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + + msk->rcvq_space.space +=3D msk->bl_space; + msk->bl_space =3D 0; +} + +static inline u32 mptcp_subflow_rcvspace(struct sock *ssk) +{ + struct tcp_sock *tp =3D tcp_sk(ssk); + int space; + + space =3D min_t(u32, tp->rcv_wnd, TCP_INIT_CWND * tp->advmss); + if (space =3D=3D 0) + space =3D TCP_INIT_CWND * TCP_MSS_DEFAULT; + return space; +} + +static inline void __mptcp_propagate_rcvspace(struct sock *sk, struct sock= *ssk) +{ + mptcp_sk(sk)->rcvq_space.space +=3D mptcp_subflow_rcvspace(ssk); +} + +static inline void __mptcp_bl_rcvspace(struct sock *sk, struct sock *ssk) +{ + mptcp_sk(sk)->bl_space +=3D mptcp_subflow_rcvspace(ssk); +} + static inline void __mptcp_sync_sndbuf(struct sock *sk) { struct mptcp_subflow_context *subflow; diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index caf6772d43e4..60f100b2a0c9 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -462,6 +462,7 @@ void __mptcp_sync_state(struct sock *sk, int state) =20 subflow =3D mptcp_subflow_ctx(ssk); __mptcp_propagate_sndbuf(sk, ssk); + __mptcp_sync_rcvspace(sk); =20 if (sk->sk_state =3D=3D TCP_SYN_SENT) { /* subflow->idsn is always available is TCP_SYN_SENT state, @@ -516,8 +517,10 @@ static void mptcp_propagate_state(struct sock *sk, str= uct sock *ssk, =20 if (!sock_owned_by_user(sk)) { __mptcp_sync_state(sk, ssk->sk_state); + __mptcp_propagate_rcvspace(sk, ssk); } else { msk->pending_state =3D ssk->sk_state; + __mptcp_bl_rcvspace(sk, ssk); __set_bit(MPTCP_SYNC_STATE, &msk->cb_flags); } mptcp_data_unlock(sk); --=20 2.51.0 From nobody Thu Nov 27 12:35:29 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 6052A3074AC for ; Fri, 7 Nov 2025 08:32:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504357; cv=none; b=P213nKj4DwxxV3MQ44213JBPCGFGE+Pm+NtN70+Kg1hLuiQ+O9KvgBv5JbYNiCO1sKlhdh4MNNHaxfz/nup1wqsHTbvWvcZXtGXvStrw6fkX3f+5hnBq61x1vxfudsEdesT+CeODL461+Tssm1v6xG3TsZEJhjljlqtwu4OhLVs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504357; c=relaxed/simple; bh=6cQr7iit7lVsPPWU2+7SO3rDibTEUfE3hHNdjtDHGmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=b1MohR9zV7IO7ojWyP3tT8jdWTDb2fbFiYloapEUv4D+hOiS7+V8Qf4TGZ6eyT+YtzP1A6JcdmDk0AGJpoRfZNcNzhC65CKuL4SflDvpR6PwXcdDcDk3kGBrz7BCP+fRLRCTCZWow0ippFV0bgH1rFSDZLpf+PU6O0HDl9WTZvc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=dFIyycEL; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dFIyycEL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762504354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1z6R9AvxAWYdaqeA5m2RJmxcDo4L++i7gfy8KZ8atIM=; b=dFIyycELMZUR1jsDhtVDB8dpmGXkh3qSjBLBkJs9NJToc5Q2yoI1VtnB4NsnL3k1CyZSr1 ZoCOLvuVW2VNAvjRtxB62PxjpVRrISI9LVhd5G5M6dhZP1/1UFC/U1jPKZo4ROTgLDKpW1 ldTpt102XuYIbe0o9/N9K+h/2I5ePgc= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-120-xtnnh5eBMnK7RIOoH26PYA-1; Fri, 07 Nov 2025 03:32:31 -0500 X-MC-Unique: xtnnh5eBMnK7RIOoH26PYA-1 X-Mimecast-MFC-AGG-ID: xtnnh5eBMnK7RIOoH26PYA_1762504350 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4832195608F; Fri, 7 Nov 2025 08:32:30 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.44.32.157]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A23761800361; Fri, 7 Nov 2025 08:32:29 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH v3 mptcp-next 6/7] mptcp: better mptcp-level RTT estimator Date: Fri, 7 Nov 2025 09:32:10 +0100 Message-ID: <2e404a1c673c812819ac5b6f12d57d23625c1e71.1762504059.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Z3BMKDWcTF0MU7U43XTifZPzDSBt3IAw-66ZRCw23Bw_1762504350 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" The current MPTCP-level RTT estimator has several issues. On high speed links, the MPTCP-level receive buffer auto-tuning happens with a frequency well above the TCP-level's one. That in turn can cause excessive/unneeded receive buffer increase. On such links, the initial rtt_us value is considerably higher than the actual delay, and the current mptcp_rcv_space_adjust() updates msk->rcvq_space.rtt_us with a period equal to the such field previous value. If the initial rtt_us is 40ms, its first update will happen after 40ms, even if the subflows see actual RTT orders of magnitude lower. Additionally, setting the msk rtt to the maximum among all the subflows RTTs makes DRS constantly overshooting the rcvbuf size when a subflow has considerable higher latency than the other(s). Finally, during unidirectional bulk transfers with multiple active subflows, the TCP-level RTT estimator occasionally sees considerably higher value than the real link delay, i.e. when the packet scheduler reacts to an incoming ack on given subflow pushing data on a different subflow. Address the issue with a more accurate RTT estimation strategy: the MPTCP-level RTT is set to the minimum of all the subflows, in a rcv-win based interval, feeding data into the MPTCP-receive buffer. Use some care to avoid updating msk and ssk level fields too often and to avoid 'too high' samples. Fixes: a6b118febbab ("mptcp: add receive buffer auto-tuning") Signed-off-by: Paolo Abeni --- v1 -> v2: - do not use explicit reset flags - do rcv win based decision instead - discard 0 rtt_us samples from subflows - discard samples on non empty rx queue - discard "too high" samples, see the code comments WRT the whys --- include/trace/events/mptcp.h | 2 +- net/mptcp/protocol.c | 74 ++++++++++++++++++++++-------------- net/mptcp/protocol.h | 7 +++- 3 files changed, 53 insertions(+), 30 deletions(-) diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h index 0f24ec65cea6..d30d2a6a8b42 100644 --- a/include/trace/events/mptcp.h +++ b/include/trace/events/mptcp.h @@ -218,7 +218,7 @@ TRACE_EVENT(mptcp_rcvbuf_grow, __be32 *p32; =20 __entry->time =3D time; - __entry->rtt_us =3D msk->rcvq_space.rtt_us >> 3; + __entry->rtt_us =3D msk->rcv_rtt_est.rtt_us >> 3; __entry->copied =3D msk->rcvq_space.copied; __entry->inq =3D mptcp_inq_hint(sk); __entry->space =3D msk->rcvq_space.space; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 97c4f1ee25e0..3d0990c58c02 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -868,6 +868,42 @@ static bool move_skbs_to_msk(struct mptcp_sock *msk, s= truct sock *ssk) return moved; } =20 +static void mptcp_rcv_rtt_update(struct mptcp_sock *msk, + struct mptcp_subflow_context *subflow) +{ + const struct tcp_sock *tp =3D tcp_sk(subflow->tcp_sock); + u32 rtt_us =3D tp->rcv_rtt_est.rtt_us; + u8 sr =3D tp->scaling_ratio; + + /* MPTCP can react to incoming acks pushing data on different subflows, + * causing apparent high RTT: ignore large samples; also do the update + * only on RTT changes + */ + if (tp->rcv_rtt_est.seq =3D=3D subflow->prev_rtt_seq || + (subflow->prev_rtt_us && (rtt_us >> 1) > subflow->prev_rtt_us)) + return; + + /* Similar to plain TCP, only consider samples with empty RX queue. */ + if (!rtt_us || mptcp_data_avail(msk)) + return; + + /* Refresh the RTT after a full win per subflow */ + subflow->prev_rtt_us =3D rtt_us; + subflow->prev_rtt_seq =3D tp->rcv_rtt_est.seq; + if (after(subflow->map_seq, msk->rcv_rtt_est.seq)) { + msk->rcv_rtt_est.seq =3D subflow->map_seq + + tp->rcv_wnd * msk->pm.extra_subflows; + msk->rcv_rtt_est.rtt_us =3D rtt_us; + msk->scaling_ratio =3D sr; + return; + } + + if (rtt_us < msk->rcv_rtt_est.rtt_us) + msk->rcv_rtt_est.rtt_us =3D rtt_us; + if (sr < msk->scaling_ratio) + msk->scaling_ratio =3D sr; +} + void mptcp_data_ready(struct sock *sk, struct sock *ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); @@ -881,6 +917,7 @@ void mptcp_data_ready(struct sock *sk, struct sock *ssk) return; =20 mptcp_data_lock(sk); + mptcp_rcv_rtt_update(msk, subflow); if (!sock_owned_by_user(sk)) { /* Wake-up the reader only for in-sequence data */ if (move_skbs_to_msk(msk, ssk) && mptcp_epollin_ready(sk)) @@ -2058,6 +2095,7 @@ static void mptcp_rcv_space_init(struct mptcp_sock *m= sk) msk->rcvspace_init =3D 1; =20 mptcp_data_lock(sk); + msk->rcv_rtt_est.seq =3D atomic64_read(&msk->rcv_wnd_sent); __mptcp_sync_rcvspace(sk); =20 /* Paranoid check: at least one subflow pushed data to the msk. */ @@ -2076,9 +2114,8 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock = *msk, int copied) { struct mptcp_subflow_context *subflow; struct sock *sk =3D (struct sock *)msk; - u8 scaling_ratio =3D U8_MAX; - u32 time, advmss =3D 1; - u64 rtt_us, mstamp; + u32 rtt_us, time; + u64 mstamp; =20 msk_owned_by_me(msk); =20 @@ -2093,29 +2130,8 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock= *msk, int copied) mstamp =3D mptcp_stamp(); time =3D tcp_stamp_us_delta(mstamp, READ_ONCE(msk->rcvq_space.time)); =20 - rtt_us =3D msk->rcvq_space.rtt_us; - if (rtt_us && time < (rtt_us >> 3)) - return; - - rtt_us =3D 0; - mptcp_for_each_subflow(msk, subflow) { - const struct tcp_sock *tp; - u64 sf_rtt_us; - u32 sf_advmss; - - tp =3D tcp_sk(mptcp_subflow_tcp_sock(subflow)); - - sf_rtt_us =3D READ_ONCE(tp->rcv_rtt_est.rtt_us); - sf_advmss =3D READ_ONCE(tp->advmss); - - rtt_us =3D max(sf_rtt_us, rtt_us); - advmss =3D max(sf_advmss, advmss); - scaling_ratio =3D min(tp->scaling_ratio, scaling_ratio); - } - - msk->rcvq_space.rtt_us =3D rtt_us; - msk->scaling_ratio =3D scaling_ratio; - if (time < (rtt_us >> 3) || rtt_us =3D=3D 0) + rtt_us =3D READ_ONCE(msk->rcv_rtt_est.rtt_us); + if (rtt_us =3D=3D U32_MAX || time < (rtt_us >> 3)) return; =20 if (msk->rcvq_space.copied <=3D msk->rcvq_space.space) @@ -2954,7 +2970,8 @@ static void __mptcp_init_sock(struct sock *sk) msk->scaling_ratio =3D TCP_DEFAULT_SCALING_RATIO; msk->backlog_len =3D 0; msk->rcvq_space.copied =3D 0; - msk->rcvq_space.rtt_us =3D 0; + msk->rcv_rtt_est.rtt_us =3D U32_MAX; + msk->scaling_ratio =3D U8_MAX; =20 WRITE_ONCE(msk->first, NULL); inet_csk(sk)->icsk_sync_mss =3D mptcp_sync_mss; @@ -3399,7 +3416,8 @@ static int mptcp_disconnect(struct sock *sk, int flag= s) msk->bytes_retrans =3D 0; msk->rcvspace_init =3D 0; msk->rcvq_space.copied =3D 0; - msk->rcvq_space.rtt_us =3D 0; + msk->scaling_ratio =3D U8_MAX; + msk->rcv_rtt_est.rtt_us =3D U32_MAX; =20 /* for fallback's sake */ WRITE_ONCE(msk->ack_seq, 0); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index adc0851bad69..051f21b06d33 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -340,11 +340,14 @@ struct mptcp_sock { */ struct mptcp_pm_data pm; struct mptcp_sched_ops *sched; + struct { + u32 rtt_us; /* Minimum RTT of subflows */ + u64 seq; /* Refresh RTT after this seq */ + } rcv_rtt_est; struct { int space; /* bytes copied in last measurement window */ int copied; /* bytes copied in this measurement window */ u64 time; /* start time of measurement window */ - u64 rtt_us; /* last maximum rtt of subflows */ } rcvq_space; u8 scaling_ratio; bool allow_subflows; @@ -523,6 +526,8 @@ struct mptcp_subflow_context { u32 map_data_len; __wsum map_data_csum; u32 map_csum_len; + u32 prev_rtt_us; + u32 prev_rtt_seq; u32 request_mptcp : 1, /* send MP_CAPABLE */ request_join : 1, /* send MP_JOIN */ request_bkup : 1, --=20 2.51.0 From nobody Thu Nov 27 12:35:29 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 744CD3207 for ; Fri, 7 Nov 2025 08:32:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504359; cv=none; b=DnUEoN5neFQCjmM+yDluGcJAz8a/hlnqHGOgWLtc3xAUC90n9N35MzypG3/U68Mpq9Y46v6XxQnnwU7emIBnoNbo3yL8HbRaKi/Jff7NpmtKQ6mq+mOBBSVIiojx84LbSBF1tKD9A9fvzI7CSe8EoPazK1MB1wtCzeeS6DOlLtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762504359; c=relaxed/simple; bh=RAUdH8AHnZ/0SiGrg1xNbvyi+3Z0dVCqBNFMtUZM1d0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=tPMjdK+jValVoHXmORFI1PGGCfLt87BYGUeneSznVkygDCYqr+PekgsEek5k17uljXG+MQRwYLM5koAS+b4FkJ4rFvqXdSqwu0w5+X0kxhjFncBajXEWrwvsPWyE95Eq2BKcUxNBea4WaS15ab7e9snU+z4wePUbHqgIRbtii18= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=SsPDYEc6; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SsPDYEc6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762504355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1T2s7b/6VWUqAEMZrvFlCURLconuaCjbqGbCX5tJIKg=; b=SsPDYEc6P1Jqfm/OmICCKCf25KBFX9xvq76zlAfwGQzCOXAqQ1MiwJ4OxnYPCDEthImro6 O5U8cSMbapJkEpkxa9SAThmHR7gL+W+sCB04UrKcFURtOFs9RrtwY5ESgKAFpWLEdTwssN HArTTUdFy6vXKdNaRqv0Mt0yZKZW93Q= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-c0XoCfN-MIGa94HsKLczJw-1; Fri, 07 Nov 2025 03:32:33 -0500 X-MC-Unique: c0XoCfN-MIGa94HsKLczJw-1 X-Mimecast-MFC-AGG-ID: c0XoCfN-MIGa94HsKLczJw_1762504352 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 80C9118001FE; Fri, 7 Nov 2025 08:32:32 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.44.32.157]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 634DA180094D; Fri, 7 Nov 2025 08:32:31 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH v3 mptcp-next 7/7] mptcp: add receive queue awareness in tcp_rcv_space_adjust() Date: Fri, 7 Nov 2025 09:32:11 +0100 Message-ID: <52528a901bec6183494eb8aece19e4cf7f4e922f.1762504059.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Gj4cxWY_7Ss9HhWc7_6Nc-otWRGlovx-5aPGGK3NFrc_1762504352 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" This is the mptcp counter-part of commit ea33537d8292 ("tcp: add receive queue awareness in tcp_rcv_space_adjust()"). Prior to this commit: ESTAB 33165568 0 192.168.255.2:5201 192.168.255.1:53380 \ skmem:(r33076416,rb33554432,t0,tb91136,f448,w0,o0,bl0,d0) After: ESTAB 3279168 0 192.168.255.2:5201 192.168.255.1]:53042 \ skmem:(r3190912,rb3719956,t0,tb91136,f1536,w0,o0,bl0,d0) (same tput) Signed-off-by: Paolo Abeni --- net/mptcp/protocol.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3d0990c58c02..34e6bc731085 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2134,11 +2134,13 @@ static void mptcp_rcv_space_adjust(struct mptcp_soc= k *msk, int copied) if (rtt_us =3D=3D U32_MAX || time < (rtt_us >> 3)) return; =20 - if (msk->rcvq_space.copied <=3D msk->rcvq_space.space) + copied =3D msk->rcvq_space.copied; + copied -=3D mptcp_inq_hint(sk); + if (copied <=3D msk->rcvq_space.space) goto new_measure; =20 trace_mptcp_rcvbuf_grow(sk, time); - if (mptcp_rcvbuf_grow(sk, msk->rcvq_space.copied)) { + if (mptcp_rcvbuf_grow(sk, copied)) { /* Make subflows follow along. If we do not do this, we * get drops at subflow level if skbs can't be moved to * the mptcp rx queue fast enough (announced rcv_win can @@ -2152,7 +2154,7 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock = *msk, int copied) slow =3D lock_sock_fast(ssk); /* subflows can be added before tcp_init_transfer() */ if (tcp_sk(ssk)->rcvq_space.space) - tcp_rcvbuf_grow(ssk, msk->rcvq_space.copied); + tcp_rcvbuf_grow(ssk, copied); unlock_sock_fast(ssk, slow); } } --=20 2.51.0