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 DECDE8017D for ; Mon, 16 Nov 2026 20:47:42 +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 6AGKkVLj031665; Mon, 16 Nov 2026 23:46:32 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkVLj031665 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="djef+4Mx" 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 6AGKkEId031606 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:14 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkEId031606 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-4a339a24cd1so212332f8f.0 for ; Mon, 16 Nov 2026 12:46:14 -0800 (PST) X-Gm-Message-State: APuU4Z+Gvn47EsOEquvt7eXezvnjNhHA23/0STumLgkwf79y6TUdTet0 0oYYUvJg6BArq/yZJzDlgv5UJWh+kx9XgphMhR6DxAeOYYeb6w6LsWje+oZEm502hKMNjhrYHbJ fI3e58RxP3TWnVkTjh/+AtVs6AhNmd/8Wf18G6zZBZA1OOBOlJm1L4Q== X-Gm-Gg: AZFdTZcuz2KUdroX7KqKJ7sf/AaHskcJWD9Zco6x0aFB9mWYKAPsLvrln/4RlXFEDJw v+QGFMciR3N1PsHXu/jsBxZNCOeRut6YiLvc5tOywTKFKNb1Cq9g5UCKmBbEdP6kJ0XiyTisyeP V+lskf/ixNoF4I5JDCjhR4kQJ8e7ZOL2ymX6yyaEcBi7tHft7iLV0pdqKQ41+cYHjxl5V8nJn/S GHjGXk/qf1Zs6T8TEEf3PqPBGm9TizWj/lESLPPdQdCGtk3m89YWEAPnS+v7SfjwHwB5hHwC5DL STgiq9bVqzn1ulpr3Lt9zCMdJm+Bi4G+E8Fh+jMDeqjRhbjGch3UhDBmx4D4Br/LvYdZJGkW05r mCR4JdnGqFdcAjCN/nFEhR/ZaXA== X-Received: by 2002:a05:6000:490a:b0:48e:353b:9f28 with SMTP id ffacd0b85a97d-49c6dc01369mr25056357f8f.1.1794861973818; Mon, 16 Nov 2026 12:46:13 -0800 (PST) X-Received: by 2002:a05:6000:490a:b0:48e:353b:9f28 with SMTP id ffacd0b85a97d-49c6dc01369mr25056327f8f.1.1794861973383; Mon, 16 Nov 2026 12:46:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794861973; cv=none; d=google.com; s=arc-20260327; b=Virnyt3aLcw6gGN/ZKp2EJ65mRI+sH/PgVR18WX3OZASdHu7R80QaiBpYln0rnQnWe FhIC49wr6wacQISjiJjafVY1wmrBpQ/8EtRA++SR9yFh5pqm+/Phsd99PSZDmXy3FL3d MtooUAX6L8rgUCQot2lr+FbCAdORdzmR5p0qtmIR+V0iAqNbEmvA4Xm97u9i5XJyu2PD eBvGvHkkOoFE66e4VEJte6mh8CZOOTktEZvy1rPF1+9SIBs3+S6O0Et5BtvMDl25SZ0G X+qs3YKACAX1pfqjmygWjerQsK0mZ8b5JRWZeMypRYSw4XdcYio5ELVYq4w1KK2j4TMC kugg== 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=nbFLT+iPKeMPUVkSr3lbwt0xRa7OtNUoZXWUT/67528=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=ehWbIR4kk54UaQ3EgfBWVMjX5U3KouEOwJsr3Cghx7yjNf2oxKJZG2oajM0eqREvct yQq1ZS2hg8mnnvw5veXdzN8DPDRHN5K9uj8YX7Df0yx1H45dxr7cffC0KWZYtYCUv0CZ YiSOQmAverN5iCMlKyLZ1125gmjNF+bBWC8yqrWUZdv54sTDMmQEe+zucoDmnIvPhN1m t15jXQn2gGBSfgmJXl0MQkzqb9DdcAqr7hfIKRxIUYGIS5fs5U4QRpDE1LjsFcpjVx5o 2RML4qpVN+OWEgKYKsgDTjlD+fP4g3hM5c6ckk535Pd9eY7G77e7QVkxMUJYrQP3y1av +RAQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=djef+4Mx; 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-49c63122497si24601463f8f.146.2026.11.16.12.46.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46:13 -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=djef+4Mx; 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=nbFLT+iPKeMPUVkSr3lbwt0xRa7OtNUoZXWUT/67528=; b=djef+4MxoyLV BVNKA3zla2mrBr4jKJ5GbpVT9Au/n/KYpag/5o3a92KMlx3qCMKS4JgoexwdJ3OuxmkBUQ85l+Jv9 znfaC8/jeeCtR+j/opZNgGgbH3+Kr0LEEvKHbCQXtS+z46t1TOI35uSWVjVgl5FwDK852GeD2f62S iK5sSLm9ZFjP29BaZcZFbkVGRK4pTgWN4Regw4RK8BQ9N1pFwU69tULCpbmTFqNjCzSXhb0Ro8eSi aDYNKIb+i/PIiHUFPnvoXGzyijpe2z8kDzxVoE3QIJuJrgj9Fjg5RzcHNKxFeiwH3niyb6D55eqiJ qSI39JCMJ4o5Kti4TfNoYg==; 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 1xT3WO-00BfjZ-34; Mon, 16 Nov 2026 21:46:04 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:06:00 +0200 Message-ID: <20261116204557.718500-9-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 08/11] ms/mptcp: explicitly drop over memory limits 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 enforcement of the rcvbuf constraint is implemented when moving the skbs into the msk receive or OoO queue, keeping the incoming skbs in the subflow queue when over limits. Under significant memory pressure the above can cause permanent data transfer stalls, as the skb needed to make forward progress can be stuck in a subflow queue. Over memory limits, drop the incoming skb, relying on MPTCP-level retransmissions. Note that fallback socket must perform the limit before the skb reaches the subflow-level queue, as dropping an in-sequence already acked skb would break the stream. This is not a complete fix for the stall issue, as the drop strategy needs refinements that will come in the next patches. 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-4-dbc1eb853cc3@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit e0e4d56b050597a690b4dd1c281af532469b0636) Rebase note: this tree has no MPTCP-level backlog, its receive path moves the skbs from the subflow queue straight to the msk. The drop goes into __mptcp_move_skb(), and the loops that move the skbs stop over the limits only for a fallback socket, which keeps them in the subflow queue as before. The options.c check that drops them for a fallback socket before that queue, and the BacklogDrop counter, are left out; RcvPruned is already there. https://virtuozzo.atlassian.net/browse/VSTOR-153491 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e0048bfda370..4cf70cca0158 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -286,6 +286,15 @@ static bool __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk, skb_ext_reset(skb); skb_orphan(skb); + /* Can't drop packets for fallback socket this late, or the stream + * will break. + */ + if (unlikely(sk_rmem_alloc_get(sk) > READ_ONCE(sk->sk_rcvbuf)) && + !__mptcp_check_fallback(msk)) { + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED); + goto drop; + } + /* try to fetch required memory from subflow */ if (!sk_rmem_schedule(sk, skb, skb->truesize)) { MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED); @@ -599,7 +608,8 @@ static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk, struct sk_buff *skb; bool fin; - if (sk_rmem_alloc_get(sk) > sk->sk_rcvbuf) + if (__mptcp_check_fallback(msk) && + sk_rmem_alloc_get(sk) > sk->sk_rcvbuf) break; /* try to move as much data as available */ @@ -2078,11 +2088,11 @@ static bool __mptcp_move_skbs(struct sock *sk) struct sock *ssk; bool slowpath; - /* - * As an optimization avoid traversing the subflows list - * and ev. acquiring the subflow socket lock before baling out + /* Over the limits a fallback socket leaves the data in the + * subflows, don't loop on them */ - if (sk_rmem_alloc_get(sk) > sk->sk_rcvbuf) + if (__mptcp_check_fallback(msk) && + sk_rmem_alloc_get(sk) > sk->sk_rcvbuf) break; subflow = __mptcp_first_ready_from(msk, subflow); -- 2.56.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel