* [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes
@ 2026-11-16 18:03 Eva Kurchatova
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 1/4] ms/mptcp: reset rcv wnd on disconnect Eva Kurchatova
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Eva Kurchatova @ 2026-11-16 18:03 UTC (permalink / raw)
To: khorenko; +Cc: devel
Patchset for task https://virtuozzo.atlassian.net/browse/VSTOR-15532
Rebased backports from mainline only.
Paolo Abeni (4):
ms/mptcp: reset rcv wnd on disconnect
ms/mptcp: prevent race between disconnect() and rtx
ms/mptcp: close race between scheduler and state change
ms/mptcp: fix bad accounting in __mptcp_subflow_push_pending()
net/mptcp/protocol.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
--
2.56.1
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Devel] [PATCH hci-8.1 1/4] ms/mptcp: reset rcv wnd on disconnect
2026-11-16 18:03 [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Eva Kurchatova
@ 2026-11-16 18:03 ` Eva Kurchatova
2026-11-16 18:09 ` no-reply
2026-11-17 11:29 ` Konstantin Khorenko
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 2/4] ms/mptcp: prevent race between disconnect() and rtx Eva Kurchatova
` (3 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Eva Kurchatova @ 2026-11-16 18:03 UTC (permalink / raw)
To: khorenko; +Cc: devel
From: Paolo Abeni <pabeni@redhat.com>
If the MPTCP socket fallback to TCP before the MP handshake completion,
the IASN remain 0, and the rcv_wnd_sent field is not explicitly
initialized, just incremented over time with the data transfer.
At disconnect time such value is not cleared. If the next connection falls
back to TCP before the MP handshake completion, the data transfer will
keep incrementing the receive window end sequence starting from the last
value used in the previous connection: the announced window will be
unrelated from the actual receiver buffer size and likely too big.
Address the issue zeroing the field at disconnect time.
Fixes: b29fcfb54cd7 ("mptcp: full disconnect implementation")
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260515-net-mptcp-misc-fixes-7-1-rc4-v2-4-701e96419f2f@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
(cherry picked from commit 0981f90e1a05773a4c29c6e720f5ea1e3c8f1876)
Rebase note: this tree lacks commits 2834f8edd74d ("mptcp: cleanup
fallback dummy mapping generation") and d2000361e4dd ("mptcp: better
mptcp-level RTT estimator"), which add the lines around the mainline
hunk, so the reset goes after the other counters.
https://virtuozzo.atlassian.net/browse/VSTOR-155322
Feature: fix ms/net
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
---
net/mptcp/protocol.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index e526648a583e..40d78fe6e111 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3238,6 +3238,7 @@ static int mptcp_disconnect(struct sock *sk, int flags)
msk->bytes_retrans = 0;
msk->rcvspace_init = 0;
msk->fastclosing = 0;
+ atomic64_set(&msk->rcv_wnd_sent, 0);
WRITE_ONCE(sk->sk_shutdown, 0);
sk_error_report(sk);
--
2.56.1
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Devel] [PATCH hci-8.1 2/4] ms/mptcp: prevent race between disconnect() and rtx
2026-11-16 18:03 [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Eva Kurchatova
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 1/4] ms/mptcp: reset rcv wnd on disconnect Eva Kurchatova
@ 2026-11-16 18:03 ` Eva Kurchatova
2026-11-16 18:08 ` no-reply
2026-11-17 11:29 ` Konstantin Khorenko
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 3/4] ms/mptcp: close race between scheduler and state change Eva Kurchatova
` (2 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Eva Kurchatova @ 2026-11-16 18:03 UTC (permalink / raw)
To: khorenko; +Cc: devel
From: Paolo Abeni <pabeni@redhat.com>
Sashiko noted that the two event can race, leading to inconsistent
status. Prevent the race using the synchronous timer stop operation.
Cc: stable@vger.kernel.org
Fixes: b29fcfb54cd7 ("mptcp: full disconnect implementation")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260908-net-mptcp-misc-fixes-7-3-rc1-v2-6-df1de70348b6@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 85c580b0d8590520ae00a15c29e9fb9c99427a3e)
Rebase note: this tree lacks commits 9a5e5334adc0 ("tcp: remove
icsk->icsk_retransmit_timer") and e4141ea18a73 ("tcp: introduce
icsk->icsk_keepalive_timer"), so the timers stopped are still
icsk_retransmit_timer and sk_timer. It also lacks commit ea4eb2adb0d3
("mptcp: honour configured min/max RTO in retransmit paths"), which
initialises icsk_rto_min, so timer_ival is reset to TCP_RTO_MIN, as in
__mptcp_init_sock() here and in the 6.12.y backport.
https://virtuozzo.atlassian.net/browse/VSTOR-155322
Feature: fix ms/net
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
---
net/mptcp/protocol.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 40d78fe6e111..1d4754b20cea 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3188,6 +3188,7 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk)
static int mptcp_disconnect(struct sock *sk, int flags)
{
+ struct inet_connection_sock *icsk = inet_csk(sk);
struct mptcp_sock *msk = mptcp_sk(sk);
/* We are on the fastopen error path. We can't call straight into the
@@ -3200,8 +3201,13 @@ static int mptcp_disconnect(struct sock *sk, int flags)
mptcp_check_listen_stop(sk);
mptcp_set_state(sk, TCP_CLOSE);
- mptcp_stop_rtx_timer(sk);
- mptcp_stop_tout_timer(sk);
+ /* The later subflow close can not kick again the tout timer,
+ * as the msk is already in closed status.
+ */
+ msk->timer_ival = TCP_RTO_MIN;
+ sk_stop_timer_sync(sk, &icsk->icsk_retransmit_timer);
+ icsk->icsk_mtup.probe_timestamp = 0;
+ sk_stop_timer_sync(sk, &sk->sk_timer);
mptcp_pm_connection_closed(msk);
--
2.56.1
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Devel] [PATCH hci-8.1 3/4] ms/mptcp: close race between scheduler and state change
2026-11-16 18:03 [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Eva Kurchatova
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 1/4] ms/mptcp: reset rcv wnd on disconnect Eva Kurchatova
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 2/4] ms/mptcp: prevent race between disconnect() and rtx Eva Kurchatova
@ 2026-11-16 18:03 ` Eva Kurchatova
2026-11-16 18:10 ` no-reply
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 4/4] ms/mptcp: fix bad accounting in __mptcp_subflow_push_pending() Eva Kurchatova
2026-11-17 11:29 ` [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Konstantin Khorenko
4 siblings, 1 reply; 12+ messages in thread
From: Eva Kurchatova @ 2026-11-16 18:03 UTC (permalink / raw)
To: khorenko; +Cc: devel
From: Paolo Abeni <pabeni@redhat.com>
The mptcp scheduler may race with subflow sockets state change: data
transmission on the selected socket may fail and a later release could
try to use mss_now reset to 0 for a divide operation.
Address the issue by explicitly checking for the critical scenario.
Fixes: c886d70286bf ("mptcp: do not queue data on closed subflows")
Cc: stable@vger.kernel.org
Reported-by: Shardul Bankar <shardul.b@mpiricsoftware.com>
Reported-by: Xinyang Ge <xinyang@anthropic.com>
Closes: https://lore.kernel.org/20260525194828.1137119-1-shardul.b@mpiricsoftware.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260917-net-mptcp-misc-fixes-7-3-rc4-v2-2-0cf5c72667c8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 42064de57fb83231fcc89663a94885f228a1ee53)
https://virtuozzo.atlassian.net/browse/VSTOR-155322
Feature: fix ms/net
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
---
net/mptcp/protocol.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 1d4754b20cea..685c8a395476 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1434,7 +1434,9 @@ struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk)
static void mptcp_push_release(struct sock *ssk, struct mptcp_sendmsg_info *info)
{
- tcp_push(ssk, 0, info->mss_now, tcp_sk(ssk)->nonagle, info->size_goal);
+ if (info->mss_now)
+ tcp_push(ssk, 0, info->mss_now, tcp_sk(ssk)->nonagle,
+ info->size_goal);
release_sock(ssk);
}
--
2.56.1
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Devel] [PATCH hci-8.1 4/4] ms/mptcp: fix bad accounting in __mptcp_subflow_push_pending()
2026-11-16 18:03 [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Eva Kurchatova
` (2 preceding siblings ...)
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 3/4] ms/mptcp: close race between scheduler and state change Eva Kurchatova
@ 2026-11-16 18:03 ` Eva Kurchatova
2026-11-16 18:10 ` no-reply
2026-11-17 11:29 ` [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Konstantin Khorenko
4 siblings, 1 reply; 12+ messages in thread
From: Eva Kurchatova @ 2026-11-16 18:03 UTC (permalink / raw)
To: khorenko; +Cc: devel
From: Paolo Abeni <pabeni@redhat.com>
If __subflow_push_pending() errors out we should avoid updating the
copied byte counters, to avoid mismatch push call later on.
Fixes: 0fa1b3783a17 ("mptcp: use get_send wrapper")
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260917-net-mptcp-misc-fixes-7-3-rc4-v2-3-0cf5c72667c8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit f3ef03357396d4b147d8e76c75fb612c2f264ffc)
https://virtuozzo.atlassian.net/browse/VSTOR-155322
Feature: fix ms/net
Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
---
net/mptcp/protocol.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 685c8a395476..93e511f8d943 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1624,7 +1624,8 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, bool
ret = __subflow_push_pending(sk, ssk, &info);
if (ret <= 0)
keep_pushing = false;
- copied += ret;
+ else
+ copied += ret;
}
mptcp_for_each_subflow(msk, subflow) {
--
2.56.1
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Devel] [PATCH hci-8.1 2/4] ms/mptcp: prevent race between disconnect() and rtx
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 2/4] ms/mptcp: prevent race between disconnect() and rtx Eva Kurchatova
@ 2026-11-16 18:08 ` no-reply
2026-11-17 11:29 ` Konstantin Khorenko
1 sibling, 0 replies; 12+ messages in thread
From: no-reply @ 2026-11-16 18:08 UTC (permalink / raw)
To: Eva Kurchatova, khorenko; +Cc: devel
> From: Paolo Abeni <pabeni@redhat.com>
>
> Sashiko noted that the two event can race, leading to inconsistent
> status. Prevent the race using the synchronous timer stop operation.
>
> Cc: stable@vger.kernel.org
> Fixes: b29fcfb54cd7 ("mptcp: full disconnect implementation")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> Link: https://patch.msgid.link/20260908-net-mptcp-misc-fixes-7-3-rc1-v2-6-df1de70348b6@kernel.org
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> (cherry picked from commit 85c580b0d8590520ae00a15c29e9fb9c99427a3e)
>
> Rebase note: this tree lacks commits 9a5e5334adc0 ("tcp: remove
> icsk->icsk_retransmit_timer") and e4141ea18a73 ("tcp: introduce
> icsk->icsk_keepalive_timer"), so the timers stopped are still
> icsk_retransmit_timer and sk_timer. It also lacks commit ea4eb2adb0d3
> ("mptcp: honour configured min/max RTO in retransmit paths"), which
> initialises icsk_rto_min, so timer_ival is reset to TCP_RTO_MIN, as in
> __mptcp_init_sock() here and in the 6.12.y backport.
>
> https://virtuozzo.atlassian.net/browse/VSTOR-155322
> Feature: fix ms/net
>
> Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Sashiko has reviewed this patch and found no issues.
--
Sashiko AI review · https://sashiko.vzint.dev/#/patchset/20261116180419.685520-3-eva.kurchatova@virtuozzo.com?part=2
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Devel] [PATCH hci-8.1 1/4] ms/mptcp: reset rcv wnd on disconnect
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 1/4] ms/mptcp: reset rcv wnd on disconnect Eva Kurchatova
@ 2026-11-16 18:09 ` no-reply
2026-11-17 11:29 ` Konstantin Khorenko
1 sibling, 0 replies; 12+ messages in thread
From: no-reply @ 2026-11-16 18:09 UTC (permalink / raw)
To: Eva Kurchatova, khorenko; +Cc: devel
> From: Paolo Abeni <pabeni@redhat.com>
>
> If the MPTCP socket fallback to TCP before the MP handshake completion,
> the IASN remain 0, and the rcv_wnd_sent field is not explicitly
> initialized, just incremented over time with the data transfer.
>
> At disconnect time such value is not cleared. If the next connection falls
> back to TCP before the MP handshake completion, the data transfer will
> keep incrementing the receive window end sequence starting from the last
> value used in the previous connection: the announced window will be
> unrelated from the actual receiver buffer size and likely too big.
>
> Address the issue zeroing the field at disconnect time.
>
> Fixes: b29fcfb54cd7 ("mptcp: full disconnect implementation")
> [ ... ]
>
> https://virtuozzo.atlassian.net/browse/VSTOR-155322
> Feature: fix ms/net
>
> Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Sashiko has reviewed this patch and found no issues.
--
Sashiko AI review · https://sashiko.vzint.dev/#/patchset/20261116180419.685520-3-eva.kurchatova@virtuozzo.com?part=1
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Devel] [PATCH hci-8.1 3/4] ms/mptcp: close race between scheduler and state change
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 3/4] ms/mptcp: close race between scheduler and state change Eva Kurchatova
@ 2026-11-16 18:10 ` no-reply
0 siblings, 0 replies; 12+ messages in thread
From: no-reply @ 2026-11-16 18:10 UTC (permalink / raw)
To: Eva Kurchatova, khorenko; +Cc: devel
> From: Paolo Abeni <pabeni@redhat.com>
>
> The mptcp scheduler may race with subflow sockets state change: data
> transmission on the selected socket may fail and a later release could
> try to use mss_now reset to 0 for a divide operation.
>
> Address the issue by explicitly checking for the critical scenario.
>
> Fixes: c886d70286bf ("mptcp: do not queue data on closed subflows")
> Cc: stable@vger.kernel.org
> Reported-by: Shardul Bankar <shardul.b@mpiricsoftware.com>
> Reported-by: Xinyang Ge <xinyang@anthropic.com>
> Closes: https://lore.kernel.org/20260525194828.1137119-1-shardul.b@mpiricsoftware.com
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> Link: https://patch.msgid.link/20260917-net-mptcp-misc-fixes-7-3-rc4-v2-2-0cf5c72667c8@kernel.org
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> (cherry picked from commit 42064de57fb83231fcc89663a94885f228a1ee53)
>
> https://virtuozzo.atlassian.net/browse/VSTOR-155322
> Feature: fix ms/net
>
> Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Sashiko has reviewed this patch and found no issues.
--
Sashiko AI review · https://sashiko.vzint.dev/#/patchset/20261116180419.685520-3-eva.kurchatova@virtuozzo.com?part=3
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Devel] [PATCH hci-8.1 4/4] ms/mptcp: fix bad accounting in __mptcp_subflow_push_pending()
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 4/4] ms/mptcp: fix bad accounting in __mptcp_subflow_push_pending() Eva Kurchatova
@ 2026-11-16 18:10 ` no-reply
0 siblings, 0 replies; 12+ messages in thread
From: no-reply @ 2026-11-16 18:10 UTC (permalink / raw)
To: Eva Kurchatova, khorenko; +Cc: devel
> From: Paolo Abeni <pabeni@redhat.com>
>
> If __subflow_push_pending() errors out we should avoid updating the
> copied byte counters, to avoid mismatch push call later on.
>
> Fixes: 0fa1b3783a17 ("mptcp: use get_send wrapper")
> Cc: stable@vger.kernel.org
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> Link: https://patch.msgid.link/20260917-net-mptcp-misc-fixes-7-3-rc4-v2-3-0cf5c72667c8@kernel.org
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> (cherry picked from commit f3ef03357396d4b147d8e76c75fb612c2f264ffc)
>
> https://virtuozzo.atlassian.net/browse/VSTOR-155322
> Feature: fix ms/net
>
> Signed-off-by: Eva Kurchatova <eva.kurchatova@virtuozzo.com>
Sashiko has reviewed this patch and found no issues.
--
Sashiko AI review · https://sashiko.vzint.dev/#/patchset/20261116180419.685520-3-eva.kurchatova@virtuozzo.com?part=4
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes
2026-11-16 18:03 [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Eva Kurchatova
` (3 preceding siblings ...)
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 4/4] ms/mptcp: fix bad accounting in __mptcp_subflow_push_pending() Eva Kurchatova
@ 2026-11-17 11:29 ` Konstantin Khorenko
4 siblings, 0 replies; 12+ messages in thread
From: Konstantin Khorenko @ 2026-11-17 11:29 UTC (permalink / raw)
To: Eva Kurchatova; +Cc: devel
I won't apply this version, please send v2 with the changes below.
On Mon, 16 Nov 2026 20:03:00 +0200, Eva Kurchatova wrote:
> Patchset for task https://virtuozzo.atlassian.net/browse/VSTOR-15532
The backports are right: 3/4 and 4/4 are mainline as is, and the 2/4
timer adaptation matches __mptcp_init_sock() here and the 6.12.y
backport. What to change for v2:
1. Base v2 on "ms/mptcp: stability fixes" (v4 when it comes). Its
7/11 is 2834f8edd74d5 ("mptcp: cleanup fallback dummy mapping
generation"), the commit 1/4 goes with in mainline and in 6.12.y,
where it was taken as "Stable-dep-of: 0981f90e1a05". Today the two
series do not apply on top of each other (both add a line after
msk->fastclosing = 0 in mptcp_disconnect()). On that base 1/4 is a
plain cherry-pick and needs no rebase note.
2. Patch 2: the rebase note names e4141ea18a73, the 6.12.y id; the
mainline commit is 08dfe370239e5.
3. Cover letter: the task is VSTOR-155322. Say what the four fixes
fix, how the series was tested, and that it goes on top of the
stability series.
Thanks.
--
Konstantin Khorenko,
Virtuozzo Linux Kernel Team
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Devel] [PATCH hci-8.1 1/4] ms/mptcp: reset rcv wnd on disconnect
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 1/4] ms/mptcp: reset rcv wnd on disconnect Eva Kurchatova
2026-11-16 18:09 ` no-reply
@ 2026-11-17 11:29 ` Konstantin Khorenko
1 sibling, 0 replies; 12+ messages in thread
From: Konstantin Khorenko @ 2026-11-17 11:29 UTC (permalink / raw)
To: Eva Kurchatova; +Cc: devel
I won't apply this version, please send v2 with the changes below.
On Mon, 16 Nov 2026 20:03:01 +0200, Eva Kurchatova wrote:
> Rebase note: this tree lacks commits 2834f8edd74d ("mptcp: cleanup
> fallback dummy mapping generation") and d2000361e4dd ("mptcp: better
> mptcp-level RTT estimator"), which add the lines around the mainline
> hunk, so the reset goes after the other counters.
Item 1 of the cover letter reply: apply this on top of the stability
series and drop the note.
Why: 2834f8edd74d5 is more than context. It resets msk->ack_seq in
mptcp_disconnect(), and this patch resets rcv_wnd_sent to match it;
mptcp_set_rwin() works on the pair. With only this patch, a reused
socket that falls back to TCP before the MP handshake keeps the old
ack_seq against rcv_wnd_sent = 0, and for an ack_seq in the upper half
of the u64 range mptcp_set_rwin() takes the raise_win path and sets
tp->rcv_wnd to U32_MAX. Before the patch both values were stale but
consistent. d2000361e4dd does not touch the hunk context at all.
--
Konstantin Khorenko,
Virtuozzo Linux Kernel Team
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Devel] [PATCH hci-8.1 2/4] ms/mptcp: prevent race between disconnect() and rtx
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 2/4] ms/mptcp: prevent race between disconnect() and rtx Eva Kurchatova
2026-11-16 18:08 ` no-reply
@ 2026-11-17 11:29 ` Konstantin Khorenko
1 sibling, 0 replies; 12+ messages in thread
From: Konstantin Khorenko @ 2026-11-17 11:29 UTC (permalink / raw)
To: Eva Kurchatova; +Cc: devel
I won't apply this version, please send v2 with the changes below.
On Mon, 16 Nov 2026 20:03:02 +0200, Eva Kurchatova wrote:
> icsk->icsk_retransmit_timer") and e4141ea18a73 ("tcp: introduce
> icsk->icsk_keepalive_timer"), so the timers stopped are still
Item 2 of the cover letter reply: name the mainline commit,
08dfe370239e5.
Why: e4141ea18a73 is the 6.12.y backport of it.
--
Konstantin Khorenko,
Virtuozzo Linux Kernel Team
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2026-11-17 11:31 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-16 18:03 [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Eva Kurchatova
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 1/4] ms/mptcp: reset rcv wnd on disconnect Eva Kurchatova
2026-11-16 18:09 ` no-reply
2026-11-17 11:29 ` Konstantin Khorenko
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 2/4] ms/mptcp: prevent race between disconnect() and rtx Eva Kurchatova
2026-11-16 18:08 ` no-reply
2026-11-17 11:29 ` Konstantin Khorenko
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 3/4] ms/mptcp: close race between scheduler and state change Eva Kurchatova
2026-11-16 18:10 ` no-reply
2026-11-16 18:03 ` [Devel] [PATCH hci-8.1 4/4] ms/mptcp: fix bad accounting in __mptcp_subflow_push_pending() Eva Kurchatova
2026-11-16 18:10 ` no-reply
2026-11-17 11:29 ` [Devel] [PATCH hci-8.1 0/4] ms/mptcp: backport cc-stable fixes Konstantin Khorenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.