Skip to content

Commit 1d59f36

Browse files
author
Thomas Hellström
committed
drm/ttm: Fix ttm_bo_shrink() infinite LRU walk on backup failure
Apply the same fix as b2ed01e ("drm/ttm: Fix ttm_bo_swapout() infinite LRU walk on swapout failure") to the ttm_bo_shrink() path. Move del_bulk_move from before the backup to after success only, using ttm_resource_del_bulk_move_unevictable() since the resource is now unevictable once fully backed up. Fixes: 70d645d ("drm/ttm: Add helpers for shrinking") Cc: Christian König <christian.koenig@amd.com> Cc: Huang Rui <ray.huang@amd.com> Cc: Matthew Auld <matthew.auld@intel.com> Cc: Matthew Brost <matthew.brost@intel.com> Cc: Dave Airlie <airlied@redhat.com> Cc: dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org # v6.15+ Assisted-by: GitHub_Copilot:claude-opus-4.6 Reviewed-by: Matthew Auld <matthew.auld@intel.com> Link: https://patch.msgid.link/20260511162443.24352-1-thomas.hellstrom@linux.intel.com Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
1 parent 591711b commit 1d59f36

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

drivers/gpu/drm/ttm/ttm_bo_util.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,19 +1112,14 @@ long ttm_bo_shrink(struct ttm_operation_ctx *ctx, struct ttm_buffer_object *bo,
11121112
if (lret < 0)
11131113
return lret;
11141114

1115-
if (bo->bulk_move) {
1116-
spin_lock(&bdev->lru_lock);
1117-
ttm_resource_del_bulk_move(bo->resource, bo);
1118-
spin_unlock(&bdev->lru_lock);
1119-
}
1120-
11211115
lret = ttm_tt_backup(bdev, bo->ttm, (struct ttm_backup_flags)
11221116
{.purge = flags.purge,
11231117
.writeback = flags.writeback});
11241118

1125-
if (lret <= 0 && bo->bulk_move) {
1119+
if (lret > 0) {
11261120
spin_lock(&bdev->lru_lock);
1127-
ttm_resource_add_bulk_move(bo->resource, bo);
1121+
ttm_resource_del_bulk_move_unevictable(bo->resource, bo);
1122+
ttm_resource_move_to_lru_tail(bo->resource);
11281123
spin_unlock(&bdev->lru_lock);
11291124
}
11301125

0 commit comments

Comments
 (0)