From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Gerd Hoffmann <kraxel@redhat.com>, Daniel Vetter <daniel.vetter@intel.com> Subject: [PATCH 8/9] drm/shmem-helpers: Ensure get_pages is not called on imported dma-buf Date: Mon, 11 May 2020 11:35:53 +0200 [thread overview] Message-ID: <20200511093554.211493-9-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20200511093554.211493-1-daniel.vetter@ffwll.ch> 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. 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> --- drivers/gpu/drm/drm_gem_shmem_helper.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 117a7841e284..f7011338813e 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -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); -- 2.26.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: "Rob Herring" <robh@kernel.org>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "Noralf Trønnes" <noralf@tronnes.org>, "Gerd Hoffmann" <kraxel@redhat.com>, "Daniel Vetter" <daniel.vetter@intel.com> Subject: [Intel-gfx] [PATCH 8/9] drm/shmem-helpers: Ensure get_pages is not called on imported dma-buf Date: Mon, 11 May 2020 11:35:53 +0200 [thread overview] Message-ID: <20200511093554.211493-9-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20200511093554.211493-1-daniel.vetter@ffwll.ch> 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. 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> --- drivers/gpu/drm/drm_gem_shmem_helper.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 117a7841e284..f7011338813e 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -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); -- 2.26.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-05-11 9:36 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-11 9:35 [PATCH 0/9] shmem helper untangling Daniel Vetter 2020-05-11 9:35 ` [Intel-gfx] " Daniel Vetter 2020-05-11 9:35 ` [PATCH 1/9] drm/msm: Don't call dma_buf_vunmap without _vmap Daniel Vetter 2020-05-11 9:35 ` [Intel-gfx] " Daniel Vetter 2020-05-11 9:35 ` Daniel Vetter 2020-05-11 15:24 ` Rob Clark 2020-05-11 15:24 ` [Intel-gfx] " Rob Clark 2020-05-11 15:24 ` Rob Clark 2020-05-11 15:28 ` Daniel Vetter 2020-05-11 15:28 ` [Intel-gfx] " Daniel Vetter 2020-05-11 15:28 ` Daniel Vetter 2020-05-11 20:36 ` Rob Clark 2020-05-11 20:36 ` [Intel-gfx] " Rob Clark 2020-05-11 20:36 ` Rob Clark 2020-05-14 20:11 ` [PATCH] " Daniel Vetter 2020-05-14 20:11 ` Daniel Vetter 2020-05-28 8:29 ` Daniel Vetter 2020-05-28 8:29 ` Daniel Vetter 2020-05-31 16:02 ` Rob Clark 2020-05-31 16:02 ` Rob Clark 2020-06-03 12:46 ` Daniel Vetter 2020-06-03 12:46 ` Daniel Vetter 2020-05-11 9:35 ` [PATCH 2/9] drm/gem: WARN if drm_gem_get_pages is called on a private obj Daniel Vetter 2020-05-11 9:35 ` [Intel-gfx] " Daniel Vetter 2020-05-14 7:45 ` Thomas Zimmermann 2020-05-14 7:45 ` [Intel-gfx] " Thomas Zimmermann 2020-05-11 9:35 ` [PATCH 3/9] drm/doc: Some polish for shmem helpers Daniel Vetter 2020-05-11 9:35 ` [Intel-gfx] " Daniel Vetter 2020-05-11 11:12 ` Thomas Zimmermann 2020-05-11 11:12 ` [Intel-gfx] " Thomas Zimmermann 2020-05-14 20:05 ` Daniel Vetter 2020-05-14 20:05 ` [Intel-gfx] " Daniel Vetter 2020-05-15 6:26 ` Thomas Zimmermann 2020-05-15 6:26 ` [Intel-gfx] " Thomas Zimmermann 2020-05-11 9:35 ` [PATCH 4/9] drm/virtio: Call the right " Daniel Vetter 2020-05-11 9:35 ` [Intel-gfx] " Daniel Vetter 2020-05-11 9:35 ` Daniel Vetter 2020-05-14 7:46 ` Thomas Zimmermann 2020-05-14 7:46 ` [Intel-gfx] " Thomas Zimmermann 2020-05-14 7:46 ` Thomas Zimmermann 2020-05-11 9:35 ` [PATCH 5/9] drm/udl: Don't call get/put_pages on imported dma-buf Daniel Vetter 2020-05-11 9:35 ` [Intel-gfx] " Daniel Vetter 2020-05-11 11:23 ` Thomas Zimmermann 2020-05-11 11:23 ` [Intel-gfx] " Thomas Zimmermann 2020-05-11 11:37 ` Daniel Vetter 2020-05-11 11:37 ` [Intel-gfx] " Daniel Vetter 2020-05-11 12:04 ` Thomas Zimmermann 2020-05-11 12:04 ` [Intel-gfx] " Thomas Zimmermann 2020-05-14 7:25 ` Thomas Zimmermann 2020-05-14 7:25 ` [Intel-gfx] " Thomas Zimmermann 2020-05-14 12:47 ` Daniel Vetter 2020-05-14 12:47 ` [Intel-gfx] " Daniel Vetter 2020-06-03 12:57 ` Daniel Vetter 2020-06-03 12:57 ` [Intel-gfx] " Daniel Vetter 2020-05-11 9:35 ` [PATCH 6/9] drm/shmem-helpers: Don't call get/put_pages on imported dma-buf in vmap Daniel Vetter 2020-05-11 9:35 ` [Intel-gfx] " Daniel Vetter 2020-05-14 7:16 ` Thomas Zimmermann 2020-05-14 7:16 ` [Intel-gfx] " Thomas Zimmermann 2020-05-14 12:49 ` Daniel Vetter 2020-05-14 12:49 ` [Intel-gfx] " Daniel Vetter 2020-05-14 20:22 ` [PATCH] " Daniel Vetter 2020-05-11 9:35 ` [PATCH 7/9] drm/shmem-helpers: Redirect mmap for imported dma-buf Daniel Vetter 2020-05-11 9:35 ` [Intel-gfx] " Daniel Vetter 2020-05-14 7:23 ` Thomas Zimmermann 2020-05-14 7:23 ` [Intel-gfx] " Thomas Zimmermann 2020-05-14 12:47 ` Daniel Vetter 2020-05-14 12:47 ` [Intel-gfx] " Daniel Vetter 2020-05-27 18:32 ` Thomas Zimmermann 2020-05-27 18:32 ` [Intel-gfx] " Thomas Zimmermann 2020-05-27 19:34 ` Daniel Vetter 2020-05-27 19:34 ` [Intel-gfx] " Daniel Vetter 2020-05-28 12:53 ` Thomas Zimmermann 2020-05-28 12:53 ` [Intel-gfx] " Thomas Zimmermann 2020-05-11 9:35 ` Daniel Vetter [this message] 2020-05-11 9:35 ` [Intel-gfx] [PATCH 8/9] drm/shmem-helpers: Ensure get_pages is not called on " Daniel Vetter 2020-05-14 7:30 ` Thomas Zimmermann 2020-05-14 7:30 ` [Intel-gfx] " Thomas Zimmermann 2020-06-03 13:12 ` Daniel Vetter 2020-06-03 13:12 ` [Intel-gfx] " Daniel Vetter 2020-06-08 14:40 ` Thomas Zimmermann 2020-06-08 14:40 ` [Intel-gfx] " Thomas Zimmermann 2020-06-08 15:04 ` Daniel Vetter 2020-06-08 15:04 ` [Intel-gfx] " Daniel Vetter 2020-05-11 9:35 ` [PATCH 9/9] drm/shmem-helpers: Simplify dma-buf importing Daniel Vetter 2020-05-11 9:35 ` [Intel-gfx] " Daniel Vetter 2020-05-14 7:44 ` Thomas Zimmermann 2020-05-14 7:44 ` [Intel-gfx] " Thomas Zimmermann 2020-05-14 12:55 ` Daniel Vetter 2020-05-14 12:55 ` [Intel-gfx] " Daniel Vetter 2020-05-14 15:26 ` Thomas Zimmermann 2020-05-14 15:26 ` [Intel-gfx] " Thomas Zimmermann 2020-05-20 18:02 ` [PATCH] " Daniel Vetter 2020-05-29 13:34 ` Boris Brezillon 2020-05-29 13:35 ` Boris Brezillon 2020-05-29 13:49 ` Boris Brezillon 2020-05-29 14:05 ` Daniel Vetter 2020-05-29 14:36 ` Boris Brezillon 2020-06-15 8:23 ` [PATCH 9/9] " Thomas Zimmermann 2020-06-15 8:23 ` [Intel-gfx] " Thomas Zimmermann 2020-05-11 11:32 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for shmem helper untangling Patchwork 2020-05-11 11:56 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-05-11 14:30 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2020-05-29 13:52 ` [PATCH 0/9] " Boris Brezillon 2020-05-29 13:52 ` [Intel-gfx] " Boris Brezillon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200511093554.211493-9-daniel.vetter@ffwll.ch \ --to=daniel.vetter@ffwll.ch \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=kraxel@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.