From mboxrd@z Thu Jan 1 00:00:00 1970 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 34E8CD2ECF7 for ; Tue, 20 Jan 2026 06:09:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E3AEA10E4C9; Tue, 20 Jan 2026 06:09:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="nehqlRAv"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 65A4510E4C4 for ; Tue, 20 Jan 2026 06:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1768889370; x=1800425370; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AdAFovaCrSI+n7EOlVovfHkAt0x4PRN2OJJ0DBonCAA=; b=nehqlRAvKleMQwuDyJ6CLocS9dj1b2aY5EgGbLsgmJn76f0a6HkvOr4E /MbWAP4CZw9jxqtRbE20TmkErwGLdV+A+K5CbwHu/kkLVjuGIqj2qwzVh vmtU5md/b4PguQW7NGFkgbfTdJCG02qOQ7uUItccKiNa8+DIFFyzDj87H uCBzC9e5Mdha4vhyfl/kv5Lj3BOuuM+5JjhXh/i+FEZZZAwTX9XGEnEsa /xpgVJrwalFzEBGXj4u5vFSkwAbrwQm8R/BQ8Tyl+H1/h3ORY21UB/xd/ ZJvoN6gr2MSqgY1Ql1iJOy6CfohjUM7pMPDM/jIAg2WGKJarcFok5ZBAJ Q==; X-CSE-ConnectionGUID: EH6u2RHrTXarQ4dCKQJ+TA== X-CSE-MsgGUID: bcTr37AfSx+RsFu7gl8fNg== X-IronPort-AV: E=McAfee;i="6800,10657,11676"; a="72677011" X-IronPort-AV: E=Sophos;i="6.21,240,1763452800"; d="scan'208";a="72677011" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2026 22:09:30 -0800 X-CSE-ConnectionGUID: yQPFV2MOTJ6hZHm5sPE6Bg== X-CSE-MsgGUID: hNTmn3dbTIqDzdJbF96ZEA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,240,1763452800"; d="scan'208";a="205658620" Received: from varungup-desk.iind.intel.com ([10.190.238.71]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2026 22:09:28 -0800 From: Arvind Yadav To: intel-xe@lists.freedesktop.org Cc: matthew.brost@intel.com, himal.prasad.ghimiray@intel.com, thomas.hellstrom@linux.intel.com, pallavi.mishra@intel.com Subject: [PATCH v4 8/8] drm/xe/bo: Add purgeable shrinker state helpers Date: Tue, 20 Jan 2026 11:38:54 +0530 Message-ID: <20260120060900.3137984-9-arvind.yadav@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260120060900.3137984-1-arvind.yadav@intel.com> References: <20260120060900.3137984-1-arvind.yadav@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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" Encapsulate TTM purgeable flag updates and shrinker page accounting into helper functions. This prevents desynchronization between the TTM tt->purgeable flag and the shrinker's page bucket counters. Without these helpers, direct manipulation of xe_ttm_tt->purgeable risks forgetting to update the corresponding shrinker counters, leading to incorrect memory pressure calculations. Add xe_bo_set_purgeable_shrinker() and xe_bo_clear_purgeable_shrinker() which atomically update both the TTM flag and transfer pages between the shrinkable and purgeable buckets. v4: - @madv_purgeable atomic_t → u32 change across all relevant patches. (Matt) Cc: Matthew Brost Cc: Thomas Hellström Cc: Himal Prasad Ghimiray Signed-off-by: Arvind Yadav --- drivers/gpu/drm/xe/xe_bo.c | 60 ++++++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_bo.h | 3 ++ drivers/gpu/drm/xe/xe_vm_madvise.c | 13 +++++-- 3 files changed, 73 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c index cc547915161d..2b1448ea3aed 100644 --- a/drivers/gpu/drm/xe/xe_bo.c +++ b/drivers/gpu/drm/xe/xe_bo.c @@ -836,6 +836,66 @@ static int xe_bo_move_notify(struct xe_bo *bo, return 0; } +/** + * xe_bo_set_purgeable_shrinker() - Mark BO purgeable and update shrinker + * @bo: Buffer object + * + * Transfers pages from shrinkable to purgeable bucket. Shrinker can now + * discard pages immediately without swapping. Caller holds BO lock. + */ +void xe_bo_set_purgeable_shrinker(struct xe_bo *bo) +{ + struct ttm_buffer_object *ttm_bo = &bo->ttm; + struct ttm_tt *tt = ttm_bo->ttm; + struct xe_device *xe = ttm_to_xe_device(ttm_bo->bdev); + struct xe_ttm_tt *xe_tt; + + xe_bo_assert_held(bo); + + if (!tt || !ttm_tt_is_populated(tt)) + return; + + xe_tt = container_of(tt, struct xe_ttm_tt, ttm); + + if (!xe_tt->purgeable) { + xe_tt->purgeable = true; + /* Transfer pages from shrinkable to purgeable count */ + xe_shrinker_mod_pages(xe->mem.shrinker, + -(long)tt->num_pages, + tt->num_pages); + } +} + +/** + * xe_bo_clear_purgeable_shrinker() - Mark BO non-purgeable and update shrinker + * @bo: Buffer object + * + * Transfers pages from purgeable to shrinkable bucket. Shrinker must now + * swap pages instead of discarding. Caller holds BO lock. + */ +void xe_bo_clear_purgeable_shrinker(struct xe_bo *bo) +{ + struct ttm_buffer_object *ttm_bo = &bo->ttm; + struct ttm_tt *tt = ttm_bo->ttm; + struct xe_device *xe = ttm_to_xe_device(ttm_bo->bdev); + struct xe_ttm_tt *xe_tt; + + xe_bo_assert_held(bo); + + if (!tt || !ttm_tt_is_populated(tt)) + return; + + xe_tt = container_of(tt, struct xe_ttm_tt, ttm); + + if (xe_tt->purgeable) { + xe_tt->purgeable = false; + /* Transfer pages from purgeable to shrinkable count */ + xe_shrinker_mod_pages(xe->mem.shrinker, + tt->num_pages, + -(long)tt->num_pages); + } +} + /** * xe_ttm_bo_purge() - Purge buffer object backing store * @ttm_bo: The TTM buffer object to purge diff --git a/drivers/gpu/drm/xe/xe_bo.h b/drivers/gpu/drm/xe/xe_bo.h index 00e93b3065c9..681495e905af 100644 --- a/drivers/gpu/drm/xe/xe_bo.h +++ b/drivers/gpu/drm/xe/xe_bo.h @@ -270,6 +270,9 @@ static inline bool xe_bo_madv_is_dontneed(struct xe_bo *bo) return bo->madv_purgeable == XE_MADV_PURGEABLE_DONTNEED; } +void xe_bo_set_purgeable_shrinker(struct xe_bo *bo); +void xe_bo_clear_purgeable_shrinker(struct xe_bo *bo); + static inline void xe_bo_unpin_map_no_vm(struct xe_bo *bo) { if (likely(bo)) { diff --git a/drivers/gpu/drm/xe/xe_vm_madvise.c b/drivers/gpu/drm/xe/xe_vm_madvise.c index 5808fef89777..0fb07a1ed3ae 100644 --- a/drivers/gpu/drm/xe/xe_vm_madvise.c +++ b/drivers/gpu/drm/xe/xe_vm_madvise.c @@ -274,12 +274,16 @@ void xe_bo_recheck_purgeable_on_vma_unbind(struct xe_bo *bo) if (xe_bo_all_vmas_dontneed(bo)) { /* All VMAs are DONTNEED - mark BO purgeable */ - if (bo->madv_purgeable != XE_MADV_PURGEABLE_DONTNEED) + if (bo->madv_purgeable != XE_MADV_PURGEABLE_DONTNEED) { bo->madv_purgeable = XE_MADV_PURGEABLE_DONTNEED; + xe_bo_set_purgeable_shrinker(bo); + } } else { /* At least one VMA is WILLNEED - BO must not be purgeable */ - if (bo->madv_purgeable != XE_MADV_PURGEABLE_WILLNEED) + if (bo->madv_purgeable != XE_MADV_PURGEABLE_WILLNEED) { bo->madv_purgeable = XE_MADV_PURGEABLE_WILLNEED; + xe_bo_clear_purgeable_shrinker(bo); + } } } @@ -325,13 +329,16 @@ static bool xe_vm_madvise_purgeable_bo(struct xe_device *xe, struct xe_vm *vm, /* Mark VMA WILLNEED - BO becomes non-purgeable immediately */ bo->madv_purgeable = XE_MADV_PURGEABLE_WILLNEED; + xe_bo_clear_purgeable_shrinker(bo); break; case DRM_XE_VMA_PURGEABLE_STATE_DONTNEED: vmas[i]->purgeable_state = XE_MADV_PURGEABLE_DONTNEED; /* Mark BO purgeable only if all VMAs are DONTNEED */ - if (xe_bo_all_vmas_dontneed(bo)) + if (xe_bo_all_vmas_dontneed(bo)) { bo->madv_purgeable = XE_MADV_PURGEABLE_DONTNEED; + xe_bo_set_purgeable_shrinker(bo); + } break; default: drm_warn(&vm->xe->drm, "Invalid madvice value = %d\n", -- 2.43.0