Skip to content

Commit

Permalink
drm/ttm: Fix a deadlock if the target BO is not idle during swap
Browse files Browse the repository at this point in the history
[ Upstream commit 70982ee ]

The ret value might be -EBUSY, caller will think lru lock is still
locked but actually NOT. So return -ENOSPC instead. Otherwise we hit
list corruption.

ttm_bo_cleanup_refs might fail too if BO is not idle. If we return 0,
caller(ttm_tt_populate -> ttm_global_swapout ->ttm_device_swapout) will
be stuck as we actually did not free any BO memory. This usually happens
when the fence is not signaled for a long time.

Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Fixes: ebd5985 ("drm/ttm: move swapout logic around v3")
Link: https://patchwork.freedesktop.org/patch/msgid/20210907040832.1107747-1-xinhui.pan@amd.com
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
xinhui pan authored and gregkh committed Sep 26, 2021
1 parent 3a4a126 commit f7525b4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/ttm/ttm_bo.c
Expand Up @@ -1157,9 +1157,9 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx,
}

if (bo->deleted) {
ttm_bo_cleanup_refs(bo, false, false, locked);
ret = ttm_bo_cleanup_refs(bo, false, false, locked);
ttm_bo_put(bo);
return 0;
return ret == -EBUSY ? -ENOSPC : ret;
}

ttm_bo_del_from_lru(bo);
Expand Down Expand Up @@ -1213,7 +1213,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx,
if (locked)
dma_resv_unlock(bo->base.resv);
ttm_bo_put(bo);
return ret;
return ret == -EBUSY ? -ENOSPC : ret;
}

void ttm_bo_tt_destroy(struct ttm_buffer_object *bo)
Expand Down

0 comments on commit f7525b4

Please sign in to comment.