drm/shmem-helpers: Ensure get_pages is not called on imported dma-buf
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 11 May 2020 09:35:53 +0000 (11:35 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 8 Jun 2020 15:03:41 +0000 (17:03 +0200)
Just a bit of light paranoia. Also sprinkle this check over
drm_gem_shmem_get_sg_table, which should only be called when
exporting, same for the pin/unpin functions, on which it relies to
work correctly.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Noralf Trønnes <noralf@tronnes.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200511093554.211493-9-daniel.vetter@ffwll.ch
drivers/gpu/drm/drm_gem_shmem_helper.c

index afe9668f1750c46c328c73f6465e62cfc1799655..06cee8e97d27a55833f45afc5b912905df0d3199 100644 (file)
@@ -170,6 +170,8 @@ int drm_gem_shmem_get_pages(struct drm_gem_shmem_object *shmem)
 {
        int ret;
 
+       WARN_ON(shmem->base.import_attach);
+
        ret = mutex_lock_interruptible(&shmem->pages_lock);
        if (ret)
                return ret;
@@ -225,6 +227,8 @@ int drm_gem_shmem_pin(struct drm_gem_object *obj)
 {
        struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
 
+       WARN_ON(shmem->base.import_attach);
+
        return drm_gem_shmem_get_pages(shmem);
 }
 EXPORT_SYMBOL(drm_gem_shmem_pin);
@@ -240,6 +244,8 @@ void drm_gem_shmem_unpin(struct drm_gem_object *obj)
 {
        struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
 
+       WARN_ON(shmem->base.import_attach);
+
        drm_gem_shmem_put_pages(shmem);
 }
 EXPORT_SYMBOL(drm_gem_shmem_unpin);
@@ -510,6 +516,8 @@ static void drm_gem_shmem_vm_open(struct vm_area_struct *vma)
        struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
        int ret;
 
+       WARN_ON(shmem->base.import_attach);
+
        ret = drm_gem_shmem_get_pages(shmem);
        WARN_ON_ONCE(ret != 0);
 
@@ -611,6 +619,8 @@ struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_object *obj)
 {
        struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
 
+       WARN_ON(shmem->base.import_attach);
+
        return drm_prime_pages_to_sg(shmem->pages, obj->size >> PAGE_SHIFT);
 }
 EXPORT_SYMBOL_GPL(drm_gem_shmem_get_sg_table);