From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (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 F379B44B67D; Mon, 11 May 2026 17:30:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778520660; cv=none; b=rnKLxkFiOB5xf3naX9VkCa7+E6Qe2fOpl/yHk19ItX6lXkYUqTW1RvznV92XZqaCs3D2XiOMhFK2NdlFOCU9yuKrMOSk3f2pO1YAmIpEWAJvVWpXWaMrpkM0o4rzYhw50RwoPggQT3vdNFvTsJf/maGlHlzOcgK8YHjMZrk1JsU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778520660; c=relaxed/simple; bh=D4EknCkaHCNIg8p5sLeL9NZg/F8aPtj1hSM+njyxWqg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=l9kEFKwEfgqkAVGEbAsqzPOi8OiJ01+8Jvqeq7ct0ZFQ8yg64lm5W/5tdu4dFF+k/Ik09r74RTdwWq/JcetZxhCLAd0HFJ2nzlvHI4TtD3M1cucNfJnkLha7dMN2visuaNJl6Xv7V+aRCz12x7pUleBn+ktgwRRVFlWjL7bRb0o= 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=UDV2W6Uq; arc=none smtp.client-ip=198.175.65.21 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="UDV2W6Uq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778520659; x=1810056659; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=D4EknCkaHCNIg8p5sLeL9NZg/F8aPtj1hSM+njyxWqg=; b=UDV2W6UqvVS2MVCnRmgAUAKmiz2AmqhRm+q78LoxZWciVr1+pvMaxZ1J JxrboQEljTzoGEmHl1xQlwryf6cSO/5APGDpQ3Wk8yqnCDbQxVkrN2Vln VYD1Kd1EAcw4z58/lSvP1+ReArtVAJuiBDybBJjlFrwWsXjRNP7fBmJd9 1ZbAgCkfZpayUunvA4ZsDzs64E+ILiVB90xGplg3bkp9z7mgmxJSEOhQl F/Pp8nS2XXTJlsvdWGScBpobWsE/ZpmSCapeTfRC0QztdA1drGxEkx3gv YJaYv4KwVhpuu4lhpxtZ06fAzk+o+bI4+2pOHJ5rJGFeYj2VqsqRdhMS4 A==; X-CSE-ConnectionGUID: qHy+V74YTwe1l9pafJIn8w== X-CSE-MsgGUID: 4WEQsdThQvO31fom+15qmg== X-IronPort-AV: E=McAfee;i="6800,10657,11783"; a="79314213" X-IronPort-AV: E=Sophos;i="6.23,229,1770624000"; d="scan'208";a="79314213" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2026 10:30:58 -0700 X-CSE-ConnectionGUID: mZBnCvj3TlG9ul2tPZ5/0g== X-CSE-MsgGUID: sUW8LuzDQ7KgesZFC0Eyxw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,229,1770624000"; d="scan'208";a="261000443" Received: from pgcooper-mobl3.ger.corp.intel.com (HELO fedora) ([10.245.244.248]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2026 10:30:53 -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 v3 4/5] drm/xe: Wire up dmem cgroup reclaim for VRAM manager Date: Mon, 11 May 2026 19:30:07 +0200 Message-ID: <20260511173008.36526-5-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260511173008.36526-1-thomas.hellstrom@linux.intel.com> References: <20260511173008.36526-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.54.0