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 03AD08017D for ; Mon, 16 Nov 2026 03:54:03 +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 6AG3qouk019336; Mon, 16 Nov 2026 06:52:50 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qouk019336 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="t+6T2+qN" 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 6AG3qlit019332 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 06:52:47 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qlit019332 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-48e29c25101so1169965f8f.3 for ; Sun, 15 Nov 2026 19:52:47 -0800 (PST) X-Gm-Message-State: APuU4Z/USiJTHA7d/yPTFaMUlO3HUpcDkjoqmtFBLL3HmuQdjGvh4N8H /3mApXu5a/2t/cvo6fbk/e/VAaVT+NjDkfBHh4F76xS0e3HqL6p55caeT31w2mmK8/2W8Mquzze cuUPfXBBPhtUhjhul8yto9RUc3JH3PTFW4wuSnRBdw+c7Go+nwTuctA== X-Gm-Gg: AYBFou0iX+RIpg7SAU7Ziz4KWMNYS61s6aO0TuMkVyFi6hZrvOuCwTJM/bTgo9vyzxD hadxp4xeIPmDf6Hgsh1rmvRXoicCBg9to/d0YZ5J3UrqkxFhoI28+t+t9tOQPaclyCbDFEn9qkU 2nHRaqBcnyLviXYceZ0Oey1EN9JJWzsIjiaU0Pha0X3NQfqtfRWIdfzn9ZPoPX6jgtecSpTgdUK RP5aF7o9H438uZi5AhB9MFOfrlqmx/VvuCq2JTLeRm6I5uu2H4dJxRrNlVAxhCg3irgRlUs8DN7 6D7PFUwqeCkQ8aSZ2phNi3Wj3IxZAxKzxUGUeshZoE48+3ArVieEgeE74AVmGkv9aI2uAItJ9Ba 6lXKmR6++EYjJRccXK/wwHSOn X-Received: by 2002:a05:6000:2602:b0:491:66b9:625b with SMTP id ffacd0b85a97d-49c73bf0527mr21007473f8f.31.1794801167546; Sun, 15 Nov 2026 19:52:47 -0800 (PST) X-Received: by 2002:a05:6000:2602:b0:491:66b9:625b with SMTP id ffacd0b85a97d-49c73bf0527mr21007443f8f.31.1794801167050; Sun, 15 Nov 2026 19:52:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794801167; cv=none; d=google.com; s=arc-20260327; b=S9JoZNlkg+DdTuTLLdOKn8pftpk2NbE7ZuogylXT465i5I+pj96FUrMSOLeDJDq8T8 YQc3IWOuH2rFEWD37Ory0o0+p+rtArWaFBRbz5b7YtLZbZHTmHDK4QDDYY953VaO+2T8 56pGyerRnlIJf8AQGq7j4jy2faOc8+mBfpl51wYCcs/YQ8LV3I0t0X9OZk8KKvmHKyeH 07hNQ9qEY+0x+PccIhTqLWcQBHCYHKSllbpjRiI6Dob+nUdmIrbTNKSZaaMTPqtuC2OY R22RjFYSHe/1XJzezGHEk/MJDCmqmG8hOaGzVG/yCWWNVWSTd5upMvOvutCcL4NkmXEg P6jA== 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=SfCzQOLonOnxe3sIcdnfN7V5IV+46L9PaGB+D4XcFDZAZpWuZsc6KUuNQTa8PvZ15p bKW0oSWqc4HPBaknLwncOt2x5cbSmOWZd44PZrcs9d9KZxGa2fF9V/y3DKxudCVBxzzx kV7V2rlC0x0LNLBfHoq5QodMyPbcpAPQI9bCanTeMlZ9haIoDsdw0SA5+py9ggiBxUrm UGUb0YHnoj75ySQouW+3wGN95tP//GTh8S6uh3w2Qdbq2uopTiFriycsmLrdqNqACf2t WAAjZykRHVJG7rN02LfRA/hZlNPatRMN091SrjgOPzeIX/oQ8rkLPo1crXlaQL9oavDC /pZA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=t+6T2+qN; 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-49c6312202fsi18786463f8f.138.2026.11.15.19.52.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 19:52: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=t+6T2+qN; 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=t+6T2+qNrWsb 9dJW9w/1cKHEoZfmtexz+RpZuidmoE5F+Zer4XM6Y7lldTS/lT1cxJhAYSe/MHWjD14Z7oRoGLmwX FjHGWd+8odlb9A4+tQ7T0P5NPTxJhCZFckoQlO/lB8TnpXmih62ATbFU7mLvxtJTMq7XATVe+Zpxh X2v8v5/avAcOUbGhQLyFIDYcnSkltJfSE+uctGj9IBcbjrjl5CAvd+Pn0zpX2lpXO9bE6oPPqvSsE K3hAxCZnogr83brnS7doIQSN2WBxXKX0GpilETX58egLtOr6O5G2wWOhPrieRh7D8ZT9d44PlK4yM gW+gnn19tFyidq1fE2h/5g==; 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 1xSnh7-00A3ol-1s; Mon, 16 Nov 2026 04:52:04 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 05:49:17 +0200 Message-ID: <20261116035204.564416-11-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 10/10] 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