Skip to content

Commit

Permalink
i915/pmu: Wire GuC backend to per-client busyness
Browse files Browse the repository at this point in the history
GuC provides engine_id and last_switch_in ticks for an active context in the
pphwsp. The context image provides a 32 bit total ticks which is the accumulated
by the context (a.k.a. context[CTX_TIMESTAMP]). This information is used to
calculate the context busyness as follows:

If the engine_id is valid, then busyness is the sum of accumulated total ticks
and active ticks. Active ticks is calculated with current gt time as reference.

If engine_id is invalid, busyness is equal to accumulated total ticks.

Since KMD (CPU) retrieves busyness data from 2 sources - GPU and GuC, a
potential race was highlighted in an earlier review that can lead to double
accounting of busyness. While the solution to this is a wip, busyness is still
usable for platforms running GuC submission.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
  • Loading branch information
johnharr-intel authored and JeevakaPrabu committed Jun 21, 2023
1 parent 2b70700 commit c01c587
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 11 deletions.
11 changes: 9 additions & 2 deletions drivers/gpu/drm/i915/gt/intel_context.c
Original file line number Diff line number Diff line change
Expand Up @@ -576,16 +576,23 @@ void intel_context_bind_parent_child(struct intel_context *parent,
child->parallel.parent = parent;
}

u64 intel_context_get_total_runtime_ns(const struct intel_context *ce)
u64 intel_context_get_total_runtime_ns(struct intel_context *ce)
{
u64 total, active;

if (ce->ops->update_stats)
ce->ops->update_stats(ce);

total = ce->stats.runtime.total;
if (ce->ops->flags & COPS_RUNTIME_CYCLES)
total *= ce->engine->gt->clock_period_ns;

active = READ_ONCE(ce->stats.active);
if (active)
/*
* GuC backend returns the actual time the context was active, so skip
* the calculation here for GuC.
*/
if (active && !intel_engine_uses_guc(ce->engine))
active = intel_context_clock() - active;

return total + active;
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/gt/intel_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static inline bool intel_context_is_parent(struct intel_context *ce)
return !!ce->parallel.number_children;
}

static inline bool intel_context_is_pinned(struct intel_context *ce);
static inline bool intel_context_is_pinned(const struct intel_context *ce);

static inline struct intel_context *
intel_context_to_parent(struct intel_context *ce)
Expand Down Expand Up @@ -118,7 +118,7 @@ static inline int intel_context_lock_pinned(struct intel_context *ce)
* Returns: true if the context is currently pinned for use by the GPU.
*/
static inline bool
intel_context_is_pinned(struct intel_context *ce)
intel_context_is_pinned(const struct intel_context *ce)
{
return atomic_read(&ce->pin_count);
}
Expand Down Expand Up @@ -362,7 +362,7 @@ intel_context_clear_nopreempt(struct intel_context *ce)
clear_bit(CONTEXT_NOPREEMPT, &ce->flags);
}

u64 intel_context_get_total_runtime_ns(const struct intel_context *ce);
u64 intel_context_get_total_runtime_ns(struct intel_context *ce);
u64 intel_context_get_avg_runtime_ns(struct intel_context *ce);

static inline u64 intel_context_clock(void)
Expand Down
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/gt/intel_context_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ struct intel_context_ops {

void (*sched_disable)(struct intel_context *ce);

void (*update_stats)(struct intel_context *ce);

void (*reset)(struct intel_context *ce);
void (*destroy)(struct kref *kref);

Expand Down Expand Up @@ -148,6 +150,7 @@ struct intel_context {
struct ewma_runtime avg;
u64 total;
u32 last;
u64 start_gt_clk;
I915_SELFTEST_DECLARE(u32 num_underflow);
I915_SELFTEST_DECLARE(u32 max_underflow);
} runtime;
Expand Down
5 changes: 5 additions & 0 deletions drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,11 @@ static inline u8 guc_class_to_engine_class(u8 guc_class)
return guc_class_engine_class_map[guc_class];
}

/* Per context engine usage stats: */
#define PPHWSP_GUC_CONTEXT_USAGE_STAMP_LO (0x500 / sizeof(u32))
#define PPHWSP_GUC_CONTEXT_USAGE_STAMP_HI (PPHWSP_GUC_CONTEXT_USAGE_STAMP_LO + 1)
#define PPHWSP_GUC_CONTEXT_USAGE_ENGINE_ID (PPHWSP_GUC_CONTEXT_USAGE_STAMP_HI + 1)

/* Work item for submitting workloads into work queue of GuC. */
struct guc_wq_item {
u32 header;
Expand Down
55 changes: 54 additions & 1 deletion drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ static inline void set_context_guc_id_invalid(struct intel_context *ce)
ce->guc_id.id = GUC_INVALID_CONTEXT_ID;
}

static inline struct intel_guc *ce_to_guc(struct intel_context *ce)
static inline struct intel_guc *ce_to_guc(const struct intel_context *ce)
{
return &ce->engine->gt->uc.guc;
}
Expand Down Expand Up @@ -1378,13 +1378,16 @@ static void __update_guc_busyness_stats(struct intel_guc *guc)
spin_unlock_irqrestore(&guc->timestamp.lock, flags);
}

static void __guc_context_update_clks(struct intel_context *ce);
static void guc_timestamp_ping(struct work_struct *wrk)
{
struct intel_guc *guc = container_of(wrk, typeof(*guc),
timestamp.work.work);
struct intel_uc *uc = container_of(guc, typeof(*uc), guc);
struct intel_gt *gt = guc_to_gt(guc);
struct intel_context *ce;
intel_wakeref_t wakeref;
unsigned long index;
int srcu, ret;

/*
Expand All @@ -1398,6 +1401,10 @@ static void guc_timestamp_ping(struct work_struct *wrk)
with_intel_runtime_pm(&gt->i915->runtime_pm, wakeref)
__update_guc_busyness_stats(guc);

/* adjust context stats for overflow */
xa_for_each(&guc->context_lookup, index, ce)
__guc_context_update_clks(ce);

intel_gt_reset_unlock(gt, srcu);

mod_delayed_work(system_highpri_wq, &guc->timestamp.work,
Expand Down Expand Up @@ -1482,6 +1489,48 @@ void intel_guc_busyness_unpark(struct intel_gt *gt)
guc->timestamp.ping_delay);
}

static void __guc_context_update_clks(struct intel_context *ce)
{
struct intel_guc *guc = ce_to_guc(ce);
struct intel_gt *gt = ce->engine->gt;
u32 *pphwsp, last_switch, engine_id;
u64 start_gt_clk = 0, active = 0;
unsigned long flags;
ktime_t unused;

spin_lock_irqsave(&guc->timestamp.lock, flags);

pphwsp = ((void *)ce->lrc_reg_state) - LRC_STATE_OFFSET;
last_switch = READ_ONCE(pphwsp[PPHWSP_GUC_CONTEXT_USAGE_STAMP_LO]);
engine_id = READ_ONCE(pphwsp[PPHWSP_GUC_CONTEXT_USAGE_ENGINE_ID]);

guc_update_pm_timestamp(guc, &unused);

if (engine_id != 0xffffffff && last_switch) {
start_gt_clk = READ_ONCE(ce->stats.runtime.start_gt_clk);
__extend_last_switch(guc, &start_gt_clk, last_switch);
active = intel_gt_clock_interval_to_ns(gt, guc->timestamp.gt_stamp - start_gt_clk);
WRITE_ONCE(ce->stats.runtime.start_gt_clk, start_gt_clk);
WRITE_ONCE(ce->stats.active, active);
} else {
lrc_update_runtime(ce);
}

spin_unlock_irqrestore(&guc->timestamp.lock, flags);
}

static void guc_context_update_stats(struct intel_context *ce)
{
if (!intel_context_pin_if_active(ce)) {
WRITE_ONCE(ce->stats.runtime.start_gt_clk, 0);
WRITE_ONCE(ce->stats.active, 0);
return;
}

__guc_context_update_clks(ce);
intel_context_unpin(ce);
}

static inline bool
submission_disabled(struct intel_guc *guc)
{
Expand Down Expand Up @@ -2805,6 +2854,7 @@ static void guc_context_unpin(struct intel_context *ce)
{
struct intel_guc *guc = ce_to_guc(ce);

lrc_update_runtime(ce);
unpin_guc_id(guc, ce);
lrc_unpin(ce);

Expand Down Expand Up @@ -3426,6 +3476,7 @@ static void remove_from_context(struct i915_request *rq)
}

static const struct intel_context_ops guc_context_ops = {
.flags = COPS_RUNTIME_CYCLES,
.alloc = guc_context_alloc,

.pre_pin = guc_context_pre_pin,
Expand All @@ -3442,6 +3493,8 @@ static const struct intel_context_ops guc_context_ops = {

.sched_disable = guc_context_sched_disable,

.update_stats = guc_context_update_stats,

.reset = lrc_reset,
.destroy = guc_context_destroy,

Expand Down
6 changes: 1 addition & 5 deletions drivers/gpu/drm/i915/i915_drm_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,7 @@ void i915_drm_client_fdinfo(struct seq_file *m, struct file *f)
PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
seq_printf(m, "drm-client-id:\t%u\n", client->id);

/*
* Temporarily skip showing client engine information with GuC submission till
* fetching engine busyness is implemented in the GuC submission backend
*/
if (GRAPHICS_VER(i915) < 8 || intel_uc_uses_guc_submission(&i915->gt0.uc))
if (GRAPHICS_VER(i915) < 8)
return;

for (i = 0; i < ARRAY_SIZE(uabi_class_names); i++)
Expand Down

0 comments on commit c01c587

Please sign in to comment.