This is a note to let you know that I've just added the patch titled
mptcp: push at DSS boundaries
to the 6.1-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-push-at-dss-boundaries.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b9cd26f640a308ea314ad23532de9a8592cd09d2 Mon Sep 17 00:00:00 2001
From: Paolo Abeni <pabeni@xxxxxxxxxx>
Date: Fri, 23 Feb 2024 17:14:14 +0100
Subject: mptcp: push at DSS boundaries
From: Paolo Abeni <pabeni@xxxxxxxxxx>
commit b9cd26f640a308ea314ad23532de9a8592cd09d2 upstream.
when inserting not contiguous data in the subflow write queue,
the protocol creates a new skb and prevent the TCP stack from
merging it later with already queued skbs by setting the EOR marker.
Still no push flag is explicitly set at the end of previous GSO
packet, making the aggregation on the receiver side sub-optimal -
and packetdrill self-tests less predictable.
Explicitly mark the end of not contiguous DSS with the push flag.
Fixes: 6d0060f600ad ("mptcp: Write MPTCP DSS headers to outgoing data packets")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx>
Reviewed-by: Mat Martineau <martineau@xxxxxxxxxx>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240223-upstream-net-20240223-misc-fixes-v1-4-162e87e48497@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
@@ -1319,6 +1319,7 @@ static int mptcp_sendmsg_frag(struct soc
mpext = skb_ext_find(skb, SKB_EXT_MPTCP);
if (!mptcp_skb_can_collapse_to(data_seq, skb, mpext)) {
TCP_SKB_CB(skb)->eor = 1;
+ tcp_mark_push(tcp_sk(ssk), skb);
goto alloc_skb;
}
Patches currently in stable-queue which might be from pabeni@xxxxxxxxxx are
queue-6.1/mptcp-push-at-dss-boundaries.patch
queue-6.1/mptcp-fix-snd_wnd-initialization-for-passive-socket.patch
queue-6.1/mptcp-fix-data-races-on-local_id.patch
queue-6.1/af_unix-fix-task-hung-while-purging-oob_skb-in-gc.patch
queue-6.1/mptcp-fix-possible-deadlock-in-subflow-diag.patch
queue-6.1/veth-try-harder-when-allocating-queue-memory.patch
queue-6.1/gtp-fix-use-after-free-and-null-ptr-deref-in-gtp_newlink.patch
queue-6.1/net-hsr-use-correct-offset-for-hsr-tlv-values-in-sup.patch
queue-6.1/mptcp-fix-duplicate-subflow-creation.patch
queue-6.1/mptcp-fix-data-races-on-remote_id.patch
