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 1C023803BB for ; Mon, 16 Nov 2026 03:53:41 +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 6AG3qVlx019292; Mon, 16 Nov 2026 06:52:31 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qVlx019292 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="r8P44T6A" 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 6AG3qCEY019231 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 06:52:12 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qCEY019231 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-4916d47eeb5so2754224f8f.1 for ; Sun, 15 Nov 2026 19:52:12 -0800 (PST) X-Gm-Message-State: APuU4Z+oSqrtkCE7/3ByAoYcIOId0wmvgrmDPoROLZzLQfIYLKFRgNAO ZkuRCKIHG9+LFYWibmZF62rzMglw7DI7+BajQ2ssMnjcwS64NEAxOMI6TSzvnM2tJ76EIWUbwzx qO7ollgztuO+q5CxydeHHTOvmSDBhWNFCmOkWfkK8X+z+5XOZxPsOSQ== X-Gm-Gg: AYBFou3UGPYBN2gjgXlv+W0CJouIwU9KKZ8cBxhWKtAwdcXEI/KxysfDh1mGTcIkK0q P7PoJkddoZpuq0H9X5zI7Mg9CYSJBNbo4gYRXKICV7D8ZwFWKpdVuYAEqTNfQhX54fkd8/uq9t3 U+515RTZHT/i5Q1/SsqH8dlMuZ5R7VLmVQDaEX0ZEV1SolFzKq8R2gwbetiHWzlCXMgDdDp0EZr rhZ5OpqzxDHfkUB5d+gEpxbr0enafif0PTD5PUj+z+hQhPAcGesaoyrwYwPrqFk2PyFe8j5lhQC gecQK4OhtyWcTdrFMEYva8N/ztXLbwF3+yJZrYqzG4xD3EEioXATfb4S2TCOAYhQvxf1gMVtH+m yZVCnYMtWgFq3fy35DBCO8PvG X-Received: by 2002:a05:6000:186f:b0:48e:4561:8a17 with SMTP id ffacd0b85a97d-49c70de3819mr21819005f8f.16.1794801131994; Sun, 15 Nov 2026 19:52:11 -0800 (PST) X-Received: by 2002:a05:6000:186f:b0:48e:4561:8a17 with SMTP id ffacd0b85a97d-49c70de3819mr21818981f8f.16.1794801131535; Sun, 15 Nov 2026 19:52:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794801131; cv=none; d=google.com; s=arc-20260327; b=gbjDc5hrRnHfvnWAbM0zqfYvaPo8Uq87KE7yDi8FRRoz2lQE9P7jcYsSmXEh+TzCRF opv99AQw6wEI1t4Y2dHNAUPDXOhozw+KH9/oKrBy+XWXJrajQ5ri+JnMPm9CdB6DaiKo MV1PMecIBP+yev9x9EcpPJhBPAb9FaaU1RkSYEx5gLVZPbpKtx+yWzMd591/q4wyrXAR JGAFkNQ2KYTcfp5ECNVkkShnQmeSFOrmO0YiNyuRxqrDXAzs7BdgkFVMl7Jv2bO1CEsJ z1UmMPjZg5sljJxLFa4l2KuGQF3esRMbwEfk2BNS/DfZJ0boSnjEydVlRGgjGT9RiaDQ VrOA== 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=u1nzAfmLShJIQj5+R/km/PFe2KFIAWbsO1p4duPrrHo=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=UqFQBqvLsWJBgMQAnn9rU+akLFr+e6rvfH2DG4GqcAe4UdRvmNnwFgUplE4Kt+xAaz AoNAFdeIJCj+BeGiYp3z6vLsAmHHhD+TvddNPUejYHMC7Jmi/leQ00gnTrKCxDVRkVzE zTcYps16zH32n1U6y2m214MPHWGvvT1pWBGUOKiq2bC0iduOuJa2YzgUvMyBRMMbpsXM XJE01hkZA3MG5zPtDdgkgoY6Vq6410UmIgigbRoYydeMN7tF9WSUQ4J2D4ahS/DtYhRQ +4v/DmVDQ9CCaFQM81QOUmbNcC/9FB2TcRmAAV6kJbr8SKgAecgLwn+v4h16LMrD4eM5 a09Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=r8P44T6A; 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-49c644560e3si18273130f8f.322.2026.11.15.19.52.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 19:52:11 -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=r8P44T6A; 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=u1nzAfmLShJIQj5+R/km/PFe2KFIAWbsO1p4duPrrHo=; b=r8P44T6AS8Qe boFUxLGWWdnY+h+hiX1oux3vAirw80t5T33e30cgMYofO2r/HwDwBWU6B8FAzDbDKeip6clle2YYv UTrZqBbcaNqFWw0JghLBmdoxLRLWtr/CVm2cg+59blLrXYY8VWMjuH/hL9TNk4XhFDnobgwCG300I HqU4L/STEzHFwDUJZNMhmp5+nYCfPb9NlghaxJd/hoz7HPUGDZcf/Uh2M65d4DGbB9QwO2/jLJaJU IG2uEQ8cRaAB0kaurY3qnq3Q0fCS9bzWQ4tCCEhLHDmJsv2G8LulMmXObaiS+ojtMj2eTFILRcm0V PmSPh+xl5pF17qN0p3yv2Q==; 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 1xSnh6-00A3ol-2j; Mon, 16 Nov 2026 04:52:03 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 05:49:14 +0200 Message-ID: <20261116035204.564416-8-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 07/10] 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 2dcce47a1ef7..6e8779646d17 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.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel