Patch "drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail" has been added to the 4.5-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail
to the 4.5-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-ttm-fix-kref-count-mess-in-ttm_bo_move_to_lru_tail.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
56fc350224f16901db709cd8cba86bac751aa2a2Mon Sep 17 00:00:00 2001
From: Flora Cui <[email protected]>
Date: Wed, 20 Apr 2016 10:23:47 +0800
Subject: drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Flora Cui <[email protected]>
commit 56fc350224f16901db709cd8cba86bac751aa2a2 upstream.
Fixes the following scenario:
1. Page table bo allocated in vram and linked to man->lru. tbo->list_kref.refcount=2
2. Page table bo is swapped out and removed from man->lru. tbo->list_kref.refcount=1
3. Command submission from userspace. Page table bo is moved to vram. ttm_bo_move_to_lru_tail() link it to man->lru and don't increase the kref count.
--- drivers/gpu/drm/ttm/ttm_bo.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +4 -13
@@ -230,22 +230,13 @@ EXPORT_SYMBOL(ttm_bo_del_sub_from_lru);void ttm_bo_move_to_lru_tail (struct ttm_buffer_object *bo) { -struct ttm_bo_device *bdev = bo->bdev; -struct ttm_mem_type_manager *man; +int put_count =0 ;lockdep_assert_held (&bo->resv->lock.base); -if (bo->mem.placement &TTM_PL_FLAG_NO_EVICT ) { -list_del_init (&bo->swap); -list_del_init (&bo->lru); - - }else { -if (bo->ttm && !(bo->ttm->page_flags &TTM_PAGE_FLAG_SG )) -list_move_tail (&bo->swap, &bo->glob->swap_lru); - - man = &bdev->man[bo->mem.mem_type]; -list_move_tail (&bo->lru, &man->lru); - } + put_count =ttm_bo_del_from_lru (bo); +ttm_bo_list_ref_sub (bo, put_count, true); +ttm_bo_add_to_lru (bo); }EXPORT_SYMBOL (ttm_bo_move_to_lru_tail);
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/drm-ttm-fix-kref-count-mess-in-ttm_bo_move_to_lru_tail.patch