Hi Greg, On 06/01/2025 13:30, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > This is a note to let you know that I've just added the patch titled > > mptcp: prevent excessive coalescing on receive > > to the 6.12-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > mptcp-prevent-excessive-coalescing-on-receive.patch > and it can be found in the queue-6.12 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > From 56b824eb49d6258aa0bad09a406ceac3f643cdae Mon Sep 17 00:00:00 2001 > From: Paolo Abeni <pabeni@xxxxxxxxxx> > Date: Mon, 30 Dec 2024 19:12:32 +0100 > Subject: mptcp: prevent excessive coalescing on receive > > From: Paolo Abeni <pabeni@xxxxxxxxxx> > > commit 56b824eb49d6258aa0bad09a406ceac3f643cdae upstream. > > Currently the skb size after coalescing is only limited by the skb > layout (the skb must not carry frag_list). A single coalesced skb > covering several MSS can potentially fill completely the receive > buffer. In such a case, the snd win will zero until the receive buffer > will be empty again, affecting tput badly. > > Fixes: 8268ed4c9d19 ("mptcp: introduce and use mptcp_try_coalesce()") > Cc: stable@xxxxxxxxxxxxxxx # please delay 2 weeks after 6.13-final release I'm sorry, I was not sure how to write this comment here. Do you think it is possible to delay the inclusion of this patch in stable releases please? The patch looks OK, and should only improve the situation, but we prefer to be cautious and wait for more feedback if that's possible: it was hard to get such feedback by the end of December. > Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx> > Reviewed-by: Mat Martineau <martineau@xxxxxxxxxx> > Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx> > Link: https://patch.msgid.link/20241230-net-mptcp-rbuf-fixes-v1-3-8608af434ceb@xxxxxxxxxx > Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > --- > net/mptcp/protocol.c | 1 + > 1 file changed, 1 insertion(+) > > --- a/net/mptcp/protocol.c > +++ b/net/mptcp/protocol.c > @@ -136,6 +136,7 @@ static bool mptcp_try_coalesce(struct so > int delta; > > if (MPTCP_SKB_CB(from)->offset || > + ((to->len + from->len) > (sk->sk_rcvbuf >> 3)) || > !skb_try_coalesce(to, from, &fragstolen, &delta)) > return false; > > > > Patches currently in stable-queue which might be from pabeni@xxxxxxxxxx are > > queue-6.12/mptcp-fix-recvbuffer-adjust-on-sleeping-rcvmsg.patch > queue-6.12/mptcp-prevent-excessive-coalescing-on-receive.patch > queue-6.12/mptcp-don-t-always-assume-copied-data-in-mptcp_cleanup_rbuf.patch > queue-6.12/mptcp-fix-tcp-options-overflow.patch Cheers, Matt -- Sponsored by the NGI0 Core fund.
