FAILED: patch "[PATCH] mptcp: fix snd_wnd initialization for passive socket" failed to apply to 5.15-stable tree

FAILED: patch "[PATCH] mptcp: fix snd_wnd initialization for passive socket" failed to apply to 5.15-stable tree

[gregkh]

The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x adf1bb78dab55e36d4d557aa2fb446ebcfe9e5ce
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024030417-jaws-icky-a0f2@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..

Possible dependencies:

adf1bb78dab5 ("mptcp: fix snd_wnd initialization for passive socket")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From adf1bb78dab55e36d4d557aa2fb446ebcfe9e5ce Mon Sep 17 00:00:00 2001
From: Paolo Abeni <pabeni@redhat.com>
Date: Fri, 23 Feb 2024 17:14:15 +0100
Subject: [PATCH] mptcp: fix snd_wnd initialization for passive socket

Such value should be inherited from the first subflow, but
passive sockets always used 'rsk_rcv_wnd'.

Fixes: 6f8a612a33e4 ("mptcp: keep track of advertised windows right edge")
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240223-upstream-net-20240223-misc-fixes-v1-5-162e87e48497@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 442fa7d9b57a..2c8f931c6d5b 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3211,7 +3211,7 @@ struct sock *mptcp_sk_clone_init(const struct sock *sk,
 	msk->write_seq = subflow_req->idsn + 1;
 	msk->snd_nxt = msk->write_seq;
 	msk->snd_una = msk->write_seq;
-	msk->wnd_end = msk->snd_nxt + req->rsk_rcv_wnd;
+	msk->wnd_end = msk->snd_nxt + tcp_sk(ssk)->snd_wnd;
 	msk->setsockopt_seq = mptcp_sk(sk)->setsockopt_seq;
 	mptcp_init_sched(msk, mptcp_sk(sk)->sched);
 

Re: FAILED: patch "[PATCH] mptcp: fix snd_wnd initialization for passive socket" failed to apply to 5.15-stable tree

[Matthieu Baerts]

Hi Greg,

On 04/03/2024 10:30, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 5.15-stable tree.

(...)

> ------------------ original commit in Linus's tree ------------------
> 
> From adf1bb78dab55e36d4d557aa2fb446ebcfe9e5ce Mon Sep 17 00:00:00 2001
> From: Paolo Abeni <pabeni@redhat.com>
> Date: Fri, 23 Feb 2024 17:14:15 +0100
> Subject: [PATCH] mptcp: fix snd_wnd initialization for passive socket
> 
> Such value should be inherited from the first subflow, but
> passive sockets always used 'rsk_rcv_wnd'.
> 
> Fixes: 6f8a612a33e4 ("mptcp: keep track of advertised windows right edge")

This commit depends on commit 7e8b88ec35ee ("mptcp: consolidate passive
msk socket initialization") which has apparently not been backported to
v5.15 due to a too long list of dependences.

Even if it would be better to have this fix, I don't think it is worth
having it in v5.15.

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

Re: FAILED: patch "[PATCH] mptcp: fix snd_wnd initialization for passive socket" failed to apply to 5.15-stable tree

[Greg KH]

On Mon, Mar 04, 2024 at 05:13:29PM +0100, Matthieu Baerts wrote:
> Hi Greg,
> 
> On 04/03/2024 10:30, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 5.15-stable tree.
> 
> (...)
> 
> > ------------------ original commit in Linus's tree ------------------
> > 
> > From adf1bb78dab55e36d4d557aa2fb446ebcfe9e5ce Mon Sep 17 00:00:00 2001
> > From: Paolo Abeni <pabeni@redhat.com>
> > Date: Fri, 23 Feb 2024 17:14:15 +0100
> > Subject: [PATCH] mptcp: fix snd_wnd initialization for passive socket
> > 
> > Such value should be inherited from the first subflow, but
> > passive sockets always used 'rsk_rcv_wnd'.
> > 
> > Fixes: 6f8a612a33e4 ("mptcp: keep track of advertised windows right edge")
> 
> This commit depends on commit 7e8b88ec35ee ("mptcp: consolidate passive
> msk socket initialization") which has apparently not been backported to
> v5.15 due to a too long list of dependences.
> 
> Even if it would be better to have this fix, I don't think it is worth
> having it in v5.15.

Thanks for looking into this and letting us know.

greg k-h