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 66995817C6 for ; Mon, 16 Nov 2026 20:47:27 +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 6AGKkHWj031624; Mon, 16 Nov 2026 23:46:17 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkHWj031624 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="wTN7VQo0" Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGKk7EN031572 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:07 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKk7EN031572 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-4901562b819so3721872f8f.3 for ; Mon, 16 Nov 2026 12:46:07 -0800 (PST) X-Gm-Message-State: APuU4Z8Hb8REkx4ypQossYmJOR1XiqjD5JVhA6Kx3RyqM/zXTIvbrrot LRSt8oUBViJnX1ln0sYGBxcLEVUu1LMXOwMQfzl1jQLk5yVu0lnw+01LrgBsP9pOcrubE7JSciN 3mGk4vc55PZggI2rKEXw0UX9fxsEjAlAroVE64uiixu0z8QdrpIuSUw== X-Gm-Gg: AZFdTZdhZmBPx0DwtgdR1DUHxyreIRrnB5JoS1S63AJ4H4OrAQpNBEnMYMtm+W061MJ eJaX0SHTmA50/Z1Dm+sixhXAbbb4jJZ7m4iWGHGerTK9H2jpoLe34xVMJIYStogh01ijqGJFiNj h9sNw+Y2gvC7NpGf6xOne/cbL8Gnf98I2DNsEacxo7UERONdDbgr0eHL9o/zLK5vVqcRKr42HNZ eeXFGbcBphuK5UrcZ38Y36XpAloOwsArCxrxoRczDQaakIiLpSC3sQjUwPsG9lKSklwgBh2wumO zQ9EDbQm3jMpKBObMHH3ewhdeauQCa9/pqlsz3HDywkTYI5u09a5vwRvopfhoAQITdXlvL1kymy cLAONQwP51hdrraHPHDmblrGx X-Received: by 2002:a05:6000:430a:b0:48d:f14a:9182 with SMTP id ffacd0b85a97d-49c6fd93307mr27892885f8f.20.1794861967069; Mon, 16 Nov 2026 12:46:07 -0800 (PST) X-Received: by 2002:a05:6000:430a:b0:48d:f14a:9182 with SMTP id ffacd0b85a97d-49c6fd93307mr27892849f8f.20.1794861966551; Mon, 16 Nov 2026 12:46:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794861966; cv=none; d=google.com; s=arc-20260327; b=nPm9uNJ2/GJvOBSxMlvwIhJMPes/lh+CFemiPvqxo2KFqtM6zpfiy88hZBhl8NnU5g oIEaCV67dRVY48yShZ7c4yaef3hCSX5aKzOgvAFZncJBjLIeWrV4xwhZt/bcZsb2nh9n amoovJqd8he44SvbWYTMf/P9YJzmDBweLjRGqeu6F+Mk4wnxa67M6JC1xHGCgJqRrmZx NdbpgfUfqvRTyw3JISsnPdAAkK9qeG1HK9FKXhybZHOSAyAdlszXatsR9YkEhxby6JEv zTvuMZkQWMfficjFSJXtZG6haaueJnibyvXKzDVb17PXZ8HZ+EKDa5smGPx1jxMJZ5Ry BVXg== 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=xF3HOmzMihB6uXPpqPf+aNkuF/Oxj5FiedT0WlIW/oo=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=iEqtgdqI2EvhyPPOpmZL0Ki9vS3CSFsE6jgyAWsF9mY9TymBuaxQ5k6IuaZtqdgS8A 69MZF8JGeDLO2SciVP3HTzZDZR0w/G3DF5xI53mmuobfziMqtRoJXlMZl2UISx1C/wBk 6Im0KNbU5uiB6JMyaAw84UqvilgOyRCNs59VAd2JnM2nGsXOjOTUsufFr6ZcfgeDQsGe X/a+DmaYfu/4GFoOVoBEk6NLisIgKey1feeU4sCd71dzUarC9KI6h8RxUUhdk7moQa3a Idve6sUgCWi2NgIuer6sDKQ5o3ETnx+A7KzXp4A30yyqyRGA+FYighzIuT3CQZ23CZbU BsqQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=wTN7VQo0; 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-49c7f8e02c7si23041757f8f.63.2026.11.16.12.46.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46:06 -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=wTN7VQo0; 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=xF3HOmzMihB6uXPpqPf+aNkuF/Oxj5FiedT0WlIW/oo=; b=wTN7VQo0pf83 Q2CQxZt2m72AstskOw8JnspxWH4mJSWpTfUhm7oE2MQ8SmzTbMNgjD5Srta91aXJpffsoN2NZmHwI q2Gbc/aR83De4POVlSI242igMmOu7JNWj6boDjWFYBWI7tZCcxv2B06Emq5fwa/H985nI0QjrNwXL RUBBnZrntEsVgX7m0mU1PDm/5ZO0rzVgj80ZVki86mpKv4KJILwC0nxB6mMpwxa1/zHsr0uWoFnNp GF9wS+7yg531naajx2vn0cCNPr/+C63wbuZQuzgfcaDywfSSvSfBVzad1A4v9T5nwcq9cqoDVpIRO 3PuZqh0YiJCbw4BYKg+s3g==; 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 1xT3WH-00BfjZ-2z; Mon, 16 Nov 2026 21:45:57 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:05:55 +0200 Message-ID: <20261116204557.718500-4-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 03/11] ms/mptcp: move the stale logic out of retrans scheduler 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 allow separating the stale logic invocation and the retrans scheduler, and will simplify the next patch. It's also a cleaner design as the retrans scheduler has currently too many side effects. As a possible downside, the retrans work will now traverse the subflows list additional times; that does not matter much, as this is slowpath. While at it, pick more accurate names for the involved helpers and explicitly note that the per subflow stale data is under msk socket lock protection. The scheduler and the stale logic may observe different subflow statues, as no subflow lock is acquired. This is intentional and not harmful, worst case leading to slower retransmissions. Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260807-net-next-mptcp-oooq-pruning-v3-2-dbc1eb853cc3@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit 6cafe51e0f98fe60a106783d30b2f4c4b6039f4c) Rebase note: this tree has no "closing" subflow flag, so __unused grows from 9 to 10 instead of from 8 to 9. https://virtuozzo.atlassian.net/browse/VSTOR-153491 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/pm.c | 43 ++++++++++++++++++++++++++++--------------- net/mptcp/protocol.c | 4 ++-- net/mptcp/protocol.h | 11 +++++++---- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index a330e74bf5c1..05775d0b6493 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -908,7 +908,8 @@ bool mptcp_pm_is_backup(struct mptcp_sock *msk, struct sock_common *skc) return mptcp_pm_nl_is_backup(msk, &skc_local); } -static void mptcp_pm_subflows_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) +static void +mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) { struct mptcp_subflow_context *iter, *subflow = mptcp_subflow_ctx(ssk); struct sock *sk = (struct sock *)msk; @@ -945,22 +946,34 @@ static void mptcp_pm_subflows_chk_stale(const struct mptcp_sock *msk, struct soc } } -void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) +void mptcp_pm_chk_stale(const struct mptcp_sock *msk) { - struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk); - u32 rcv_tstamp = READ_ONCE(tcp_sk(ssk)->rcv_tstamp); - - /* keep track of rtx periods with no progress */ - if (!subflow->stale_count) { - subflow->stale_rcv_tstamp = rcv_tstamp; - subflow->stale_count++; - } else if (subflow->stale_rcv_tstamp == rcv_tstamp) { - if (subflow->stale_count < U8_MAX) + struct mptcp_subflow_context *subflow; + + mptcp_for_each_subflow(msk, subflow) { + struct sock *ssk = mptcp_subflow_tcp_sock(subflow); + u32 rcv_tstamp; + + if (!__mptcp_subflow_active(subflow)) + continue; + + /* No data outstanding at TCP level? not stale */ + if (tcp_rtx_and_write_queues_empty(ssk)) + continue; + + /* keep track of rtx periods with no progress */ + rcv_tstamp = READ_ONCE(tcp_sk(ssk)->rcv_tstamp); + if (!subflow->stale_count) { + subflow->stale_rcv_tstamp = rcv_tstamp; subflow->stale_count++; - mptcp_pm_subflows_chk_stale(msk, ssk); - } else { - subflow->stale_count = 0; - mptcp_subflow_set_active(subflow); + } else if (subflow->stale_rcv_tstamp == rcv_tstamp) { + if (subflow->stale_count < U8_MAX) + subflow->stale_count++; + mptcp_pm_subflow_chk_stale(msk, ssk); + } else { + subflow->stale_count = 0; + mptcp_subflow_set_active(subflow); + } } } diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 8c17857bbbcf..838b18bc19c9 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2291,7 +2291,6 @@ struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) /* still data outstanding at TCP level? skip this */ if (!tcp_rtx_and_write_queues_empty(ssk)) { - mptcp_pm_subflow_chk_stale(msk, ssk); min_stale_count = min_t(int, min_stale_count, subflow->stale_count); continue; } @@ -2646,9 +2645,10 @@ static void __mptcp_retrans(struct sock *sk) struct mptcp_data_frag *dfrag; int err, len; + mptcp_pm_chk_stale(msk); + 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) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 22804ae2e85a..efddbb1920e6 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -530,12 +530,11 @@ struct mptcp_subflow_context { send_infinite_map : 1, remote_key_valid : 1, /* received the peer key from */ disposable : 1, /* ctx can be free at ulp release time */ - stale : 1, /* unable to snd/rcv data, do not use for xmit */ valid_csum_seen : 1, /* at least one csum validated */ is_mptfo : 1, /* subflow is doing TFO */ close_event_done : 1, /* has done the post-closed part */ mpc_drop : 1, /* the MPC option has been dropped in a rtx */ - __unused : 9; + __unused : 10; bool data_avail; bool scheduled; bool pm_listener; /* a listener managed by the kernel PM? */ @@ -553,7 +552,11 @@ struct mptcp_subflow_context { u8 reset_seen:1; u8 reset_transient:1; u8 reset_reason:4; - u8 stale_count; + u8 stale_count; /* Protected by the msk socket lock */ + u8 stale; /* Protected by the msk socket lock, + * if set the subflow is unable to snd/rcv + * data, the schedule should skip it + */ u32 subflow_id; @@ -1004,7 +1007,7 @@ int mptcp_pm_parse_entry(struct nlattr *attr, struct genl_info *info, bool mptcp_pm_addr_families_match(const struct sock *sk, const struct mptcp_addr_info *loc, const struct mptcp_addr_info *rem); -void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk); +void mptcp_pm_chk_stale(const struct mptcp_sock *msk); void mptcp_pm_new_connection(struct mptcp_sock *msk, const struct sock *ssk, int server_side); void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk); bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk); -- 2.56.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel