drm/ttm: Don't add swapped BOs to swap-LRU list
authorFelix Kuehling <Felix.Kuehling@amd.com>
Thu, 18 Jan 2018 04:52:03 +0000 (23:52 -0500)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 31 May 2018 23:30:09 +0000 (00:30 +0100)
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

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Christian K├Ânig <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
[bwh: Backported to 3.2: We aren't checking for TTM_PAGE_FLAG_SG here as that's
 not defined]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/drm/ttm/ttm_bo.c

index f5e5037..35d98cf 100644 (file)
@@ -184,7 +184,7 @@ void ttm_bo_add_to_lru(struct ttm_buffer_object *bo)
                list_add_tail(&bo->lru, &man->lru);
                kref_get(&bo->list_kref);
 
                list_add_tail(&bo->lru, &man->lru);
                kref_get(&bo->list_kref);
 
-               if (bo->ttm != NULL) {
+               if (bo->ttm && !(bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {
                        list_add_tail(&bo->swap, &bo->glob->swap_lru);
                        kref_get(&bo->list_kref);
                }
                        list_add_tail(&bo->swap, &bo->glob->swap_lru);
                        kref_get(&bo->list_kref);
                }