From: Paolo Abeni <[email protected]>

MPTCP currently access ack_seq outside the msk socket log scope to
generate the dummy mapping for fallback socket. Soon we are going
to introduce backlog usage and even for fallback socket the ack_seq
value will be significantly off outside of the msk socket lock scope.

Avoid relying on ack_seq for dummy mapping generation, using instead
the subflow sequence number. Note that in case of disconnect() and
(re)connect() we must ensure that any previous state is re-set.

Signed-off-by: Paolo Abeni <[email protected]>
Reviewed-by: Geliang Tang <[email protected]>
Tested-by: Geliang Tang <[email protected]>
Reviewed-by: Mat Martineau <[email protected]>
Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
Link: 
https://patch.msgid.link/20251121-net-next-mptcp-memcg-backlog-imp-v1-6-1f34b6c1e...@kernel.org
Signed-off-by: Jakub Kicinski <[email protected]>
(cherry picked from commit 2834f8edd74d5dda368087a654c0e52b141e9893)

https://virtuozzo.atlassian.net/browse/VSTOR-153491
Feature: fix ms/net
Signed-off-by: Eva Kurchatova <[email protected]>
---
 net/mptcp/protocol.c | 3 +++
 net/mptcp/subflow.c  | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 2dcce47a1ef7..e0048bfda370 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3299,6 +3299,9 @@ static int mptcp_disconnect(struct sock *sk, int flags)
        msk->rcvspace_init = 0;
        msk->fastclosing = 0;
 
+       /* for fallback's sake */
+       WRITE_ONCE(msk->ack_seq, 0);
+
        WRITE_ONCE(sk->sk_shutdown, 0);
        sk_error_report(sk);
        return 0;
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 040a7f1bdcf0..eeb4c926a66b 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -490,6 +490,9 @@ static void subflow_set_remote_key(struct mptcp_sock *msk,
        mptcp_crypto_key_sha(subflow->remote_key, NULL, &subflow->iasn);
        subflow->iasn++;
 
+       /* for fallback's sake */
+       subflow->map_seq = subflow->iasn;
+
        WRITE_ONCE(msk->remote_key, subflow->remote_key);
        WRITE_ONCE(msk->ack_seq, subflow->iasn);
        WRITE_ONCE(msk->can_ack, true);
@@ -1432,9 +1435,12 @@ static bool subflow_check_data_avail(struct sock *ssk)
 
        skb = skb_peek(&ssk->sk_receive_queue);
        subflow->map_valid = 1;
-       subflow->map_seq = READ_ONCE(msk->ack_seq);
        subflow->map_data_len = skb->len;
        subflow->map_subflow_seq = tcp_sk(ssk)->copied_seq - 
subflow->ssn_offset;
+       subflow->map_seq = __mptcp_expand_seq(subflow->map_seq,
+                                             subflow->iasn +
+                                             TCP_SKB_CB(skb)->seq -
+                                             subflow->ssn_offset - 1);
        WRITE_ONCE(subflow->data_avail, true);
        return true;
 }
-- 
2.56.1

_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to