Re: [PATCH 4/8] drm/radeon: Implement mmap as GEM object function

Am 06.04.21 um 11:08 schrieb Thomas Zimmermann:

Moving the driver-specific mmap code into a GEM object function allows for using DRM helpers for various mmap callbacks.

This change also allows to support prime-based mmap via DRM's helper drm_gem_prime_mmap().

Permission checks are implemented by drm_gem_mmap(), with an additional check for radeon_ttm_tt_has_userptr() in the GEM object function. The function radeon_verify_access() is now unused and has thus been removed.

As a side effect, amdgpu_ttm_vm_ops and amdgpu_ttm_fault() are now implemented in amdgpu's GEM code.

Signed-off-by: Thomas Zimmermann tzimmermann@suse.de

drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/radeon_gem.c | 52 +++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_ttm.c | 65 ----------------------------- drivers/gpu/drm/radeon/radeon_ttm.h | 1 - 4 files changed, 54 insertions(+), 67 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index efeb115ae70e..4039b6d71aa2 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -557,7 +557,7 @@ static const struct file_operations radeon_driver_kms_fops = { .open = drm_open, .release = drm_release, .unlocked_ioctl = radeon_drm_ioctl,

• .mmap = radeon_mmap,

• .mmap = drm_gem_mmap, .poll = drm_poll, .read = drm_read, #ifdef CONFIG_COMPAT

@@ -632,6 +632,7 @@ static const struct drm_driver kms_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table,

• .gem_prime_mmap = drm_gem_prime_mmap,

  .name = DRIVER_NAME, .desc = DRIVER_DESC,

diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index 05ea2f39f626..71e8737bce01 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -44,6 +44,42 @@ void radeon_gem_prime_unpin(struct drm_gem_object *obj);

const struct drm_gem_object_funcs radeon_gem_object_funcs;

+static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)

Please name this radeon_gem_fault or radeon_gem_object_fault.

Apart from that looks good to me.

Christian.

+{

• struct ttm_buffer_object *bo = vmf->vma->vm_private_data;
• struct radeon_device *rdev = radeon_get_rdev(bo->bdev);
• vm_fault_t ret;
• down_read(&rdev->pm.mclk_lock);
• ret = ttm_bo_vm_reserve(bo, vmf);
• if (ret)

• goto unlock_mclk;
  

• ret = radeon_bo_fault_reserve_notify(bo);
• if (ret)

• goto unlock_resv;
  

• ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,

• 		       TTM_BO_VM_NUM_PREFAULT, 1);
  

• if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT))

• goto unlock_mclk;
  

+unlock_resv:

• dma_resv_unlock(bo->base.resv);

+unlock_mclk:

• up_read(&rdev->pm.mclk_lock);
• return ret;

+}

+static const struct vm_operations_struct radeon_ttm_vm_ops = {

• .fault = radeon_ttm_fault,
• .open = ttm_bo_vm_open,
• .close = ttm_bo_vm_close,
• .access = ttm_bo_vm_access

+};

• static void radeon_gem_object_free(struct drm_gem_object *gobj) { struct radeon_bo *robj = gem_to_radeon_bo(gobj);

@@ -226,6 +262,20 @@ static int radeon_gem_handle_lockup(struct radeon_device *rdev, int r) return r; }

+static int radeon_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) +{

• struct radeon_bo *bo = gem_to_radeon_bo(obj);
• struct radeon_device *rdev = radeon_get_rdev(bo->tbo.bdev);
• if (!rdev)

• return -EINVAL;
  

• if (radeon_ttm_tt_has_userptr(rdev, bo->tbo.ttm))

• return -EPERM;
  

• return drm_gem_ttm_mmap(obj, vma);

+}

• const struct drm_gem_object_funcs radeon_gem_object_funcs = { .free = radeon_gem_object_free, .open = radeon_gem_object_open,

@@ -236,6 +286,8 @@ const struct drm_gem_object_funcs radeon_gem_object_funcs = { .get_sg_table = radeon_gem_prime_get_sg_table, .vmap = drm_gem_ttm_vmap, .vunmap = drm_gem_ttm_vunmap,

• .mmap = radeon_gem_object_mmap,

• .vm_ops = &radeon_ttm_vm_ops, };

  /*

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 476ce9c24b9f..a5ce43a909a2 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -136,17 +136,6 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo, *placement = rbo->placement; }

-static int radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp) -{

• struct radeon_bo *rbo = container_of(bo, struct radeon_bo, tbo);
• struct radeon_device *rdev = radeon_get_rdev(bo->bdev);
• if (radeon_ttm_tt_has_userptr(rdev, bo->ttm))

• return -EPERM;
  

• return drm_vma_node_verify_access(&rbo->tbo.base.vma_node,

• 			  filp->private_data);
  

-}

• static int radeon_move_blit(struct ttm_buffer_object *bo, bool evict, struct ttm_resource *new_mem,

@@ -704,7 +693,6 @@ static struct ttm_device_funcs radeon_bo_driver = { .eviction_valuable = ttm_bo_eviction_valuable, .evict_flags = &radeon_evict_flags, .move = &radeon_bo_move,

• .verify_access = &radeon_verify_access, .delete_mem_notify = &radeon_bo_delete_mem_notify, .io_mem_reserve = &radeon_ttm_io_mem_reserve, };

@@ -801,59 +789,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size) man->size = size >> PAGE_SHIFT; }

-static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf) -{

• struct ttm_buffer_object *bo = vmf->vma->vm_private_data;
• struct radeon_device *rdev = radeon_get_rdev(bo->bdev);
• vm_fault_t ret;
• down_read(&rdev->pm.mclk_lock);
• ret = ttm_bo_vm_reserve(bo, vmf);
• if (ret)

• goto unlock_mclk;
  

• ret = radeon_bo_fault_reserve_notify(bo);
• if (ret)

• goto unlock_resv;
  

• ret = ttm_bo_vm_fault_reserved(vmf, vmf->vma->vm_page_prot,

• 		       TTM_BO_VM_NUM_PREFAULT, 1);
  

• if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT))

• goto unlock_mclk;
  

-unlock_resv:

• dma_resv_unlock(bo->base.resv);

-unlock_mclk:

• up_read(&rdev->pm.mclk_lock);
• return ret;

-}

-static const struct vm_operations_struct radeon_ttm_vm_ops = {

• .fault = radeon_ttm_fault,
• .open = ttm_bo_vm_open,
• .close = ttm_bo_vm_close,
• .access = ttm_bo_vm_access

-};

-int radeon_mmap(struct file *filp, struct vm_area_struct *vma) -{

• int r;
• struct drm_file *file_priv = filp->private_data;
• struct radeon_device *rdev = file_priv->minor->dev->dev_private;
• if (rdev == NULL)

• return -EINVAL;
  

• r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
• if (unlikely(r != 0))

• return r;
  

• vma->vm_ops = &radeon_ttm_vm_ops;
• return 0;

-}

• #if defined(CONFIG_DEBUG_FS)

  static int radeon_mm_vram_dump_table_show(struct seq_file *m, void *unused)

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.h b/drivers/gpu/drm/radeon/radeon_ttm.h index 4d7b90ee2774..91ea7141bc81 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.h +++ b/drivers/gpu/drm/radeon/radeon_ttm.h @@ -32,6 +32,5 @@ struct radeon_device;

int radeon_ttm_init(struct radeon_device *rdev); void radeon_ttm_fini(struct radeon_device *rdev); -int radeon_mmap(struct file *filp, struct vm_area_struct *vma);

#endif /* __RADEON_TTM_H__ */