From: Paolo Abeni <[email protected]>

This is a cleanup in order to make the next patch simpler.

No functional change intended.

Tested-by: Gang Yan <[email protected]>
Tested-by: Geliang Tang <[email protected]>
Acked-by: Geliang Tang <[email protected]>
Signed-off-by: Paolo Abeni <[email protected]>
Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
Link: 
https://patch.msgid.link/20260807-net-next-mptcp-oooq-pruning-v3-1-dbc1eb853...@kernel.org
Signed-off-by: Jakub Kicinski <[email protected]>
(cherry picked from commit 789e6a844b51bf6362a7e7f551553ba988f3dc92)

Rebase note: this tree increments icsk_retransmits without the
WRITE_ONCE() that mainline added later, and the moved code keeps the
plain increment.

https://virtuozzo.atlassian.net/browse/VSTOR-153491
Feature: fix ms/net
Signed-off-by: Eva Kurchatova <[email protected]>
---
 net/mptcp/protocol.c | 72 ++++++++++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 30 deletions(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 9f1cc648a272..8c17857bbbcf 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -2578,40 +2578,14 @@ static void mptcp_check_fastclose(struct mptcp_sock 
*msk)
        sk_error_report(sk);
 }
 
-static void __mptcp_retrans(struct sock *sk)
+/* Retransmit the specified data fragment on all the selected subflows. */
+static int __mptcp_push_retrans(struct sock *sk, struct mptcp_data_frag *dfrag)
 {
        struct mptcp_sendmsg_info info = { .data_lock_held = true, };
        struct mptcp_sock *msk = mptcp_sk(sk);
        struct mptcp_subflow_context *subflow;
-       struct mptcp_data_frag *dfrag;
        struct sock *ssk;
-       int ret, err;
-       u16 len = 0;
-
-       mptcp_clean_una_wakeup(sk);
-
-       /* first check ssk: need to kick "stale" logic */
-       err = mptcp_sched_get_retrans(msk);
-       dfrag = mptcp_rtx_head(sk);
-       if (!dfrag) {
-               if (mptcp_data_fin_enabled(msk)) {
-                       struct inet_connection_sock *icsk = inet_csk(sk);
-
-                       icsk->icsk_retransmits++;
-                       mptcp_set_datafin_timeout(sk);
-                       mptcp_send_ack(msk);
-
-                       goto reset_timer;
-               }
-
-               if (!mptcp_send_head(sk))
-                       goto clear_scheduled;
-
-               goto reset_timer;
-       }
-
-       if (err)
-               goto reset_timer;
+       int ret, len = 0;
 
        mptcp_for_each_subflow(msk, subflow) {
                if (READ_ONCE(subflow->scheduled)) {
@@ -2639,7 +2613,7 @@ static void __mptcp_retrans(struct sock *sk)
                            !msk->allow_subflows) {
                                spin_unlock_bh(&msk->fallback_lock);
                                release_sock(ssk);
-                               goto clear_scheduled;
+                               return -1;
                        }
 
                        while (info.sent < info.limit) {
@@ -2662,6 +2636,44 @@ static void __mptcp_retrans(struct sock *sk)
                        release_sock(ssk);
                }
        }
+       return len;
+}
+
+static void __mptcp_retrans(struct sock *sk)
+{
+       struct mptcp_sock *msk = mptcp_sk(sk);
+       struct mptcp_subflow_context *subflow;
+       struct mptcp_data_frag *dfrag;
+       int err, len;
+
+       mptcp_clean_una_wakeup(sk);
+
+       /* first check ssk: need to kick "stale" logic */
+       err = mptcp_sched_get_retrans(msk);
+       dfrag = mptcp_rtx_head(sk);
+       if (!dfrag) {
+               if (mptcp_data_fin_enabled(msk)) {
+                       struct inet_connection_sock *icsk = inet_csk(sk);
+
+                       icsk->icsk_retransmits++;
+                       mptcp_set_datafin_timeout(sk);
+                       mptcp_send_ack(msk);
+
+                       goto reset_timer;
+               }
+
+               if (!mptcp_send_head(sk))
+                       goto clear_scheduled;
+
+               goto reset_timer;
+       }
+
+       if (err)
+               goto reset_timer;
+
+       len = __mptcp_push_retrans(sk, dfrag);
+       if (len < 0)
+               goto clear_scheduled;
 
        msk->bytes_retrans += len;
        dfrag->already_sent = max(dfrag->already_sent, len);
-- 
2.56.0

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

Reply via email to