From patchwork Mon Jan 11 11:01:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8001961 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 490619F32E for ; Mon, 11 Jan 2016 11:02:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2ED1F2028D for ; Mon, 11 Jan 2016 11:02:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 03B3A20279 for ; Mon, 11 Jan 2016 11:02:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD5AD6E47D; Mon, 11 Jan 2016 03:02:14 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B1666E47C for ; Mon, 11 Jan 2016 03:02:03 -0800 (PST) Received: by mail-wm0-f66.google.com with SMTP id f206so25723536wmf.2 for ; Mon, 11 Jan 2016 03:02:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=cVL4S4GlHJaZpkJcptJS9yCmoswbRy/TkhWzVZcluEQ=; b=v1Masz0RUs/g92f8JjGNtsPTEXLUEdQqZYUxzY7qmTbTHpAtrdJQz/AflaJh0CZmnG XfakZCFgdIAYYcUd4n51ty2zZjAwlnRHlkMe3bLgwvI4MI+7sJaCLOwb80ehoqnL9Aj5 Nuf/tou7cgxMwAEgQ9d7LO66lHvmtUyoCRL8BnhGbPkS/IhLJmtAjMrePw7Nqu/n54PR e5+hzuStJYkHGfYrik4+a/FR+qQJyWi5+zwPtUFGbF/GwykZpEcve1OtD4wudvHKk6Y7 07d2tZAgurws8UpuO3IlFWbD3DzpmfoeprIJaMV7we1AOcPlYBTCVEdTVr92qecvvJjE x1+g== X-Received: by 10.28.129.139 with SMTP id c133mr13183483wmd.30.1452510122192; Mon, 11 Jan 2016 03:02:02 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id 73sm12311579wmm.7.2016.01.11.03.02.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 03:02:00 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 11 Jan 2016 11:01:00 +0000 Message-Id: <1452510091-6833-18-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1452510091-6833-1-git-send-email-chris@chris-wilson.co.uk> References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk> <1452510091-6833-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 159/190] drm/i915: Defer active reference until required X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We only need the active reference to keep the object alive after the handle has been deleted (so as to prevent a synchronous gem_close). Why the pay the price of a kref on every execbuf when we can insert that final active ref just in time for the handle deletion? Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_drv.h | 26 +++++++++++++++++++++++ drivers/gpu/drm/i915/i915_gem.c | 31 +++++++++++++++++++++++----- drivers/gpu/drm/i915/i915_gem_batch_pool.c | 2 +- drivers/gpu/drm/i915/i915_gem_context.c | 2 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 5 +---- drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 7 files changed, 57 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 917686eed962..addd33bbc847 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2048,6 +2048,13 @@ struct drm_i915_gem_object { #define __I915_BO_ACTIVE(bo) (READ_ONCE((bo)->flags) & (I915_BO_ACTIVE_MASK << I915_BO_ACTIVE_SHIFT)) /** + * Have we taken a reference for the object for incomplete GPU + * activity? + */ +#define I915_BO_ACTIVE_REF_SHIFT (I915_BO_ACTIVE_SHIFT + I915_NUM_RINGS) +#define I915_BO_ACTIVE_REF_BIT (1 << I915_BO_ACTIVE_REF_SHIFT) + + /** * This is set if the object has been written to since last bound * to the GTT */ @@ -2163,6 +2170,25 @@ i915_gem_object_has_active_engine(const struct drm_i915_gem_object *obj, return obj->flags & (1 << (engine + I915_BO_ACTIVE_SHIFT)); } +static inline bool +i915_gem_object_has_active_reference(const struct drm_i915_gem_object *obj) +{ + return obj->flags & I915_BO_ACTIVE_REF_BIT; +} + +static inline void +i915_gem_object_set_active_reference(struct drm_i915_gem_object *obj) +{ + obj->flags |= I915_BO_ACTIVE_REF_BIT; +} + +static inline void +i915_gem_object_unset_active_reference(struct drm_i915_gem_object *obj) +{ + obj->flags &= ~I915_BO_ACTIVE_REF_BIT; +} +void __i915_gem_object_release_unless_active(struct drm_i915_gem_object *obj); + void i915_gem_track_fb(struct drm_i915_gem_object *old, struct drm_i915_gem_object *new, unsigned frontbuffer_bits); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 1fa4752682d6..962fd81ce26c 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2116,7 +2116,10 @@ i915_gem_object_retire__read(struct i915_gem_active *active, list_move_tail(&obj->global_list, &request->i915->mm.bound_list); - drm_gem_object_unreference(&obj->base); + if (i915_gem_object_has_active_reference(obj)) { + i915_gem_object_unset_active_reference(obj); + drm_gem_object_unreference(&obj->base); + } } static void i915_gem_mark_idle(struct drm_i915_private *dev_priv) @@ -2390,13 +2393,12 @@ out: * write domains, emitting any outstanding lazy request and retiring and * completed requests. */ -static void -i915_gem_object_flush_active(struct drm_i915_gem_object *obj) +static bool i915_gem_object_flush_active(struct drm_i915_gem_object *obj) { int i; if (!i915_gem_object_is_active(obj)) - return; + return false; for (i = 0; i < I915_NUM_RINGS; i++) { struct drm_i915_gem_request *req; @@ -2408,6 +2410,8 @@ i915_gem_object_flush_active(struct drm_i915_gem_object *obj) if (i915_gem_request_completed(req)) i915_gem_request_retire_upto(req); } + + return i915_gem_object_is_active(obj); } void i915_vma_close(struct i915_vma *vma) @@ -2431,7 +2435,12 @@ void i915_gem_close_object(struct drm_gem_object *gem, list_for_each_entry_safe(vma, vn, &obj->vma_list, obj_link) if (vma->vm->file == fpriv) i915_vma_close(vma); - i915_gem_object_flush_active(obj); + + if (i915_gem_object_flush_active(obj) && + !i915_gem_object_has_active_reference(obj)) { + i915_gem_object_set_active_reference(obj); + drm_gem_object_reference(&obj->base); + } mutex_unlock(&obj->base.dev->struct_mutex); } @@ -3847,6 +3856,18 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj) intel_runtime_pm_put(dev_priv); } +void __i915_gem_object_release_unless_active(struct drm_i915_gem_object *obj) +{ + if (obj == NULL) + return; + + GEM_BUG_ON(i915_gem_object_has_active_reference(obj)); + if (i915_gem_object_is_active(obj)) + i915_gem_object_set_active_reference(obj); + else + drm_gem_object_unreference(&obj->base); +} + static void i915_gem_stop_ringbuffers(struct drm_device *dev) { diff --git a/drivers/gpu/drm/i915/i915_gem_batch_pool.c b/drivers/gpu/drm/i915/i915_gem_batch_pool.c index 5ec5b1439e1f..d46012234db1 100644 --- a/drivers/gpu/drm/i915/i915_gem_batch_pool.c +++ b/drivers/gpu/drm/i915/i915_gem_batch_pool.c @@ -75,7 +75,7 @@ void i915_gem_batch_pool_fini(struct i915_gem_batch_pool *pool) batch_pool_link); list_del(&obj->batch_pool_link); - drm_gem_object_unreference(&obj->base); + __i915_gem_object_release_unless_active(obj); } } } diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index f261d9e0929d..e619cdadaeb6 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -151,7 +151,7 @@ void i915_gem_context_free(struct kref *ctx_ref) if (ce->ring) intel_ring_free(ce->ring); - drm_gem_object_unreference(&ce->state->base); + __i915_gem_object_release_unless_active(ce->state); } i915_ppgtt_put(ctx->ppgtt); diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index b7424f1b1293..00f3529a3560 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1202,15 +1202,12 @@ void i915_vma_move_to_active(struct i915_vma *vma, obj->dirty = 1; /* be paranoid */ - /* Add a reference if we're newly entering the active list. - * The order in which we add operations to the retirement queue is + /* The order in which we add operations to the retirement queue is * vital here: mark_active adds to the start of the callback list, * such that subsequent callbacks are called first. Therefore we * add the active reference first and queue for it to be dropped * *last*. */ - if (!i915_gem_object_is_active(obj)) - drm_gem_object_reference(&obj->base); i915_gem_object_set_active(obj, engine); i915_gem_request_mark_active(req, &obj->last_read[engine]); diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c index 89b5c99bbb02..2fac95b0ba44 100644 --- a/drivers/gpu/drm/i915/i915_gem_render_state.c +++ b/drivers/gpu/drm/i915/i915_gem_render_state.c @@ -173,7 +173,7 @@ err_out: static void render_state_fini(struct render_state *so) { i915_vma_unpin(so->vma); - drm_gem_object_unreference(&so->obj->base); + __i915_gem_object_release_unless_active(so->obj); } static int render_state_prepare(struct intel_engine_cs *ring, diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index be2207f551e3..41c52cdcbe4a 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1961,7 +1961,7 @@ void intel_ring_unmap(struct intel_ring *ring) static void intel_destroy_ringbuffer_obj(struct intel_ring *ringbuf) { - drm_gem_object_unreference(&ringbuf->obj->base); + __i915_gem_object_release_unless_active(ringbuf->obj); ringbuf->obj = NULL; }