From patchwork Mon Apr 20 09:13:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lionel Landwerlin X-Patchwork-Id: 11498491 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B6EC192C for ; Mon, 20 Apr 2020 09:13:26 +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 9E9B42072B for ; Mon, 20 Apr 2020 09:13:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E9B42072B 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 C407D6E497; Mon, 20 Apr 2020 09:13:25 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02E0E6E497 for ; Mon, 20 Apr 2020 09:13:23 +0000 (UTC) IronPort-SDR: dEY5uHoT3c07xNDABJ++BZQ3YmwN+iDRayqO0FyBBO89+UQ3NdnTk6EuaYYjddr0zGjH9IaOuO JIQ7RjJyxlIg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2020 02:13:23 -0700 IronPort-SDR: +jkeAvVhmHtUQWv9yvj3nsai1ACz4yrXEt6Dpq7MDBgLN8lWuosJTnXCRrzc458NF3YXcUSnrG lWjhhyouTTUA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,406,1580803200"; d="scan'208";a="245306420" Received: from unknown (HELO delly.ger.corp.intel.com) ([10.252.46.74]) by fmsmga007.fm.intel.com with ESMTP; 20 Apr 2020 02:13:22 -0700 From: Lionel Landwerlin To: intel-gfx@lists.freedesktop.org Date: Mon, 20 Apr 2020 12:13:20 +0300 Message-Id: <20200420091320.427777-1-lionel.g.landwerlin@intel.com> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3] drm/i915: store HW tagging information into tracepoints 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: , Cc: Chris Wilson Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" In Gpuvis [1] we added matching of the OA report tags against i915 tracepoints fields to figure what workload was submitted by what process. It doesn't matter much whether HW tags get reused for a single request, as it gets preempted for example. All we need is link between the OA report and seqno/engine over a short period of time. That is enough to find the relationship between the different elements on a timeline. The tags got removed from the tracepoints in 2935ed5339c4 ("drm/i915: Remove logical HW ID"). I was fine with the idea of reuse and dropping them from most tracepoints, but we still need it at execlist port insertion. This change brings the hw_id back just for the i915_request_in tracepoint. TODO: someone figures what Guc's putting in the upper 32bits of the execlist port v2: s/hw_tag/hw_id/ to keep the old gpuvis code going v3: Don't store anything on i915_request [1] : https://github.com/mikesart/gpuvis/wiki/TechDocs-Intel#gpu-generated-countersevents Signed-off-by: Lionel Landwerlin Fixes: 2935ed5339c4 ("drm/i915: Remove logical HW ID") Cc: Daniele Ceraolo Spurio Cc: Tvrtko Ursulin Cc: Chris Wilson --- drivers/gpu/drm/i915/gt/intel_lrc.c | 6 +++++- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 3 ++- drivers/gpu/drm/i915/i915_trace.h | 8 +++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index 6fbad5e2343f..58970099db25 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -1278,7 +1278,6 @@ execlists_schedule_in(struct i915_request *rq, int idx) struct intel_engine_cs *old; GEM_BUG_ON(!intel_engine_pm_is_awake(rq->engine)); - trace_i915_request_in(rq, idx); old = READ_ONCE(ce->inflight); do { @@ -1288,6 +1287,11 @@ execlists_schedule_in(struct i915_request *rq, int idx) } } while (!try_cmpxchg(&ce->inflight, &old, ptr_inc(old))); + /* + * Emit the tracepoint once the ce->lrc_desc has been updated. + */ + trace_i915_request_in(rq, idx, ce->lrc_desc >> 32); + GEM_BUG_ON(intel_context_inflight(ce) != rq->engine); return i915_request_get(rq); } 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 fe7778c28d2d..fd3d63d720d9 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -263,7 +263,8 @@ static inline int rq_prio(const struct i915_request *rq) static struct i915_request *schedule_in(struct i915_request *rq, int idx) { - trace_i915_request_in(rq, idx); + trace_i915_request_in(rq, idx, + 0 /* TODO: figure out what value GuC chooses */); /* * Currently we are not tracking the rq->context being inflight diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index bc854ad60954..3a36adb8094b 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -790,7 +790,7 @@ DEFINE_EVENT(i915_request, i915_request_execute, ); TRACE_EVENT(i915_request_in, - TP_PROTO(struct i915_request *rq, unsigned int port), + TP_PROTO(struct i915_request *rq, unsigned int port, u32 hw_id), TP_ARGS(rq, port), TP_STRUCT__entry( @@ -801,6 +801,7 @@ TRACE_EVENT(i915_request_in, __field(u32, seqno) __field(u32, port) __field(s32, prio) + __field(u32, hw_id) ), TP_fast_assign( @@ -811,12 +812,13 @@ TRACE_EVENT(i915_request_in, __entry->seqno = rq->fence.seqno; __entry->prio = rq->sched.attr.priority; __entry->port = port; + __entry->hw_id = hw_id; ), - TP_printk("dev=%u, engine=%u:%u, ctx=%llu, seqno=%u, prio=%d, port=%u", + TP_printk("dev=%u, engine=%u:%u, ctx=%llu, seqno=%u, prio=%d, port=%u hw_id=%u", __entry->dev, __entry->class, __entry->instance, __entry->ctx, __entry->seqno, - __entry->prio, __entry->port) + __entry->prio, __entry->port, __entry->hw_id) ); TRACE_EVENT(i915_request_out,