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 E1C1D803F7 for ; Mon, 16 Nov 2026 03:53:35 +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 6AG3qN2Z019271; Mon, 16 Nov 2026 06:52:24 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qN2Z019271 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="aAnjKS2Z" Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AG3qBJp019215 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 06:52:11 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qBJp019215 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-48e4d1e29f3so2654149f8f.3 for ; Sun, 15 Nov 2026 19:52:11 -0800 (PST) X-Gm-Message-State: APuU4Z8ZbOrGnI5WHXzZ+aKiSjaogwp7nnnYSOhHpe5k/t+aFkwx27yt 9cn9zdluAiiuIN6KzyJN6PyhCQ90v+q+n4bUN1BCnAotLcUGkyDn/5Wxd+c57JsJ30xtSRLWpRH 16NjyOUHBZ2k1dmEn8IY8OnVLq86CNnHemCMe+OdpsczcEaJfAUW8Lw== X-Gm-Gg: AYBFou3kWPMLkv0RRI7coUOQquxwt15Y78qLUkCA36qZR2ozNCMqxE2Bmnni9Pn00+l NVUoFmH5u0ZMjUOZ6zAFrY49LkeHZl8u0AprvCAf+GuRgPl0+GvuGvNZngaFGDMc5o74Caybqqh 0tMjkt0l7Mwt5CkVHZM48ocfQpyNclaylEuZu4JQkgVlWNXsC+UZ6oDEdmtAVRuIeG1RGJSYg1k qXKJZQCOKJRXQ0mMrcvDEixxmK5l7tqJIgyhNjf273fwOqSqZRXB19vxLxzAVi4dL+NCSsAA9B5 JoX5aLp003xwa6yijqjT3LSA8oMH4CzZufrVghzdLyFc2p+HIA+j0tpAeQjIKbYvJixeYs1JdnF OnpjVo6Fh/GmEycH1ZunPoS1CKw== X-Received: by 2002:a05:6000:24c8:b0:49c:9e8a:31b9 with SMTP id ffacd0b85a97d-49c9e8a3318mr21147568f8f.9.1794801131271; Sun, 15 Nov 2026 19:52:11 -0800 (PST) X-Received: by 2002:a05:6000:24c8:b0:49c:9e8a:31b9 with SMTP id ffacd0b85a97d-49c9e8a3318mr21147548f8f.9.1794801130766; Sun, 15 Nov 2026 19:52:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794801130; cv=none; d=google.com; s=arc-20260327; b=M37MkUo2Rej1RFX/fYOIqXaEQS9lTv+wA7U+C0gP5R8jZmxRz1Fdx6xjepBHpbsUXW B1YwbtTK3XgTg/45N04jYvm2EahNO7NFiIT3NlpRc3MxUHSAeWqci3lFW5P3uVh7tWKo OGxVhunF6sCl/3ioW1rk1AYLBR3TMApSvs6Iji9oabP5xFqD6INsFcCAp5AFeEz7EGAc Kl2bfXgEGwTe+joGTMxl+RFEybfZ75UJMxCovLAYsCMwQ8XLx9wfs9Ka6MuCZuoc3On8 RyEDAAq0cL6w7Loxdvke0LgU09Wwxyyv0sSTZWMy+pAab/2te4ZdJG+UXHqaqEs+mR7D CpVA== 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=CJNWYrufgz0joxkT+T//saLp59l8Byo3W6EE8O0M3bg=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=M0MNvGF6uD+iZ6tFDDarRicBXf+5WF9yLHo4YimTbSbxP/kLuuSP4KnOkgS02FJwxj bFZvw0ZvqdT9zHzMsAGWhhzkfDW2CrAkQACaSgsUYOA0Ew6hVZTNjgAjJWZE+TZy1zv1 MyswJnwcSP8rAYXNSjXJjcrVBJL9lU1aSPSUMs2f1FKwr11XPd5w92aGmtCMC8wX07oq tIN6LlKnMQ8L2i5LLOkHf82eW7LXN+g5kQZJXVbz4xNI/9mCcQY4/7RWgITRsS1dpKTa XNM36nJjJv8yWSNV2QLJgts+KdsfEPQdMThYCEglbO7XJdXUDi+C6nSWi3og4IQc8/bv mknQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=aAnjKS2Z; 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-49c63123174si20403651f8f.53.2026.11.15.19.52.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 19:52:10 -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=aAnjKS2Z; 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=CJNWYrufgz0joxkT+T//saLp59l8Byo3W6EE8O0M3bg=; b=aAnjKS2ZpAB2 GUveipCFg23pLC8kDvYkzf4qzVkPlipsmScrbIbYfQzdex6nCcm6iO3lDBh6VNhwlr4tICQIAdjmd pdqRELlhV67KCJWL7f4CLVTg5XQ3LrsFwDoL0yB69mU4WtHOd7OoEbSkdiAvnrOrHnTcmKlRBBO9v h0kcyAh/xGUs1am3pnQE93gRYDvW87s+JYyWhTRGsiGS5rHfDXC5WA8b1glveGWmS2At/J6KKWDBu jDGEU7LUZfJY8S7qouD5zgHixSU1FUkKKz0mjXuIWGWk/fl9FjQombb1GQDy8Btmm0N+aXNU3idMZ 2oGgL7+ryCE2qLh/+jtXtQ==; 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 1xSnh6-00A3ol-0K; Mon, 16 Nov 2026 04:52:02 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 05:49:11 +0200 Message-ID: <20261116035204.564416-5-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261116035204.564416-1-eva.kurchatova@virtuozzo.com> References: <20261116035204.564416-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 04/10] 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.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel