From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id B5A47817C6 for ; Mon, 16 Nov 2026 20:47:29 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGKkJ2A031631; Mon, 16 Nov 2026 23:46:20 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkJ2A031631 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="W9lY1aoB" Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGKk8Dr031582 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:09 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKk8Dr031582 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-4903fc8537aso2554874f8f.0 for ; Mon, 16 Nov 2026 12:46:09 -0800 (PST) X-Gm-Message-State: APuU4Z9qFluUtgve4XsFfNWJ7bC4PQn/Q+Jta03T8ZMq9xM2zlPzZxYq JwwE8cC/STWwrMIgfeaYCY7kGm+i5UUPzMCPfdgBIKFBJfQBbAlnVAl/Fx7BCL/Cg41fUQWh1zK vUx0An9g5fSryMUrBwa0ReYWmRZZ7m+xJmshG91gtOj3a+Ar9IZIOSA== X-Gm-Gg: AZFdTZeQtKagw+FnFNkhLmnZbMJnqI8anG/PRSZOFTGMibsxgd3Pcd2yCWwArte72FP Nk8BYADYYCNIUavKDonXo/+HADNFlnd8ap6DKiZKz71+RvjzYBKvRMcHlJaQlsScngwLzhVe5V6 IgMy45gAaNqROq/Et1AxVtJsoKRVH6TUarMz9k0OG/7dE3Ac6MglNR9XU9kpC6xuK2NUQTEhd8D bAsInqPinGtdV2m66MBNaSD2dnE+bHibn7FO6EXzjUAeaHlKikOtRiMsaaVfnKqu06XDQne+UPe E/m+LU0KpDxEVAJM0o+UItKhy1vDNPaSDa6plBHmiZBf2Ome+AETOugO9UAWEpqzjYpm7/VEJov kD9jGKOy0H8z2jlEc+zp4/RCB X-Received: by 2002:a5d:64c8:0:b0:49c:192f:cf19 with SMTP id ffacd0b85a97d-49c740bbf73mr25429458f8f.39.1794861968621; Mon, 16 Nov 2026 12:46:08 -0800 (PST) X-Received: by 2002:a5d:64c8:0:b0:49c:192f:cf19 with SMTP id ffacd0b85a97d-49c740bbf73mr25429432f8f.39.1794861968175; Mon, 16 Nov 2026 12:46:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794861968; cv=none; d=google.com; s=arc-20260327; b=aITgKAoLx8OVxrCxPVWIyt5kXcTki1+dG8Ac69+kyh7Pq0/LPSmL7YSy6Puo1J/ZBG +aKjY5h/746haA826mDiJieTIJO+a/I/3DYam+yuGu1Pc0rPwOow661ONataEofGJ2NX zwBQq4oy4GEvU4VdeHnahCbqPJU5l9tkx8ixeurQDsrqkT0gVTYDTI+Ad5lVBsbKXJu/ HC2zndKcCbOZoaKqmXnngNye4EiXQ3tQkQn+mYUkxwMbVvelx1J3EiHbe320qfgY50dY L+aryiwZkwoXDDwiIFEBnzt1eoUEAhlccunNf7ikcx/ANeTpxDt7chbB0qG0h/cxTaoz d7+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ZXtXev+8eBujeaS7RqAcTP2Th4+gS1PupTqDsSbOD4Q=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=VndR3uX1tL8UrDY+qkGTfy/sHM+Vwn7QvXco8HZd/9+y/Ujx6ZlcP4HGdH1jjAOaYn rJE6e7ZaxoELy9lAKi5KUi+xwD3wGRzT8DcYvQtOe1g4Mrz4CzVp2zk7zwsewDh8OlF6 W4o1ss/nOf/md6ptE0fpNVGhLBqatoYGEfmt22JPHdFT2GqFRQD4bj4thkPyKqq8/uBG uXyl1XmomPqZllmFTzwstc6MRUr6Sq8nuiF663f3nAdKHq9uXik4sdRzvezsjDZWGRLx 84lkhzxIBrymAxnadWBOFStTcQyy7BExyps1GjdkaPaOpqhXIIoje5G7cCA4OZ9V3GPm iZoA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=W9lY1aoB; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-49c63122716si23567538f8f.84.2026.11.16.12.46.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46:08 -0800 (PST) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=W9lY1aoB; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=ZXtXev+8eBujeaS7RqAcTP2Th4+gS1PupTqDsSbOD4Q=; b=W9lY1aoBfOoY hzej/OoRI4lfd43bIsFtSAr+IhdaVgg3xgfKo2qmrU0LOwWvhKWS4Rh0jvfa2hJNEr57Lm1OwTQ2G aKu65/X0aKj9E/5dEr2xUpmbfBd02hw7jZQ4nfk8Zjt3+D/JBfvsom640Lgz1unm84EbRiR8poSCG oavdQ+gXRkKlUzBB98G3ECppaWj1gkirX62LK+anFZPWNx21vaCqQ2bxsLo/69FlADeugumYo145t 5ylya4VbznN4+pqDkVE5W9C+nq4ceCJ2fL4u4QiSSEb5pbrhaxh/WRQgMoYpG9LHVx5vSJYsMUKjK OdqN6X0EMDoiPe71hRaFWA==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xT3WJ-00BfjZ-1l; Mon, 16 Nov 2026 21:45:59 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:05:56 +0200 Message-ID: <20261116204557.718500-5-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261116204557.718500-1-eva.kurchatova@virtuozzo.com> References: <20261116204557.718500-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 04/11] ms/mptcp: let the retrans scheduler do its job X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org From: Paolo Abeni Currently the MPTCP core enforces that when MPTCP-level retrans timer fires, at most a single dfrag is retransmitted. In some corner-cases, it may be necessary to retransmit multiple dfrags, and the MPTCP socket will need to wait multiple retrans timeout to accomplish that. Remove the mentioned constraint, allowing to transmit multiple dfrags per retrans period, as long as the scheduler keeps selecting subflows for retransmissions and pending data is available in the rtx queue. The default scheduler will transmit a dfrag per available subflow. Tested-by: Gang Yan Tested-by: Geliang Tang Acked-by: Geliang Tang Signed-off-by: Paolo Abeni Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260807-net-next-mptcp-oooq-pruning-v3-3-dbc1eb853cc3@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit 96d846e3e2a7ea01ff8a584a0b5e2a42fa9ccc1e) https://virtuozzo.atlassian.net/browse/VSTOR-153491 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.c | 106 ++++++++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 31 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 838b18bc19c9..2dcce47a1ef7 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1000,13 +1000,6 @@ static void __mptcp_clean_una_wakeup(struct sock *sk) mptcp_write_space(sk); } -static void mptcp_clean_una_wakeup(struct sock *sk) -{ - mptcp_data_lock(sk); - __mptcp_clean_una_wakeup(sk); - mptcp_data_unlock(sk); -} - static void mptcp_enter_memory_pressure(struct sock *sk) { struct mptcp_subflow_context *subflow; @@ -2577,8 +2570,12 @@ static void mptcp_check_fastclose(struct mptcp_sock *msk) sk_error_report(sk); } -/* Retransmit the specified data fragment on all the selected subflows. */ -static int __mptcp_push_retrans(struct sock *sk, struct mptcp_data_frag *dfrag) +/* + * Retransmit the specified data fragment on all the selected subflows, + * starting from the specified sequence + */ +static int __mptcp_push_retrans(struct sock *sk, struct mptcp_data_frag *dfrag, + u64 sent_seq) { struct mptcp_sendmsg_info info = { .data_lock_held = true, }; struct mptcp_sock *msk = mptcp_sk(sk); @@ -2588,6 +2585,7 @@ static int __mptcp_push_retrans(struct sock *sk, struct mptcp_data_frag *dfrag) mptcp_for_each_subflow(msk, subflow) { if (READ_ONCE(subflow->scheduled)) { + u16 offset = sent_seq - dfrag->data_seq; u16 copied = 0; mptcp_subflow_set_scheduled(subflow, false); @@ -2597,7 +2595,7 @@ static int __mptcp_push_retrans(struct sock *sk, struct mptcp_data_frag *dfrag) lock_sock(ssk); /* limit retransmission to the bytes already sent on some subflows */ - info.sent = 0; + info.sent = offset; info.limit = READ_ONCE(msk->csum_enabled) ? dfrag->data_len : dfrag->already_sent; @@ -2643,45 +2641,91 @@ static void __mptcp_retrans(struct sock *sk) struct mptcp_sock *msk = mptcp_sk(sk); struct mptcp_subflow_context *subflow; struct mptcp_data_frag *dfrag; + u64 retrans_seq, sent_seq; + bool need_retrans; int err, len; mptcp_pm_chk_stale(msk); - mptcp_clean_una_wakeup(sk); - - err = mptcp_sched_get_retrans(msk); + /* Get an updated and consistent rtx queue status. */ + mptcp_data_lock(sk); + __mptcp_clean_una_wakeup(sk); + retrans_seq = msk->snd_una; dfrag = mptcp_rtx_head(sk); - if (!dfrag) { + need_retrans = !!dfrag; + mptcp_data_unlock(sk); + + for (;;) { + bool already_acked; + + err = mptcp_sched_get_retrans(msk); + if (err) + break; + + /* `already_sent` can be 0 for `dfrag` belonging to the RTX + * queue due to __mptcp_retransmit_pending_data(). + */ + if (!dfrag || !dfrag->already_sent) + break; + + /* Can fail only in case of fallback. */ + len = __mptcp_push_retrans(sk, dfrag, retrans_seq); + if (len < 0) + goto clear_scheduled; + + retrans_seq += len; + msk->bytes_retrans += len; + dfrag->already_sent = max_t(u16, dfrag->already_sent, + retrans_seq - dfrag->data_seq); + + /* With csum enabled, retransmission can send new data. */ + sent_seq = dfrag->already_sent + dfrag->data_seq; + if (after64(sent_seq, msk->snd_nxt)) + WRITE_ONCE(msk->snd_nxt, sent_seq); + + /* Attempt the next fragment only if the current one is + * completely retransmitted. + */ + if (before64(retrans_seq, dfrag->data_seq + dfrag->data_len)) + break; + + dfrag = list_is_last(&dfrag->list, &msk->rtx_queue) ? + NULL : list_next_entry(dfrag, list); + if (!dfrag) + break; + + /* Incoming acks can move snd_una after the current dfrag + * across loop iterations, if so start again from RTX head. + */ + mptcp_data_lock(sk); + already_acked = !before64(msk->snd_una, dfrag->data_seq + + dfrag->already_sent); + if (already_acked) { + __mptcp_clean_una_wakeup(sk); + retrans_seq = msk->snd_una; + dfrag = mptcp_rtx_head(sk); + need_retrans = !!dfrag; + } else if (after64(msk->snd_una, retrans_seq)) { + retrans_seq = msk->snd_una; + } + mptcp_data_unlock(sk); + } + + /* Attempt data-fin retransmission only when the RTX queue is empty. */ + if (!need_retrans) { 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); - - /* With csum enabled retransmission can send new data. */ - if (after64(dfrag->already_sent + dfrag->data_seq, msk->snd_nxt)) - WRITE_ONCE(msk->snd_nxt, dfrag->already_sent + dfrag->data_seq); - reset_timer: mptcp_check_and_set_pending(sk); -- 2.56.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel