Commit 7ba4c5f0 authored by Matthew Brost's avatar Matthew Brost Committed by Rodrigo Vivi
Browse files

drm/xe: VM LRU bulk move 



Use the TTM LRU bulk move for BOs tied to a VM. Update the bulk moves
LRU position on every exec.

v2: Bulk move for compute VMs, use WARN rather than BUG

Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 73c09901

drivers/gpu/drm/xe/xe_bo.c

+27 −4
Original line number Diff line number Diff line
@@ -992,6 +992,22 @@ static void xe_gem_object_free(struct drm_gem_object *obj) 
	ttm_bo_put(container_of(obj, struct ttm_buffer_object, base));

}



static void xe_gem_object_close(struct drm_gem_object *obj,

				struct drm_file *file_priv)

{

	struct xe_bo *bo = gem_to_xe_bo(obj);



	if (bo->vm && !xe_vm_in_fault_mode(bo->vm)) {

		struct ww_acquire_ctx ww;



		XE_WARN_ON(!xe_bo_is_user(bo));



		xe_bo_lock(bo, &ww, 0, false);

		ttm_bo_set_bulk_move(&bo->ttm, NULL);

		xe_bo_unlock(bo, &ww);

	}

}



static bool should_migrate_to_system(struct xe_bo *bo)

{

	struct xe_device *xe = xe_bo_device(bo);
@@ -1047,6 +1063,7 @@ static const struct vm_operations_struct xe_gem_vm_ops = { 


static const struct drm_gem_object_funcs xe_gem_object_funcs = {

	.free = xe_gem_object_free,

	.close = xe_gem_object_close,

	.mmap = drm_gem_ttm_mmap,

	.export = xe_gem_prime_export,

	.vm_ops = &xe_gem_vm_ops,
@@ -1088,8 +1105,8 @@ void xe_bo_free(struct xe_bo *bo) 


struct xe_bo *__xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo,

				    struct xe_tile *tile, struct dma_resv *resv,

				    size_t size, enum ttm_bo_type type,

				    u32 flags)

				    struct ttm_lru_bulk_move *bulk, size_t size,

				    enum ttm_bo_type type, u32 flags)

{

	struct ttm_operation_ctx ctx = {

		.interruptible = true,
@@ -1156,6 +1173,9 @@ struct xe_bo *__xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo, 
		return ERR_PTR(err);



	bo->created = true;

	if (bulk)

		ttm_bo_set_bulk_move(&bo->ttm, bulk);

	else

		ttm_bo_move_to_lru_tail_unlocked(&bo->ttm);



	return bo;
@@ -1226,7 +1246,10 @@ xe_bo_create_locked_range(struct xe_device *xe, 
		}

	}



	bo = __xe_bo_create_locked(xe, bo, tile, vm ? &vm->resv : NULL, size,

	bo = __xe_bo_create_locked(xe, bo, tile, vm ? &vm->resv : NULL,

				   vm && !xe_vm_in_fault_mode(vm) &&

				   flags & XE_BO_CREATE_USER_BIT ?

				   &vm->lru_bulk_move : NULL, size,

				   type, flags);

	if (IS_ERR(bo))

		return bo;

drivers/gpu/drm/xe/xe_bo.h

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ void xe_bo_free(struct xe_bo *bo); 


struct xe_bo *__xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo,

				    struct xe_tile *tile, struct dma_resv *resv,

				    size_t size, enum ttm_bo_type type,

				    u32 flags);

				    struct ttm_lru_bulk_move *bulk, size_t size,

				    enum ttm_bo_type type, u32 flags);

struct xe_bo *

xe_bo_create_locked_range(struct xe_device *xe,

			  struct xe_tile *tile, struct xe_vm *vm,

drivers/gpu/drm/xe/xe_dma_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ xe_dma_buf_init_obj(struct drm_device *dev, struct xe_bo *storage, 
	int ret;



	dma_resv_lock(resv, NULL);

	bo = __xe_bo_create_locked(xe, storage, NULL, resv, dma_buf->size,

	bo = __xe_bo_create_locked(xe, storage, NULL, resv, NULL, dma_buf->size,

				   ttm_bo_type_sg, XE_BO_CREATE_SYSTEM_BIT);

	if (IS_ERR(bo)) {

		ret = PTR_ERR(bo);

drivers/gpu/drm/xe/xe_exec.c

+6 −0
Original line number Diff line number Diff line
@@ -399,6 +399,12 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	xe_sched_job_push(job);

	xe_vm_reactivate_rebind(vm);



	if (!err && !xe_vm_no_dma_fences(vm)) {

		spin_lock(&xe->ttm.lru_lock);

		ttm_lru_bulk_move_tail(&vm->lru_bulk_move);

		spin_unlock(&xe->ttm.lru_lock);

	}



err_repin:

	if (!xe_vm_no_dma_fences(vm))

		up_read(&vm->userptr.notifier_lock);

drivers/gpu/drm/xe/xe_vm.c

+4 −0
Original line number Diff line number Diff line
@@ -632,6 +632,10 @@ static void preempt_rebind_work_func(struct work_struct *w) 


#undef retry_required



	spin_lock(&vm->xe->ttm.lru_lock);

	ttm_lru_bulk_move_tail(&vm->lru_bulk_move);

	spin_unlock(&vm->xe->ttm.lru_lock);



	/* Point of no return. */

	arm_preempt_fences(vm, &preempt_fences);

	resume_and_reinstall_preempt_fences(vm);