drm/panfrost: Add the panfrost_gem_mapping concept
Subsystems (3)
Rob Herring
maintainerPATCH v3 1/1 drm/panfrost: Add the panfrost_gem_mapping concept
From: Boris Brezillon <[email protected]>
With the introduction of per-FD address space, the same BO can be mapped in different address space if the BO is globally visible (GEM_FLINK) and opened in different context or if the dmabuf is self-imported. The current implementation does not take case into account, and attaches the mapping directly to the panfrost_gem_object.
Let's create a panfrost_gem_mapping struct and allow multiple mappings per BO.
The mappings are refcounted which helps solve another problem where mappings were torn down (GEM handle closed by userspace) while GPU jobs accessing those BOs were still in-flight. Jobs now keep a reference on the mappings they use.
v2 (robh):
- Minor review comment clean-ups from Steven
- Use list_is_singular helper
- Just WARN if we add a mapping when madvise state is not WILLNEED. With that, drop the use of object_name_lock.
v3 (robh):
- Revert returning list iterator in panfrost_gem_mapping_get()
--- drivers/gpu/drm/panfrost/panfrost_drv.c | 91 +++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.c | 123 +++++++++++++++--- drivers/gpu/drm/panfrost/panfrost_gem.h | 41 +++++- .../gpu/drm/panfrost/panfrost_gem_shrinker.c | 3 +- drivers/gpu/drm/panfrost/panfrost_job.c | 13 +- drivers/gpu/drm/panfrost/panfrost_job.h | 1 + drivers/gpu/drm/panfrost/panfrost_mmu.c | 61 +++++---- drivers/gpu/drm/panfrost/panfrost_mmu.h | 6 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 34 +++-- 9 files changed, 299 insertions(+), 74 deletions(-)
drivers/gpu/drm/panfrost/panfrost_drv.c +82 -9
@@ -78,8 +78,10 @@ static int panfrost_ioctl_get_param(struct drm_device *ddev, void *data, structstatic int panfrost_ioctl_create_bo (struct drm_device *dev,void *data,struct drm_file *file) { +struct panfrost_file_priv *priv = file->driver_priv;struct panfrost_gem_object *bo;struct drm_panfrost_create_bo *args = data; +struct panfrost_gem_mapping *mapping;if (!args->size || args->pad || (args->flags & ~(PANFROST_BO_NOEXEC |PANFROST_BO_HEAP )))
@@ -95,7 +97,14 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,if (IS_ERR (bo))return PTR_ERR (bo); - args->offset = bo->node.start <<PAGE_SHIFT ; + mapping =panfrost_gem_mapping_get (bo, priv); +if (!mapping) { +drm_gem_object_put_unlocked (&bo->base.base); +return -EINVAL ; + } + + args->offset = mapping->mmnode.start <<PAGE_SHIFT ; +panfrost_gem_mapping_put (mapping);return 0 ; }
@@ -119,6 +128,11 @@ panfrost_lookup_bos(struct drm_device *dev,struct drm_panfrost_submit *args, struct panfrost_job *job) { + struct panfrost_file_priv *priv = file_priv->driver_priv; +struct panfrost_gem_object *bo; +unsigned int i; +int ret; + job->bo_count = args->bo_handle_count;if (!job->bo_count)
@@ -130,9 +144,32 @@ panfrost_lookup_bos(struct drm_device *dev,if (!job->implicit_fences)return -ENOMEM ; -return drm_gem_objects_lookup (file_priv, - (void __user *)(uintptr_t )args->bo_handles, - job->bo_count, &job->bos); + ret =drm_gem_objects_lookup (file_priv, + (void __user *)(uintptr_t )args->bo_handles, + job->bo_count, &job->bos); +if (ret) +return ret; + + job->mappings =kvmalloc_array (job->bo_count, +sizeof (struct panfrost_gem_mapping *), +GFP_KERNEL | __GFP_ZERO); +if (!job->mappings) +return -ENOMEM ; + +for (i =0 ; i < job->bo_count; i++) { +struct panfrost_gem_mapping *mapping; + + bo =to_panfrost_bo (job->bos[i]); + mapping =panfrost_gem_mapping_get (bo, priv); +if (!mapping) { + ret = -EINVAL ; +break ; + } + + job->mappings[i] = mapping; + } + +return ret; }/**
@@ -320,7 +357,9 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data,static int panfrost_ioctl_get_bo_offset (struct drm_device *dev,void *data,struct drm_file *file_priv) { +struct panfrost_file_priv *priv = file_priv->driver_priv;struct drm_panfrost_get_bo_offset *args = data; +struct panfrost_gem_mapping *mapping;struct drm_gem_object *gem_obj;struct panfrost_gem_object *bo;
@@ -331,18 +370,26 @@ static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data, } bo =to_panfrost_bo (gem_obj); - args->offset = bo->node.start <<PAGE_SHIFT ; - + mapping =panfrost_gem_mapping_get (bo, priv);drm_gem_object_put_unlocked (gem_obj); + +if (!mapping) +return -EINVAL ; + + args->offset = mapping->mmnode.start <<PAGE_SHIFT ; +panfrost_gem_mapping_put (mapping);return 0 ; }static int panfrost_ioctl_madvise (struct drm_device *dev,void *data,struct drm_file *file_priv) { +struct panfrost_file_priv *priv = file_priv->driver_priv;struct drm_panfrost_madvise *args = data;struct panfrost_device *pfdev = dev->dev_private;struct drm_gem_object *gem_obj; +struct panfrost_gem_object *bo; +int ret =0 ; gem_obj =drm_gem_object_lookup (file_priv, args->handle);if (!gem_obj) {
@@ -350,22 +397,48 @@ static int panfrost_ioctl_madvise(struct drm_device *dev, void *data,return -ENOENT ; } + bo =to_panfrost_bo (gem_obj); +mutex_lock (&pfdev->shrinker_lock); +mutex_lock (&bo->mappings.lock); +if (args->madv ==PANFROST_MADV_DONTNEED ) { +struct panfrost_gem_mapping *first; + + first =list_first_entry (&bo->mappings.list, + struct panfrost_gem_mapping, + node); + +/* +* If we want to mark the BO purgeable, there must be only one +* user: the caller FD. +* We could do something smarter and mark the BO purgeable only +* when all its users have marked it purgeable, but globally +* visible/shared BOs are likely to never be marked purgeable +* anyway, so let's not bother. +*/ +if (!list_is_singular (&bo->mappings.list) || +WARN_ON_ONCE (first->mmu != &priv->mmu)) { + ret = -EINVAL ; + goto out_unlock_mappings; + } + } + args->retained =drm_gem_shmem_madvise (gem_obj, args->madv);if (args->retained) { -struct panfrost_gem_object *bo =to_panfrost_bo (gem_obj); -if (args->madv ==PANFROST_MADV_DONTNEED )list_add_tail (&bo->base.madv_list, &pfdev->shrinker_list);else if (args->madv ==PANFROST_MADV_WILLNEED )list_del_init (&bo->base.madv_list); } + +out_unlock_mappings: +mutex_unlock (&bo->mappings.lock);mutex_unlock (&pfdev->shrinker_lock);drm_gem_object_put_unlocked (gem_obj); -return 0 ; +return ret; }int panfrost_unstable_ioctl_check (void )
drivers/gpu/drm/panfrost/panfrost_gem.c +107 -16
168 lines not on this page · raw message
drivers/gpu/drm/panfrost/panfrost_gem.h +35 -6
64 lines not on this page · raw message
drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c +2 -1
@@ -39,11 +39,12 @@ panfrost_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *scstatic bool panfrost_gem_purge (struct drm_gem_object *obj) {struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); +struct panfrost_gem_object *bo =to_panfrost_bo (obj);if (!mutex_trylock (&shmem->pages_lock))return false; -panfrost_mmu_unmap (to_panfrost_bo (obj)); +panfrost_gem_teardown_mappings (bo);drm_gem_shmem_purge_locked (obj);mutex_unlock (&shmem->pages_lock);
drivers/gpu/drm/panfrost/panfrost_job.c +12 -1
@@ -268,9 +268,20 @@ static void panfrost_job_cleanup(struct kref *ref)dma_fence_put (job->done_fence);dma_fence_put (job->render_done_fence); -if (job->bos) { +if (job->mappings) {for (i =0 ; i < job->bo_count; i++) +panfrost_gem_mapping_put (job->mappings[i]); +kvfree (job->mappings); + } + +if (job->bos) { +struct panfrost_gem_object *bo; + +for (i =0 ; i < job->bo_count; i++) { + bo =to_panfrost_bo (job->bos[i]);drm_gem_object_put_unlocked (job->bos[i]); + } +kvfree (job->bos); }
drivers/gpu/drm/panfrost/panfrost_job.h +1 -0
@@ -32,6 +32,7 @@ struct panfrost_job {/* Exclusive fences we have taken from the BOs to wait for */ struct dma_fence **implicit_fences; +struct panfrost_gem_mapping **mappings;struct drm_gem_object **bos;u32 bo_count;
drivers/gpu/drm/panfrost/panfrost_mmu.c +35 -26
148 lines not on this page · raw message
drivers/gpu/drm/panfrost/panfrost_mmu.h +3 -3
@@ -4,12 +4,12 @@#ifndef __PANFROST_MMU_H__#define __PANFROST_MMU_H__ -struct panfrost_gem_object ; +struct panfrost_gem_mapping ;struct panfrost_file_priv ;struct panfrost_mmu ; -int panfrost_mmu_map (struct panfrost_gem_object *bo); -void panfrost_mmu_unmap (struct panfrost_gem_object *bo); +int panfrost_mmu_map (struct panfrost_gem_mapping *mapping); +void panfrost_mmu_unmap (struct panfrost_gem_mapping *mapping);int panfrost_mmu_init (struct panfrost_device *pfdev);void panfrost_mmu_fini (struct panfrost_device *pfdev);
drivers/gpu/drm/panfrost/panfrost_perfcnt.c +22 -12
@@ -25,7 +25,7 @@#define V4_SHADERS_PER_COREGROUP 4struct panfrost_perfcnt { -struct panfrost_gem_object *bo; +struct panfrost_gem_mapping *mapping;size_t bosize;void *buf;struct panfrost_file_priv *user;
@@ -49,7 +49,7 @@ static int panfrost_perfcnt_dump_locked(struct panfrost_device *pfdev)int ret;reinit_completion (&pfdev->perfcnt->dump_comp); - gpuva = pfdev->perfcnt->bo->node.start <<PAGE_SHIFT ; + gpuva = pfdev->perfcnt->mapping->mmnode.start <<PAGE_SHIFT ;gpu_write (pfdev,GPU_PERFCNT_BASE_LO , gpuva);gpu_write (pfdev,GPU_PERFCNT_BASE_HI , gpuva >>32 ); gpu_write(pfdev, GPU_INT_CLEAR,
@@ -89,17 +89,22 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,if (IS_ERR (bo))return PTR_ERR (bo); - perfcnt->bo =to_panfrost_bo (&bo->base); -/* Map the perfcnt buf in the address space attached to file_priv. */ - ret =panfrost_gem_open (&perfcnt->bo->base.base, file_priv); + ret =panfrost_gem_open (&bo->base, file_priv);if (ret) goto err_put_bo; + perfcnt->mapping =panfrost_gem_mapping_get (to_panfrost_bo (&bo->base), + user); +if (!perfcnt->mapping) { + ret = -EINVAL ; + goto err_close_bo; + } + perfcnt->buf =drm_gem_shmem_vmap (&bo->base);if (IS_ERR (perfcnt->buf)) { ret =PTR_ERR (perfcnt->buf); - goto err_close_bo; + goto err_put_mapping; }/*
@@ -154,12 +159,17 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,if (panfrost_has_hw_issue (pfdev,HW_ISSUE_8186 ))gpu_write (pfdev,GPU_PRFCNT_TILER_EN ,0xffffffff ); +/* The BO ref is retained by the mapping. */ +drm_gem_object_put_unlocked (&bo->base); +return 0 ; err_vunmap: -drm_gem_shmem_vunmap (&perfcnt->bo->base.base, perfcnt->buf); +drm_gem_shmem_vunmap (&bo->base, perfcnt->buf); +err_put_mapping: +panfrost_gem_mapping_put (perfcnt->mapping); err_close_bo: -panfrost_gem_close (&perfcnt->bo->base.base, file_priv); +panfrost_gem_close (&bo->base, file_priv); err_put_bo:drm_gem_object_put_unlocked (&bo->base);return ret;
@@ -182,11 +192,11 @@ static int panfrost_perfcnt_disable_locked(struct panfrost_device *pfdev, GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_OFF)); perfcnt->user =NULL ; -drm_gem_shmem_vunmap (&perfcnt->bo->base.base, perfcnt->buf); +drm_gem_shmem_vunmap (&perfcnt->mapping->obj->base.base, perfcnt->buf); perfcnt->buf =NULL ; -panfrost_gem_close (&perfcnt->bo->base.base, file_priv); -drm_gem_object_put_unlocked (&perfcnt->bo->base.base); - perfcnt->bo =NULL ; +panfrost_gem_close (&perfcnt->mapping->obj->base.base, file_priv); +panfrost_gem_mapping_put (perfcnt->mapping); + perfcnt->mapping =NULL ;pm_runtime_mark_last_busy (pfdev->dev);pm_runtime_put_autosuspend (pfdev->dev);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerQuoted 17 lines · Rob Herring
From: Boris Brezillon <[email protected]>
With the introduction of per-FD address space, the same BO can be mapped in different address space if the BO is globally visible (
GEM_FLINK) and opened in different context or if the dmabuf is self-imported. The current implementation does not take case into account, and attaches the mapping directly to thepanfrost_gem_object.Let's create a
panfrost_gem_mappingstruct and allow multiple mappings per BO.The mappings are refcounted which helps solve another problem where mappings were torn down (GEM handle closed by userspace) while GPU jobs accessing those BOs were still in-flight. Jobs now keep a reference on the mappings they use.
Quoted 8 lines
v2 (robh):
- Minor review comment clean-ups from Steven
- Uselist_is_singularhelper
- Just WARN if we add a mapping when madvise state is not WILLNEED. With that, drop the use ofobject_name_lock.v3 (robh):
- Revert returning list iterator inpanfrost_gem_mapping_get()
Ignore this one...
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel