leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/ttm: once more fix ttm_bo_bulk_move_lru_tail

Browse Source 
While cutting the lists we sometimes accidentally added a list_head from
the stack to the LRUs, effectively corrupting the list.

Remove the list cutting and use explicit list manipulation instead.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-and-Tested: Huang Rui <ray.huang@amd.com>
Tested-by: Mike Lothian <mike@fireburn.co.uk>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2018-09-12 21:19:57 +02:00 committed by Alex Deucher
parent c37e2d29f0
commit 03651735fb
1 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/gpu/drm/ttm/ttm_bo.c
View File

@ -247,23 +247,18 @@ void ttm_bo_move_to_lru_tail(struct ttm_buffer_object *bo,
}
EXPORT_SYMBOL(ttm_bo_move_to_lru_tail);
static void ttm_bo_bulk_move_helper(struct ttm_lru_bulk_move_pos *pos,
struct list_head *lru, bool is_swap)
static void ttm_list_move_bulk_tail(struct list_head *list,
struct list_head *first,
struct list_head *last)
{
struct list_head *list;
LIST_HEAD(entries);
LIST_HEAD(before);
first->prev->next = last->next;
last->next->prev = first->prev;
reservation_object_assert_held(pos->last->resv);
list = is_swap ? &pos->last->swap : &pos->last->lru;
list_cut_position(&entries, lru, list);
list->prev->next = first;
first->prev = list->prev;
reservation_object_assert_held(pos->first->resv);
list = is_swap ? pos->first->swap.prev : pos->first->lru.prev;
list_cut_position(&before, &entries, list);
list_splice(&before, lru);
list_splice_tail(&entries, lru);
last->next = list;
list->prev = last;
}
void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk)
@ -271,23 +266,33 @@ void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk)
unsigned i;
for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {
struct ttm_lru_bulk_move_pos *pos = &bulk->tt[i];
struct ttm_mem_type_manager *man;
if (!bulk->tt[i].first)
if (!pos->first)
continue;
man = &bulk->tt[i].first->bdev->man[TTM_PL_TT];
ttm_bo_bulk_move_helper(&bulk->tt[i], &man->lru[i], false);
reservation_object_assert_held(pos->first->resv);
reservation_object_assert_held(pos->last->resv);
man = &pos->first->bdev->man[TTM_PL_TT];
ttm_list_move_bulk_tail(&man->lru[i], &pos->first->lru,
&pos->last->lru);
}
for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {
struct ttm_lru_bulk_move_pos *pos = &bulk->vram[i];
struct ttm_mem_type_manager *man;
if (!bulk->vram[i].first)
if (!pos->first)
continue;
man = &bulk->vram[i].first->bdev->man[TTM_PL_VRAM];
ttm_bo_bulk_move_helper(&bulk->vram[i], &man->lru[i], false);
reservation_object_assert_held(pos->first->resv);
reservation_object_assert_held(pos->last->resv);
man = &pos->first->bdev->man[TTM_PL_VRAM];
ttm_list_move_bulk_tail(&man->lru[i], &pos->first->lru,
&pos->last->lru);
}
for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) {
@ -297,8 +302,12 @@ void ttm_bo_bulk_move_lru_tail(struct ttm_lru_bulk_move *bulk)
if (!pos->first)
continue;
reservation_object_assert_held(pos->first->resv);
reservation_object_assert_held(pos->last->resv);
lru = &pos->first->bdev->glob->swap_lru[i];
ttm_bo_bulk_move_helper(&bulk->swap[i], lru, true);
ttm_list_move_bulk_tail(lru, &pos->first->swap,
&pos->last->swap);
}
}
EXPORT_SYMBOL(ttm_bo_bulk_move_lru_tail);