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 1AC0A81299 for ; Fri, 6 Nov 2026 03:04:52 +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 6A633caR012797; Fri, 6 Nov 2026 06:03:39 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A633caR012797 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="bKpR4LoP" 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 6A633AK4012723 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Fri, 6 Nov 2026 06:03:11 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A633AK4012723 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-48e29c25101so86972f8f.3 for ; Thu, 05 Nov 2026 19:03:11 -0800 (PST) X-Gm-Message-State: APuU4Z/qUdmu++Qk0o/WbB1KOxU5NkRlyzdaqQDy00LmdlwYQaCXnpof 094fdsa8263VS0bBAuTqKzxacNsqTK6u+bKFLH24CG/zuVFcIZUS0pSC8SGbSW1xjTw43ZGlDum x826Xp0ti0x6sXte/oPKtI9uOf8TmzVInavUs7QHT6lST7pyU9hP64w== X-Gm-Gg: AYBFou2ChebJBiKa4ouSar5y3QQpknD0QDiZyQF31Q8HYO2NnRjre6gJ5V+lX6u2RRE oDhOf6YxgbXY5DGo3+Zlo/72aCTZR+ZKzJlJmHuQfO1BNSmotQVs2NkhHFwMnX7uqcI6yxRDEbE HeRf53UngV1y1MZHSSwc+PskYmmQRBAXpCllf+5tbLvt0MjAAumVkf9/5GkJWibAmefduE5lNy2 DJNImp2lvTM+s0PiICxeZP2z5x6/G7RFyIqsbvQMUf3Tuy/2fo9x4geswme0Wf5pnElGISZXVk4 DiPkBEFTSlVrYjKVADcQ7MmQsm4g7Nw4csvDDM/5fjpHKpP5wg1Y0jJHf6DpFtu+3Gs3yL5Gcg1 Wcq1zA6hNxwWQTIc1dj2c/ECIag== X-Received: by 2002:a05:6000:420d:b0:492:b5e9:4916 with SMTP id ffacd0b85a97d-492b5e9499emr1132210f8f.24.1793934190644; Thu, 05 Nov 2026 19:03:10 -0800 (PST) X-Received: by 2002:a05:6000:420d:b0:492:b5e9:4916 with SMTP id ffacd0b85a97d-492b5e9499emr1132181f8f.24.1793934190147; Thu, 05 Nov 2026 19:03:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1793934190; cv=none; d=google.com; s=arc-20260327; b=YAFBwxSh4DY3ugWQYkxrXEW/pLOQ55Xt1D5y+fXHInLCnN5iItAceeoThPqBDiZDxa XFHZyOscyoNAASn2TR+UEyzuPl6iL894cz7owj+HRFX8T3akNc1Wk0MiSxnKZTnJj9qM 7wad7NvIcu4X7PfOY5e1g/XYBJd0Yw0+6wnoc05u5z2ae2m0Ou4XpCZbhyn3ytLLOeoz ppmYBy2kJrdiCTYK8nxsjMoHt9E0mTL+aIJAIAaXLGJAzbBUQfI0kjmdNCyKBZR2naTL KTdGfalkdQ9U69XgEyUr8hdFekC1qjzMDan6E8YJKxUzluPaSWuDWulzF0qpER0+J1Br vLng== 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=ebpaxFW7UtSo96YxqOkYiAa6t2atOnTpR1ghPmFuPuA=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=lSFIEHvhsbp4RHexK93TSD4S4qmMI0bIfOcgIFI43hQsXfR9FdhQzo+vjZI0xQE+jZ bmeY8s5+cp4lc06TVacCWEU03jXyrchSZ7FRvtdR5yZIU/YvsYr3Ch4LoGpLgK/SD1QK QVSFcb0CnCrw3IVV6/KcQ8YBmcWVE0QEO9Gxf3sEXsXR35PB7VvZ6X9bb+3uU5jhN2KH 67i04K7G1gcM8tyo4qbagyYt9gjH7kHkEClmbILVlW9r+UyDh7fBlb2ZrggiBNTYhbGT HnHCQcJgDK8QTw954WXNrrMEpCTPR8jTKMUH15s4uPM6kDfrg2aKbR+gkOwNHtfRfW3V 4NNg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=bKpR4LoP; 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-492d7ad95a1si1125619f8f.309.2026.11.05.19.03.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2026 19:03: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=bKpR4LoP; 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=ebpaxFW7UtSo96YxqOkYiAa6t2atOnTpR1ghPmFuPuA=; b=bKpR4LoP0Ugd jNVoYm3mREMyCl90upTeAv0yu1TcjnkCe05NK3GNgb3vNt/UKybusSPWwhOWLLC7GABMslHonvRv3 7or7hwHWGTYRCu6rpsgMfN8nqYqUuBkNVVRqqG1b7cN0dNDf7B/UQjvhy5G6zJ+PlhjJaJ9zB71wZ eNzuwfSx/l9KM1gmNgH5AfL7Yvm1tUlSi4Hp9njnnr6Jb9CXLJy1LnfFe5i7e5jJG2rSYlpdcSlh2 y3U/U5qNAtDf+xeQhm1uyjvGEon9IpbbsS3F65HWIKbnT/Qo37YcHBh5I/s9fZ4yTF90nTGZIATjI tuforZnXFFdBgJg7VqB7Wg==; 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 1xPAAQ-00Gfia-2F; Fri, 06 Nov 2026 04:03:06 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Fri, 6 Nov 2026 05:02:16 +0200 Message-ID: <20261106030306.16014-9-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261106030306.16014-1-eva.kurchatova@virtuozzo.com> References: <20261106030306.16014-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 8/8] 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 b5aab32a970a..26e0d2c5020b 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.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel