Patch "drm/xe: Fix stale pinned_link entry when fb-pin performs the final unpin" has been added to the 7.2-stable tree
Subsystems (2)
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
drm/xe: Fix stale pinned_link entry when fb-pin performs the final unpin
to the 7.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-xe-fix-stale-pinned_link-entry-when-fb-pin-performs-the-final-unpin.patch
and it can be found in the queue-7.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From cf238c067eaae1cbfb00738e29219b9568d2313e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= <[email protected]>
Date: Fri, 2 Oct 2026 12:08:30 +0200
Subject: drm/xe: Fix stale pinned_link entry when fb-pin performs the final unpin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Thomas Hellström <[email protected]>
commit cf238c067eaae1cbfb00738e29219b9568d2313e upstream.
xe_bo_pin_external() and xe_bo_unpin_external() maintain the bo's pinned_link list membership in xe->pinned.late.external, based on whether the current call is the outermost pin or the final unpin. However, the same external bo's pin_count can also be raised and lowered directly by __xe_pin_fb_vma()/__xe_unpin_fb_vma(), which pin the bo as a display scanout buffer without going through xe_bo_pin_external()/xe_bo_unpin_external() at all, and have no notion of, or ownership over, pinned_link.
If a bo is pinned both externally (e.g. dma-buf export) and as an fb, and the external unpin happens first, xe_bo_unpin_external() correctly observes pin_count > 1 and leaves the bo on pinned_link. When the fb unpin later performs the true last unpin (pin_count 1 -> 0), it never touches pinned_link, leaving the bo linked on xe->pinned.late.external indefinitely. Once the bo is subsequently freed, this stale list entry points into freed memory, corrupting the list and risking a use-after-free the next time the list is walked or spliced.
The backup object pin/unpin sites in xe_bo_notifier_prepare_pinned()/ xe_bo_notifier_unprepare_pinned() have the same bypass characteristic, though they never add their bo to a pinned list, so are not affected by this particular list-corruption issue.
Move the pinned_link removal into xe_bo_account_unpin(), which already runs on every unpin path (kernel, external, framebuffer, backup object) right before the true 1 -> 0 pin_count transition. Since list_del_init() only operates on the node itself, this removal is list-agnostic and safe to perform regardless of which list (external or kernel_bo_present) the bo happens to be linked on, or which code path is performing the final unpin. Drop the now-redundant explicit list_del_init() calls in xe_bo_unpin_external() and xe_bo_unpin().
v2:
- New patch
v3:
- Rebased on changes to previous patch.
--- drivers/gpu/drm/xe/xe_bo.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
drivers/gpu/drm/xe/xe_bo.c +16 -9
@@ -483,12 +483,27 @@ static void xe_bo_account_pin(struct xe_* ttm_bo_unpin(), so that the check against the true 1->0 transition sees * the pin count that is about to be released. See xe_bo_account_pin() for * why imported bos are excluded. +* +* On the true last unpin, also removes @bo from whichever pinned-bo list +* (external or kernel_bo_present) it may currently be linked on, since a +* bo's final unpin can happen through a pin path (e.g. framebuffer, +* backup object) that has no notion of, or ownership over, that list. +* This is safe and list-agnostic: list_del_init() only needs the node +* itself, not knowledge of which list it is threaded through, and is a +* no-op if @bo is not linked. */ static void xe_bo_account_unpin (struct xe_bo *bo) {struct xe_device *xe =xe_bo_device (bo); +bool last_unpin = bo->ttm.pin_count ==1 ; + +if (last_unpin && !list_empty (&bo->pinned_link)) { +spin_lock (&xe->pinned.lock); +list_del_init (&bo->pinned_link); +spin_unlock (&xe->pinned.lock); + } -if (bo->ttm.pin_count ==1 && bo->ttm.ttm &&ttm_tt_is_populated (bo->ttm.ttm) && +if (last_unpin && bo->ttm.ttm &&ttm_tt_is_populated (bo->ttm.ttm) && !xe_ttm_bo_is_imported (&bo->ttm))xe_ttm_tt_account_add (xe, bo->ttm.ttm); }
@@ -3149,11 +3164,6 @@ void xe_bo_unpin_external(struct xe_bo *xe_assert (xe,xe_bo_is_pinned (bo));xe_assert (xe,xe_bo_is_user (bo)); -spin_lock (&xe->pinned.lock); -if (bo->ttm.pin_count ==1 && !list_empty (&bo->pinned_link)) -list_del_init (&bo->pinned_link); -spin_unlock (&xe->pinned.lock); -xe_bo_unpin_account (bo);/*
@@ -3172,10 +3182,7 @@ void xe_bo_unpin(struct xe_bo *bo)xe_assert (xe,xe_bo_is_pinned (bo));if (mem_type_is_vram (place->mem_type) || bo->flags &XE_BO_FLAG_GGTT ) { -spin_lock (&xe->pinned.lock);xe_assert (xe, !list_empty (&bo->pinned_link)); -list_del_init (&bo->pinned_link); -spin_unlock (&xe->pinned.lock);if (bo->backup_obj) {if (xe_bo_is_pinned (bo->backup_obj))
Patches currently in stable-queue which might be from [email protected] are
queue-7.2/drm-xe-fix-shrinker-accounting-double-subtraction-on-nested-external-pins.patch queue-7.2/drm-xe-fix-stale-pinned_link-entry-when-fb-pin-performs-the-final-unpin.patch