Patch "drm/ttm: Don't add swapped BOs to swap-LRU list" has been added to the 4.14-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
drm/ttm: Don't add swapped BOs to swap-LRU list
to the 4.14-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-don-t-add-swapped-bos-to-swap-lru-list.patch
and it can be found in the queue-4.14 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
fd5002d6a3c602664b07668a24df4ef7a43bf078Mon Sep 17 00:00:00 2001
From: Felix Kuehling <[email protected]>
Date: Wed, 17 Jan 2018 23:52:03 -0500
Subject: drm/ttm: Don't add swapped BOs to swap-LRU list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Felix Kuehling <[email protected]>
commit fd5002d6a3c602664b07668a24df4ef7a43bf078 upstream.
A BO that's already swapped would be added back to the swap-LRU list for example if its validation failed under high memory pressure. This could later lead to swapping it out again and leaking previous swap storage.
This commit adds a condition to prevent that from happening.
v2: Check page_flags instead of swap_storage
--- drivers/gpu/drm/ttm/ttm_bo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/ttm/ttm_bo.c +2 -1
@@ -175,7 +175,8 @@ void ttm_bo_add_to_lru(struct ttm_bufferlist_add_tail (&bo->lru, &man->lru[bo->priority]);kref_get (&bo->list_kref); -if (bo->ttm && !(bo->ttm->page_flags &TTM_PAGE_FLAG_SG )) { +if (bo->ttm && !(bo->ttm->page_flags & + (TTM_PAGE_FLAG_SG |TTM_PAGE_FLAG_SWAPPED ))) {list_add_tail (&bo->swap, &bo->glob->swap_lru[bo->priority]);kref_get (&bo->list_kref);
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/drm-ttm-don-t-add-swapped-bos-to-swap-lru-list.patch