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 120A4817C6 for ; Mon, 16 Nov 2026 20:47:26 +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 6AGKkCb0031599; Mon, 16 Nov 2026 23:46:13 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkCb0031599 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="wyypHhvU" 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 6AGKk5Lw031566 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:06 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKk5Lw031566 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-4a3705ea6ccso123232f8f.2 for ; Mon, 16 Nov 2026 12:46:05 -0800 (PST) X-Gm-Message-State: APuU4Z8E+64m8ybXVlOaUlYvfZx6cwpnrcewzdxJoaETDUj+GDaR7YIK OZnb5qZD6BlzHOG3NyI+11oQrKOD9ki1piGgqGh0cQPlOUQ1M39AVE51yBMf0Sl2zdtBkedTCOy V/QDR20LlFG/B96fSkqWOm+Aa47EhhfyTDe9TmiZ2cP2OdPf3H0klOQ== X-Gm-Gg: AZFdTZcnHV5rQy4mRVcx6u8I7sVQ1f9VfakKY4Thk5NDCJgcEzfnOvAjH07vWDF/jQj P6gyLxgQBNSxxceCQPlwfdKVPx7u8/m08BETnck2vQ6wm1q43MHPeTogPJV3/kRUDZKDMUL7bG1 lHgFwMpYRmvpcdHSPADHzwtF1+yw+oUdCBQI8aTRw5cVii3MZ46RGYsM5kfvqJt6HNZuuc8qkoX 9c/ieIkVuZMFYHu0h+loqsDEyG8DWJHjDOowi+p3dmI0V3dISGu00JWbzgmeWZyReWMZUbCK5ng HJDyW0B0mx/ebOjJmYXFGi4BdUC/efaCnueZ76b8pF3rd8tk31Xgj2OFiG0K7Lah6PaQohfq9wv SMrT4mGPncrkzZQXLzyw7FyTlSw== X-Received: by 2002:a05:6000:4024:b0:4a2:6542:9873 with SMTP id ffacd0b85a97d-4a26542992cmr5874249f8f.55.1794861965515; Mon, 16 Nov 2026 12:46:05 -0800 (PST) X-Received: by 2002:a05:6000:4024:b0:4a2:6542:9873 with SMTP id ffacd0b85a97d-4a26542992cmr5874199f8f.55.1794861964904; Mon, 16 Nov 2026 12:46:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794861964; cv=none; d=google.com; s=arc-20260327; b=AJAqHaKGqXH13ey+M4i7JiZ22aYC9CpGWgyAGHJgJHmbIXc/KsMX+HG/XWJxFgnQWy OLfouIPKE+yKdzY870k+oHMiHeMaV77ylQ7VSdU9ljGOfv7yf2t8s8qFZX76BmFmtzhW 0OAXWZYhJ1fr+hSGLC5ieHtO3UnbHMLgdQNj1zi9xLhXzyYLyhj23vd3QHJ0BmLw0odE s805WhvWAcj+OFSSsEFUYHLEqCce523zLxB4AtlZlo7qwNtW5SFVrtTQGir0AjUwOdIm rBrU2MSr4kD4EIJfv2+eyv+0kJa7ZkA37eMCFd9FKf26NUykNr+Ml6burZgcKJv7fl12 lanA== 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=xDgLUlEiWjZ+pwUs5+MIqIVPwHeHmmRxzTjFtc69hj4=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=fe0Y8xdZX4rO8hX/llbnd/6GSkDrzOz8LzKN093+4JmnLzIoTbVVSOfNemp5QuREyg GpO91Vngc1lJTyzHRUTnI9B3hqdfu9kU1Ap/+uPqXMFokFIwBkEm7+RbcDsOrT6+mrP5 2MpC7uO9GKK4310RQ0GhJrsbnC0joP7wV/Q3sCtfUOk3ATPXskamza/4Y7HI2AISYMZy bXBeXNfAkDwiTweASo8uJHuGpuJEfH/K6EIe7iYVmV+O414fEEcaajGSbHFD6vTUFWXw yhdd9hNlcrfPsGGXk8dp+8mk+ui7hfxtNMZEcebB2zs/Bufjf6+IDQnsLEYivCVgCikt WgFQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=wyypHhvU; 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-49c64b0b2f8si22141366f8f.395.2026.11.16.12.46.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46:04 -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=wyypHhvU; 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=xDgLUlEiWjZ+pwUs5+MIqIVPwHeHmmRxzTjFtc69hj4=; b=wyypHhvUmwUB lR1uYhe4peMreZR/nRjE8hlAEvOBRafcfprmkTWhaX0QCDXkP6vCOzWmR7Kz7fhffIc3jPCDHcE+S ijmjXUDL7F99NP1HKNG1SGyPZZ/SfvTNjtmYrR73Ci57HAuBVs3hrfm8x5Gyvwqhnona0sMKm2CiD ydFicrOXtw1j+i1cWhl5Szpur3vPLLfGfTantz96xZ/JhBJa5dDCOPGCJtI3+O59PN9cVysIFGcE0 EDUijv2nsEu4Ipt6ZzcrMgw0p91Y+zOop7U0QXedOxGrFwLuzTtywdWUq9U/zXSrzV9X8Cb86DIKF ESgfwMYA01woZLms2Iqvbg==; 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 1xT3WG-00BfjZ-1P; Mon, 16 Nov 2026 21:45:55 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:05:54 +0200 Message-ID: <20261116204557.718500-3-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 02/11] 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.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel