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 04326803F7 for ; Mon, 16 Nov 2026 03:53:33 +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 6AG3qK4f019264; Mon, 16 Nov 2026 06:52:21 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qK4f019264 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="luozjWWt" 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 6AG3qBlj019212 (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 6AG3qBlj019212 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-4916d47eeb5so2754213f8f.1 for ; Sun, 15 Nov 2026 19:52:11 -0800 (PST) X-Gm-Message-State: APuU4Z9Y04ZIGnycbmAtntRl9XjtL7wn6+oMXiwkvLQi9wQBHha5mjbZ MblGKF6loR7x28AroS3d4nOIILhxLKVq/LLrXYa59TK6wOR4C6Mb0OwnKAVv2W+iE5LPMGeZYrK 5CpmaWuwerR+CsIyIGP+FQl43cevNyOLV2cL9Rw6XvlpCJpbKsj99tg== X-Gm-Gg: AYBFou1atHO/gnu9mjXlWc7NAQ83Wz4NyJ67ur6KvR/VAOxvKvgms0yPPU3CyaMO2wj 3Zul2e8BTNXr395LpBCy7jygoudx5aS3btqkoGOr+b3gsMs8KEp8GIK5TkpEY/PNN8N92WuYV/3 enmIdj+VDb7F2ZHVXuxfB0w80OyzQvMGxQrzfE88OXlCJM6Q3p/RXojNw4wNFgnunJ9uzDWxekS w9nVmqD3XflInYzdTUs03CO5xEVssfENuj3KvBnxc4saJ+PzAblyqsDUNrKe6nEX5Vz4Wo4NS+S 0IHgOoyhnmgztP3R4j7xyNR3HCfPyOQ+bRY+jVnYDBFzUubaSjEg+jjOKjdfrD5CLP+XQuIR6GE eQNJ0zgELHJ7hqenxvZa8Ve1MDg== X-Received: by 2002:a05:6000:2084:b0:498:be72:6371 with SMTP id ffacd0b85a97d-49c713aa624mr20918877f8f.21.1794801131022; Sun, 15 Nov 2026 19:52:11 -0800 (PST) X-Received: by 2002:a05:6000:2084:b0:498:be72:6371 with SMTP id ffacd0b85a97d-49c713aa624mr20918857f8f.21.1794801130530; 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=P2zg4kgy8MoK3lNqDQJUJZzLPYGt79MSK+JrNtRxNNEVdF0bIBoKm/cBtdkDz/nisJ qz+1GY5t/nuxSbIoPUxtxnC9YJepGaZb0ym5V7oTNqAsqDNN+PRorAX0qEnnvIkIAPF1 kevwBq6HV5sPZt1ifC6L9oFhK9P1+AkKK6tMYprBteLOIaAzHOaVtEtZpwSkMXxSNoH5 8o3g7f10JWVpFvI/cjHJzXL0OqFzAKaceijz9wJIShz5GtltF9hRGbadySGarsQAkvNz ihx+ja7MmSm/oVjsBnjnLEPDrHrGiUvUEeEJ87Z/o9qIfumdaftANokmZr+v/HyZKH+m w3jw== 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=hXYyB8nHmk6FgBXtJDiH9V7g5RZ22v2iA35QTwC9RtA=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=hIqIlPfobeFqT9Ka585XikszlcYuDcylOIhXdiPdap1jyPMtTLC9qKkvc3Kl/v7vuC a61mpKi4qgqRCoYRgQu6FdHa4AYNAV/c2ayhD+qYBU/MHKjV4XLE1zgUfa/tWzEzD89k eYbcGAjWJE25YoGlcjsBDnh1CK1pGwUROkmNbyFBTVDtg7Qcm2JjlE6VvipnVBj/rZP0 i/Zim2wwGdJj3D4JjGdTg6oMtThWpSoem02Qd9L2+pFOttruo8gq7LU2ks7vHqPoOQ8V 8P7Un9qCMkc7b1MXcvvhWAq7Co4xuST5j/F/aTLLi9oRxNW8w2QBmcBk2Ais5Z5EjgmD y/Kg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=luozjWWt; 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-49c63122404si19567162f8f.98.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=luozjWWt; 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=hXYyB8nHmk6FgBXtJDiH9V7g5RZ22v2iA35QTwC9RtA=; b=luozjWWtX8Ia +jKRWG/a+CdBVI0wvCPvhKE6itwOvmnQ7ylva2px7IgL5GUYvFz2K1eFJYqaPSoZgvc8gQ+tvQE7e yPkVRBWC5Jt9MhyB1kR7VuhqIDgoYEtiQJ5+rdsj5xPChk4zcLD+FO06l7gy4tIu2oEIsz8b13Yuj oszJoK3wn8242e/+u9gLSvrgBiDWHfJ3xvkBitQtpd8zGdwerd21LsWH37eKhCIYNU9lgxT1WmreI iq9b6+d6b3fpMkxY05qA8pLYwFRZfw2SXkJZOY9/txmQKAFHGNJE03G72n+3nNA+9Cg1ChkQIhXkl +NjkDQWBdgfMu/Gu/6LbjA==; 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-2k; Mon, 16 Nov 2026 04:52:02 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 05:49:10 +0200 Message-ID: <20261116035204.564416-4-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 03/10] 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.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel