Skip to content

Commit cda0641

Browse files
committed
drm/xe: Wait for migration job before unmapping pages
Fix a potential GPU page fault during tt -> system moves by waiting for migration jobs to complete before unmapping SG. This ensures that IOMMU mappings are not prematurely torn down while a migration job is still in progress. v2: Use intr=false(Matt A) v3: Update commit message(Matt A) v4: s/DMA_RESV_USAGE_BOOKKEEP/DMA_RESV_USAGE_KERNEL(Thomas) Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/3466 Fixes: 75521e8 ("drm/xe: Perform dma_map when moving system buffer objects to TT") Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> Cc: Matthew Brost <matthew.brost@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: stable@vger.kernel.org # v6.11+ Cc: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241213122415.3880017-2-nirmoy.das@intel.com Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
1 parent dc5e20a commit cda0641

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

drivers/gpu/drm/xe/xe_bo.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,8 +857,16 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict,
857857

858858
out:
859859
if ((!ttm_bo->resource || ttm_bo->resource->mem_type == XE_PL_SYSTEM) &&
860-
ttm_bo->ttm)
860+
ttm_bo->ttm) {
861+
long timeout = dma_resv_wait_timeout(ttm_bo->base.resv,
862+
DMA_RESV_USAGE_KERNEL,
863+
false,
864+
MAX_SCHEDULE_TIMEOUT);
865+
if (timeout < 0)
866+
ret = timeout;
867+
861868
xe_tt_unmap_sg(ttm_bo->ttm);
869+
}
862870

863871
return ret;
864872
}

0 commit comments

Comments
 (0)