[Intel-xe] [PATCH v2 08/31] drm/xe: VM LRU bulk move

[Matthew Brost]

On Mon, May 08, 2023 at 05:39:12PM -0400, Rodrigo Vivi wrote:
> On Mon, May 01, 2023 at 05:17:04PM -0700, Matthew Brost wrote:
> > Use the TTM LRU bulk move for BOs tied to a VM. Update the bulk moves
> > LRU position on every exec.
> > 
> > Signed-off-by: Matthew Brost <matthew.brost at intel.com>
> > ---
> >  drivers/gpu/drm/xe/xe_bo.c       | 32 ++++++++++++++++++++++++++++----
> >  drivers/gpu/drm/xe/xe_bo.h       |  4 ++--
> >  drivers/gpu/drm/xe/xe_dma_buf.c  |  2 +-
> >  drivers/gpu/drm/xe/xe_exec.c     |  6 ++++++
> >  drivers/gpu/drm/xe/xe_vm_types.h |  3 +++
> >  5 files changed, 40 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
> > index 3ab404e33fae..da99ee53e7d7 100644
> > --- a/drivers/gpu/drm/xe/xe_bo.c
> > +++ b/drivers/gpu/drm/xe/xe_bo.c
> > @@ -985,6 +985,23 @@ 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_no_dma_fences(bo->vm)) {
> > +		struct ww_acquire_ctx ww;
> > +
> > +		XE_BUG_ON(!xe_bo_is_user(bo));
> 
> We need to really stop using BUG_ON and move towards the usage of more WARNs.
> 

If that is the direction, sure I'll change this but personally I BUG_ON
for things that should be impossible with a correct KMD.

Matt 

> But the rest of the patch looks good to me... I just believe it would be
> good to get Thomas' review here.
> 
> > +
> > +		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);
> > @@ -1040,6 +1057,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,
> > @@ -1081,8 +1099,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_gt *gt, 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,
> > @@ -1149,7 +1167,10 @@ struct xe_bo *__xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo,
> >  		return ERR_PTR(err);
> >  
> >  	bo->created = true;
> > -	ttm_bo_move_to_lru_tail_unlocked(&bo->ttm);
> > +	if (bulk)
> > +		ttm_bo_set_bulk_move(&bo->ttm, bulk);
> > +	else
> > +		ttm_bo_move_to_lru_tail_unlocked(&bo->ttm);
> >  
> >  	return bo;
> >  }
> > @@ -1219,7 +1240,10 @@ xe_bo_create_locked_range(struct xe_device *xe,
> >  		}
> >  	}
> >  
> > -	bo = __xe_bo_create_locked(xe, bo, gt, vm ? &vm->resv : NULL, size,
> > +	bo = __xe_bo_create_locked(xe, bo, gt, vm ? &vm->resv : NULL,
> > +				   vm && !xe_vm_no_dma_fences(vm) &&
> > +				   flags & XE_BO_CREATE_USER_BIT ?
> > +				   &vm->lru_bulk_move : NULL, size,
> >  				   type, flags);
> >  	if (IS_ERR(bo))
> >  		return bo;
> > diff --git a/drivers/gpu/drm/xe/xe_bo.h b/drivers/gpu/drm/xe/xe_bo.h
> > index 8354d05ccdf3..25457b3c757b 100644
> > --- a/drivers/gpu/drm/xe/xe_bo.h
> > +++ b/drivers/gpu/drm/xe/xe_bo.h
> > @@ -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_gt *gt, 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_gt *gt, struct xe_vm *vm,
> > diff --git a/drivers/gpu/drm/xe/xe_dma_buf.c b/drivers/gpu/drm/xe/xe_dma_buf.c
> > index 9b252cc782b7..975dee1f770f 100644
> > --- a/drivers/gpu/drm/xe/xe_dma_buf.c
> > +++ b/drivers/gpu/drm/xe/xe_dma_buf.c
> > @@ -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);
> > diff --git a/drivers/gpu/drm/xe/xe_exec.c b/drivers/gpu/drm/xe/xe_exec.c
> > index 44ea9bcd0066..21a9c2fddf86 100644
> > --- a/drivers/gpu/drm/xe/xe_exec.c
> > +++ b/drivers/gpu/drm/xe/xe_exec.c
> > @@ -374,6 +374,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);
> > diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_types.h
> > index fada7896867f..d3e99f22510d 100644
> > --- a/drivers/gpu/drm/xe/xe_vm_types.h
> > +++ b/drivers/gpu/drm/xe/xe_vm_types.h
> > @@ -164,6 +164,9 @@ struct xe_vm {
> >  	/** Protects @rebind_list and the page-table structures */
> >  	struct dma_resv resv;
> >  
> > +	/** @lru_bulk_move: Bulk LRU move list for this VM's BOs */
> > +	struct ttm_lru_bulk_move lru_bulk_move;
> > +
> >  	u64 size;
> >  	struct rb_root vmas;
> >  
> > -- 
> > 2.34.1
> >