All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [RFC 04/10] drm/i915: Use explicit flag to mark unreachable intel_context
Date: Wed, 11 Mar 2020 18:26:12 +0000	[thread overview]
Message-ID: <20200311182618.21513-5-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20200311182618.21513-1-tvrtko.ursulin@linux.intel.com>

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

I need to keep the GEM context around a bit longer so adding an explicit
flag for syncing execbuf with closed/abandonded contexts.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_context.c    | 3 ++-
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +-
 drivers/gpu/drm/i915/gt/intel_context_types.h  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index 0f4150c8d7fe..c49cfec6d616 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -568,7 +568,8 @@ static void engines_idle_release(struct i915_gem_context *ctx,
 		int err = 0;
 
 		/* serialises with execbuf */
-		RCU_INIT_POINTER(ce->gem_context, NULL);
+		WRITE_ONCE(ce->closed, true);
+
 		if (!intel_context_pin_if_active(ce))
 			continue;
 
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 0893ce781a84..17dbe03f8e2e 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -2547,7 +2547,7 @@ static void eb_request_add(struct i915_execbuffer *eb)
 	prev = __i915_request_commit(rq);
 
 	/* Check that the context wasn't destroyed before submission */
-	if (likely(rcu_access_pointer(eb->context->gem_context))) {
+	if (likely(!READ_ONCE(eb->context->closed))) {
 		attr = eb->gem_context->sched;
 
 		/*
diff --git a/drivers/gpu/drm/i915/gt/intel_context_types.h b/drivers/gpu/drm/i915/gt/intel_context_types.h
index 0f3b68b95c56..bcefebcf6b88 100644
--- a/drivers/gpu/drm/i915/gt/intel_context_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_context_types.h
@@ -50,6 +50,7 @@ struct intel_context {
 
 	struct i915_address_space *vm;
 	struct i915_gem_context __rcu *gem_context;
+	bool closed;
 
 	struct list_head signal_link;
 	struct list_head signals;
-- 
2.20.1

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

  parent reply	other threads:[~2020-03-11 18:26 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-11 18:26 [Intel-gfx] [RFC 00/12] Per client engine busyness Tvrtko Ursulin
2020-03-11 18:26 ` [Intel-gfx] [RFC 01/10] drm/i915: Expose list of clients in sysfs Tvrtko Ursulin
2020-03-13 10:36   ` Chris Wilson
2020-03-11 18:26 ` [Intel-gfx] [RFC 02/10] drm/i915: Update client name on context create Tvrtko Ursulin
2020-03-13 10:41   ` Chris Wilson
2020-03-11 18:26 ` [Intel-gfx] [RFC 03/10] drm/i915: Make GEM contexts track DRM clients Tvrtko Ursulin
2020-03-13 11:00   ` Chris Wilson
2020-03-11 18:26 ` Tvrtko Ursulin [this message]
2020-03-13 11:03   ` [Intel-gfx] [RFC 04/10] drm/i915: Use explicit flag to mark unreachable intel_context Chris Wilson
2020-03-11 18:26 ` [Intel-gfx] [RFC 05/10] drm/i915: Track runtime spent in unreachable intel_contexts Tvrtko Ursulin
2020-03-11 18:26 ` [Intel-gfx] [RFC 06/10] drm/i915: Track runtime spent in closed GEM contexts Tvrtko Ursulin
2020-03-11 18:26 ` [Intel-gfx] [RFC 07/10] drm/i915: Track all user contexts per client Tvrtko Ursulin
2020-03-11 18:26 ` [Intel-gfx] [RFC 08/10] drm/i915: Expose per-engine client busyness Tvrtko Ursulin
2020-03-11 18:26 ` [Intel-gfx] [RFC 09/10] drm/i915: Track context current active time Tvrtko Ursulin
2020-03-11 18:26 ` [Intel-gfx] [RFC 10/10] drm/i915: Prefer software tracked context busyness Tvrtko Ursulin
2020-03-12  2:08 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Per client engine busyness (rev6) Patchwork
2020-03-12  2:14 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-03-12  2:33 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2020-03-13 10:28 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Per client engine busyness (rev7) Patchwork
2020-03-13 10:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-03-13 10:54 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-03-13 17:26 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork

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=20200311182618.21513-5-tvrtko.ursulin@linux.intel.com \
    --to=tvrtko.ursulin@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.