From: Daniel Vetter <daniel@ffwll.ch>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: dri-devel@lists.freedesktop.org, tzimmermann@suse.de,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v4 05/17] drm: add mmap() to drm_gem_object_funcs
Date: Tue, 3 Sep 2019 11:48:59 +0200 [thread overview]
Message-ID: <20190903094859.GQ2112@phenom.ffwll.local> (raw)
In-Reply-To: <20190808134417.10610-6-kraxel@redhat.com>
On Thu, Aug 08, 2019 at 03:44:05PM +0200, Gerd Hoffmann wrote:
> drm_gem_object_funcs->vm_ops alone can't handle
> everything mmap() needs. Add a new callback for it.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> include/drm/drm_gem.h | 9 +++++++++
> drivers/gpu/drm/drm_gem.c | 6 ++++++
> 2 files changed, 15 insertions(+)
>
> diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
> index ae693c0666cd..ee3c4ad742c6 100644
> --- a/include/drm/drm_gem.h
> +++ b/include/drm/drm_gem.h
> @@ -150,6 +150,15 @@ struct drm_gem_object_funcs {
> */
> void (*vunmap)(struct drm_gem_object *obj, void *vaddr);
>
> + /**
> + * @mmap:
> + *
> + * Called by drm_gem_mmap() for additional checks/setup.
> + *
> + * This callback is optional.
> + */
> + int (*mmap)(struct drm_gem_object *obj, struct vm_area_struct *vma);
I think if we do an mmap callback, it should replace all the mmap handling
(except the drm_gem_object_get) that drm_gem_mmap_obj does. So maybe
something like the below:
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 6854f5867d51..e8b7779633dd 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -1104,17 +1104,22 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
if (obj_size < vma->vm_end - vma->vm_start)
return -EINVAL;
- if (obj->funcs && obj->funcs->vm_ops)
- vma->vm_ops = obj->funcs->vm_ops;
- else if (dev->driver->gem_vm_ops)
- vma->vm_ops = dev->driver->gem_vm_ops;
- else
- return -EINVAL;
-
- vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
vma->vm_private_data = obj;
- vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
- vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
+
+ if (obj->funcs && obj->funcs->mmap)
+ obj->funcs->mmap(obj, vma);
+ else {
+ if (obj->funcs && obj->funcs->vm_ops)
+ vma->vm_ops = obj->funcs->vm_ops;
+ else if (dev->driver->gem_vm_ops)
+ vma->vm_ops = dev->driver->gem_vm_ops;
+ else
+ return -EINVAL;
+
+ vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
+ vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+ vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
+ }
/* Take a ref for this mapping of the object, so that the fault
* handler can dereference the mmap offset's pointer to the object.
Since I remember quite a few discussions where the default vma flag
wrangling we're doing is seriously getting in the way of things too.
I think even better would be if this new ->mmap hook could also be used
directly by the dma-buf mmap code, without having to jump through hoops
creating a fake file and fake vma offset and everything. I think with that
we'd have a really solid case to add this ->mmap hook.
-Daniel
> +
> /**
> * @vm_ops:
> *
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index afc38cece3f5..84db8de217e1 100644
> --- a/drivers/gpu/drm/drm_gem.c
> +++ b/drivers/gpu/drm/drm_gem.c
> @@ -1105,6 +1105,8 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
> vma->vm_ops = obj->funcs->vm_ops;
> else if (dev->driver->gem_vm_ops)
> vma->vm_ops = dev->driver->gem_vm_ops;
> + else if (obj->funcs && obj->funcs->mmap)
> + /* obj->funcs->mmap must set vma->vm_ops */;
> else
> return -EINVAL;
>
> @@ -1192,6 +1194,10 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
> ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node) << PAGE_SHIFT,
> vma);
>
> + if (ret == 0)
> + if (obj->funcs->mmap)
> + ret = obj->funcs->mmap(obj, vma);
> +
> drm_gem_object_put_unlocked(obj);
>
> return ret;
> --
> 2.18.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2019-09-03 9:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190808134417.10610-1-kraxel@redhat.com>
2019-08-08 13:44 ` [PATCH v4 01/17] drm/ttm: turn ttm_bo_device.vma_manager into a pointer Gerd Hoffmann
2019-09-03 9:49 ` Daniel Vetter
2019-08-08 13:44 ` [PATCH v4 02/17] drm/ttm: add gem_ttm_bo_device_init() Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 03/17] drm/vram: switch vram helpers to the new gem_ttm_bo_device_init() Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 04/17] drm/qxl: switch qxl " Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 05/17] drm: add mmap() to drm_gem_object_funcs Gerd Hoffmann
2019-09-03 9:48 ` Daniel Vetter [this message]
2019-09-06 12:13 ` Gerd Hoffmann
2019-09-06 13:10 ` Daniel Vetter
2019-09-09 10:06 ` Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 06/17] drm/shmem: switch shmem helper to drm_gem_object_funcs->mmap Gerd Hoffmann
2019-08-08 22:51 ` Rob Herring
2019-08-08 13:44 ` [PATCH v4 07/17] drm/shmem: drop DEFINE_DRM_GEM_SHMEM_FOPS Gerd Hoffmann
2019-08-08 22:51 ` Rob Herring
2019-08-08 13:44 ` [PATCH v4 08/17] drm/ttm: factor out ttm_bo_mmap_vma_setup Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 09/17] drm/ttm: add drm_gem_ttm_mmap() Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 10/17] drm/vram: switch vram helper to drm_gem_object_funcs->mmap codepath Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 11/17] drm/vram: drop verify_access Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 12/17] drm: drop DRM_VRAM_MM_FILE_OPERATIONS Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 13/17] drm/qxl: use drm_gem_object_funcs Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 14/17] drm/qxl: drop qxl_ttm_fault Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 15/17] drm/qxl: switch qxl to drm_gem_object_funcs->mmap codepath Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 16/17] drm/qxl: drop verify_access Gerd Hoffmann
2019-08-08 13:44 ` [PATCH v4 17/17] drm/qxl: use DEFINE_DRM_GEM_FOPS() Gerd Hoffmann
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=20190903094859.GQ2112@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=maxime.ripard@bootlin.com \
--cc=sean@poorly.run \
--cc=tzimmermann@suse.de \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).