Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 16/22] drm/i915: Dirty hack to fix selftests locking inversion
Date: Mon, 30 Mar 2020 16:35:39 +0200	[thread overview]
Message-ID: <20200330143545.4371-16-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20200330143545.4371-1-maarten.lankhorst@linux.intel.com>

Some i915 selftests still use i915_vma_lock() as inner lock, and
intel_context_create_request() intel_timeline->mutex as outer lock.
Fortunately for selftests this is not an issue, they should be fixed
but we can move ahead and cleanify lockdep now.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/i915/gt/intel_context.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
index 113d0bda1bcf..5c7acddf9651 100644
--- a/drivers/gpu/drm/i915/gt/intel_context.c
+++ b/drivers/gpu/drm/i915/gt/intel_context.c
@@ -460,6 +460,18 @@ struct i915_request *intel_context_create_request(struct intel_context *ce)
 	rq = i915_request_create(ce);
 	intel_context_unpin(ce);
 
+	if (IS_ERR(rq))
+		return rq;
+
+	/*
+	 * timeline->mutex should be the inner lock, but is used as outer lock.
+	 * Hack around this to shut up lockdep in selftests..
+	 */
+	lockdep_unpin_lock(&ce->timeline->mutex, rq->cookie);
+	mutex_release(&ce->timeline->mutex.dep_map, _RET_IP_);
+	mutex_acquire(&ce->timeline->mutex.dep_map, SINGLE_DEPTH_NESTING, 0, _RET_IP_);
+	rq->cookie = lockdep_pin_lock(&ce->timeline->mutex);
+
 	return rq;
 }
 
-- 
2.25.1

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

  parent reply	other threads:[~2020-03-30 14:36 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-30 14:35 [Intel-gfx] [PATCH 01/22] Revert "drm/i915/gem: Drop relocation slowpath" Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 02/22] perf/core: Only copy-to-user after completely unlocking all locks. (CI test) Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 03/22] drm/i915: Add an implementation for i915_gem_ww_ctx locking, v2 Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 04/22] drm/i915: Remove locking from i915_gem_object_prepare_read/write Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 05/22] drm/i915: Parse command buffer earlier in eb_relocate(slow) Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 06/22] drm/i915: Use per object locking in execbuf, v7 Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 07/22] drm/i915: Use ww locking in intel_renderstate Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 08/22] drm/i915: Add ww context handling to context_barrier_task Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 09/22] drm/i915: Nuke arguments to eb_pin_engine Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 10/22] drm/i915: Pin engine before pinning all objects, v3 Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 11/22] drm/i915: Rework intel_context pinning to do everything outside of pin_mutex Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 12/22] drm/i915: Make sure execbuffer always passes ww state to i915_vma_pin Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 13/22] drm/i915: Convert i915_gem_object/client_blt.c to use ww locking as well, v2 Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 14/22] drm/i915: Kill last user of intel_context_create_request outside of selftests Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 15/22] drm/i915: Convert i915_perf to ww locking as well Maarten Lankhorst
2020-03-30 14:35 ` Maarten Lankhorst [this message]
2020-03-30 14:35 ` [Intel-gfx] [PATCH 17/22] drm/i915/selftests: Fix locking inversion in lrc selftest Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 18/22] drm/i915: Use ww pinning for intel_context_create_request() Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 19/22] drm/i915: Move i915_vma_lock in the selftests to avoid lock inversion, v2 Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 20/22] drm/i915: Add ww locking to vm_fault_gtt Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 21/22] drm/i915: Add ww locking to pin_to_display_plane Maarten Lankhorst
2020-03-30 14:35 ` [Intel-gfx] [PATCH 22/22] drm/i915: Ensure we hold the pin mutex Maarten Lankhorst
2020-03-30 20:37 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/22] Revert "drm/i915/gem: Drop relocation slowpath" Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2020-03-30 14:09 [Intel-gfx] [PATCH 01/22] " Maarten Lankhorst
2020-03-30 14:09 ` [Intel-gfx] [PATCH 16/22] drm/i915: Dirty hack to fix selftests locking inversion Maarten Lankhorst

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200330143545.4371-16-maarten.lankhorst@linux.intel.com \
    --to=maarten.lankhorst@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox