With a view to removing the nasty recursion on struct_mutex (which
allows us to wait upon it while also servicing GPU resets and the
shrinker), explicitly track any mutex which might be used inside
i915_reset() and warn if we hit a potential inversion where we are
holding the mutex and may need to reset (e.g. waiting on the GPU).
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_drv.c | 21 ++++++++++++++++++++-
drivers/gpu/drm/i915/i915_drv.h | 3 +++
drivers/gpu/drm/i915/i915_gpu_error.h | 2 ++
drivers/gpu/drm/i915/i915_request.c | 12 ++++++++++--
4 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3834bd758a2e..5b67a7458f74 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -878,6 +878,7 @@ static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv)
static int i915_driver_init_early(struct drm_i915_private *dev_priv,
const struct pci_device_id *ent)
{
+ static struct lock_class_key reset_key;
const struct intel_device_info *match_info =
(struct intel_device_info *)ent->driver_data;
struct intel_device_info *device_info;
@@ -894,11 +895,15 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,
BUILD_BUG_ON(INTEL_MAX_PLATFORMS >
sizeof(device_info->platform_mask) * BITS_PER_BYTE);
BUG_ON(device_info->gen > sizeof(device_info->gen_mask) * BITS_PER_BYTE);
+
spin_lock_init(&dev_priv->irq_lock);
- spin_lock_init(&dev_priv->gpu_error.lock);
mutex_init(&dev_priv->backlight_lock);
spin_lock_init(&dev_priv->uncore.lock);
+ spin_lock_init(&dev_priv->gpu_error.lock);
+ lockdep_init_map(&dev_priv->gpu_error.lockdep,
+ "i915.reset", &reset_key, 0);
+
mutex_init(&dev_priv->sb_lock);
mutex_init(&dev_priv->modeset_restore_lock);
mutex_init(&dev_priv->av_mutex);
@@ -1917,6 +1922,8 @@ void i915_reset(struct drm_i915_private *i915,
if (!test_bit(I915_RESET_HANDOFF, &error->flags))
return;
+ lock_map_acquire(&error->lockdep);
+
/* Clear any previous failed attempts at recovery. Time to try again. */
if (!i915_gem_unset_wedged(i915))
goto wakeup;
@@ -1990,6 +1997,7 @@ void i915_reset(struct drm_i915_private *i915,
enable_irq(i915->drm.irq);
wakeup:
+ lock_map_release(&error->lockdep);
clear_bit(I915_RESET_HANDOFF, &error->flags);
wake_up_bit(&error->flags, I915_RESET_HANDOFF);
return;
@@ -2014,6 +2022,17 @@ void i915_reset(struct drm_i915_private *i915,
goto finish;
}
+void i915_reset_taints_mutex(struct drm_i915_private *i915, struct mutex *mutex)
+{
+ if (!IS_ENABLED(CONFIG_LOCKDEP))
+ return;
+
+ lock_map_acquire(&i915->gpu_error.lockdep);
+ mutex_lock(mutex);
+ mutex_unlock(mutex);
+ lock_map_release(&i915->gpu_error.lockdep);
+}
+
static inline int intel_gt_reset_engine(struct drm_i915_private *dev_priv,
struct intel_engine_cs *engine)
{
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 4fb937399440..006000bfffcf 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2719,6 +2719,9 @@ extern void i915_reset(struct drm_i915_private *i915,
extern int i915_reset_engine(struct intel_engine_cs *engine,
const char *reason);
+extern void i915_reset_taints_mutex(struct drm_i915_private *i915,
+ struct mutex *mutex);
+
extern bool intel_has_reset_engine(struct drm_i915_private *dev_priv);
extern int intel_reset_guc(struct drm_i915_private *dev_priv);
extern int intel_guc_reset_engine(struct intel_guc *guc,
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h
index f893a4e8b783..78521b10d9e5 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.h
+++ b/drivers/gpu/drm/i915/i915_gpu_error.h
@@ -293,6 +293,8 @@ struct i915_gpu_error {
/* For missed irq/seqno simulation. */
unsigned long test_irq_rings;
+
+ struct lockdep_map lockdep;
};
struct drm_i915_error_state_buf {
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index 5c2c93cbab12..8216639697a4 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -1253,8 +1253,12 @@ static bool __i915_wait_request_check_and_reset(struct i915_request *request)
if (likely(!i915_reset_handoff(error)))
return false;
+ lock_map_release(&error->lockdep);
+
__set_current_state(TASK_RUNNING);
i915_reset(request->i915, error->stalled_mask, error->reason);
+
+ lock_map_acquire_read(&error->lockdep);
return true;
}
@@ -1305,8 +1309,10 @@ long i915_request_wait(struct i915_request *rq,
trace_i915_request_wait_begin(rq, flags);
add_wait_queue(&rq->execute, &exec);
- if (flags & I915_WAIT_LOCKED)
+ if (flags & I915_WAIT_LOCKED) {
+ lock_map_acquire_read(&rq->i915->gpu_error.lockdep);
add_wait_queue(errq, &reset);
+ }
intel_wait_init(&wait);
@@ -1409,8 +1415,10 @@ long i915_request_wait(struct i915_request *rq,
intel_engine_remove_wait(rq->engine, &wait);
complete:
__set_current_state(TASK_RUNNING);
- if (flags & I915_WAIT_LOCKED)
+ if (flags & I915_WAIT_LOCKED) {
+ lock_map_release(&rq->i915->gpu_error.lockdep);
remove_wait_queue(errq, &reset);
+ }
remove_wait_queue(&rq->execute, &exec);
trace_i915_request_wait_end(rq);
--
2.18.0