@@ -1252,18 +1252,17 @@ __execlists_schedule_in(struct i915_request *rq)
if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
execlists_check_context(ce, engine);
- ce->lrc_desc &= ~GENMASK_ULL(47, 37);
if (ce->tag) {
- /* Use a fixed tag for OA and friends */
- ce->lrc_desc |= (u64)ce->tag << 32;
+ rq->tag = ce->tag;
} else {
- /* We don't need a strict matching tag, just different values */
- ce->lrc_desc |=
- (u64)(++engine->context_tag % NUM_CONTEXT_TAG) <<
- GEN11_SW_CTX_ID_SHIFT;
+ rq->tag = (++engine->context_tag % NUM_CONTEXT_TAG) <<
+ (GEN11_SW_CTX_ID_SHIFT - 32);
BUILD_BUG_ON(NUM_CONTEXT_TAG > GEN12_MAX_CONTEXT_HW_ID);
}
+ ce->lrc_desc &= ~GENMASK_ULL(47, 37);
+ ce->lrc_desc |= (u64)rq->tag << 32;
+
__intel_gt_pm_get(engine->gt);
execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_IN);
intel_engine_context_in(engine);
@@ -1278,7 +1277,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 +1286,11 @@ execlists_schedule_in(struct i915_request *rq, int idx)
}
} while (!try_cmpxchg(&ce->inflight, &old, ptr_inc(old)));
+ /*
+ * Emit the tracepoint once the rq->tag has been selected.
+ */
+ trace_i915_request_in(rq, idx);
+
GEM_BUG_ON(intel_context_inflight(ce) != rq->engine);
return i915_request_get(rq);
}
@@ -289,6 +289,9 @@ struct i915_request {
struct list_head link;
unsigned long delay;
} mock;)
+
+ /** Last tag used in the execlist descriptor */
+ u32 tag;
};
#define I915_FENCE_GFP (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN)
@@ -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 = rq->tag;
),
- 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,
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 [1] : https://github.com/mikesart/gpuvis/wiki/TechDocs-Intel#gpu-generated-countersevents Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Fixes: 2935ed5339c4 ("drm/i915: Remove logical HW ID") Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/gt/intel_lrc.c | 19 +++++++++++-------- drivers/gpu/drm/i915/i915_request.h | 3 +++ drivers/gpu/drm/i915/i915_trace.h | 6 ++++-- 3 files changed, 18 insertions(+), 10 deletions(-)