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 1DD7180E7E for ; Fri, 6 Nov 2026 03:04: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 6A633Zgq012790; Fri, 6 Nov 2026 06:03:35 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A633Zgq012790 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="He2jMQpF" Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6A633AAZ012719 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Fri, 6 Nov 2026 06:03:10 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A633AAZ012719 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-4903fc8537aso141411f8f.0 for ; Thu, 05 Nov 2026 19:03:10 -0800 (PST) X-Gm-Message-State: APuU4Z9fMep/q1NuMXHwpS2bBHDLVDExaCeaIuqmjcIWKjI4OvqT8z97 XKQ/CM5AIHAFs6py8Sz82xH2Gn2T7JEMC5fHvRmX7RRVnMaHWClcCazCDgeyQFyK0hkhBhEbo9d dLJH2FbUYJW55d8hi+YC8Gsq+YOFUXRQvFFd26KAB3N3Rvhu826B/cQ== X-Gm-Gg: AYBFou1qDAdFcfmOUbAv+RY0vGAM1S3AV43WzjW7vaxfbWmIomHwgX/f1jP/+YAmI5m zj9iqKxnPF1glzQTxd1A5OaoaFFPokC4B+RVkt8v/hfm5Omud8C+mYpwu2ZgiAB/7PEg/J/5vjI ZmEJQx0XF+vinoMWtRlOFHAxyzr1l4vLOItXziOvUSvw/6ATfXi6xAmzjnFOq2SeBityPU3OHSy gJX+ia+HNGG5/B23Kw9U2Fw/VMd7+gySzvgDrP4iE4O2e1KMCg1WlwN69/i4fcjoFJ/ox4pQSAI 8iWSBoCzENcZw8K3L/NE8bWKCIB34R0o8/+Iuxqka0ckQ/mXv8hfUk4pF7hQhUjfMM4YdO5bNOO t3Jw5Z75wKy2wXd2aJ2j6iaOHdQ== X-Received: by 2002:a05:6000:22c1:b0:491:7ede:60e5 with SMTP id ffacd0b85a97d-492762c5224mr2488070f8f.20.1793934190390; Thu, 05 Nov 2026 19:03:10 -0800 (PST) X-Received: by 2002:a05:6000:22c1:b0:491:7ede:60e5 with SMTP id ffacd0b85a97d-492762c5224mr2488048f8f.20.1793934189890; Thu, 05 Nov 2026 19:03:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1793934189; cv=none; d=google.com; s=arc-20260327; b=YaEE3JjDdeoXBB7K5GVgMZVPorwnPRPhonNXOX64hh7/mmfN8pflw/xuIoRmReSbfK oN7+nnLFUqcrT58EfmJGyaW5fhQK1EmEkWjU7PUFqB4DpC38QheHs4dhDjmojGPp+J+L he4EzkluKN6FBuylN+Itm0Uul8zj1XQ2iddDHXqQj3WEj6powRJUd/NMf8dGwlKgd8T/ LsLOs2eQIKrwLyRRdC6stahl8I+bDjumEAxvcFQtL3FNxWkOA3DsI/DvFHTQ2SRYw1Eu 7HovTMfQxUI2nc4WnZFZGxu9yS264YX7fFhQ0FxtbDZtKngWe77xEOytuCSLrdCJxNMs LmxQ== 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=G9fbDc/eA2+c3LG82C0QzYFYPhfsoc/rfIYySjUMrxl3j8MjxQWsIoZN2QZmRK8K0G Yuw8ihZPrCYw5JUIAHu7Sg8nlW29N/dlaUt5TD2LpkSWagTMhqbs7Sly12quroBZBr49 QwdTs/jBr16169AvH3M4oKJWmyoZEK4X98yoI9SuHgIrsHmYUw84xfDblLxi7W8y21td iyf3SrM2iC3RtOgymlXoIOZbBJhUO8Fvi/nCfeN39d4jJ92i0AIcbYoQXE4RYYHQqvk7 Stfo5aNzcEkxe9pzCdLI4HtDhQUCgmsJ9uIR/ha3uuRQSJAUucZZGbbgGA1v3owY/oCy 0QYQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=He2jMQpF; 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-492d79e4065si967863f8f.310.2026.11.05.19.03.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2026 19:03:09 -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=He2jMQpF; 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=He2jMQpForMi rQB5gOxxdjzK3GtyVq9oUtdnp94BFMAwoNtnwmkzjEKE5Zfw69nC216MsOcA3xBRqRDrOLJ2VfWyo yONDUO2R54/CpSpKHphB4baJHMOGDntp0D1KB7Mos/5oAc3w04+zWS2qvwn6E7LJeFpPOy7kpCJ7U tBg6lvsIKzVc4rkj5sOi+ZwasVLzpheqml8h1dlhGPiYI/fh4QYI2BbdwirSt8rhgnxLuWyakv3rG ObiE4No5QiCrS1ZmVPOIAjlMkDZfi0xwaghO1qVxYcWVpWXdfp2spdnF9VVzaxTMlKB0NMDzlfBDJ RzvYok2tGCk99VmSDPsixA==; 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-1S; Fri, 06 Nov 2026 04:03:06 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Fri, 6 Nov 2026 05:02:15 +0200 Message-ID: <20261106030306.16014-8-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 7/8] 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