From patchwork Mon Mar 19 18:16:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10293869 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0BBC060386 for ; Mon, 19 Mar 2018 18:16:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBF4728543 for ; Mon, 19 Mar 2018 18:16:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E069829310; Mon, 19 Mar 2018 18:16:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7DFA028543 for ; Mon, 19 Mar 2018 18:16:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E25806E5F3; Mon, 19 Mar 2018 18:16:40 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F6CC6E5EF for ; Mon, 19 Mar 2018 18:16:39 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id f14so19568519wre.8 for ; Mon, 19 Mar 2018 11:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W/9g0cARnUS5BgKvKvxmhc8Owhzt2HdpEtAVD5tCZwM=; b=VvCLEVzRBvlSVlXbwAxfOOwaVQQwYKD2YgOd/U48UoYvwO5k5xpvEWqNIeaHELYomV WnmZziIEgUZBsn2RgX3qeRvEv9Mj+o+q4xd3JVIFHweHmavqcKAXCGOSgaWB2aglztzA m4AuP2Dm+sxqsqVDZfN2xmJof0pqDXu+K1la2DfjWZ4fXeJEVNxn+GhRNoSTYb6BmNXW TGQMHxAoZvTa24aedEhZ7OyzC4OrnoHRc/axdFuneU0kiXqag6xu7zjYXOyJlHxoZTos e3GMvfW90yvao1/PoCh9BjBZQEi1t7NL5O70IWU1XR1pfHrxk8oI/8/5ocPXouVHX7AZ KAMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=W/9g0cARnUS5BgKvKvxmhc8Owhzt2HdpEtAVD5tCZwM=; b=V0gNtv7sazVVnTQ/gT4I0Qcr8YdFWsOqgU6Nf7YgO7i9JGtkclXHCSn4JaGwvzLp/7 ah+0RB9xUDpCQoBFcoGN+ai5xd1EsY4M/1anG4uBfPuj1sXMGP9JFZMilUiMAYpKrlcG 8SCf+GgYdlZas7jrXzhFKCvHMipDvxnKT1Kr3qQlE6AfTSzEnJOuOenVa+GMRJiuI3Zi PUnDd85ei8dPGJoGjIPwbgDaELPaDK62wHysxBAIPbWmAsO583cXKQRSekWxILZkIOV7 RcJlZIx8pvzb6qDxfLtpHMSUUuDdLsd8aAmhQ0kR8h90DFn0e8+G6HPy4jhreMJwgSQH K/cg== X-Gm-Message-State: AElRT7FRRNxJINf0NMCTX45vMfWss9czhsZNUcc0Jy2heKBIaKXXbyh5 DoVgtqIOKpjDz3xDLJecxa0sqOtA X-Google-Smtp-Source: AG47ELuU6eTuf/6wbNIdbatNLUoeMNg61D/m0jDsH0yX4NAjvPy9wKHRITvul4wspoL696fOKzrpQA== X-Received: by 10.223.184.219 with SMTP id c27mr11202224wrg.30.1521483397573; Mon, 19 Mar 2018 11:16:37 -0700 (PDT) Received: from localhost.localdomain ([95.146.144.186]) by smtp.gmail.com with ESMTPSA id r19sm1234030wmd.48.2018.03.19.11.16.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Mar 2018 11:16:37 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Mon, 19 Mar 2018 18:16:21 +0000 Message-Id: <20180319181625.29292-4-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180319181625.29292-1-tvrtko.ursulin@linux.intel.com> References: <20180319181625.29292-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 3/7] drm/i915: Keep a count of requests submitted from userspace X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Keep a count of requests submitted from userspace and not yet runnable due unresolved dependencies. v2: Rename and move under the container struct. (Chris Wilson) v3: Rebase. Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_request.c | 3 +++ drivers/gpu/drm/i915/intel_engine_cs.c | 3 ++- drivers/gpu/drm/i915/intel_ringbuffer.h | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index 2052028c1d68..79bb26928263 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -634,6 +634,7 @@ submit_notify(struct i915_sw_fence *fence, enum i915_sw_fence_notify state) rcu_read_lock(); request->engine->submit_request(request); rcu_read_unlock(); + atomic_dec(&request->engine->request_stats.queued); break; case FENCE_FREE: @@ -1112,6 +1113,8 @@ void __i915_request_add(struct i915_request *request, bool flush_caches) engine->schedule(request, request->ctx->priority); rcu_read_unlock(); + atomic_inc(&engine->request_stats.queued); + local_bh_disable(); i915_sw_fence_commit(&request->submit); local_bh_enable(); /* Kick the execlists tasklet if just scheduled */ diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c index 3726544cfb00..fa9aceb076b4 100644 --- a/drivers/gpu/drm/i915/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/intel_engine_cs.c @@ -1917,12 +1917,13 @@ void intel_engine_dump(struct intel_engine_cs *engine, if (i915_terminally_wedged(&engine->i915->gpu_error)) drm_printf(m, "*** WEDGED ***\n"); - drm_printf(m, "\tcurrent seqno %x, last %x, hangcheck %x [%d ms], inflight %d, runnable %u\n", + drm_printf(m, "\tcurrent seqno %x, last %x, hangcheck %x [%d ms], inflight %d, queued %u, runnable %u\n", intel_engine_get_seqno(engine), intel_engine_last_submit(engine), engine->hangcheck.seqno, jiffies_to_msecs(jiffies - engine->hangcheck.action_timestamp), engine->timeline->inflight_seqnos, + atomic_read(&engine->request_stats.queued), engine->request_stats.runnable); drm_printf(m, "\tReset count: %d (global %d)\n", i915_reset_engine_count(error, engine), diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index e98e007cb96b..810ef79959f2 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -339,6 +339,14 @@ struct intel_engine_cs { struct drm_i915_gem_object *default_state; struct { + /** + * @queued: Number of submitted requests with dependencies. + * + * Count of requests waiting for dependencies before they can be + * submitted to the backend. + */ + atomic_t queued; + /** * @runnable: Number of runnable requests sent to the backend. *