From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60B04C07E9C for ; Mon, 12 Jul 2021 18:08:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 302BD61186 for ; Mon, 12 Jul 2021 18:08:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 302BD61186 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BAE9A896E7; Mon, 12 Jul 2021 18:08:29 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F13889402; Mon, 12 Jul 2021 18:08:28 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10043"; a="207014142" X-IronPort-AV: E=Sophos;i="5.84,234,1620716400"; d="scan'208";a="207014142" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2021 11:08:25 -0700 X-IronPort-AV: E=Sophos;i="5.84,234,1620716400"; d="scan'208";a="412664344" Received: from johnharr-mobl1.amr.corp.intel.com (HELO [10.209.125.18]) ([10.209.125.18]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2021 11:08:23 -0700 Subject: Re: [PATCH 24/47] drm/i915/guc: Add several request trace points To: Matthew Brost , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20210624070516.21893-1-matthew.brost@intel.com> <20210624070516.21893-25-matthew.brost@intel.com> From: John Harrison Message-ID: Date: Mon, 12 Jul 2021 11:08:23 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210624070516.21893-25-matthew.brost@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: daniele.ceraolospurio@intel.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 6/24/2021 00:04, Matthew Brost wrote: > Add trace points for request dependencies and GuC submit. Extended > existing request trace points to include submit fence value,, guc_id, Excessive punctuation. Or maybe should say 'fence value, tail, guc_id'? With that fixed: Reviewed-by: John Harrison > and ring tail value. > > Cc: John Harrison > Signed-off-by: Matthew Brost > --- > .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 3 ++ > drivers/gpu/drm/i915/i915_request.c | 3 ++ > drivers/gpu/drm/i915/i915_trace.h | 39 ++++++++++++++++++- > 3 files changed, 43 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > index 89b3c7e5d15b..c2327eebc09c 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -422,6 +422,7 @@ static int guc_dequeue_one_context(struct intel_guc *guc) > guc->stalled_request = last; > return false; > } > + trace_i915_request_guc_submit(last); > } > > guc->stalled_request = NULL; > @@ -642,6 +643,8 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc, > ret = guc_add_request(guc, rq); > if (ret == -EBUSY) > guc->stalled_request = rq; > + else > + trace_i915_request_guc_submit(rq); > > return ret; > } > diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c > index d92c9f25c9f4..7f7aa096e873 100644 > --- a/drivers/gpu/drm/i915/i915_request.c > +++ b/drivers/gpu/drm/i915/i915_request.c > @@ -1344,6 +1344,9 @@ __i915_request_await_execution(struct i915_request *to, > return err; > } > > + trace_i915_request_dep_to(to); > + trace_i915_request_dep_from(from); > + > /* Couple the dependency tree for PI on this exposed to->fence */ > if (to->engine->sched_engine->schedule) { > err = i915_sched_node_add_dependency(&to->sched, > diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h > index 6778ad2a14a4..b02d04b6c8f6 100644 > --- a/drivers/gpu/drm/i915/i915_trace.h > +++ b/drivers/gpu/drm/i915/i915_trace.h > @@ -794,22 +794,27 @@ DECLARE_EVENT_CLASS(i915_request, > TP_STRUCT__entry( > __field(u32, dev) > __field(u64, ctx) > + __field(u32, guc_id) > __field(u16, class) > __field(u16, instance) > __field(u32, seqno) > + __field(u32, tail) > ), > > TP_fast_assign( > __entry->dev = rq->engine->i915->drm.primary->index; > __entry->class = rq->engine->uabi_class; > __entry->instance = rq->engine->uabi_instance; > + __entry->guc_id = rq->context->guc_id; > __entry->ctx = rq->fence.context; > __entry->seqno = rq->fence.seqno; > + __entry->tail = rq->tail; > ), > > - TP_printk("dev=%u, engine=%u:%u, ctx=%llu, seqno=%u", > + TP_printk("dev=%u, engine=%u:%u, guc_id=%u, ctx=%llu, seqno=%u, tail=%u", > __entry->dev, __entry->class, __entry->instance, > - __entry->ctx, __entry->seqno) > + __entry->guc_id, __entry->ctx, __entry->seqno, > + __entry->tail) > ); > > DEFINE_EVENT(i915_request, i915_request_add, > @@ -818,6 +823,21 @@ DEFINE_EVENT(i915_request, i915_request_add, > ); > > #if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS) > +DEFINE_EVENT(i915_request, i915_request_dep_to, > + TP_PROTO(struct i915_request *rq), > + TP_ARGS(rq) > +); > + > +DEFINE_EVENT(i915_request, i915_request_dep_from, > + TP_PROTO(struct i915_request *rq), > + TP_ARGS(rq) > +); > + > +DEFINE_EVENT(i915_request, i915_request_guc_submit, > + TP_PROTO(struct i915_request *rq), > + TP_ARGS(rq) > +); > + > DEFINE_EVENT(i915_request, i915_request_submit, > TP_PROTO(struct i915_request *rq), > TP_ARGS(rq) > @@ -887,6 +907,21 @@ TRACE_EVENT(i915_request_out, > > #else > #if !defined(TRACE_HEADER_MULTI_READ) > +static inline void > +trace_i915_request_dep_to(struct i915_request *rq) > +{ > +} > + > +static inline void > +trace_i915_request_dep_from(struct i915_request *rq) > +{ > +} > + > +static inline void > +trace_i915_request_guc_submit(struct i915_request *rq) > +{ > +} > + > static inline void > trace_i915_request_submit(struct i915_request *rq) > { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19B33C07E99 for ; Mon, 12 Jul 2021 18:08:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E05B361186 for ; Mon, 12 Jul 2021 18:08:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E05B361186 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 89DB189402; Mon, 12 Jul 2021 18:08:29 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F13889402; Mon, 12 Jul 2021 18:08:28 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10043"; a="207014142" X-IronPort-AV: E=Sophos;i="5.84,234,1620716400"; d="scan'208";a="207014142" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2021 11:08:25 -0700 X-IronPort-AV: E=Sophos;i="5.84,234,1620716400"; d="scan'208";a="412664344" Received: from johnharr-mobl1.amr.corp.intel.com (HELO [10.209.125.18]) ([10.209.125.18]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2021 11:08:23 -0700 To: Matthew Brost , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20210624070516.21893-1-matthew.brost@intel.com> <20210624070516.21893-25-matthew.brost@intel.com> From: John Harrison Message-ID: Date: Mon, 12 Jul 2021 11:08:23 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210624070516.21893-25-matthew.brost@intel.com> Content-Language: en-GB Subject: Re: [Intel-gfx] [PATCH 24/47] drm/i915/guc: Add several request trace points X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 6/24/2021 00:04, Matthew Brost wrote: > Add trace points for request dependencies and GuC submit. Extended > existing request trace points to include submit fence value,, guc_id, Excessive punctuation. Or maybe should say 'fence value, tail, guc_id'? With that fixed: Reviewed-by: John Harrison > and ring tail value. > > Cc: John Harrison > Signed-off-by: Matthew Brost > --- > .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 3 ++ > drivers/gpu/drm/i915/i915_request.c | 3 ++ > drivers/gpu/drm/i915/i915_trace.h | 39 ++++++++++++++++++- > 3 files changed, 43 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > index 89b3c7e5d15b..c2327eebc09c 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -422,6 +422,7 @@ static int guc_dequeue_one_context(struct intel_guc *guc) > guc->stalled_request = last; > return false; > } > + trace_i915_request_guc_submit(last); > } > > guc->stalled_request = NULL; > @@ -642,6 +643,8 @@ static int guc_bypass_tasklet_submit(struct intel_guc *guc, > ret = guc_add_request(guc, rq); > if (ret == -EBUSY) > guc->stalled_request = rq; > + else > + trace_i915_request_guc_submit(rq); > > return ret; > } > diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c > index d92c9f25c9f4..7f7aa096e873 100644 > --- a/drivers/gpu/drm/i915/i915_request.c > +++ b/drivers/gpu/drm/i915/i915_request.c > @@ -1344,6 +1344,9 @@ __i915_request_await_execution(struct i915_request *to, > return err; > } > > + trace_i915_request_dep_to(to); > + trace_i915_request_dep_from(from); > + > /* Couple the dependency tree for PI on this exposed to->fence */ > if (to->engine->sched_engine->schedule) { > err = i915_sched_node_add_dependency(&to->sched, > diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h > index 6778ad2a14a4..b02d04b6c8f6 100644 > --- a/drivers/gpu/drm/i915/i915_trace.h > +++ b/drivers/gpu/drm/i915/i915_trace.h > @@ -794,22 +794,27 @@ DECLARE_EVENT_CLASS(i915_request, > TP_STRUCT__entry( > __field(u32, dev) > __field(u64, ctx) > + __field(u32, guc_id) > __field(u16, class) > __field(u16, instance) > __field(u32, seqno) > + __field(u32, tail) > ), > > TP_fast_assign( > __entry->dev = rq->engine->i915->drm.primary->index; > __entry->class = rq->engine->uabi_class; > __entry->instance = rq->engine->uabi_instance; > + __entry->guc_id = rq->context->guc_id; > __entry->ctx = rq->fence.context; > __entry->seqno = rq->fence.seqno; > + __entry->tail = rq->tail; > ), > > - TP_printk("dev=%u, engine=%u:%u, ctx=%llu, seqno=%u", > + TP_printk("dev=%u, engine=%u:%u, guc_id=%u, ctx=%llu, seqno=%u, tail=%u", > __entry->dev, __entry->class, __entry->instance, > - __entry->ctx, __entry->seqno) > + __entry->guc_id, __entry->ctx, __entry->seqno, > + __entry->tail) > ); > > DEFINE_EVENT(i915_request, i915_request_add, > @@ -818,6 +823,21 @@ DEFINE_EVENT(i915_request, i915_request_add, > ); > > #if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS) > +DEFINE_EVENT(i915_request, i915_request_dep_to, > + TP_PROTO(struct i915_request *rq), > + TP_ARGS(rq) > +); > + > +DEFINE_EVENT(i915_request, i915_request_dep_from, > + TP_PROTO(struct i915_request *rq), > + TP_ARGS(rq) > +); > + > +DEFINE_EVENT(i915_request, i915_request_guc_submit, > + TP_PROTO(struct i915_request *rq), > + TP_ARGS(rq) > +); > + > DEFINE_EVENT(i915_request, i915_request_submit, > TP_PROTO(struct i915_request *rq), > TP_ARGS(rq) > @@ -887,6 +907,21 @@ TRACE_EVENT(i915_request_out, > > #else > #if !defined(TRACE_HEADER_MULTI_READ) > +static inline void > +trace_i915_request_dep_to(struct i915_request *rq) > +{ > +} > + > +static inline void > +trace_i915_request_dep_from(struct i915_request *rq) > +{ > +} > + > +static inline void > +trace_i915_request_guc_submit(struct i915_request *rq) > +{ > +} > + > static inline void > trace_i915_request_submit(struct i915_request *rq) > { _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx