Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30308C44507 for ; Wed, 15 Jul 2026 21:29:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E3D3410F172; Wed, 15 Jul 2026 21:29:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="H4usfM60"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C36410E6DE for ; Wed, 15 Jul 2026 21:28:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1784150939; x=1815686939; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/3Qt805+M7hT8WLtYBSPQWvolXREyRD8raxkZSWDu14=; b=H4usfM60N6/ssegM3h2T0GzFCnyBlQ7jpatRQVmL0qnp5Mp1fl4ypt3f H3Q4gTPWyKCaB17ahV4ECQZE5zZk96Gp471KHk+gIhjo/G9tqnXcKpziU Mp+x+KuhqvSoAONRbD9nADMVmmD3jNSGsht1DL0NHwQkrF3uTaJ1SjJQB Zo3ExWU2mbr6Rwr8loWLvN4pBf/J7OclzuxIp2r/1W9bljvq8SvIhu9bY vJ/QaEDUlCtTz8ehpUMNfPXuMSiK46KFHfwYEB1ndWOPJXBTo6CGFeIMO Qa1M+eCDGPMJY9axLjq8i/nIOymtoIdUe3g17rELEzrMiRrmZ1E0mgYGv Q==; X-CSE-ConnectionGUID: 3dNno1KoRPa5zIjnEzJyeA== X-CSE-MsgGUID: kA1yR7EdRM+3j0N7FKh79Q== X-IronPort-AV: E=McAfee;i="6800,10657,11847"; a="107603340" X-IronPort-AV: E=Sophos;i="6.25,166,1779174000"; d="scan'208";a="107603340" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2026 14:28:59 -0700 X-CSE-ConnectionGUID: WVWXOhf2R1K4DPuWp2aMbw== X-CSE-MsgGUID: XyB3ETdFTa68Z3nciS6noQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,166,1779174000"; d="scan'208";a="258270758" Received: from gsse-cloud1.jf.intel.com ([10.54.39.91]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2026 14:28:59 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org Cc: Carlos Santa , Ryan Neph Subject: [PATCH v5 3/4] drm/xe: Lower BO TTM priority to lowest when fully unmapped from VM Date: Wed, 15 Jul 2026 14:28:53 -0700 Message-Id: <20260715212854.3881683-4-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260715212854.3881683-1-matthew.brost@intel.com> References: <20260715212854.3881683-1-matthew.brost@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" An UNMAP (or the unmap half of a REMAP) can leave a BO with no remaining VMA mappings anywhere. Such a BO is unlikely to be touched again soon, so rather than leaving it at whatever priority band it had while still in active use, drop it to XE_BO_PRIORITY_LOW, the lowest level, so it becomes one of the first candidates considered for eviction/shrinking. This applies both to BOs private to a VM and to extobjs shared across multiple VMs (bo->vm == NULL) -- an extobj with no bindings left anywhere is just as good an eviction/shrink candidate as an unmapped private BO. Imported bos are excluded, since their vma_count is never tracked (xe_bo_vma_count_inc/dec_locked() are no-ops for them), so it would never reflect anything meaningful. This has to be done inside xe_vma_destroy() itself, right after xe_bo_vma_count_dec_locked(), rather than by its callers after the fact: xe_vma_destroy() may drop the last reference to the BO via xe_bo_put() in xe_vma_destroy_late() (called either synchronously, or asynchronously via a fence callback), so a caller that stashed a pointer to the BO before calling xe_vma_destroy() and then dereferences it afterwards risks a use-after-free. Doing the check and update before that possible final put avoids this. bo->purgeable.vma_count, which xe_bo_vma_count_dec_locked() just updated, tells us whether the BO has become fully unmapped. A REMAP that only shrinks a mapping still leaves vma_count > 0 via the prev/next VMA(s) created earlier in the bind, so those are correctly left untouched. This runs under the BO's dma-resv, already asserted held via xe_bo_assert_held() just above. Cc: Carlos Santa Cc: Ryan Neph Assisted-by: GitHub_Copilot:claude-sonnet-5 Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_vm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index a90f310b8fa2..f74db350abf1 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -1282,6 +1282,22 @@ static void xe_vma_destroy(struct xe_vma *vma, struct dma_fence *fence) xe_bo_vma_count_dec_locked(bo); if (vma->attr.purgeable_state == XE_MADV_PURGEABLE_WILLNEED) xe_bo_willneed_put_locked(bo); + + /* + * @bo has just lost a VMA mapping. If it now has none left + * anywhere, it is unlikely to be used again soon, so lower + * its TTM priority to the lowest level, making it one of the + * first buffers considered for eviction/shrinking. This + * applies both to BOs private to @vm and to extobjs shared + * across multiple VMs (bo->vm == NULL), but not to imported + * bos, whose vma_count is never tracked. Must be done here, + * rather than by the caller, as this may be the last + * reference to @bo (see xe_vma_destroy_late()). + */ + if (!drm_gem_is_imported(&bo->ttm.base) && + !bo->purgeable.vma_count && + bo->ttm.priority != XE_BO_PRIORITY_LOW) + xe_bo_update_ttm_priority(bo, XE_BO_PRIORITY_LOW); } xe_vm_assert_held(vm); -- 2.34.1