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 3530B803BB for ; Mon, 16 Nov 2026 03:40:56 +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 6AG3cbpc019092; Mon, 16 Nov 2026 06:38:38 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3cbpc019092 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="TrlItujZ" 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 6AG3caeS019088 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 06:38:36 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3caeS019088 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-4901562b819so2742710f8f.3 for ; Sun, 15 Nov 2026 19:38:36 -0800 (PST) X-Gm-Message-State: APuU4Z+d9Bh19+ni1cfe+YsWEE6qDkB0iUsQ//QNNNzBdRs4oc2IxaQe kwun6ZqFmlBBb4Z7MhhpmQ+4o8+nzk9dyj9CetcHsJ7zveT2y6wV/QyKe51ipJ9f4WP7k6ge78v rqZbYHrjnj8ZvO6YD6PrQ6pCMEi7rDWpTQ98qsVj4SUTgezQxVqMAEg== X-Gm-Gg: AYBFou08iAUDTLpe9CDV2s9tOIIuDlK7nGuJLtQv5OOXcXJ65gEZUEeaaNwExihP8+p I9627tdJFumD4iXoGx5XtSu/gqK7xrWItKlOel/CvDCGxrxvYlLqV5W+XMhrcNooio091eq10q+ Tc+JbSV+sxL+3NZ9mSfSwvuKrtnWcnQrhUcH3HblhoyO//o1mrBqvC3GY5KgfuA3rU8GpiwDKFJ 07AxaXe2J11chjG/5aRNtlGR0PJ6fqqJlIa73o3XZmCKWi06Vc0TtycOn3KPfxz/Vcfqg1iMhvn qO7DKqTYZel5tpoqU6fVHButQUMiFuA1XcRm1qqxP7T5BMUsPYmbButsPaReHkHGmIjFcQgnxY2 XvO0JS259XhZ6lm0wFOAsBZzdrHWrOA== X-Received: by 2002:a5d:5f47:0:b0:48e:4f1e:5e24 with SMTP id ffacd0b85a97d-49c6fd92fbamr20525583f8f.14.1794800316554; Sun, 15 Nov 2026 19:38:36 -0800 (PST) X-Received: by 2002:a5d:5f47:0:b0:48e:4f1e:5e24 with SMTP id ffacd0b85a97d-49c6fd92fbamr20525577f8f.14.1794800316129; Sun, 15 Nov 2026 19:38:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794800316; cv=none; d=google.com; s=arc-20260327; b=C7QkY0oaezyxn08CENo4zBsNOcoIZKcTf8eKbgGcGgJqBIdmQ0ESWRu4tl/J4PeOYT SLIKtC8ip3leg5Qhl6YvMHPLyDhVxy+bDuQt2FVo7qHlhEUIRSBnqHVnvYMSn5ZzxYVg IInV4MRwVbrp8j15+MaLZiMVGR9g18THwAIBS1lDYWR0wKuc/is58U+9EJG3Xz2URFeB uiP524FHR4Xp5t2qWtbrb3q5LWbh4Hvth1w9HSGNESD07QYCwF8zksfWKYQ3DuLRtWKa OhLBcci2LmMMvP7s6D/+zyHZp0EhChmpCq9oYjBAc6YX6pg34dmdRFekBGdEGujPn0R8 O7dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=+OuNXh1LxRarMMdMMpOkCoe0lrpnFUzpHpa8ImLP0PQ=; fh=7hWwk1OHawbnxBhSKSLSDZxabhsDTbWAwy3CCepxcVA=; b=gOY8N6guIssHCZ1B8gdAUJK9QsO2Dor14orUyYxG7GUPvGT41aey7ge89lff9flJaq z3dvZdwBQxtT7hJcnVCeFBe3MW977vtv62C2eanE74T2hurES/Ze54mUSWQJfZMK+N6d e8EWRF4LEOU0qwGBMZNa14YJ1veL2ZqQiFNxposOufsgzPFGGQ+NzUJwC9FD9qL8liGe dLRoRB8G6kDGoDsF792xiyYAOa2PhqPsohUF5huJG/BBS0QhsiTsugZ+Y+dwqTERNpxg 8J5u9VQspnObGuZ8N/XumjkFb0X2rtHXGAxm426LwrQAKMME5TVtgSfTzhDXC6Ww4Dto +uNQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=TrlItujZ; 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 ffacd0b85a97d-49c6302dacasi19311909f8f.92.2026.11.15.19.38.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 19:38:36 -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=TrlItujZ; 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=+OuNXh1LxRarMMdMMpOkCoe0lrpnFUzpHpa8ImLP0PQ=; b=TrlItujZi3Om 6zutxOGUu4OQE/SZ5bIWbZIKciJckc90ksaueFxuFQPGeRUoyna4IJ9KFvYy875Say1UcWfI4h/ww gedIE5c+CeYb0cm9tGEqhX0kllAH656ZidBYHU956gSlsaabaEXaWY4wXqiK/tDIgSlanUP5PMqXS /0Nd07HAHVNscvYE6nwFKMcTK6Y78PT40y+gFqyk4CBY2yGGUTXfOCcQV3tk2LR/hWlvqniuGwyv1 me9iC6EN1qZCrAuICqymT1DShGfJ2gjagcuIYiz7Q+FE2Q0GOtt0SS63tfqD+/kJDK05IujrL6fp2 DUwqBqa2cfyH/53Eg1V1gg==; 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 1xSnTx-009nPJ-0f; Mon, 16 Nov 2026 04:38:28 +0100 From: Mirian Shilakadze To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 07:38:01 +0400 Message-ID: <20261116033832.26787-1-mirian.shilakadze@virtuozzo.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1] drm/amdgpu: free the buddy allocator when dmem region registration fails 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 Since commit ffbc4c6f4d0b ("ms/drm/amdgpu: Fix init ordering in amdgpu_vram_mgr_init()") the dmem cgroup region is registered after drm_buddy_init(). When drmm_cgroup_register_region() fails, amdgpu_vram_mgr_init() returns without drm_buddy_fini(), so a probe failing there leaks the buddy allocator. Free it on that error path. Upstream does the same in commit bd4f284df04d ("drm/amdgpu: Wire up dmem cgroup reclaim for VRAM manager"), which also wires up dmem reclaim and is not taken here. Fixes: ffbc4c6f4d0b ("ms/drm/amdgpu: Fix init ordering in amdgpu_vram_mgr_init()") https://virtuozzo.atlassian.net/browse/VSTOR-154845 Feature: fix ms/drm Signed-off-by: Mirian Shilakadze --- Item 1 from the review of VSTOR-153702. Not run: we have no node with an AMD GPU. Build-tested only, amdgpu_vram_mgr.o compiles with the 211.52.1.22.22 config. drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c index 2e457a0388a3..11679506de47 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c @@ -932,8 +932,10 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev) return err; man->cg = drmm_cgroup_register_region(adev_to_drm(adev), "vram", adev->gmc.real_vram_size); - if (IS_ERR(man->cg)) + if (IS_ERR(man->cg)) { + drm_buddy_fini(&mgr->mm); return PTR_ERR(man->cg); + } ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, &mgr->manager); ttm_resource_manager_set_used(man, true); -- 2.43.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel