From: Daniel Vetter <daniel@ffwll.ch>
To: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>,
airlied@linux.ie, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v2] drm: Set vm_ops to GEM object's values during mmap
Date: Fri, 15 Jan 2021 15:11:23 +0100 [thread overview]
Message-ID: <YAGii4JitMpYr7iP@phenom.ffwll.local> (raw)
In-Reply-To: <f8b37a6e-b750-7b23-4628-8b11dbc04d36@ideasonboard.com>
On Fri, Jan 15, 2021 at 09:57:24AM +0000, Kieran Bingham wrote:
> Hi Thomas,
>
> On 15/01/2021 09:30, Thomas Zimmermann wrote:
> > The GEM mmap code relies on the GEM object's mmap callback to set the
> > VMA's vm_ops field. This is easily forgotten and already led to a memory
> > leak in the CMA helpers. Instead set the vm_ops field in the DRM core
> > code to the GEM object's value. Drivers with different needs can override
> > this in their mmap callback.
> >
> > v2:
> > * support (vm_ops == NULL) if mmap is given; required by VRAM
> > helpers
I guess vram helpers need this because ttm has it's own vm_ops struct?
Might be another thing worth unifying (eventually).
> >
> > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> > Fixes: f5ca8eb6f9bd ("drm/cma-helper: Implement mmap as GEM CMA object functions")
> > Reported-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> > Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>
> Re-tested just fine this side ;-)
> - https://paste.ubuntu.com/p/Jgz6xMKNJX/
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Thanks
>
> Kieran
>
> > Cc: Maxime Ripard <mripard@kernel.org>
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Cc: Eric Anholt <eric@anholt.net>
> > Cc: dri-devel@lists.freedesktop.org
> > ---
> > drivers/gpu/drm/drm_gem.c | 19 ++++++++++---------
> > drivers/gpu/drm/drm_prime.c | 2 ++
> > 2 files changed, 12 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> > index 34b2f111c01c..c2ce78c4edc3 100644
> > --- a/drivers/gpu/drm/drm_gem.c
> > +++ b/drivers/gpu/drm/drm_gem.c
> > @@ -1068,20 +1068,17 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
> > drm_gem_object_get(obj);
> >
> > vma->vm_private_data = obj;
> > + vma->vm_ops = obj->funcs->vm_ops;
> >
> > if (obj->funcs->mmap) {
> > ret = obj->funcs->mmap(obj, vma);
> > - if (ret) {
> > - drm_gem_object_put(obj);
> > - return ret;
> > - }
> > + if (ret)
> > + goto err_drm_gem_object_put;
> > WARN_ON(!(vma->vm_flags & VM_DONTEXPAND));
> > } else {
> > - if (obj->funcs->vm_ops)
> > - vma->vm_ops = obj->funcs->vm_ops;
> > - else {
> > - drm_gem_object_put(obj);
> > - return -EINVAL;
> > + if (!vma->vm_ops) {
> > + ret = -EINVAL;
> > + goto err_drm_gem_object_put;
> > }
> >
> > vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
> > @@ -1090,6 +1087,10 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
> > }
> >
> > return 0;
> > +
> > +err_drm_gem_object_put:
> > + drm_gem_object_put(obj);
> > + return ret;
> > }
> > EXPORT_SYMBOL(drm_gem_mmap_obj);
> >
> > diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
> > index 683aa29ecd3b..2a54f86856af 100644
> > --- a/drivers/gpu/drm/drm_prime.c
> > +++ b/drivers/gpu/drm/drm_prime.c
> > @@ -717,6 +717,8 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
> > vma->vm_pgoff += drm_vma_node_start(&obj->vma_node);
> >
> > if (obj->funcs && obj->funcs->mmap) {
> > + vma->vm_ops = obj->funcs->vm_ops;
> > +
Do you know how much we still need the non-obj->funcs path here? Maybe
time to detele it and wrape the obj->funcs check in a WARN_ON?
-Daniel
> > ret = obj->funcs->mmap(obj, vma);
> > if (ret)
> > return ret;
> >
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-01-15 14:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 9:30 [PATCH v2] drm: Set vm_ops to GEM object's values during mmap Thomas Zimmermann
2021-01-15 9:57 ` Kieran Bingham
2021-01-15 14:11 ` Daniel Vetter [this message]
2021-01-15 14:23 ` Thomas Zimmermann
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=YAGii4JitMpYr7iP@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=kieran.bingham+renesas@ideasonboard.com \
--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).