drm/i915: Change i915_gem_fault() to return vm_fault_t

Commit Message

Chris Wilson June 6, 2018, 9:45 p.m. UTC

In preparation for vm_fault_t becoming a distinct type, convert the
fault handler (i915_gem_fault()) over to the new interface.

Based on a patch by Souptick Joarder

References: 1c8f422059ae ("mm: change return type to vm_fault_t")
Signed-off-by: Chris Wilson <[e-mail]>
Cc: Souptick Joarder <[e-mail]>
Cc: Joonas Lahtinen <[e-mail]>
Cc: Matthew Auld <[e-mail]>
---
 drivers/gpu/drm/i915/i915_drv.h |  3 ++-
 drivers/gpu/drm/i915/i915_gem.c | 21 +++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

Comments

Matthew Auld June 6, 2018, 10:39 p.m. UTC | #1

On 6 June 2018 at 22:45, Chris Wilson <[e-mail]> wrote:
> In preparation for vm_fault_t becoming a distinct type, convert the
> fault handler (i915_gem_fault()) over to the new interface.
>
> Based on a patch by Souptick Joarder
>
> References: 1c8f422059ae ("mm: change return type to vm_fault_t")
> Signed-off-by: Chris Wilson <[e-mail]>
> Cc: Souptick Joarder <[e-mail]>
> Cc: Joonas Lahtinen <[e-mail]>
> Cc: Matthew Auld <[e-mail]>
Reviewed-by: Matthew Auld <[e-mail]>

Chris Wilson June 7, 2018, 7:48 a.m. UTC | #2

Quoting Matthew Auld (2018-06-06 23:39:07)
> On 6 June 2018 at 22:45, Chris Wilson <[e-mail]> wrote:
> > In preparation for vm_fault_t becoming a distinct type, convert the
> > fault handler (i915_gem_fault()) over to the new interface.
> >
> > Based on a patch by Souptick Joarder
> >
> > References: 1c8f422059ae ("mm: change return type to vm_fault_t")
> > Signed-off-by: Chris Wilson <[e-mail]>
> > Cc: Souptick Joarder <[e-mail]>
> > Cc: Joonas Lahtinen <[e-mail]>
> > Cc: Matthew Auld <[e-mail]>
> Reviewed-by: Matthew Auld <[e-mail]>

Thanks for the patch and review, pushed to dinq for 4.19.
-Chris

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a4bb30c32a52..bf39f3c39bb0 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -40,6 +40,7 @@ 
 #include <linux/hash.h>
 #include <linux/intel-iommu.h>
 #include <linux/kref.h>
+#include <linux/mm_types.h>
 #include <linux/perf_event.h>
 #include <linux/pm_qos.h>
 #include <linux/reservation.h>
@@ -3174,7 +3175,7 @@  int i915_gem_wait_for_idle(struct drm_i915_private *dev_priv,
 int __must_check i915_gem_suspend(struct drm_i915_private *dev_priv);
 void i915_gem_suspend_late(struct drm_i915_private *dev_priv);
 void i915_gem_resume(struct drm_i915_private *dev_priv);
-int i915_gem_fault(struct vm_fault *vmf);
+vm_fault_t i915_gem_fault(struct vm_fault *vmf);
 int i915_gem_object_wait(struct drm_i915_gem_object *obj,
 			 unsigned int flags,
 			 long timeout,
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 86f1f9aaa119..38f970609879 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1995,7 +1995,7 @@  compute_partial_view(struct drm_i915_gem_object *obj,
  * The current feature set supported by i915_gem_fault() and thus GTT mmaps
  * is exposed via I915_PARAM_MMAP_GTT_VERSION (see i915_gem_mmap_gtt_version).
  */
-int i915_gem_fault(struct vm_fault *vmf)
+vm_fault_t i915_gem_fault(struct vm_fault *vmf)
 {
 #define MIN_CHUNK_PAGES (SZ_1M >> PAGE_SHIFT)
 	struct vm_area_struct *area = vmf->vma;
@@ -2112,10 +2112,8 @@  int i915_gem_fault(struct vm_fault *vmf)
 		 * fail). But any other -EIO isn't ours (e.g. swap in failure)
 		 * and so needs to be reported.
 		 */
-		if (!i915_terminally_wedged(&dev_priv->gpu_error)) {
-			ret = VM_FAULT_SIGBUS;
-			break;
-		}
+		if (!i915_terminally_wedged(&dev_priv->gpu_error))
+			return VM_FAULT_SIGBUS;
 	case -EAGAIN:
 		/*
 		 * EAGAIN means the gpu is hung and we'll wait for the error
@@ -2130,21 +2128,16 @@  int i915_gem_fault(struct vm_fault *vmf)
 		 * EBUSY is ok: this just means that another thread
 		 * already did the job.
 		 */
-		ret = VM_FAULT_NOPAGE;
-		break;
+		return VM_FAULT_NOPAGE;
 	case -ENOMEM:
-		ret = VM_FAULT_OOM;
-		break;
+		return VM_FAULT_OOM;
 	case -ENOSPC:
 	case -EFAULT:
-		ret = VM_FAULT_SIGBUS;
-		break;
+		return VM_FAULT_SIGBUS;
 	default:
 		WARN_ONCE(ret, "unhandled error in i915_gem_fault: %i\n", ret);
-		ret = VM_FAULT_SIGBUS;
-		break;
+		return VM_FAULT_SIGBUS;
 	}
-	return ret;
 }
 
 static void __i915_gem_object_release_mmap(struct drm_i915_gem_object *obj)