We can remove the false coupling between RPM and struct mutex by the
observation that we can use the RPM wakeref as the barrier around user
mmap access. That is as we tear down the user's PTE atomically from
within rpm suspend and then to fault in new PTE requires the rpm
wakeref, means that no user access is possible through those PTE without
RPM being awake. Having made that observation, we can then remove the
presumption of having to take rpm outside of struct_mutex and so allow
fine grained acquisition of a wakeref around hw access rather than
having to remember to acquire the wakeref early on.

v2: Rejig placement of the new intel_runtime_pm_get() to be as tight
as possible around the GTT pread/pwrite.

Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
Cc: Imre Deak <imre.d...@intel.com>
Cc: Daniel Vetter <dan...@ffwll.ch>
Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
Reviewed-by: Daniel Vetter <dan...@ffwll.ch>
---
 drivers/gpu/drm/i915/i915_debugfs.c    | 22 --------------------
 drivers/gpu/drm/i915/i915_drv.c        | 19 -----------------
 drivers/gpu/drm/i915/i915_gem.c        | 37 ++++++++++++++++++----------------
 drivers/gpu/drm/i915/i915_gem_gtt.c    | 17 ++++++++++++----
 drivers/gpu/drm/i915/i915_gem_tiling.c |  4 ----
 5 files changed, 33 insertions(+), 66 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index 18f840def1b2..ab44b71d079d 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1396,14 +1396,9 @@ static int i915_hangcheck_info(struct seq_file *m, void 
*unused)
 static int ironlake_drpc_info(struct seq_file *m)
 {
        struct drm_i915_private *dev_priv = node_to_i915(m->private);
-       struct drm_device *dev = &dev_priv->drm;
        u32 rgvmodectl, rstdbyctl;
        u16 crstandvid;
-       int ret;
 
-       ret = mutex_lock_interruptible(&dev->struct_mutex);
-       if (ret)
-               return ret;
        intel_runtime_pm_get(dev_priv);
 
        rgvmodectl = I915_READ(MEMMODECTL);
@@ -1411,7 +1406,6 @@ static int ironlake_drpc_info(struct seq_file *m)
        crstandvid = I915_READ16(CRSTANDVID);
 
        intel_runtime_pm_put(dev_priv);
-       mutex_unlock(&dev->struct_mutex);
 
        seq_printf(m, "HD boost: %s\n", yesno(rgvmodectl & MEMMODE_BOOST_EN));
        seq_printf(m, "Boost freq: %d\n",
@@ -2091,12 +2085,7 @@ static const char *swizzle_string(unsigned swizzle)
 static int i915_swizzle_info(struct seq_file *m, void *data)
 {
        struct drm_i915_private *dev_priv = node_to_i915(m->private);
-       struct drm_device *dev = &dev_priv->drm;
-       int ret;
 
-       ret = mutex_lock_interruptible(&dev->struct_mutex);
-       if (ret)
-               return ret;
        intel_runtime_pm_get(dev_priv);
 
        seq_printf(m, "bit6 swizzle for X-tiling = %s\n",
@@ -2136,7 +2125,6 @@ static int i915_swizzle_info(struct seq_file *m, void 
*data)
                seq_puts(m, "L-shaped memory detected\n");
 
        intel_runtime_pm_put(dev_priv);
-       mutex_unlock(&dev->struct_mutex);
 
        return 0;
 }
@@ -4799,13 +4787,9 @@ i915_wedged_set(void *data, u64 val)
        if (i915_reset_in_progress(&dev_priv->gpu_error))
                return -EAGAIN;
 
-       intel_runtime_pm_get(dev_priv);
-
        i915_handle_error(dev_priv, val,
                          "Manually setting wedged to %llu", val);
 
-       intel_runtime_pm_put(dev_priv);
-
        return 0;
 }
 
@@ -5040,22 +5024,16 @@ static int
 i915_cache_sharing_get(void *data, u64 *val)
 {
        struct drm_i915_private *dev_priv = data;
-       struct drm_device *dev = &dev_priv->drm;
        u32 snpcr;
-       int ret;
 
        if (!(IS_GEN6(dev_priv) || IS_GEN7(dev_priv)))
                return -ENODEV;
 
-       ret = mutex_lock_interruptible(&dev->struct_mutex);
-       if (ret)
-               return ret;
        intel_runtime_pm_get(dev_priv);
 
        snpcr = I915_READ(GEN6_MBCUNIT_SNPCR);
 
        intel_runtime_pm_put(dev_priv);
-       mutex_unlock(&dev->struct_mutex);
 
        *val = (snpcr & GEN6_MBC_SNPCR_MASK) >> GEN6_MBC_SNPCR_SHIFT;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8c3d4761dfa0..d08d6617e3b6 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2290,24 +2290,6 @@ static int intel_runtime_suspend(struct device *kdev)
 
        DRM_DEBUG_KMS("Suspending device\n");
 
-       /*
-        * We could deadlock here in case another thread holding struct_mutex
-        * calls RPM suspend concurrently, since the RPM suspend will wait
-        * first for this RPM suspend to finish. In this case the concurrent
-        * RPM resume will be followed by its RPM suspend counterpart. Still
-        * for consistency return -EAGAIN, which will reschedule this suspend.
-        */
-       if (!mutex_trylock(&dev->struct_mutex)) {
-               DRM_DEBUG_KMS("device lock contention, deffering suspend\n");
-               /*
-                * Bump the expiration timestamp, otherwise the suspend won't
-                * be rescheduled.
-                */
-               pm_runtime_mark_last_busy(kdev);
-
-               return -EAGAIN;
-       }
-
        disable_rpm_wakeref_asserts(dev_priv);
 
        /*
@@ -2315,7 +2297,6 @@ static int intel_runtime_suspend(struct device *kdev)
         * an RPM reference.
         */
        i915_gem_release_all_mmaps(dev_priv);
-       mutex_unlock(&dev->struct_mutex);
 
        intel_guc_suspend(dev);
 
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index b568694ec370..d1ab59fb7a02 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -826,6 +826,7 @@ i915_gem_gtt_pread(struct drm_device *dev,
        uint64_t offset;
        int ret;
 
+       intel_runtime_pm_get(to_i915(dev));
        vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0, PIN_MAPPABLE);
        if (!IS_ERR(vma)) {
                node.start = i915_ggtt_offset(vma);
@@ -927,6 +928,7 @@ out_unpin:
                i915_vma_unpin(vma);
        }
 out:
+       intel_runtime_pm_put(to_i915(dev));
        return ret;
 }
 
@@ -1061,12 +1063,9 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
        ret = i915_gem_shmem_pread(dev, obj, args, file);
 
        /* pread for non shmem backed objects */
-       if (ret == -EFAULT || ret == -ENODEV) {
-               intel_runtime_pm_get(to_i915(dev));
+       if (ret == -EFAULT || ret == -ENODEV)
                ret = i915_gem_gtt_pread(dev, obj, args->size,
                                        args->offset, args->data_ptr);
-               intel_runtime_pm_put(to_i915(dev));
-       }
 
        i915_gem_object_put(obj);
        mutex_unlock(&dev->struct_mutex);
@@ -1127,6 +1126,7 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_private *i915,
        if (i915_gem_object_is_tiled(obj))
                return -EFAULT;
 
+       intel_runtime_pm_get(i915);
        vma = i915_gem_object_ggtt_pin(obj, NULL, 0, 0,
                                       PIN_MAPPABLE | PIN_NONBLOCK);
        if (!IS_ERR(vma)) {
@@ -1236,6 +1236,7 @@ out_unpin:
                i915_vma_unpin(vma);
        }
 out:
+       intel_runtime_pm_put(i915);
        return ret;
 }
 
@@ -1468,12 +1469,12 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void 
*data,
         * perspective, requiring manual detiling by the client.
         */
        if (!i915_gem_object_has_struct_page(obj) ||
-           cpu_write_needs_clflush(obj)) {
-               ret = i915_gem_gtt_pwrite_fast(dev_priv, obj, args, file);
+           cpu_write_needs_clflush(obj))
                /* Note that the gtt paths might fail with non-page-backed user
                 * pointers (e.g. gtt mappings when moving data between
-                * textures). Fallback to the shmem path in that case. */
-       }
+                * textures). Fallback to the shmem path in that case.
+                */
+               ret = i915_gem_gtt_pwrite_fast(dev_priv, obj, args, file);
 
        if (ret == -EFAULT || ret == -ENOSPC) {
                if (obj->phys_handle)
@@ -1842,6 +1843,7 @@ int i915_gem_fault(struct vm_area_struct *area, struct 
vm_fault *vmf)
                goto err_unpin;
 
        /* Mark as being mmapped into userspace for later revocation */
+       assert_rpm_wakelock_held(dev_priv);
        spin_lock(&dev_priv->mm.userfault_lock);
        if (list_empty(&obj->userfault_link))
                list_add(&obj->userfault_link, &dev_priv->mm.userfault_list);
@@ -1927,8 +1929,13 @@ i915_gem_release_mmap(struct drm_i915_gem_object *obj)
        /* Serialisation between user GTT access and our code depends upon
         * revoking the CPU's PTE whilst the mutex is held. The next user
         * pagefault then has to wait until we release the mutex.
+        *
+        * Note that RPM complicates somewhat by adding an additional
+        * requirement that operations to the GGTT be made holding the RPM
+        * wakeref.
         */
        lockdep_assert_held(&i915->drm.struct_mutex);
+       intel_runtime_pm_get(i915);
 
        spin_lock(&i915->mm.userfault_lock);
        if (!list_empty(&obj->userfault_link)) {
@@ -1937,7 +1944,7 @@ i915_gem_release_mmap(struct drm_i915_gem_object *obj)
        }
        spin_unlock(&i915->mm.userfault_lock);
        if (!zap)
-               return;
+               goto out;
 
        drm_vma_node_unmap(&obj->base.vma_node,
                           obj->base.dev->anon_inode->i_mapping);
@@ -1950,6 +1957,9 @@ i915_gem_release_mmap(struct drm_i915_gem_object *obj)
         * memory writes before touching registers / GSM.
         */
        wmb();
+
+out:
+       intel_runtime_pm_put(i915);
 }
 
 void
@@ -3478,7 +3488,6 @@ int i915_gem_get_caching_ioctl(struct drm_device *dev, 
void *data,
 int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
                               struct drm_file *file)
 {
-       struct drm_i915_private *dev_priv = to_i915(dev);
        struct drm_i915_gem_caching *args = data;
        struct drm_i915_gem_object *obj;
        enum i915_cache_level level;
@@ -3507,11 +3516,9 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, 
void *data,
                return -EINVAL;
        }
 
-       intel_runtime_pm_get(dev_priv);
-
        ret = i915_mutex_lock_interruptible(dev);
        if (ret)
-               goto rpm_put;
+               return ret;
 
        obj = i915_gem_object_lookup(file, args->handle);
        if (!obj) {
@@ -3520,13 +3527,9 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, 
void *data,
        }
 
        ret = i915_gem_object_set_cache_level(obj, level);
-
        i915_gem_object_put(obj);
 unlock:
        mutex_unlock(&dev->struct_mutex);
-rpm_put:
-       intel_runtime_pm_put(dev_priv);
-
        return ret;
 }
 
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c 
b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 0a45063b465f..c6e743f96e6d 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2602,6 +2602,7 @@ static int ggtt_bind_vma(struct i915_vma *vma,
                         enum i915_cache_level cache_level,
                         u32 flags)
 {
+       struct drm_i915_private *i915 = to_i915(vma->vm->dev);
        struct drm_i915_gem_object *obj = vma->obj;
        u32 pte_flags = 0;
        int ret;
@@ -2614,8 +2615,10 @@ static int ggtt_bind_vma(struct i915_vma *vma,
        if (obj->gt_ro)
                pte_flags |= PTE_READ_ONLY;
 
+       intel_runtime_pm_get(i915);
        vma->vm->insert_entries(vma->vm, vma->pages, vma->node.start,
                                cache_level, pte_flags);
+       intel_runtime_pm_put(i915);
 
        /*
         * Without aliasing PPGTT there's no difference between
@@ -2631,6 +2634,7 @@ static int aliasing_gtt_bind_vma(struct i915_vma *vma,
                                 enum i915_cache_level cache_level,
                                 u32 flags)
 {
+       struct drm_i915_private *i915 = to_i915(vma->vm->dev);
        u32 pte_flags;
        int ret;
 
@@ -2645,14 +2649,15 @@ static int aliasing_gtt_bind_vma(struct i915_vma *vma,
 
 
        if (flags & I915_VMA_GLOBAL_BIND) {
+               intel_runtime_pm_get(i915);
                vma->vm->insert_entries(vma->vm,
                                        vma->pages, vma->node.start,
                                        cache_level, pte_flags);
+               intel_runtime_pm_put(i915);
        }
 
        if (flags & I915_VMA_LOCAL_BIND) {
-               struct i915_hw_ppgtt *appgtt =
-                       to_i915(vma->vm->dev)->mm.aliasing_ppgtt;
+               struct i915_hw_ppgtt *appgtt = i915->mm.aliasing_ppgtt;
                appgtt->base.insert_entries(&appgtt->base,
                                            vma->pages, vma->node.start,
                                            cache_level, pte_flags);
@@ -2663,13 +2668,17 @@ static int aliasing_gtt_bind_vma(struct i915_vma *vma,
 
 static void ggtt_unbind_vma(struct i915_vma *vma)
 {
-       struct i915_hw_ppgtt *appgtt = to_i915(vma->vm->dev)->mm.aliasing_ppgtt;
+       struct drm_i915_private *i915 = to_i915(vma->vm->dev);
+       struct i915_hw_ppgtt *appgtt = i915->mm.aliasing_ppgtt;
        const u64 size = min(vma->size, vma->node.size);
 
-       if (vma->flags & I915_VMA_GLOBAL_BIND)
+       if (vma->flags & I915_VMA_GLOBAL_BIND) {
+               intel_runtime_pm_get(i915);
                vma->vm->clear_range(vma->vm,
                                     vma->node.start, size,
                                     true);
+               intel_runtime_pm_put(i915);
+       }
 
        if (vma->flags & I915_VMA_LOCAL_BIND && appgtt)
                appgtt->base.clear_range(&appgtt->base,
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c 
b/drivers/gpu/drm/i915/i915_gem_tiling.c
index a14b1e3d4c78..08f796a4f5f6 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -204,8 +204,6 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
                return -EINVAL;
        }
 
-       intel_runtime_pm_get(dev_priv);
-
        mutex_lock(&dev->struct_mutex);
        if (obj->pin_display || obj->framebuffer_references) {
                err = -EBUSY;
@@ -301,8 +299,6 @@ err:
        i915_gem_object_put(obj);
        mutex_unlock(&dev->struct_mutex);
 
-       intel_runtime_pm_put(dev_priv);
-
        return err;
 }
 
-- 
2.9.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to