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 1BBF7803BB for ; Mon, 16 Nov 2026 03:53:48 +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 6AG3qacA019306; Mon, 16 Nov 2026 06:52:36 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qacA019306 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="olq9yXTK" Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AG3qCEZ019238 (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 6AG3qCEZ019238 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4a70b42bab0so8622985e9.1 for ; Sun, 15 Nov 2026 19:52:12 -0800 (PST) X-Gm-Message-State: APuU4Z+8hhk8qrynsWjdGs/n2u/9sbZ6PVnScgnzc92EQl+gpvDnXUXe NF12jGWPc5YWbCvW3KM/GZhNRILt40uDteNB1aeCphdm15CbmBda7O5ctQvyrzZ9OOz52gVylBJ aZP5+udyRCk8wCygyQiEfWmlZoyc3FKy83GC/bAYSXlqBAFD0iPumoQ== X-Gm-Gg: AYBFou1el6Yy3vjpq2r4K4C/M2hYfqkw5w6q0++1qtvF6gMmplOhAi4Xf0w48Ki7EOk dy7Lpqw8r330LZAJj8Q9GRhoN1c0T9zAOPLH8Gyewdnbr1numTB85kV4JwDtDn/E/U/2lsVN9Yl dSUHS/N24rUcOC6DZdN2Cd14tWrk+zNCToci4JcneMjv31U8YmMvt2AZQPqhsx/KTnXfVwSgznd rLQ6nKIEeba7LVGdT5jvgYfrUzjzWE56z53ZSZeRkmBoco5DJYmOKfdFiLsmaVIFylHQgeYtpcm 0fckO6U2YtWB/16q0f2wQP+F6R4jT15y6MI5WKvLsPZ1w5S4PzXLSCc0M3VsuazI3RhmQBpeFAl H+MHOFdTVrI+rkbl9VxO+uwIU X-Received: by 2002:a05:600c:55c7:b0:4a1:88df:8a2a with SMTP id 5b1f17b1804b1-4bb55a8d13fmr148107765e9.13.1794801132422; Sun, 15 Nov 2026 19:52:12 -0800 (PST) X-Received: by 2002:a05:600c:55c7:b0:4a1:88df:8a2a with SMTP id 5b1f17b1804b1-4bb55a8d13fmr148107685e9.13.1794801132006; Sun, 15 Nov 2026 19:52:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794801132; cv=none; d=google.com; s=arc-20260327; b=KGZi2lO5MRp5eoQ4WdsOcVtkm6bP3XfDqac4KOh7B0vavt7r6/SWIKmznoNkniAbSr IxI3kvxa5SVdbBGUkFvUjaqPpjs8ZHx75TJvEZ01WMjM0waYnfq4iiqVkYyNuhTMlkA5 MAkaYRxi6PNhWhC04YL2jfIesftunKuyntWpnV2aFWSxuSQ1CzgV2Szh3/9hCL4KhV1C K16JW5xCzFviD40BVZ3tNwRTxIGXcWz/qZqJ1JPq6EGlReqOm4MNuYR4ZFBHQyngV9lb uzIU3Zw9nTsEGV5o/Qj3GM5xwY+mozA1i2yz+WQv154XjzpFRgmxngJEqMzwKzfudYdP lpOw== 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=DWgfFlOlxG151XaiqAUCzUwmS8yZ8woIiNpi2Rf0vf8=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=mYGpqRH6uSPvD7lxXgf0WK9iIAtwDu4DKRhM2/Gk0l5HKrv8rxo6/5Qmq7nHXUFMQ2 m/o1R3GeiZgKtmrmGAxQPz/Lv8N4iBFe+/3wXNhuv4mcus2xpjUODdQVAuWggg9zqueM 6KNx5Sh2om5A4hxzDNQz1n5I26lQKr7whCVH8fgvHM0KtWRx07imvIr+2yhT5hPvbj4A J1S4MaKyOxG+oxFsEA8pJlOAr0eq6uOnBsKmz1ekie+x9GPFKfIFKdjOTBXxz3ukfKa0 UH4MEpi/hrGaJuNcrLjszsAO+rtLzCFzUx2ZFplDk+jiXGLEsYNBxx91qVonEewwVIeO jHmg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=olq9yXTK; 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-49c739106e5si19798332f8f.302.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=olq9yXTK; 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=DWgfFlOlxG151XaiqAUCzUwmS8yZ8woIiNpi2Rf0vf8=; b=olq9yXTKPPY5 7HwQZyQs0RBsoHALwYd9chnPnTfhBNi3UtLtjlrTqxZ9LqNUBkQDZctSCTC2SxUUj2CkSP9BNs1/K QgzaKJTENfM+wOTa6gBy275u87jNHVHRSo0GFrYVN/zFo2TPS4RSspc2uFunu0oSWTJB/rFJO55St UCYh91aRpO60PZV9nm/9H/54N40kc8oA1Bqp8psCZ92AeEb96ZQ1uf0uB0pPLdhmVsDKD0epISSYg UxIUyYRSczun5EWMx1ypHkWp/gorivlWAhxJIhZ6IEoS7ykp8qpBjzPYOLY1IAHWlIXhBhSJoKqon Qc45l4tVZ+BxlOrt0WdyqA==; 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-14; Mon, 16 Nov 2026 04:52:04 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 05:49:16 +0200 Message-ID: <20261116035204.564416-10-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 09/10] 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 3b02a63ad1a9..b5aab32a970a 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.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel