[Intel-gfx] [PATCH] drm/i915: Prevent signals from interrupting close()

Daniel Vetter daniel at ffwll.ch
Wed Apr 9 16:49:02 CEST 2014


On Wed, Apr 09, 2014 at 08:03:39AM +0100, Chris Wilson wrote:
> We neither report any unfinished operations during releasing GEM objects
> associated with the file, and even if we did, it is bad form to report
> -EINTR from a close().
> 
> The root cause of the bug that first showed itself during close is that
> we do not do proper live tracking of vma and contexts under full-ppgtt,
> but this is useful piece of defensive programming enforcing our
> userspace API contract.
> 
> Cc: Ben Widawsky <benjamin.widawsky at intel.com>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

I'd really prefer something annoying and loud like we've done when nuking
the deferred free list in

commit 1488fc08c1706288616c602416654fd38c773deb
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Apr 24 15:47:31 2012 +0100

    drm/i915: Remove the deferred-free list

where we've added a WARN_ON in gem_free_object if any unbind was failing
due to interrupts. This patch here disables that imo useful safety check.
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_dma.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 24dd55a16436..d67ca8051e07 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1937,9 +1937,18 @@ void i915_driver_lastclose(struct drm_device * dev)
>  
>  void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
>  {
> +	struct drm_i915_private *dev_priv = to_i915(dev);
> +	bool was_interruptible;
> +
>  	mutex_lock(&dev->struct_mutex);
> +	was_interruptible = dev_priv->mm.interruptible;
> +	WARN_ON(!was_interruptible);
> +	dev_priv->mm.interruptible = false;
> +
>  	i915_gem_context_close(dev, file_priv);
>  	i915_gem_release(dev, file_priv);
> +
> +	dev_priv->mm.interruptible = was_interruptible;
>  	mutex_unlock(&dev->struct_mutex);
>  }
>  
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch



More information about the Intel-gfx mailing list