From: Chris Wilson <chris@chris-wilson.co.uk> To: Intel graphics driver community testing & development <intel-gfx@lists.freedesktop.org>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, stable@vger.kernel.org, Akash Goel <akash.goel@intel.com>, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>, Adam Zabrocki <adamza@microsoft.com> Subject: Re: [PATCH 2/2] drm/i915: Handle vm_mmap error during I915_GEM_MMAP ioctl with WC set Date: Mon, 07 Jan 2019 09:18:34 +0000 [thread overview] Message-ID: <154685271408.27300.17141148405679660244@skylake-alporthouse-com> (raw) In-Reply-To: <20190107085656.22521-2-joonas.lahtinen@linux.intel.com> Quoting Joonas Lahtinen (2019-01-07 08:56:56) > Add err goto label and use it when VMA can't be established or changes > underneath. > > Fixes: 1816f9236303 ("drm/i915: Support creation of unbound wc user mappings for objects") Dubious. All it changes is one branch where the error is forced to -ENOMEM. > Reported-by: Adam Zabrocki <adamza@microsoft.com> > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: <stable@vger.kernel.org> # v4.0+ > Cc: Akash Goel <akash.goel@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> > Cc: Adam Zabrocki <adamza@microsoft.com> > --- > drivers/gpu/drm/i915/i915_gem.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index f1d594a53978..97cbc0e27e3e 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1738,6 +1738,9 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > addr = vm_mmap(obj->base.filp, 0, args->size, > PROT_READ | PROT_WRITE, MAP_SHARED, > args->offset); > + if (IS_ERR((void *)addr)) > + goto err; > + > if (args->flags & I915_MMAP_WC) { > struct mm_struct *mm = current->mm; > struct vm_area_struct *vma; > @@ -1753,17 +1756,22 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > else > addr = -ENOMEM; > up_write(&mm->mmap_sem); > + if (IS_ERR((void *)addr)) > + goto err; The issue still remains that we are returning having called vm_mmap and leaving the vma intact. And we've established above that calling vm_munmap() is a race. -Chris
WARNING: multiple messages have this Message-ID (diff)
From: Chris Wilson <chris@chris-wilson.co.uk> To: Intel graphics driver community testing & development <intel-gfx@lists.freedesktop.org> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, stable@vger.kernel.org, Akash Goel <akash.goel@intel.com>, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>, Adam Zabrocki <adamza@microsoft.com> Subject: Re: [PATCH 2/2] drm/i915: Handle vm_mmap error during I915_GEM_MMAP ioctl with WC set Date: Mon, 07 Jan 2019 09:18:34 +0000 [thread overview] Message-ID: <154685271408.27300.17141148405679660244@skylake-alporthouse-com> (raw) In-Reply-To: <20190107085656.22521-2-joonas.lahtinen@linux.intel.com> Quoting Joonas Lahtinen (2019-01-07 08:56:56) > Add err goto label and use it when VMA can't be established or changes > underneath. > > Fixes: 1816f9236303 ("drm/i915: Support creation of unbound wc user mappings for objects") Dubious. All it changes is one branch where the error is forced to -ENOMEM. > Reported-by: Adam Zabrocki <adamza@microsoft.com> > Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: <stable@vger.kernel.org> # v4.0+ > Cc: Akash Goel <akash.goel@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> > Cc: Adam Zabrocki <adamza@microsoft.com> > --- > drivers/gpu/drm/i915/i915_gem.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index f1d594a53978..97cbc0e27e3e 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1738,6 +1738,9 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > addr = vm_mmap(obj->base.filp, 0, args->size, > PROT_READ | PROT_WRITE, MAP_SHARED, > args->offset); > + if (IS_ERR((void *)addr)) > + goto err; > + > if (args->flags & I915_MMAP_WC) { > struct mm_struct *mm = current->mm; > struct vm_area_struct *vma; > @@ -1753,17 +1756,22 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > else > addr = -ENOMEM; > up_write(&mm->mmap_sem); > + if (IS_ERR((void *)addr)) > + goto err; The issue still remains that we are returning having called vm_mmap and leaving the vma intact. And we've established above that calling vm_munmap() is a race. -Chris
next prev parent reply other threads:[~2019-01-07 9:18 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-07 8:56 [PATCH 1/2] drm/i915: Prevent a race during I915_GEM_MMAP ioctl with WC set Joonas Lahtinen 2019-01-07 8:56 ` Joonas Lahtinen 2019-01-07 8:56 ` [PATCH 2/2] drm/i915: Handle vm_mmap error " Joonas Lahtinen 2019-01-07 8:56 ` Joonas Lahtinen 2019-01-07 9:18 ` Chris Wilson [this message] 2019-01-07 9:18 ` Chris Wilson 2019-01-07 9:29 ` Tvrtko Ursulin 2019-01-07 9:29 ` Tvrtko Ursulin 2019-01-07 9:13 ` [PATCH 1/2] drm/i915: Prevent a race " Chris Wilson 2019-01-07 9:13 ` Chris Wilson 2019-01-07 9:24 ` Tvrtko Ursulin 2019-01-07 9:24 ` Tvrtko Ursulin 2019-01-07 9:27 ` ✓ Fi.CI.BAT: success for series starting with [1/2] " Patchwork 2019-01-07 10:44 ` ✗ Fi.CI.IGT: failure " Patchwork 2019-01-07 10:58 ` Chris Wilson 2019-02-07 13:38 ` [PATCH 1/2] " Joonas Lahtinen 2019-02-07 13:38 ` Joonas Lahtinen 2019-02-08 0:03 ` Adam Zabrocki 2019-02-08 0:03 ` Adam Zabrocki
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=154685271408.27300.17141148405679660244@skylake-alporthouse-com \ --to=chris@chris-wilson.co.uk \ --cc=adamza@microsoft.com \ --cc=akash.goel@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=joonas.lahtinen@linux.intel.com \ --cc=stable@vger.kernel.org \ --cc=tvrtko.ursulin@linux.intel.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.