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 90C02803F7 for ; Mon, 16 Nov 2026 03:53:31 +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 6AG3qHTW019257; Mon, 16 Nov 2026 06:52:18 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qHTW019257 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="kN69rKzi" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AG3qBKj019210 (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 6AG3qBKj019210 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-490a0e72578so1711541f8f.0 for ; Sun, 15 Nov 2026 19:52:11 -0800 (PST) X-Gm-Message-State: APuU4Z/MFDt8O6+FfdvXvzBQhRQNe8C6rjpjdXuIDisQyYE3M4ip0k7M Uui4e96tE3wZf+dTYp0RA1FbAAMNirskFNTDnf5deWDGUs3GMP7akKW/mC2dDszQA4fVTvHOCDm HmdBEOGKW8CGJpRC2pd8f7wDHaLv58JauAoZDaruKuk73GN26hC4r+Q== X-Gm-Gg: AYBFou0pITg+9sFj/FzXC9GZ62FTKTCXZH7iLXpfkKfRFCKxYBxxolFmtL4FKTNgIP+ 67Fz8uJ/Qhoh0xV5ke106He7Hr8I99G54fEgve/vMtGLhlBVxIyCQL7eBwv7DpYeK7+MYnKNQ9r J2RDeDTg/iQxoIetMZSUnceh4+3GBZJdQ7GfLeT3a/e7iDO11tX0IczR0nbxPdTRsNqtNbZAd4a 1vfyRQJRK7Br961KsylD4GR5TRv3+Py5oI+VMRBjIAM26RGDoA1V0Hf8CnqP5reBitD01seNUg2 yVNZzJAowC2eG9H02slBrX+08RaegqDmcTPByyrXKSbH2BjE0F3XK4ldOqDEpiEP/SgF1bHcAlD 6BWgv9m9TiCSjI9Su4V5BL7D5 X-Received: by 2002:a05:6000:2485:b0:490:6e0f:a018 with SMTP id ffacd0b85a97d-49c739103a5mr21652435f8f.28.1794801130835; Sun, 15 Nov 2026 19:52:10 -0800 (PST) X-Received: by 2002:a05:6000:2485:b0:490:6e0f:a018 with SMTP id ffacd0b85a97d-49c739103a5mr21652417f8f.28.1794801130309; 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=b48Sgmr1yFEFYcjNwJAJiqgoGPclSnzDlhc4ob/RLcvcyxiFncYZOnV6UfdMY+AD3m NLT3y0tBhWBagOlvu0F4wvbd1pgdYEi4tlZVEaTh07b9M5C9TNp/epdynRaQGyhGKg/J VvYRjlk+OM2Gwcb8NHocvulU/w9c0OzVNIwv83cHYsp1pFiQNTB5+HmFla0uXXZrqjW6 Iis8K1AAyM1nKqkxnHA/T1cIfJgDuHrVyNfzIG77jQIAc+n2wST85ay1K75QlkOzha9V m1Kcdas42deT9jL4LsimcMgP+rpa+r7FdQ4IorSDbHSN7Tso0PgcHJ+pDtYOaaZUtcHD 1IkQ== 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=tRBCUKcGD12faGptwe60eLSwdmaGlpfgtjsNJZDmOAQ=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=M6hD4P6sFDq7/LwlzY2MY2DkRYDB8eIbZe31vb9Fc7p8yYNg0IYPBDhE8ajxW2Nv61 xJuFgeZyjuIGSj+rtbelu+QJv57fvt8e00hYywR2kDG5tKqSI9U8b9sDV6inYyOi6AeG NJaVDR0vMq39V9ap6xdEAvQ4nb2e9GbqunayCPWw1zJa6O+jZ/yzcXd/aFDNN+h8fz7E LixfvT+EQHPUXp+BHalKqXjHlCE32baR6Q4RwRVfR8mJatCqMOPgZhHLdoZjl7hBbdT8 ZCCzHiauEkg+K6iIfMxVEBTbGkUE9d7navET7jn3lT0GQLpfdqG1OGBeYwjLfcbaJwAn 1PIQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=kN69rKzi; 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-49c63122087si19772071f8f.116.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=kN69rKzi; 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=tRBCUKcGD12faGptwe60eLSwdmaGlpfgtjsNJZDmOAQ=; b=kN69rKzid4W1 Ks9a351pPZa/SBp1+5W3f2xk3DhDCS4mj58pMo+jvUaf8Jtv41XA8Agatnx+ZoWy/mXBMgMmLCbSf SN/yw9UQNyF/jjbcECRvPkpYnSaWpxmxZKyftf9PKBU6JInASQQ2bDAoeHhkLSdlzo3yLRIfFW5WQ X+ETqJ/UpFPZ/GzfsCDj2+cGiJbfDCyBN5j9EXVmbpYYGJf4s7gRQ1F1KWNxdy3LVuhekuIplLph6 dEI1/51xpDRhitfmoP19UQmn9SQ3AykZecqZ22jtn8ocPrEZ+fEH1bilGTH5CAYqvTA0Lfv4PYNzU Q6rsKJw33dnwNFxWqznvWw==; 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 1xSnh5-00A3ol-1v; Mon, 16 Nov 2026 04:52:02 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 05:49:09 +0200 Message-ID: <20261116035204.564416-3-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 02/10] ms/mptcp: move the retrans loop to a separate helper 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 This is a cleanup in order to make the next patch simpler. No functional change intended. 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-1-dbc1eb853cc3@kernel.org Signed-off-by: Jakub Kicinski (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 --- 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 Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel