On 06/01/2025 15:47, Greg KH wrote: > On Mon, Jan 06, 2025 at 03:34:39PM +0100, Matthieu Baerts wrote: >> 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. > > You wrote it correctly, I totally missed it, my fault, sorry. No problem :) >> Do you think it is possible to delay the inclusion of this patch in >> stable releases please? > > Yes. Will drop it now. Thank you! > Can you just send it to us when you feel it is > ready to be merged? That way it's easier for me to remember to apply it > then. Sure, it makes sense! I just added a reminder to do that later. Cheers, Matt -- Sponsored by the NGI0 Core fund.
