[PATCH 1/2] drm/ttm: Don't add swapped BOs to swap-LRU list

[felix.kuehling@xxxxxxx (Felix Kuehling)]

On 2018-01-18 01:09 PM, Christian König wrote:
> Am 18.01.2018 um 17:56 schrieb Felix Kuehling:
>> 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 at amd.com>
>
> Reviewed-by: Christian König <christian.koenig at amd.com> for both.

Thanks. I pushed them to amd-staging-drm-next. I think patch 1 should
also go to -fixes. Alex?

Regards,
  Felix

>
>> ---
>> Â  drivers/gpu/drm/ttm/ttm_bo.c | 3 ++-
>> Â  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
>> index 2eb71ff..62518b6 100644
>> --- a/drivers/gpu/drm/ttm/ttm_bo.c
>> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
>> @@ -170,7 +170,8 @@ void ttm_bo_add_to_lru(struct ttm_buffer_object *bo)
>> Â Â Â Â Â Â Â Â Â  list_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);
>