All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Reduce i915_request_alloc retirement to local context
@ 2019-01-07 15:29 Chris Wilson
  2019-01-07 15:47 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
                   ` (7 more replies)
  0 siblings, 8 replies; 12+ messages in thread
From: Chris Wilson @ 2019-01-07 15:29 UTC (permalink / raw)
  To: intel-gfx

In the continual quest to reduce the amount of global work required when
submitting requests, replace i915_retire_requests() after allocation
failure to retiring just our ring.

References: 11abf0c5a021 ("drm/i915: Limit the backpressure for i915_request allocation")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/i915_request.c | 33 +++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index 1e158eb8cb97..9ba218c6029b 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -477,6 +477,29 @@ submit_notify(struct i915_sw_fence *fence, enum i915_sw_fence_notify state)
 	return NOTIFY_DONE;
 }
 
+static noinline struct i915_request *
+i915_request_alloc_slow(struct intel_context *ce)
+{
+	struct intel_ring *ring = ce->ring;
+	struct i915_request *rq, *next;
+
+	list_for_each_entry_safe(rq, next, &ring->request_list, ring_link) {
+		/* Ratelimit ourselves to prevent oom from malicious clients */
+		if (&next->ring_link == &ring->request_list) {
+			cond_synchronize_rcu(rq->rcustate);
+			break; /* keep the last objects for the next request */
+		}
+
+		if (!i915_request_completed(rq))
+			break;
+
+		/* Retire our old requests in the hope that we free some */
+		i915_request_retire(rq);
+	}
+
+	return kmem_cache_alloc(ce->gem_context->i915->requests, GFP_KERNEL);
+}
+
 /**
  * i915_request_alloc - allocate a request structure
  *
@@ -559,15 +582,7 @@ i915_request_alloc(struct intel_engine_cs *engine, struct i915_gem_context *ctx)
 	rq = kmem_cache_alloc(i915->requests,
 			      GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN);
 	if (unlikely(!rq)) {
-		i915_retire_requests(i915);
-
-		/* Ratelimit ourselves to prevent oom from malicious clients */
-		rq = i915_gem_active_raw(&ce->ring->timeline->last_request,
-					 &i915->drm.struct_mutex);
-		if (rq)
-			cond_synchronize_rcu(rq->rcustate);
-
-		rq = kmem_cache_alloc(i915->requests, GFP_KERNEL);
+		rq = i915_request_alloc_slow(ce);
 		if (!rq) {
 			ret = -ENOMEM;
 			goto err_unreserve;
-- 
2.20.1

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

^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-01-09 17:02 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-07 15:29 [PATCH] drm/i915: Reduce i915_request_alloc retirement to local context Chris Wilson
2019-01-07 15:47 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-01-07 16:12 ` ✓ Fi.CI.BAT: success " Patchwork
2019-01-07 20:57 ` ✓ Fi.CI.IGT: " Patchwork
2019-01-09 11:56 ` [PATCH] " Tvrtko Ursulin
2019-01-09 12:06   ` Chris Wilson
2019-01-09 12:51     ` Tvrtko Ursulin
2019-01-09 13:14 ` [PATCH v2] " Chris Wilson
2019-01-09 13:54   ` Tvrtko Ursulin
2019-01-09 13:54 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Reduce i915_request_alloc retirement to local context (rev2) Patchwork
2019-01-09 14:33 ` ✓ Fi.CI.BAT: success " Patchwork
2019-01-09 17:02 ` ✗ Fi.CI.IGT: failure " Patchwork

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.