[Intel-gfx] [PATCH v2 2/2] drm/i915: Handle vm_mmap error during I915_GEM_MMAP ioctl with WC set

Chris Wilson chris at chris-wilson.co.uk
Tue Jan 29 16:19:52 UTC 2019


Quoting Joonas Lahtinen (2019-01-29 16:12:37)
> Add err goto label and use it when VMA can't be established or changes
> underneath.
> 
> v2:
> - Dropping Fixes: as it's indeed impossible to race an object to the
>   error address. (Chris)
> 
> Reported-by: Adam Zabrocki <adamza at microsoft.com>
> Signed-off-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com>
> Cc: Adam Zabrocki <adamza at microsoft.com>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.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 7ca78c06b22c..f2933a8a506d 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -1740,6 +1740,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))

if (IS_ERR_VALUE(addr))
-Chris


More information about the Intel-gfx mailing list