drm/shmem: Add madvise state and purge helpers
Subsystems (3)
Rob Herring
maintainerPATCH 1/2 drm/shmem: Add madvise state and purge helpers
Add support to the shmem GEM helpers for tracking madvise state and purging pages. This is based on the msm implementation.
The BO provides a list_head, but the list management is handled outside of the shmem helpers as there are different locking requirements.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 57 ++++++++++++++++++++++++++ include/drm/drm_gem_shmem_helper.h | 15 +++++++ 2 files changed, 72 insertions(+)
drivers/gpu/drm/drm_gem_shmem_helper.c +57 -0
@@ -75,6 +75,7 @@ struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t shmem =to_drm_gem_shmem_obj (obj);mutex_init (&shmem->pages_lock);mutex_init (&shmem->vmap_lock); +INIT_LIST_HEAD (&shmem->madv_list);/* * Our buffers are kept pinned, so allocating them
@@ -362,6 +363,62 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv, }EXPORT_SYMBOL (drm_gem_shmem_create_with_handle); +/* Update madvise status, returns true if not purged, else +* false or -errno. +*/ +int drm_gem_shmem_madvise (struct drm_gem_object *obj,int madv) +{ +struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); + +mutex_lock (&shmem->pages_lock); + +if (shmem->madv >=0 ) + shmem->madv = madv; + + madv = shmem->madv; + +mutex_unlock (&shmem->pages_lock); + +return (madv >=0 ); +} +EXPORT_SYMBOL (drm_gem_shmem_madvise); + +void drm_gem_shmem_purge_locked (struct drm_gem_object *obj) +{ +struct drm_device *dev = obj->dev; +struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); + +WARN_ON (!drm_gem_shmem_is_purgeable (shmem)); + +drm_gem_shmem_put_pages_locked (shmem); + + shmem->madv =-1 ; + +drm_vma_node_unmap (&obj->vma_node, dev->anon_inode->i_mapping); +drm_gem_free_mmap_offset (obj); + +/* Our goal here is to return as much of the memory as +* is possible back to the system as we are called from OOM. +* To do this we must instruct the shmfs to drop all of its +* backing pages, *now*. +*/ +shmem_truncate_range (file_inode (obj->filp),0 , (loff_t)-1 ); + +invalidate_mapping_pages (file_inode (obj->filp)->i_mapping, +0 , (loff_t)-1 ); +} +EXPORT_SYMBOL (drm_gem_shmem_purge_locked); + +void drm_gem_shmem_purge (struct drm_gem_object *obj) +{ +struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); + +mutex_lock (&shmem->pages_lock); +drm_gem_shmem_purge_locked (obj); +mutex_unlock (&shmem->pages_lock); +} +EXPORT_SYMBOL (drm_gem_shmem_purge); +/** * drm_gem_shmem_dumb_create - Create a dumb shmem buffer object * @file: DRM file structure to create the dumb buffer for
include/drm/drm_gem_shmem_helper.h +15 -0
@@ -44,6 +44,9 @@ struct drm_gem_shmem_object {*/ unsigned int pages_use_count; +int madv; +struct list_head madv_list; +/** * @pages_mark_dirty_on_put: *
@@ -121,6 +124,18 @@ void drm_gem_shmem_unpin(struct drm_gem_object *obj);void *drm_gem_shmem_vmap (struct drm_gem_object *obj);void drm_gem_shmem_vunmap (struct drm_gem_object *obj,void *vaddr); +int drm_gem_shmem_madvise (struct drm_gem_object *obj,int madv); + +static inline bool drm_gem_shmem_is_purgeable (struct drm_gem_shmem_object *shmem) +{ +return (shmem->madv >0 ) && + !shmem->vmap_use_count && shmem->sgt && + !shmem->base.dma_buf && !shmem->base.import_attach; +} + +void drm_gem_shmem_purge_locked (struct drm_gem_object *obj); +void drm_gem_shmem_purge (struct drm_gem_object *obj); +struct drm_gem_shmem_object * drm_gem_shmem_create_with_handle(struct drm_file *file_priv, struct drm_device *dev, size_t size,
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerPATCH 2/2 drm/panfrost: Add madvise and shrinker support
Add support for madvise and a shrinker similar to other drivers. This allows userspace to mark BOs which can be freed when there is memory pressure.
Unlike other implementations, we don't depend on struct_mutex. The driver maintains a list of BOs which can be freed when the shrinker is called. Access to the list is serialized with the shrinker_lock.
--- drivers/gpu/drm/panfrost/Makefile | 1 + drivers/gpu/drm/panfrost/TODO | 3 - drivers/gpu/drm/panfrost/panfrost_device.h | 4 + drivers/gpu/drm/panfrost/panfrost_drv.c | 38 +++++++ drivers/gpu/drm/panfrost/panfrost_gem.c | 5 + drivers/gpu/drm/panfrost/panfrost_gem.h | 3 + .../gpu/drm/panfrost/panfrost_gem_shrinker.c | 107 ++++++++++++++++++ include/uapi/drm/panfrost_drm.h | 22 ++++ 8 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c
drivers/gpu/drm/panfrost/Makefile +1 -0
@@ -5,6 +5,7 @@ panfrost-y := \ panfrost_device.o \ panfrost_devfreq.o \ panfrost_gem.o \ + panfrost_gem_shrinker.o \ panfrost_gpu.o \ panfrost_job.o \ panfrost_mmu.o \
drivers/gpu/drm/panfrost/TODO +0 -3
@@ -18,10 +18,7 @@ - Support userspace controlled GPU virtual addresses. Needed for Vulkan. (Tomeu) -- Support for madvise and a shrinker. - - Compute job support. So called 'compute only' jobs need to be plumbed up to userspace. - Performance counter support. (Boris) -
drivers/gpu/drm/panfrost/panfrost_device.h +4 -0
@@ -84,6 +84,10 @@ struct panfrost_device {struct mutex sched_lock;struct mutex reset_lock; +struct mutex shrinker_lock; +struct list_head shrinker_list; +struct shrinker shrinker; +struct {struct devfreq *devfreq;struct thermal_cooling_device *cooling;
drivers/gpu/drm/panfrost/panfrost_drv.c +38 -0
@@ -301,6 +301,38 @@ static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data,return 0 ; } +static int panfrost_ioctl_madvise (struct drm_device *dev,void *data, +struct drm_file *file_priv) +{ +struct drm_panfrost_madvise *args = data; +struct panfrost_device *pfdev = dev->dev_private; +struct drm_gem_object *gem_obj; + + gem_obj =drm_gem_object_lookup (file_priv, args->handle); +if (!gem_obj) { +DRM_DEBUG ("Failed to look up GEM BO %d\n" , args->handle); +return -ENOENT ; + } + + args->retained =drm_gem_shmem_madvise (gem_obj, args->madv); + +if (args->retained) { +struct panfrost_gem_object *bo =to_panfrost_bo (gem_obj); + +mutex_lock (&pfdev->shrinker_lock); + +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); + +mutex_unlock (&pfdev->shrinker_lock); + } + +drm_gem_object_put_unlocked (gem_obj); +return 0 ; +} +int panfrost_unstable_ioctl_check (void ) {if (!unstable_ioctls)
@@ -352,6 +384,7 @@ static const struct drm_ioctl_desc panfrost_drm_driver_ioctls[] = {PANFROST_IOCTL (GET_BO_OFFSET , get_bo_offset,DRM_RENDER_ALLOW ),PANFROST_IOCTL (PERFCNT_ENABLE , perfcnt_enable,DRM_RENDER_ALLOW ),PANFROST_IOCTL (PERFCNT_DUMP , perfcnt_dump,DRM_RENDER_ALLOW ), +PANFROST_IOCTL (MADVISE , madvise,DRM_RENDER_ALLOW ), };DEFINE_DRM_GEM_SHMEM_FOPS (panfrost_drm_driver_fops);
@@ -400,6 +433,8 @@ static int panfrost_probe(struct platform_device *pdev) pfdev->ddev = ddev;spin_lock_init (&pfdev->mm_lock); +mutex_init (&pfdev->shrinker_lock); +INIT_LIST_HEAD (&pfdev->shrinker_list);/* 4G enough for now. can be 48-bit */ drm_mm_init (&pfdev->mm,SZ_32M >>PAGE_SHIFT , (SZ_4G -SZ_32M ) >>PAGE_SHIFT );
@@ -430,6 +465,8 @@ static int panfrost_probe(struct platform_device *pdev)if (err <0 ) goto err_out1; +panfrost_gem_shrinker_init (ddev); +return 0 ; err_out1:
@@ -446,6 +483,7 @@ static int panfrost_remove(struct platform_device *pdev)struct drm_device *ddev = pfdev->ddev;drm_dev_unregister (ddev); +panfrost_gem_shrinker_cleanup (ddev);pm_runtime_get_sync (pfdev->dev);pm_runtime_put_sync_autosuspend (pfdev->dev);pm_runtime_disable (pfdev->dev);
drivers/gpu/drm/panfrost/panfrost_gem.c +5 -0
@@ -26,6 +26,11 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj)drm_mm_remove_node (&bo->node);spin_unlock (&pfdev->mm_lock); +mutex_lock (&pfdev->shrinker_lock); +if (!list_empty (&bo->base.madv_list)) +list_del (&bo->base.madv_list); +mutex_unlock (&pfdev->shrinker_lock); +drm_gem_shmem_free_object (obj); }
drivers/gpu/drm/panfrost/panfrost_gem.h +3 -0
@@ -27,4 +27,7 @@ panfrost_gem_prime_import_sg_table(struct drm_device *dev,struct dma_buf_attachment *attach, struct sg_table *sgt); +void panfrost_gem_shrinker_init (struct drm_device *dev); +void panfrost_gem_shrinker_cleanup (struct drm_device *dev); +#endif /* __PANFROST_GEM_H__ */
drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c new file +107 -0
107 lines not on this page · raw message
include/uapi/drm/panfrost_drm.h +22 -0
@@ -20,6 +20,7 @@ extern "C" {#define DRM_PANFROST_GET_BO_OFFSET 0x05#define DRM_PANFROST_PERFCNT_ENABLE 0x06#define DRM_PANFROST_PERFCNT_DUMP 0x07 +#define DRM_PANFROST_MADVISE 0x08#define DRM_IOCTL_PANFROST_SUBMIT DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_SUBMIT, struct drm_panfrost_submit)#define DRM_IOCTL_PANFROST_WAIT_BO DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_WAIT_BO, struct drm_panfrost_wait_bo)
@@ -27,6 +28,7 @@ extern "C" {#define DRM_IOCTL_PANFROST_MMAP_BO DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_MMAP_BO, struct drm_panfrost_mmap_bo)#define DRM_IOCTL_PANFROST_GET_PARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_GET_PARAM, struct drm_panfrost_get_param)#define DRM_IOCTL_PANFROST_GET_BO_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_GET_BO_OFFSET, struct drm_panfrost_get_bo_offset) +#define DRM_IOCTL_PANFROST_MADVISE DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_MADVISE, struct drm_panfrost_madvise)/* * Unstable ioctl(s): only exposed when the unsafe unstable_ioctls module
@@ -159,6 +161,26 @@ struct drm_panfrost_perfcnt_dump {__u64 buf_ptr; }; +/* madvise provides a way to tell the kernel in case a buffers contents +* can be discarded under memory pressure, which is useful for userspace +* bo cache where we want to optimistically hold on to buffer allocate +* and potential mmap, but allow the pages to be discarded under memory +* pressure. +* +* Typical usage would involve madvise(DONTNEED) when buffer enters BO +* cache, and madvise(WILLNEED) if trying to recycle buffer from BO cache. +* In the WILLNEED case, 'retained' indicates to userspace whether the +* backing pages still exist. +*/ +#define PANFROST_MADV_WILLNEED 0/* backing pages are needed, status returned in 'retained' */ +#define PANFROST_MADV_DONTNEED 1/* backing pages not needed */ + +struct drm_panfrost_madvise { +__u32 handle;/* in, GEM handle */ +__u32 madv;/* in, PANFROST_MADV_x */ +__u32 retained;/* out, whether backing store still exists */ +}; +#if defined(__cplusplus) }#endif
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/2] drm/panfrost: Add madvise and shrinker support
Quoted 9 lines
include/uapi/drm/panfrost_drm.h +9
-0+/* madvise provides a way to tell the kernel in case a buffers contents +* can be discarded under memory pressure, which is useful for userspace +* bo cache where we want to optimistically hold on to buffer allocate +* and potential mmap, but allow the pages to be discarded under memory +* pressure. +* +* Typical usage would involve madvise(DONTNEED) when buffer enters BO +* cache, and madvise(WILLNEED) if trying to recycle buffer from BO cache. +* In the WILLNEED case, 'retained' indicates to userspace whether the
include/uapi/drm/panfrost_drm.h struct drm_panfrost_perfcnt_dump { · line 182
Quoted 10 lines
include/uapi/drm/panfrost_drm.h +10
-0+* backing pages still exist. +*/ +#define PANFROST_MADV_WILLNEED 0/* backing pages are needed, status returned in 'retained' */ +#define PANFROST_MADV_DONTNEED 1/* backing pages not needed */ + +struct drm_panfrost_madvise { +__u32 handle;/* in, GEM handle */ +__u32 madv;/* in, PANFROST_MADV_x */ +__u32 retained;/* out, whether backing store still exists */ +};
Just to clarify about the retained flag: if userspace does a madvise(WILLNEED) and we find out that retained=0, what's supposed to happen?
Should userspace evict the BO from its local cache and allocate one fresh? Or just remmap? Or something else?
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerRe: [PATCH 2/2] drm/panfrost: Add madvise and shrinker support
Quoted 25 lines · Alyssa Rosenzweig
Quoted 10 lines
include/uapi/drm/panfrost_drm.h +9
-0+/* madvise provides a way to tell the kernel in case a buffers contents +* can be discarded under memory pressure, which is useful for userspace +* bo cache where we want to optimistically hold on to buffer allocate +* and potential mmap, but allow the pages to be discarded under memory +* pressure. +* +* Typical usage would involve madvise(DONTNEED) when buffer enters BO +* cache, and madvise(WILLNEED) if trying to recycle buffer from BO cache. +* In the WILLNEED case, 'retained' indicates to userspace whether the include/uapi/drm/panfrost_drm.h struct drm_panfrost_perfcnt_dump { · line 182
Quoted 10 lines
include/uapi/drm/panfrost_drm.h +10
-0+* backing pages still exist. +*/ +#define PANFROST_MADV_WILLNEED 0/* backing pages are needed, status returned in 'retained' */ +#define PANFROST_MADV_DONTNEED 1/* backing pages not needed */ + +struct drm_panfrost_madvise { +__u32 handle;/* in, GEM handle */ +__u32 madv;/* in, PANFROST_MADV_x */ +__u32 retained;/* out, whether backing store still exists */ +};Just to clarify about the
retainedflag: if userspace does a madvise(WILLNEED) and we find out that retained=0, what's supposed to happen?
Quoted 2 lines
Should userspace evict the BO from its local cache and allocate one fresh?
Yes. Just like msm/freedreno.
Quoted 1 line
Or just remmap? Or something else?
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/2] drm/panfrost: Add madvise and shrinker support
Quoted 8 lines
Quoted 6 lines
Just to clarify about the
retainedflag: if userspace does a madvise(WILLNEED) and we find out that retained=0, what's supposed to happen?Should userspace evict the BO from its local cache and allocate one fresh?
Yes. Just like msm/freedreno.
Got it. In that case, the series has my A-b :)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 24 lines · Rob Herring
Add support to the shmem GEM helpers for tracking madvise state and purging pages. This is based on the msm implementation.
The BO provides a
list_head, but the list management is handled outside of the shmem helpers as there are different locking requirements.Cc Tomeu Vizoso <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Sean Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Eric Anholt <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 57 ++++++++++++++++++++++++++ include/drm/drm_gem_shmem_helper.h | 15 +++++++ 2 files changed, 72 insertions(+)drivers/gpu/drm/drm_gem_shmem_helper.c +0
-0
drivers/gpu/drm/drm_gem_shmem_helper.c struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t · line 77
Quoted 3 lines
drivers/gpu/drm/drm_gem_shmem_helper.c +0
-0@@ -75,6 +75,7 @@ struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t shmem =to_drm_gem_shmem_obj (obj);mutex_init (&shmem->pages_lock);mutex_init (&shmem->vmap_lock);
Maybe a bit late, but for reasons (interop with ttm, which will be more important once we have dynamic dma-buf) it would be real nice to use the reservation_obj lock for all this stuff. msm, being struct_mutex based, isn't a great example here. The downside is that it will be a lot harder to get msm to use these then, but much better to not spread struct_mutex inspired locking too far.
Other bit: Wire this all up in a shrinker while at it? -Daniel
Quoted 103 lines
drivers/gpu/drm/drm_gem_shmem_helper.c +57
-0+INIT_LIST_HEAD (&shmem->madv_list);/* * Our buffers are kept pinned, so allocating them @@ -362,6 +363,62 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv, }EXPORT_SYMBOL (drm_gem_shmem_create_with_handle); +/* Update madvise status, returns true if not purged, else +* false or -errno. +*/ +int drm_gem_shmem_madvise (struct drm_gem_object *obj,int madv) +{ +struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); + +mutex_lock (&shmem->pages_lock); + +if (shmem->madv >=0 ) + shmem->madv = madv; + + madv = shmem->madv; + +mutex_unlock (&shmem->pages_lock); + +return (madv >=0 ); +} +EXPORT_SYMBOL (drm_gem_shmem_madvise); + +void drm_gem_shmem_purge_locked (struct drm_gem_object *obj) +{ +struct drm_device *dev = obj->dev; +struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); + +WARN_ON (!drm_gem_shmem_is_purgeable (shmem)); + +drm_gem_shmem_put_pages_locked (shmem); + + shmem->madv =-1 ; + +drm_vma_node_unmap (&obj->vma_node, dev->anon_inode->i_mapping); +drm_gem_free_mmap_offset (obj); + +/* Our goal here is to return as much of the memory as +* is possible back to the system as we are called from OOM. +* To do this we must instruct the shmfs to drop all of its +* backing pages, *now*. +*/ +shmem_truncate_range (file_inode (obj->filp),0 , (loff_t)-1 ); + +invalidate_mapping_pages (file_inode (obj->filp)->i_mapping, +0 , (loff_t)-1 ); +} +EXPORT_SYMBOL (drm_gem_shmem_purge_locked); + +void drm_gem_shmem_purge (struct drm_gem_object *obj) +{ +struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); + +mutex_lock (&shmem->pages_lock); +drm_gem_shmem_purge_locked (obj); +mutex_unlock (&shmem->pages_lock); +} +EXPORT_SYMBOL (drm_gem_shmem_purge); +/** * drm_gem_shmem_dumb_create - Create a dumb shmem buffer object * @file: DRM file structure to create the dumb buffer for include/drm/drm_gem_shmem_helper.h +15
-0@@ -44,6 +44,9 @@ struct drm_gem_shmem_object {*/ unsigned int pages_use_count; +int madv; +struct list_head madv_list; +/** * @pages_mark_dirty_on_put: * @@ -121,6 +124,18 @@ void drm_gem_shmem_unpin(struct drm_gem_object *obj);void *drm_gem_shmem_vmap (struct drm_gem_object *obj);void drm_gem_shmem_vunmap (struct drm_gem_object *obj,void *vaddr); +int drm_gem_shmem_madvise (struct drm_gem_object *obj,int madv); + +static inline bool drm_gem_shmem_is_purgeable (struct drm_gem_shmem_object *shmem) +{ +return (shmem->madv >0 ) && + !shmem->vmap_use_count && shmem->sgt && + !shmem->base.dma_buf && !shmem->base.import_attach; +} + +void drm_gem_shmem_purge_locked (struct drm_gem_object *obj); +void drm_gem_shmem_purge (struct drm_gem_object *obj); +struct drm_gem_shmem_object * drm_gem_shmem_create_with_handle(struct drm_file *file_priv, struct drm_device *dev, size_t size,Signature · 1 line
2.20.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 21 lines · Daniel Vetter
Quoted 19 lines · Rob Herring
Add support to the shmem GEM helpers for tracking madvise state and purging pages. This is based on the msm implementation.
The BO provides a
list_head, but the list management is handled outside of the shmem helpers as there are different locking requirements.Cc Tomeu Vizoso <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Sean Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Eric Anholt <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 57 ++++++++++++++++++++++++++ include/drm/drm_gem_shmem_helper.h | 15 +++++++ 2 files changed, 72 insertions(+)
Quoted 16 lines
drivers/gpu/drm/drm_gem_shmem_helper.c struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t · line 77
Quoted 8 lines
drivers/gpu/drm/drm_gem_shmem_helper.c +0
-0@@ -75,6 +75,7 @@ struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t shmem =to_drm_gem_shmem_obj (obj);mutex_init (&shmem->pages_lock);mutex_init (&shmem->vmap_lock);Maybe a bit late, but for reasons (interop with ttm, which will be more important once we have dynamic dma-buf) it would be real nice to use the
reservation_objlock for all this stuff. msm, beingstruct_mutexbased, isn't a great example here. The downside is that it will be a lot harder to get msm to use these then, but much better to not spreadstruct_mutexinspired locking too far.
but somewhere you need to protect access to list of bo's that are available to shrink.. iirc that is the only thing we should need struct_mutex for now in shrinker path in drm/msm. The per-bo state is protected by a per-bo lock.
BR,
-R
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerQuoted 40 lines · Rob Clark
Quoted 21 lines · Daniel Vetter
Quoted 19 lines · Rob Herring
Add support to the shmem GEM helpers for tracking madvise state and purging pages. This is based on the msm implementation.
The BO provides a
list_head, but the list management is handled outside of the shmem helpers as there are different locking requirements.Cc Tomeu Vizoso <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Sean Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Eric Anholt <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 57 ++++++++++++++++++++++++++ include/drm/drm_gem_shmem_helper.h | 15 +++++++ 2 files changed, 72 insertions(+)Quoted 16 lines
drivers/gpu/drm/drm_gem_shmem_helper.c struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t · line 77
Quoted 8 lines
drivers/gpu/drm/drm_gem_shmem_helper.c +0
-0@@ -75,6 +75,7 @@ struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t shmem =to_drm_gem_shmem_obj (obj);mutex_init (&shmem->pages_lock);mutex_init (&shmem->vmap_lock);Maybe a bit late, but for reasons (interop with ttm, which will be more important once we have dynamic dma-buf) it would be real nice to use the
reservation_objlock for all this stuff. msm, beingstruct_mutexbased, isn't a great example here. The downside is that it will be a lot harder to get msm to use these then, but much better to not spreadstruct_mutexinspired locking too far.
Quoted 4 lines
but somewhere you need to protect access to list of bo's that are available to shrink.. iirc that is the only thing we should need
struct_mutexfor now in shrinker path in drm/msm. The per-bo state is protected by a per-bo lock.
Right. And for panfrost, I have a lock just for the shrinker list and don't use struct_mutex. Hopefully I've understood the locking requirements sufficiently.
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 99 lines · Rob Herring
Add support to the shmem GEM helpers for tracking madvise state and purging pages. This is based on the msm implementation.
The BO provides a
list_head, but the list management is handled outside of the shmem helpers as there are different locking requirements.Cc Tomeu Vizoso <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Sean Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Eric Anholt <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 57 ++++++++++++++++++++++++++ include/drm/drm_gem_shmem_helper.h | 15 +++++++ 2 files changed, 72 insertions(+)drivers/gpu/drm/drm_gem_shmem_helper.c +57
-0@@ -75,6 +75,7 @@ struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t shmem =to_drm_gem_shmem_obj (obj);mutex_init (&shmem->pages_lock);mutex_init (&shmem->vmap_lock); +INIT_LIST_HEAD (&shmem->madv_list);/* * Our buffers are kept pinned, so allocating them @@ -362,6 +363,62 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv, }EXPORT_SYMBOL (drm_gem_shmem_create_with_handle); +/* Update madvise status, returns true if not purged, else +* false or -errno. +*/ +int drm_gem_shmem_madvise (struct drm_gem_object *obj,int madv) +{ +struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); + +mutex_lock (&shmem->pages_lock); + +if (shmem->madv >=0 ) + shmem->madv = madv; + + madv = shmem->madv; + +mutex_unlock (&shmem->pages_lock); + +return (madv >=0 ); +} +EXPORT_SYMBOL (drm_gem_shmem_madvise); + +void drm_gem_shmem_purge_locked (struct drm_gem_object *obj) +{ +struct drm_device *dev = obj->dev; +struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); + +WARN_ON (!drm_gem_shmem_is_purgeable (shmem)); + +drm_gem_shmem_put_pages_locked (shmem); + + shmem->madv =-1 ; + +drm_vma_node_unmap (&obj->vma_node, dev->anon_inode->i_mapping); +drm_gem_free_mmap_offset (obj); + +/* Our goal here is to return as much of the memory as +* is possible back to the system as we are called from OOM. +* To do this we must instruct the shmfs to drop all of its +* backing pages, *now*. +*/ +shmem_truncate_range (file_inode (obj->filp),0 , (loff_t)-1 ); + +invalidate_mapping_pages (file_inode (obj->filp)->i_mapping, +0 , (loff_t)-1 ); +} +EXPORT_SYMBOL (drm_gem_shmem_purge_locked); + +void drm_gem_shmem_purge (struct drm_gem_object *obj) +{ +struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); + +mutex_lock (&shmem->pages_lock); +drm_gem_shmem_purge_locked (obj); +mutex_unlock (&shmem->pages_lock); +} +EXPORT_SYMBOL (drm_gem_shmem_purge); +/** * drm_gem_shmem_dumb_create - Create a dumb shmem buffer object * @file: DRM file structure to create the dumb buffer for include/drm/drm_gem_shmem_helper.h +0
-0
include/drm/drm_gem_shmem_helper.h struct drm_gem_shmem_object { · line 48
Quoted 5 lines
include/drm/drm_gem_shmem_helper.h +2
-0@@ -44,6 +44,9 @@ struct drm_gem_shmem_object {*/ unsigned int pages_use_count; +int madv; +struct list_head madv_list;
Hey Rob,
Not sure why I didn't notice this earlier, but:
../include/drm/drm_gem_shmem_helper.h:87: warning: Function parameter or member 'madv' not described in 'drm_gem_shmem_object' ../include/drm/drm_gem_shmem_helper.h:87: warning: Function parameter or member 'madv_list' not described in 'drm_gem_shmem_object'
Could you please add some kerneldoc for these?
Sean
Quoted 26 lines
include/drm/drm_gem_shmem_helper.h +13
-0+/** * @pages_mark_dirty_on_put: * @@ -121,6 +124,18 @@ void drm_gem_shmem_unpin(struct drm_gem_object *obj);void *drm_gem_shmem_vmap (struct drm_gem_object *obj);void drm_gem_shmem_vunmap (struct drm_gem_object *obj,void *vaddr); +int drm_gem_shmem_madvise (struct drm_gem_object *obj,int madv); + +static inline bool drm_gem_shmem_is_purgeable (struct drm_gem_shmem_object *shmem) +{ +return (shmem->madv >0 ) && + !shmem->vmap_use_count && shmem->sgt && + !shmem->base.dma_buf && !shmem->base.import_attach; +} + +void drm_gem_shmem_purge_locked (struct drm_gem_object *obj); +void drm_gem_shmem_purge (struct drm_gem_object *obj); +struct drm_gem_shmem_object * drm_gem_shmem_create_with_handle(struct drm_file *file_priv, struct drm_device *dev, size_t size,Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel