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 4EB0E803F6 for ; Mon, 16 Nov 2026 20:47:59 +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 6AGKknpl031689; Mon, 16 Nov 2026 23:46:50 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKknpl031689 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="g8Qvc1tC" 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 6AGKkmRY031685 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:48 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkmRY031685 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-4930269afdcso2732699f8f.2 for ; Mon, 16 Nov 2026 12:46:48 -0800 (PST) X-Gm-Message-State: APuU4Z+iCMJqNL4HAp2GCboC451p9qvUT5mp7pbV1FLSbYaZeWXzNYuB 5KU3SmYIauoeEqY/7JXmd08OROvDmKks94cVxZV5CiieyKmRJi+5klHcUf5Yk0mLdoUmWNIKr/G 3rRwiS2sSREjwBSrRhcTWsj69jZ38EV4u+mGT27SGE+WqDDMLx5zF0A== X-Gm-Gg: AYBFou31iuKuhvH9iKrlNpJe7dMy6zskSkiz8l8w+ws+jwanv24c+fE2iL3HSNEyspZ XFD0r/VgIaqE/e1kKTB+196W3wZNORm9ce2lh3LrT3s5Z+i7D/uW9dMPkgMB/CtqZUrtcE18mbl iFiQVKuovsefogQrqYhJOn71hahnlY1WjrLW3XV6RhieUG6Vkw/5wedo5KYEbX8yK/ynz4/AL3w DCxLimjdU59V4vCLp87zE/jZ7MLQwa2gL5rrFblBNKWGsI0fee6BPIvHc5A5BsubeebyomqAdJ9 pUXc7KWaSOCV5oGS8RCnIWA6P91NU/CJEmQChUJ3eCzGu7RnkFtceteRUFKR5k58xvr42LhmZhw SzdBcdrl0QxF5blOERfDH0ndL6A== X-Received: by 2002:a05:600c:3e1a:b0:4a2:191f:7cbd with SMTP id 5b1f17b1804b1-4bb55a3e31emr220627905e9.11.1794862008235; Mon, 16 Nov 2026 12:46:48 -0800 (PST) X-Received: by 2002:a05:600c:3e1a:b0:4a2:191f:7cbd with SMTP id 5b1f17b1804b1-4bb55a3e31emr220627655e9.11.1794862007735; Mon, 16 Nov 2026 12:46:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794862007; cv=none; d=google.com; s=arc-20260327; b=OPMV/C0k1aAEWIp3aArEGhUlWFydJgL3vzQFdx2dFkEzoGU6jB3Brex0yvzED2dFWW TOSkaZgXpJ/XiRFizWUWHYU6muP24zDy5UpTfWH+icMZ8G7RWiiIjr1xCds3QyBn0Vii kc4UDSulSoHwC1fK5b/4/SjkR+WReZu4FZNse7YSXdSwid0ZioEKhOlTacTVcHAyQRUw tm/ipEDyyZtJX9dNgCSOLdViyHYiisw6Clyjm94TVX94jtB64O+ARS+tfc5X6uY2wiuZ 0Vs95hHFOLjfUIVWhnp2RGkXr47pWHkBGUwLMw2KN3zCWh+se5AIg1Mr08l4kd7Kr27n A+0Q== 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=VvWm8BdKHChE7mS2hYXf+SUEEWmiz9rRbQnVsBnZhik=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=AD+z7b+Rb0IoGxoWktuln6qFAlcnDukksDFaIfSe0/GcBmXl8EYScdmTZHX6pqwxVh ngQ+b+sJB+txSTyabv3Q2Ax9nWJb01bIml8Q6Q2GsfyV85r6InZRDh457NE85UbySgaA R0RwOU9Oi2GRMJspACk7LzvO86Cb5TTeDSqKo/xtaFOCCjzXEdyWgCQG4ko8Cif6Q+HG KC7MkwUvd+6MkMfh5/X1vIyPAh3qG1d7ntozm8cVEX1DqxodCHZstofJho2o7Ksx2Pa6 FJ8324G6FjI4w4/QNPLAMMZYDwCSHVXYsGe5pmQpgKqv61lYoTaaxkGfsBpMqAr3YrxS kXDw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=g8Qvc1tC; 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-49d36fa7daesi19876779f8f.485.2026.11.16.12.46.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46:47 -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=g8Qvc1tC; 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=VvWm8BdKHChE7mS2hYXf+SUEEWmiz9rRbQnVsBnZhik=; b=g8Qvc1tC8MrD ZfNyLHFHJmL48AE1urPh1VUFAaKZLxTDi+E91e4tV0fHeze0qb8GnFnPOefUFC8y2nD9977IDZQFt kjQQMuWebkSQ0szXv6WFjK0wqEI8Fx1p/H76GHd5UpV3c/0V7lRudc0tizHWh53MSxDYNmPawgcuN ZSeRYDcacCx5gyP9TUhOUjs97pB32aaz2BNlDV9yorRdam+u/9FbO95o/txWdyqqic3lxLfN4Lmpf WD+1s8ESjUqzbl0dJJU6Avv3GiEZFrcUal9xPL8mS70YOt+zwWLly14duaJvVQduw3wRi06xG9pvc /5C+7EZs8W5RVdKYpgepuQ==; 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 1xT3WT-00BfjZ-0E; Mon, 16 Nov 2026 21:46:08 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:06:03 +0200 Message-ID: <20261116204557.718500-12-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 11/11] ms/mptcp: avoid pruning for OoW data 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 Pruning is expansive and destructive, do it only when we expect to accept the skb triggering the cleanup. Fixes: e468d371180d ("mptcp: implemented OoO queue pruning") Cc: stable@vger.kernel.org Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260908-net-mptcp-misc-fixes-7-3-rc1-v2-15-df1de70348b6@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit f01b8275745efe611284f6c3628099a81a421f0d) https://virtuozzo.atlassian.net/browse/VSTOR-153491 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index caa560d0d460..07bfb443450e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -227,12 +227,6 @@ static void mptcp_data_queue_ofo(struct mptcp_sock *msk, struct sk_buff *skb) u64 seq, end_seq, max_seq; struct sk_buff *skb1; - if (!mptcp_try_rmem_schedule(sk, skb)) { - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED); - mptcp_drop(sk, skb); - return; - } - seq = MPTCP_SKB_CB(skb)->map_seq; end_seq = MPTCP_SKB_CB(skb)->end_seq; max_seq = atomic64_read(&msk->rcv_wnd_sent); @@ -249,6 +243,12 @@ static void mptcp_data_queue_ofo(struct mptcp_sock *msk, struct sk_buff *skb) return; } + if (!mptcp_try_rmem_schedule(sk, skb)) { + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED); + mptcp_drop(sk, skb); + return; + } + p = &msk->out_of_order_queue.rb_node; MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOQUEUE); if (RB_EMPTY_ROOT(&msk->out_of_order_queue)) { -- 2.56.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel