From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F2F13D34B9; Tue, 28 Apr 2026 07:32:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777361523; cv=none; b=b26sdAVx6JfUXyWWAAL7ZDd8vg4kMDTTFFZeQEemn6OahbEEJywOeVJrPn+m8YM9Y8lJiDSnmh9CKHYkS7G44EOp53zD0YXlfdD56GgEea+6CAvQr7RV+v6DTvP1TVNG2pbnjTT+EWCdtHBGWcMjUqokhCNcPUHOImTr6Ug5Xe8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777361523; c=relaxed/simple; bh=VCXy79fbBAt5QnmrzmMMuvOq3FMqVb404fQrx6b1TDI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DdvPWHRerPMip2By1bfag1KDhQX9Luk+/X0CvA6Zr8xSisLGtQUfpGEVSni1FznMnakPm1lmDYaIGhvtoiNwlr9qMJCAVZn3VETzHktY/IzbCF1usqLBAaxE5iAjzl95MDRZbf2HaHcS4LliQVal4NYX8ZWCMtcrD948UJZB8wg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=cXeXxuOv; arc=none smtp.client-ip=192.198.163.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="cXeXxuOv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1777361522; x=1808897522; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VCXy79fbBAt5QnmrzmMMuvOq3FMqVb404fQrx6b1TDI=; b=cXeXxuOvjuLRibXGr4h4WQF0UArPzkxcun3JHhQbwV3GcwWIT+Om/LfN OmjfRjfKJ3OtuWaqnG17Wue2O0zaOwM7fkeAA2v1+m7xnl5o+6rftGqfV C/E76U2WMJl4WRxL9ZonSCKqDvWxBLw5RvM4G+o4KOeixC8dussAdK+eJ jpxbMMun3DbX/JZBFp/VtmOqGVPSoigynzJS0uKC7L8FcuBghlzlsqH4x mppAU6PbkyjT8u5K/vhd/F5kr+2HA4qXY9hDjJ1E3em50+GYH8sbWXOt9 wzgCSwZOSfW1VgdrEEJbVWr8q/XstfZc8JawS3x6aMA34/yxSb8N5bsCH Q==; X-CSE-ConnectionGUID: mMCYRcxQRFuUbP+Pk/VrTA== X-CSE-MsgGUID: e0U1MGGgSu2a/gB/k8Zvlg== X-IronPort-AV: E=McAfee;i="6800,10657,11769"; a="103722087" X-IronPort-AV: E=Sophos;i="6.23,203,1770624000"; d="scan'208";a="103722087" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2026 00:32:02 -0700 X-CSE-ConnectionGUID: thzTjcEASHOlGw9V5CTc/Q== X-CSE-MsgGUID: nGnALVDHStSfm8t0zfVbIw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,203,1770624000"; d="scan'208";a="230716357" Received: from pgcooper-mobl3.ger.corp.intel.com (HELO fedora) ([10.245.244.161]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2026 00:31:57 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Natalie Vock , Johannes Weiner , Tejun Heo , =?UTF-8?q?Michal=20Koutn=C3=BD?= , cgroups@vger.kernel.org, Huang Rui , Matthew Brost , Matthew Auld , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Simona Vetter , David Airlie , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Rodrigo Vivi , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] drm/xe: Wire up dmem cgroup reclaim for VRAM manager Date: Tue, 28 Apr 2026 09:31:15 +0200 Message-ID: <20260428073116.15687-4-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260428073116.15687-1-thomas.hellstrom@linux.intel.com> References: <20260428073116.15687-1-thomas.hellstrom@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Register the VRAM manager with the dmem cgroup reclaim infrastructure so that lowering dmem.max below current VRAM usage triggers TTM eviction rather than failing with -EBUSY. Assisted-by: GitHub Copilot:claude-sonnet-4.6 Signed-off-by: Thomas Hellström --- drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c index 5fd0d5506a7e..1bdcb3fee901 100644 --- a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +++ b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c @@ -303,13 +303,6 @@ int __xe_ttm_vram_mgr_init(struct xe_device *xe, struct xe_ttm_vram_mgr *mgr, struct ttm_resource_manager *man = &mgr->manager; int err; - if (mem_type != XE_PL_STOLEN) { - const char *name = mem_type == XE_PL_VRAM0 ? "vram0" : "vram1"; - man->cg = drmm_cgroup_register_region(&xe->drm, name, size); - if (IS_ERR(man->cg)) - return PTR_ERR(man->cg); - } - man->func = &xe_ttm_vram_mgr_func; mgr->mem_type = mem_type; mutex_init(&mgr->lock); @@ -318,6 +311,18 @@ int __xe_ttm_vram_mgr_init(struct xe_device *xe, struct xe_ttm_vram_mgr *mgr, mgr->visible_avail = io_size; ttm_resource_manager_init(man, &xe->ttm, size); + + if (mem_type != XE_PL_STOLEN) { + const char *name = mem_type == XE_PL_VRAM0 ? "vram0" : "vram1"; + struct dmem_cgroup_region *cg = + drmm_cgroup_register_region(&xe->drm, name, size); + + if (IS_ERR(cg)) + return PTR_ERR(cg); + + ttm_resource_manager_set_dmem_region(man, cg); + } + err = gpu_buddy_init(&mgr->mm, man->size, default_page_size); if (err) return err; -- 2.53.0