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 365CA803F6 for ; Mon, 16 Nov 2026 20:48:02 +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 6AGKkp3u031700; Mon, 16 Nov 2026 23:46:52 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKkp3u031700 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="RIW+22kQ" 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 6AGKko2x031692 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:50 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKko2x031692 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-4a339a24cd1so212547f8f.0 for ; Mon, 16 Nov 2026 12:46:50 -0800 (PST) X-Gm-Message-State: APuU4Z+REEHYqdWQyoRIriDigChIwt0gvh7IWcaVmt8iyiUnJrIFcbaP 4J0kXaNYiWSLXbVD/6vYKCMwhomwi+CZ7RxryGVzuO2Ofk1Fdo//onbnys6M/sMted9dZ/PE6pM QqNcmuWwFgHOO7acOqE/kjep6uhvExZtzoeRiBUHO5rSa2mvzbVWNJA== X-Gm-Gg: AZFdTZe6V+1RXj9rKy02429YyMvXKloh3DKwdXcZ0w/DTIwCUrW3zw4BB9MTof4GdN4 fF5c15lJC6ZyWSNvApmNH9AK0CnosgfpkYFyPqBBbRezQ7c6/a6bI0mWfycKAJngpKRDRooqNhL HnBCURa4sfLdfRm6tzwZFIUDoN9+Vqc8L3Vp3CAzJggjG5obA8PDaGszfsTQRdHJ+eslKXgJHit OfCfZ05GBWmetVKckhDDDbY6KAyeZjZnrngMCxRmpw0N3ihyCT5f/AS5RzHxVdFdkCTbH9/hIkP Jcmu9oK1QQerHGm4DdV2ptsI79SKgNih4Rp96KxYoUuZg2SlGnC092hKTI485zl1Ok+CaGRm/2J dlkfOWhK+PMsL17zyemBf95xM X-Received: by 2002:a05:6000:4b02:b0:48c:7386:af18 with SMTP id ffacd0b85a97d-49c6dbfff8fmr23753747f8f.8.1794862009951; Mon, 16 Nov 2026 12:46:49 -0800 (PST) X-Received: by 2002:a05:6000:4b02:b0:48c:7386:af18 with SMTP id ffacd0b85a97d-49c6dbfff8fmr23753729f8f.8.1794862009508; Mon, 16 Nov 2026 12:46:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794862009; cv=none; d=google.com; s=arc-20260327; b=fDWtCVGMlDau7PumSLQNgz+hIfxnFYIoCx4a0mqz+PjOnS0GlnR5flxUAzdm/cg72J N/0r/kwWT+1z6N9QJQBPDWFA4n1B5K6EQeTocvM8qtd6BmOeKu5gkWvhANcDv5XS901J NbisRV2x/wB2r1BOevn2HfbKdiRigQaS87CDSfcuhdS0QLjfGplcSY/UkfVveuYKTXJ4 5bV59q9xfNoznfDXZYzpEnEoteUkUOhXMEbD6KBrq/XphEpFxiK+36iSVsdWRCLjmj7f xsIlK30nlI1dhLXud6PtU8q+5yxYcr4mP4c89d3e9M85O3/mQEnCf+YEEQomVYTOw2wi ScDA== 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=BCrwLChFvYg2/4x8PXa/lLNBxWk4RYK8oXsAzK7DbNo=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=Bi4fbTv0wdxMlvKS8l4OwPuDYifGo0o7jwkhkxj+dEkB/LZ6SM+JORI8R9Iq1j2hz6 D3AsyME4oGRpmGm2KJG5UMEUil7FgF7cw+c1LT7BP0VmlZH4gzXTqTD9wk4ciyOR4J/E wquU/t7B32LoZYN7MsuCmOhBYDoyJUCr86aX6suuLrdLCDJs+WAuhZTIgC+5J/xYMVhT Tw3EKHfs7zhnIA7cv9XnX6cc5i7lSmOPIYrSTZBHCAB7ZVOqbg1WTxuM8RL8hp1XqcBC /Hh+cAf7AfWuFoXQ0IncbYO8chA8zSRknNm1LZhKaPcq4y2fhbxWF9wRo99OLCc2YjnM NPmA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=RIW+22kQ; 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-49c64455e16si24373158f8f.307.2026.11.16.12.46.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46:49 -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=RIW+22kQ; 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=BCrwLChFvYg2/4x8PXa/lLNBxWk4RYK8oXsAzK7DbNo=; b=RIW+22kQUJif aX0L0YtuhYuZmBUTMTpBvZ7CwOEstOonVMABiXBa1/fbuWSKlGHh6Abl7gJH7iDlnoNJpz8o/b3h9 ja6IEBAXAup2lLIaln38nctDKEh0LYCdqvvYVItDJn+9bvUj1WD+WyrtwJBWRsCJiPczz8X5XGl6W AX5oXSdYle6J3TIFrhAFI21OnB2L9dTaYrRcT/Hm4gwsvZoaDaXVrX9VqYig77fkDQM4Ph6stuew7 wq6ti1b7ymAjd2DItm82D30Jw2mo7xTI3rtSZF/ayc9wC3aDsOfLii5mwlyOD5aQRZwxM3GyDLtK3 jMp2g8mWX1vk5kLszLELUw==; 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 1xT3WR-00BfjZ-23; Mon, 16 Nov 2026 21:46:06 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:06:02 +0200 Message-ID: <20261116204557.718500-11-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 10/11] ms/mptcp: being below memory limit is a likely() condition 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 The current compiler hint annotation is wrong, due to inverted logic in the previous revision of the relevant code. 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-14-df1de70348b6@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit a4257a91af7a77a8347d33413ec9e54106f7ff48) https://virtuozzo.atlassian.net/browse/VSTOR-153491 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4fe666ed9d27..caa560d0d460 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -203,8 +203,8 @@ static void mptcp_prune_ofo_queue(struct sock *sk, */ static bool mptcp_can_ingest(const struct sock *sk) { - return unlikely(sk_rmem_alloc_get(sk) <= READ_ONCE(sk->sk_rcvbuf)) || - __mptcp_check_fallback(mptcp_sk(sk)); + return likely(sk_rmem_alloc_get(sk) <= READ_ONCE(sk->sk_rcvbuf)) || + __mptcp_check_fallback(mptcp_sk(sk)); } static bool mptcp_try_rmem_schedule(struct sock *sk, const struct sk_buff *skb) -- 2.56.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel