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 CAB8E81042 for ; Sun, 1 Nov 2026 23:53:41 +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 6A1NqVF8015311; Mon, 2 Nov 2026 02:52:32 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A1NqVF8015311 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Ux0tAS0l" 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 6A1NqQ7E015282 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 2 Nov 2026 02:52:27 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A1NqQ7E015282 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-48e0461e040so1952501f8f.0 for ; Sun, 01 Nov 2026 15:52:27 -0800 (PST) X-Gm-Message-State: AFq9FYJVtzN+qXDZaCXTstUoNbyDTGHresccxvjQz2ynKxygeELbJj7d KTVkgrbKvXXREAoV/0tgvvxokdlVB9xLtdGrnOi5n10+RCCzt7gpAKijwAOmlJfYgxJRngFECIQ dHYfAOD7BmSjYmR0Km/5nslTYKwQ6VfBLMEXgd4SPsAwq1I1qaSTZkg== X-Gm-Gg: AYBFou3rpPgSPjAJH9+inAF0hnnrBtUQkAvXJkkUekKznma3x4m4OahJ+BcnVsIpTmD 73IN83iiXwp7eVCLMBb0RMFwStr4h5pLzkMp0QSdquvDqKvjziRiDnO47xYo/YX9XQx53kC6B25 IKyx9B0OnJ260QO7ieMeVH3M46WRdcO0+qPv5VBlp8Tk8Rx2MhWGVpPYA7I6pM3xpSkf8svEwHD PFGlz2FiyJW8saAuBvG8uC6DsoBwCel9e0oVZ7nhzsBmXI69ryONBmzb5cHob4NcJwEeNYyotBd Q5GJyDWC/baaCBJ790vNyno47XiDSnLZ0muxshgDYHw8XiwuzMy966LdaI4l80NawT3j5/nnH22 qQlv1cd+8Qy2eTXasn3HGL9mf/Xir X-Received: by 2002:a05:600d:e:b0:4ad:181a:4355 with SMTP id 5b1f17b1804b1-4ad181a44b6mr108309765e9.26.1793577146701; Sun, 01 Nov 2026 15:52:26 -0800 (PST) X-Received: by 2002:a05:600d:e:b0:4ad:181a:4355 with SMTP id 5b1f17b1804b1-4ad181a44b6mr108309545e9.26.1793577146211; Sun, 01 Nov 2026 15:52:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1793577146; cv=none; d=google.com; s=arc-20260327; b=Eh90XoAM/hEnS4Gt7Th2QBJhFtJUPbXIf3vFPo51IGVWrSIC/kAw67EsLtlKWCQcn1 BOaEsJrfS/8EC5cKCyWAnxYX6hcwsyzocWNIJxx0lpKAcBuP3so9lBpdhEuhVZl4fppI xO1iib3AoIQ2/L6ZH4qa7wRqErwt77IlTDULn62GCW9RGFa/srjkK/h+iNLZmAag7y8f f2lGfstwgsIzVyrQz9m4/kbD4Xbc8GHouq+Vfkm5vwq5UPP/nJlzbAweFULRuNotCcZL kJDZCqsdEftqx6mXK7ScRjbumVQdDx5INYXY+lecqQuKwTk4Uw7oWdYukATiYgcyjNkq gLVA== 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=kqd9xdEnDYny87/fGFD+VR1WErXOZngX3RYCR0il5Oc=; fh=wpoNUURlquLpJK/14Kny0oMIYkY7mYwjJ/Ils9UT2kk=; b=J6V5R7eDFRF4OwqvZ6eYviZPQX7sDtgLZPUFr9cQ73WqGpZ15nx8aIzyDdEhWpheCe G2K7DS4A3mVU6gY+KjZKNcEK9qLceHrnN11dWc8fPCTtI5zBSPuEnxZjVDExLWgwhd1n JFw/7QqKKZWe+lIoxF1HFsODeasGuFLGEtzZan7b3qwm+oo2MuY6X8g3Hd6n6PJritJA kzY3+DzZ9leE9jYoPfGSxT03LZF4RQdsSYwhCwdWpLxJCK1C40VnIeZ17RtGZw4ijCm/ SW0YZVrPULmHrfUDyYFIN/M2W7BAmu8RdN/30akLqfioLvU8U735TD5TabqUQRKgvXPx y+Dw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=Ux0tAS0l; spf=pass (google.com: domain of mirian.shilakadze@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=mirian.shilakadze@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 5b1f17b1804b1-4aa82328ecfsi223478445e9.9.2026.11.01.15.52.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Nov 2026 15:52:26 -0800 (PST) Received-SPF: pass (google.com: domain of mirian.shilakadze@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=Ux0tAS0l; spf=pass (google.com: domain of mirian.shilakadze@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=mirian.shilakadze@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=kqd9xdEnDYny87/fGFD+VR1WErXOZngX3RYCR0il5Oc=; b=Ux0tAS0lj90Z JZHdiN1JLGtO8VE69xaeBtnuZes2ESaGKJlo/8GHx5hdluJXTDYnhrfozt9KPJprry9QWUYQuygWY Y9tJdDgG3TbWY0BuJItw2p4mpAwBtMUIECfl3AqXLWneVvQ3i62azwGzEmJgSCF8M84iPcDrIomZf 8nuKbR/r9zYbxKBoRbBTxM2nqDvuts7INUj05UcWYEQV2L6XD7fPvokzSRP+PVkfilG4CmOyKReEo olBfwjO1gSKUcT+c3O8mTspJ5EeINa4dHocKXTxGNUX0qKMN9FG101CalSAqOS7emcVAsaIowQRoZ W9PXc/3iRqSom+LuIx3l0Q==; Received: from ch-demo-asa.virtuozzo.com ([130.117.225.8] helo=localhost.localdomain) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xNfHk-004e5A-2s; Mon, 02 Nov 2026 00:52:18 +0100 From: Mirian Shilakadze To: khorenko@virtuozzo.com, ptikhomirov@virtuozzo.com Date: Mon, 2 Nov 2026 03:51:46 +0400 Message-ID: <20261101235155.124059-5-mirian.shilakadze@virtuozzo.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261101235155.124059-1-mirian.shilakadze@virtuozzo.com> References: <20261101235155.124059-1-mirian.shilakadze@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 4/6] ms/cgroup/dmem: Return -ENOMEM on failed pool preallocation 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: Guopeng Zhang get_cg_pool_unlocked() handles allocation failures under dmemcg_lock by dropping the lock, preallocating a pool with GFP_KERNEL, and retrying the locked lookup and creation path. If the fallback allocation fails too, pool remains NULL. Since the loop condition is while (!pool), the function can keep retrying instead of propagating the allocation failure to the caller. Set pool to ERR_PTR(-ENOMEM) when the fallback allocation fails so the loop exits through the existing common return path. The callers already handle ERR_PTR() from get_cg_pool_unlocked(), so this restores the expected error path. Fixes: b168ed458dde ("kernel/cgroup: Add "dmem" memory accounting cgroup") Cc: stable@vger.kernel.org # v6.14+ Signed-off-by: Guopeng Zhang Signed-off-by: Tejun Heo (cherry picked from commit 796ad622040f7f955ccc3973085e953415920496) https://virtuozzo.atlassian.net/browse/VSTOR-152813 Signed-off-by: Mirian Shilakadze --- kernel/cgroup/dmem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/cgroup/dmem.c b/kernel/cgroup/dmem.c index c8cfa5f3bd43..8424df801bc0 100644 --- a/kernel/cgroup/dmem.c +++ b/kernel/cgroup/dmem.c @@ -601,6 +601,7 @@ get_cg_pool_unlocked(struct dmemcg_state *cg, struct dmem_cgroup_region *region) pool = NULL; continue; } + pool = ERR_PTR(-ENOMEM); } } -- 2.43.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel