* [RFC 01/10] drm/i915: Store engine backpointer in the intel_context
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
@ 2018-05-22 12:30 ` Tvrtko Ursulin
2018-05-22 12:30 ` [RFC 02/10] drm/i915: Include i915_scheduler.h from i915_gem_context.h Tvrtko Ursulin
` (12 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
It will become useful in a later patch.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_gem_context.c | 1 +
drivers/gpu/drm/i915/i915_gem_context.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index b69b18ef8120..bff3788908e0 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -282,6 +282,7 @@ __create_hw_context(struct drm_i915_private *dev_priv,
struct intel_context *ce = &ctx->__engine[n];
ce->gem_context = ctx;
+ ce->engine = dev_priv->engine[n];
}
INIT_RADIX_TREE(&ctx->handles_vma, GFP_KERNEL);
diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h
index c3262b4dd2ee..74512c92a6a0 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.h
+++ b/drivers/gpu/drm/i915/i915_gem_context.h
@@ -150,6 +150,7 @@ struct i915_gem_context {
/** engine: per-engine logical HW state */
struct intel_context {
struct i915_gem_context *gem_context;
+ struct intel_engine_cs *engine;
struct i915_vma *state;
struct intel_ring *ring;
u32 *lrc_reg_state;
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread* [RFC 02/10] drm/i915: Include i915_scheduler.h from i915_gem_context.h
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
2018-05-22 12:30 ` [RFC 01/10] drm/i915: Store engine backpointer in the intel_context Tvrtko Ursulin
@ 2018-05-22 12:30 ` Tvrtko Ursulin
2018-05-22 12:44 ` Chris Wilson
2018-05-22 12:52 ` Mika Kuoppala
2018-05-22 12:30 ` [RFC 03/10] drm/i915: Forward declare struct intel_context Tvrtko Ursulin
` (11 subsequent siblings)
13 siblings, 2 replies; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
struct i915_gem_context embeds structr i915_sched_attr so needs to include
the respective header.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_gem_context.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h
index 74512c92a6a0..33933d43c61a 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.h
+++ b/drivers/gpu/drm/i915/i915_gem_context.h
@@ -30,6 +30,7 @@
#include <linux/radix-tree.h>
#include "i915_gem.h"
+#include "i915_scheduler.h"
struct pid;
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread* [RFC 03/10] drm/i915: Forward declare struct intel_context
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
2018-05-22 12:30 ` [RFC 01/10] drm/i915: Store engine backpointer in the intel_context Tvrtko Ursulin
2018-05-22 12:30 ` [RFC 02/10] drm/i915: Include i915_scheduler.h from i915_gem_context.h Tvrtko Ursulin
@ 2018-05-22 12:30 ` Tvrtko Ursulin
2018-05-22 12:44 ` Chris Wilson
2018-05-22 12:30 ` [RFC 04/10] drm/i915: Move intel_engine_context_in/out into intel_lrc.c Tvrtko Ursulin
` (10 subsequent siblings)
13 siblings, 1 reply; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
This is to avoid an error with structure declared in parameter list if the
include ordering changes.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_gem_context.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h
index 33933d43c61a..4d6994f311be 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.h
+++ b/drivers/gpu/drm/i915/i915_gem_context.h
@@ -46,6 +46,8 @@ struct intel_ring;
#define DEFAULT_CONTEXT_HANDLE 0
+struct intel_context;
+
struct intel_context_ops {
void (*unpin)(struct intel_context *ce);
void (*destroy)(struct intel_context *ce);
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread* [RFC 04/10] drm/i915: Move intel_engine_context_in/out into intel_lrc.c
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (2 preceding siblings ...)
2018-05-22 12:30 ` [RFC 03/10] drm/i915: Forward declare struct intel_context Tvrtko Ursulin
@ 2018-05-22 12:30 ` Tvrtko Ursulin
2018-05-22 12:46 ` Chris Wilson
2018-05-22 12:30 ` [RFC 05/10] drm/i915: Track per-context engine busyness Tvrtko Ursulin
` (9 subsequent siblings)
13 siblings, 1 reply; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Intel_lrc.c is the only caller and so to avoid some header file ordering
issues in future patches move these two over there.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_lrc.c | 57 +++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_ringbuffer.h | 55 ------------------------
2 files changed, 57 insertions(+), 55 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 8480c1534c4b..3947bdcd8ea6 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -375,6 +375,63 @@ execlists_context_status_change(struct i915_request *rq, unsigned long status)
status, rq);
}
+static inline void
+intel_engine_context_in(struct intel_engine_cs *engine)
+{
+ unsigned long flags;
+
+ if (READ_ONCE(engine->stats.enabled) == 0)
+ return;
+
+ write_seqlock_irqsave(&engine->stats.lock, flags);
+
+ if (engine->stats.enabled > 0) {
+ if (engine->stats.active++ == 0)
+ engine->stats.start = ktime_get();
+ GEM_BUG_ON(engine->stats.active == 0);
+ }
+
+ write_sequnlock_irqrestore(&engine->stats.lock, flags);
+}
+
+static inline void
+intel_engine_context_out(struct intel_engine_cs *engine)
+{
+ unsigned long flags;
+
+ if (READ_ONCE(engine->stats.enabled) == 0)
+ return;
+
+ write_seqlock_irqsave(&engine->stats.lock, flags);
+
+ if (engine->stats.enabled > 0) {
+ ktime_t last;
+
+ if (engine->stats.active && --engine->stats.active == 0) {
+ /*
+ * Decrement the active context count and in case GPU
+ * is now idle add up to the running total.
+ */
+ last = ktime_sub(ktime_get(), engine->stats.start);
+
+ engine->stats.total = ktime_add(engine->stats.total,
+ last);
+ } else if (engine->stats.active == 0) {
+ /*
+ * After turning on engine stats, context out might be
+ * the first event in which case we account from the
+ * time stats gathering was turned on.
+ */
+ last = ktime_sub(ktime_get(), engine->stats.enabled_at);
+
+ engine->stats.total = ktime_add(engine->stats.total,
+ last);
+ }
+ }
+
+ write_sequnlock_irqrestore(&engine->stats.lock, flags);
+}
+
inline void
execlists_user_begin(struct intel_engine_execlists *execlists,
const struct execlist_port *port)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 7c25db5bcaaa..1bdc42deca3c 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -1091,61 +1091,6 @@ void intel_engine_dump(struct intel_engine_cs *engine,
struct intel_engine_cs *
intel_engine_lookup_user(struct drm_i915_private *i915, u8 class, u8 instance);
-static inline void intel_engine_context_in(struct intel_engine_cs *engine)
-{
- unsigned long flags;
-
- if (READ_ONCE(engine->stats.enabled) == 0)
- return;
-
- write_seqlock_irqsave(&engine->stats.lock, flags);
-
- if (engine->stats.enabled > 0) {
- if (engine->stats.active++ == 0)
- engine->stats.start = ktime_get();
- GEM_BUG_ON(engine->stats.active == 0);
- }
-
- write_sequnlock_irqrestore(&engine->stats.lock, flags);
-}
-
-static inline void intel_engine_context_out(struct intel_engine_cs *engine)
-{
- unsigned long flags;
-
- if (READ_ONCE(engine->stats.enabled) == 0)
- return;
-
- write_seqlock_irqsave(&engine->stats.lock, flags);
-
- if (engine->stats.enabled > 0) {
- ktime_t last;
-
- if (engine->stats.active && --engine->stats.active == 0) {
- /*
- * Decrement the active context count and in case GPU
- * is now idle add up to the running total.
- */
- last = ktime_sub(ktime_get(), engine->stats.start);
-
- engine->stats.total = ktime_add(engine->stats.total,
- last);
- } else if (engine->stats.active == 0) {
- /*
- * After turning on engine stats, context out might be
- * the first event in which case we account from the
- * time stats gathering was turned on.
- */
- last = ktime_sub(ktime_get(), engine->stats.enabled_at);
-
- engine->stats.total = ktime_add(engine->stats.total,
- last);
- }
- }
-
- write_sequnlock_irqrestore(&engine->stats.lock, flags);
-}
-
int intel_enable_engine_stats(struct intel_engine_cs *engine);
void intel_disable_engine_stats(struct intel_engine_cs *engine);
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [RFC 04/10] drm/i915: Move intel_engine_context_in/out into intel_lrc.c
2018-05-22 12:30 ` [RFC 04/10] drm/i915: Move intel_engine_context_in/out into intel_lrc.c Tvrtko Ursulin
@ 2018-05-22 12:46 ` Chris Wilson
2018-05-22 13:02 ` Tvrtko Ursulin
0 siblings, 1 reply; 20+ messages in thread
From: Chris Wilson @ 2018-05-22 12:46 UTC (permalink / raw)
To: Tvrtko Ursulin, Intel-gfx
Quoting Tvrtko Ursulin (2018-05-22 13:30:14)
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Intel_lrc.c is the only caller and so to avoid some header file ordering
> issues in future patches move these two over there.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Expectation was that we would be using these in guc. Brief highlight of
how the plan changed?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC 04/10] drm/i915: Move intel_engine_context_in/out into intel_lrc.c
2018-05-22 12:46 ` Chris Wilson
@ 2018-05-22 13:02 ` Tvrtko Ursulin
0 siblings, 0 replies; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 13:02 UTC (permalink / raw)
To: Chris Wilson, Tvrtko Ursulin, Intel-gfx
On 22/05/2018 13:46, Chris Wilson wrote:
> Quoting Tvrtko Ursulin (2018-05-22 13:30:14)
>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>
>> Intel_lrc.c is the only caller and so to avoid some header file ordering
>> issues in future patches move these two over there.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Expectation was that we would be using these in guc. Brief highlight of
> how the plan changed?
"Let's postpone the disaster" ? :) I am talking about header file
ordering disaster, not GuC, so someone doesn't get me wrong.
But in actuality, since we have postponed GuC until Gen11, and there we
get a different kind of GuC, the kind where will be no way for i915 to
have visibility on when a context get in and out, and which physical
engines. So I think we really won't have a need for these hooks in the
Gen11 GuC code.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* [RFC 05/10] drm/i915: Track per-context engine busyness
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (3 preceding siblings ...)
2018-05-22 12:30 ` [RFC 04/10] drm/i915: Move intel_engine_context_in/out into intel_lrc.c Tvrtko Ursulin
@ 2018-05-22 12:30 ` Tvrtko Ursulin
2018-05-22 12:30 ` [RFC 06/10] drm/i915: Expose list of clients in sysfs Tvrtko Ursulin
` (8 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 12:30 UTC (permalink / raw)
To: Intel-gfx; +Cc: gordon.kelly
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Some customers want to know how much of the GPU time are their clients
using in order to make dynamic load balancing decisions.
With the hooks already in place which track the overall engine busyness,
we can extend that slightly to split that time between contexts.
v2: Fix accounting for tail updates.
v3: Rebase.
v4: Mark currently running contexts as active on stats enable.
v5: Include some headers to fix the build.
v6: Added fine grained lock.
v7: Convert to seqlock. (Chris Wilson)
v8: Rebase and tidy with helpers.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: gordon.kelly@intel.com
---
drivers/gpu/drm/i915/i915_gem_context.c | 1 +
drivers/gpu/drm/i915/i915_gem_context.h | 17 +++++++
drivers/gpu/drm/i915/intel_engine_cs.c | 27 +++++++++++
drivers/gpu/drm/i915/intel_lrc.c | 62 +++++++++++++++++++++----
4 files changed, 97 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index bff3788908e0..37cace775b31 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -283,6 +283,7 @@ __create_hw_context(struct drm_i915_private *dev_priv,
ce->gem_context = ctx;
ce->engine = dev_priv->engine[n];
+ seqlock_init(&ce->stats.lock);
}
INIT_RADIX_TREE(&ctx->handles_vma, GFP_KERNEL);
diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h
index 4d6994f311be..e3d9948f7186 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.h
+++ b/drivers/gpu/drm/i915/i915_gem_context.h
@@ -28,6 +28,7 @@
#include <linux/bitops.h>
#include <linux/list.h>
#include <linux/radix-tree.h>
+#include <linux/seqlock.h>
#include "i915_gem.h"
#include "i915_scheduler.h"
@@ -160,6 +161,13 @@ struct i915_gem_context {
u64 lrc_desc;
int pin_count;
+ struct intel_context_stats {
+ seqlock_t lock;
+ bool active;
+ ktime_t start;
+ ktime_t total;
+ } stats;
+
const struct intel_context_ops *ops;
} __engine[I915_NUM_ENGINES];
@@ -339,4 +347,13 @@ static inline void i915_gem_context_put(struct i915_gem_context *ctx)
kref_put(&ctx->ref, i915_gem_context_release);
}
+static inline void
+__intel_context_stats_start(struct intel_context_stats *stats, ktime_t now)
+{
+ stats->start = now;
+ stats->active = true;
+}
+
+ktime_t intel_context_get_busy_time(struct intel_context *ce);
+
#endif /* !__I915_GEM_CONTEXT_H__ */
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index abfde8968900..020391c8a874 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1580,6 +1580,14 @@ int intel_enable_engine_stats(struct intel_engine_cs *engine)
engine->stats.enabled_at = ktime_get();
+ /* Mark currently running context as active. */
+ if (port_isset(port)) {
+ struct i915_request *rq = port_request(port);
+
+ __intel_context_stats_start(&rq->hw_context->stats,
+ engine->stats.enabled_at);
+ }
+
/* XXX submission method oblivious? */
while (num_ports-- && port_isset(port)) {
engine->stats.active++;
@@ -1653,6 +1661,25 @@ void intel_disable_engine_stats(struct intel_engine_cs *engine)
write_sequnlock_irqrestore(&engine->stats.lock, flags);
}
+ktime_t intel_context_get_busy_time(struct intel_context *ce)
+{
+ unsigned int seq;
+ ktime_t total;
+
+ do {
+ seq = read_seqbegin(&ce->stats.lock);
+
+ total = ce->stats.total;
+
+ if (ce->stats.active)
+ total = ktime_add(total,
+ ktime_sub(ktime_get(),
+ ce->stats.start));
+ } while (read_seqretry(&ce->stats.lock, seq));
+
+ return total;
+}
+
#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
#include "selftests/mock_engine.c"
#include "selftests/intel_engine_cs.c"
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 3947bdcd8ea6..72e2a9065b0f 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -376,18 +376,48 @@ execlists_context_status_change(struct i915_request *rq, unsigned long status)
}
static inline void
-intel_engine_context_in(struct intel_engine_cs *engine)
+intel_context_stats_start(struct intel_context_stats *stats, ktime_t now)
{
+ write_seqlock(&stats->lock);
+ __intel_context_stats_start(stats, now);
+ write_sequnlock(&stats->lock);
+}
+
+static inline void
+intel_context_stats_stop(struct intel_context_stats *stats, ktime_t now)
+{
+ write_seqlock(&stats->lock);
+ GEM_BUG_ON(!stats->start);
+ stats->total = ktime_add(stats->total, ktime_sub(now, stats->start));
+ stats->active = false;
+ write_sequnlock(&stats->lock);
+}
+
+static inline void
+intel_context_in(struct intel_context *ce, bool submit)
+{
+ struct intel_engine_cs *engine = ce->engine;
unsigned long flags;
+ ktime_t now;
if (READ_ONCE(engine->stats.enabled) == 0)
return;
write_seqlock_irqsave(&engine->stats.lock, flags);
+ if (submit) {
+ now = ktime_get();
+ intel_context_stats_start(&ce->stats, now);
+ } else {
+ now = 0;
+ }
+
if (engine->stats.enabled > 0) {
- if (engine->stats.active++ == 0)
- engine->stats.start = ktime_get();
+ if (engine->stats.active++ == 0) {
+ if (!now)
+ now = ktime_get();
+ engine->stats.start = now;
+ }
GEM_BUG_ON(engine->stats.active == 0);
}
@@ -395,8 +425,9 @@ intel_engine_context_in(struct intel_engine_cs *engine)
}
static inline void
-intel_engine_context_out(struct intel_engine_cs *engine)
+intel_context_out(struct intel_context *ce)
{
+ struct intel_engine_cs *engine = ce->engine;
unsigned long flags;
if (READ_ONCE(engine->stats.enabled) == 0)
@@ -405,14 +436,25 @@ intel_engine_context_out(struct intel_engine_cs *engine)
write_seqlock_irqsave(&engine->stats.lock, flags);
if (engine->stats.enabled > 0) {
+ struct execlist_port *next_port = &engine->execlists.port[1];
+ ktime_t now = ktime_get();
ktime_t last;
+ intel_context_stats_stop(&ce->stats, now);
+
+ if (port_isset(next_port)) {
+ struct i915_request *next_rq = port_request(next_port);
+
+ intel_context_stats_start(&next_rq->hw_context->stats,
+ now);
+ }
+
if (engine->stats.active && --engine->stats.active == 0) {
/*
* Decrement the active context count and in case GPU
* is now idle add up to the running total.
*/
- last = ktime_sub(ktime_get(), engine->stats.start);
+ last = ktime_sub(now, engine->stats.start);
engine->stats.total = ktime_add(engine->stats.total,
last);
@@ -422,7 +464,7 @@ intel_engine_context_out(struct intel_engine_cs *engine)
* the first event in which case we account from the
* time stats gathering was turned on.
*/
- last = ktime_sub(ktime_get(), engine->stats.enabled_at);
+ last = ktime_sub(now, engine->stats.enabled_at);
engine->stats.total = ktime_add(engine->stats.total,
last);
@@ -446,16 +488,16 @@ execlists_user_end(struct intel_engine_execlists *execlists)
}
static inline void
-execlists_context_schedule_in(struct i915_request *rq)
+execlists_context_schedule_in(struct i915_request *rq, unsigned int port)
{
execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_IN);
- intel_engine_context_in(rq->engine);
+ intel_context_in(rq->hw_context, port == 0);
}
static inline void
execlists_context_schedule_out(struct i915_request *rq, unsigned long status)
{
- intel_engine_context_out(rq->engine);
+ intel_context_out(rq->hw_context);
execlists_context_status_change(rq, status);
trace_i915_request_out(rq);
}
@@ -521,7 +563,7 @@ static void execlists_submit_ports(struct intel_engine_cs *engine)
if (rq) {
GEM_BUG_ON(count > !n);
if (!count++)
- execlists_context_schedule_in(rq);
+ execlists_context_schedule_in(rq, n);
port_set(&port[n], port_pack(rq, count));
desc = execlists_update_context(rq);
GEM_DEBUG_EXEC(port[n].context_id = upper_32_bits(desc));
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread* [RFC 06/10] drm/i915: Expose list of clients in sysfs
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (4 preceding siblings ...)
2018-05-22 12:30 ` [RFC 05/10] drm/i915: Track per-context engine busyness Tvrtko Ursulin
@ 2018-05-22 12:30 ` Tvrtko Ursulin
2018-05-22 12:30 ` [RFC 07/10] drm/i915: Update client name on context create Tvrtko Ursulin
` (7 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Expose a list of clients with open file handles in sysfs.
This will be a basis for a top-like utility showing per-client and per-
engine GPU load.
Currently we only expose each client's pid and name under opaque numbered
directories in /sys/class/drm/card0/clients/.
For instance:
/sys/class/drm/card0/clients/3/name: Xorg
/sys/class/drm/card0/clients/3/pid: 5664
v2:
Chris Wilson:
* Enclose new members into dedicated structs.
* Protect against failed sysfs registration.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 19 +++++
drivers/gpu/drm/i915/i915_gem.c | 117 ++++++++++++++++++++++++++++--
drivers/gpu/drm/i915/i915_sysfs.c | 8 ++
3 files changed, 137 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index e33c380b43e3..b25799ca5c5b 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -348,6 +348,20 @@ struct drm_i915_file_private {
*/
#define I915_MAX_CLIENT_CONTEXT_BANS 3
atomic_t context_bans;
+
+ struct i915_drm_client {
+ unsigned int id;
+
+ pid_t pid;
+ char *name;
+
+ struct kobject *root;
+
+ struct {
+ struct device_attribute pid;
+ struct device_attribute name;
+ } attr;
+ } client;
};
/* Interface history:
@@ -2120,6 +2134,11 @@ struct drm_i915_private {
struct i915_pmu pmu;
+ struct i915_drm_clients {
+ struct kobject *root;
+ atomic_t serial;
+ } clients;
+
/*
* NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch
* will be rejected. Instead look for a better place.
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index ccdfa7250ad3..7be92761fc30 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -5653,6 +5653,94 @@ int i915_gem_freeze_late(struct drm_i915_private *dev_priv)
return 0;
}
+static ssize_t
+show_client_name(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+ struct drm_i915_file_private *file_priv =
+ container_of(attr, struct drm_i915_file_private,
+ client.attr.name);
+
+ return snprintf(buf, PAGE_SIZE, "%s", file_priv->client.name);
+}
+
+static ssize_t
+show_client_pid(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+ struct drm_i915_file_private *file_priv =
+ container_of(attr, struct drm_i915_file_private,
+ client.attr.pid);
+
+ return snprintf(buf, PAGE_SIZE, "%u", file_priv->client.pid);
+}
+
+static int
+i915_gem_add_client(struct drm_i915_private *i915,
+ struct drm_i915_file_private *file_priv,
+ struct task_struct *task,
+ unsigned int serial)
+{
+ int ret = -ENOMEM;
+ struct device_attribute *attr;
+ char id[32];
+
+ if (!i915->clients.root)
+ goto err_name;
+
+ file_priv->client.name = kstrdup(task->comm, GFP_KERNEL);
+ if (!file_priv->client.name)
+ goto err_name;
+
+ snprintf(id, sizeof(id), "%u", serial);
+ file_priv->client.root = kobject_create_and_add(id,
+ i915->clients.root);
+ if (!file_priv->client.root)
+ goto err_client;
+
+ attr = &file_priv->client.attr.name;
+ attr->attr.name = "name";
+ attr->attr.mode = 0444;
+ attr->show = show_client_name;
+
+ ret = sysfs_create_file(file_priv->client.root,
+ (struct attribute *)attr);
+ if (ret)
+ goto err_attr_name;
+
+ attr = &file_priv->client.attr.pid;
+ attr->attr.name = "pid";
+ attr->attr.mode = 0444;
+ attr->show = show_client_pid;
+
+ ret = sysfs_create_file(file_priv->client.root,
+ (struct attribute *)attr);
+ if (ret)
+ goto err_attr_pid;
+
+ file_priv->client.pid = pid_nr(get_task_pid(task, PIDTYPE_PID));
+
+ return 0;
+
+err_attr_pid:
+ sysfs_remove_file(file_priv->client.root,
+ (struct attribute *)&file_priv->client.attr.name);
+err_attr_name:
+ kobject_put(file_priv->client.root);
+err_client:
+ kfree(file_priv->client.name);
+err_name:
+ return ret;
+}
+
+static void i915_gem_remove_client(struct drm_i915_file_private *file_priv)
+{
+ sysfs_remove_file(file_priv->client.root,
+ (struct attribute *)&file_priv->client.attr.pid);
+ sysfs_remove_file(file_priv->client.root,
+ (struct attribute *)&file_priv->client.attr.name);
+ kobject_put(file_priv->client.root);
+ kfree(file_priv->client.name);
+}
+
void i915_gem_release(struct drm_device *dev, struct drm_file *file)
{
struct drm_i915_file_private *file_priv = file->driver_priv;
@@ -5666,32 +5754,47 @@ void i915_gem_release(struct drm_device *dev, struct drm_file *file)
list_for_each_entry(request, &file_priv->mm.request_list, client_link)
request->file_priv = NULL;
spin_unlock(&file_priv->mm.lock);
+
+ i915_gem_remove_client(file_priv);
}
int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file)
{
+ int ret = -ENOMEM;
struct drm_i915_file_private *file_priv;
- int ret;
DRM_DEBUG("\n");
file_priv = kzalloc(sizeof(*file_priv), GFP_KERNEL);
if (!file_priv)
- return -ENOMEM;
+ goto err_alloc;
+
+ file_priv->client.id = atomic_inc_return(&i915->clients.serial);
+ ret = i915_gem_add_client(i915, file_priv, current,
+ file_priv->client.id);
+ if (ret)
+ goto err_client;
file->driver_priv = file_priv;
+ ret = i915_gem_context_open(i915, file);
+ if (ret)
+ goto err_context;
+
file_priv->dev_priv = i915;
file_priv->file = file;
+ file_priv->bsd_engine = -1;
spin_lock_init(&file_priv->mm.lock);
INIT_LIST_HEAD(&file_priv->mm.request_list);
- file_priv->bsd_engine = -1;
-
- ret = i915_gem_context_open(i915, file);
- if (ret)
- kfree(file_priv);
+ return 0;
+err_context:
+ i915_gem_remove_client(file_priv);
+err_client:
+ atomic_dec(&i915->clients.serial);
+ kfree(file_priv);
+err_alloc:
return ret;
}
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index e5e6f6bb2b05..d809259456ef 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -581,6 +581,11 @@ void i915_setup_sysfs(struct drm_i915_private *dev_priv)
struct device *kdev = dev_priv->drm.primary->kdev;
int ret;
+ dev_priv->clients.root =
+ kobject_create_and_add("clients", &kdev->kobj);
+ if (!dev_priv->clients.root)
+ DRM_ERROR("Per-client sysfs setup failed\n");
+
#ifdef CONFIG_PM
if (HAS_RC6(dev_priv)) {
ret = sysfs_merge_group(&kdev->kobj,
@@ -641,4 +646,7 @@ void i915_teardown_sysfs(struct drm_i915_private *dev_priv)
sysfs_unmerge_group(&kdev->kobj, &rc6_attr_group);
sysfs_unmerge_group(&kdev->kobj, &rc6p_attr_group);
#endif
+
+ if (dev_priv->clients.root)
+ kobject_put(dev_priv->clients.root);
}
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread* [RFC 07/10] drm/i915: Update client name on context create
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (5 preceding siblings ...)
2018-05-22 12:30 ` [RFC 06/10] drm/i915: Expose list of clients in sysfs Tvrtko Ursulin
@ 2018-05-22 12:30 ` Tvrtko Ursulin
2018-05-22 12:30 ` [RFC 08/10] drm/i915: Expose per-engine client busyness Tvrtko Ursulin
` (6 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Some clients have the DRM fd passed to them over a socket by the X server.
Grab the real client and pid when they create their first context and
update the exposed data for more useful enumeration.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++
drivers/gpu/drm/i915/i915_gem.c | 4 ++--
drivers/gpu/drm/i915/i915_gem_context.c | 16 +++++++++++++---
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b25799ca5c5b..d14798bff230 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3213,6 +3213,14 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
void i915_gem_object_unpin_from_display_plane(struct i915_vma *vma);
int i915_gem_object_attach_phys(struct drm_i915_gem_object *obj,
int align);
+
+int
+i915_gem_add_client(struct drm_i915_private *i915,
+ struct drm_i915_file_private *file_priv,
+ struct task_struct *task,
+ unsigned int serial);
+void i915_gem_remove_client(struct drm_i915_file_private *file_priv);
+
int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file);
void i915_gem_release(struct drm_device *dev, struct drm_file *file);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 7be92761fc30..cbd5aa818cd4 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -5673,7 +5673,7 @@ show_client_pid(struct device *kdev, struct device_attribute *attr, char *buf)
return snprintf(buf, PAGE_SIZE, "%u", file_priv->client.pid);
}
-static int
+int
i915_gem_add_client(struct drm_i915_private *i915,
struct drm_i915_file_private *file_priv,
struct task_struct *task,
@@ -5731,7 +5731,7 @@ i915_gem_add_client(struct drm_i915_private *i915,
return ret;
}
-static void i915_gem_remove_client(struct drm_i915_file_private *file_priv)
+void i915_gem_remove_client(struct drm_i915_file_private *file_priv)
{
sysfs_remove_file(file_priv->client.root,
(struct attribute *)&file_priv->client.attr.pid);
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 37cace775b31..2fcae26f63bb 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -656,9 +656,10 @@ static bool client_is_banned(struct drm_i915_file_private *file_priv)
int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
struct drm_file *file)
{
+ struct drm_i915_file_private *file_priv = file->driver_priv;
+ pid_t pid = pid_nr(get_task_pid(current, PIDTYPE_PID));
struct drm_i915_private *dev_priv = to_i915(dev);
struct drm_i915_gem_context_create *args = data;
- struct drm_i915_file_private *file_priv = file->driver_priv;
struct i915_gem_context *ctx;
int ret;
@@ -670,8 +671,7 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
if (client_is_banned(file_priv)) {
DRM_DEBUG("client %s[%d] banned from creating ctx\n",
- current->comm,
- pid_nr(get_task_pid(current, PIDTYPE_PID)));
+ current->comm, pid);
return -EIO;
}
@@ -680,6 +680,16 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
if (ret)
return ret;
+ if (file_priv->client.pid != pid) {
+ i915_gem_remove_client(file_priv);
+ ret = i915_gem_add_client(dev_priv, file_priv, current,
+ file_priv->client.id);
+ if (ret) {
+ mutex_unlock(&dev->struct_mutex);
+ return ret;
+ }
+ }
+
ctx = i915_gem_create_context(dev_priv, file_priv);
mutex_unlock(&dev->struct_mutex);
if (IS_ERR(ctx))
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread* [RFC 08/10] drm/i915: Expose per-engine client busyness
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (6 preceding siblings ...)
2018-05-22 12:30 ` [RFC 07/10] drm/i915: Update client name on context create Tvrtko Ursulin
@ 2018-05-22 12:30 ` Tvrtko Ursulin
2018-05-22 12:30 ` [RFC 09/10] drm/i915: Add sysfs toggle to enable per-client engine stats Tvrtko Ursulin
` (5 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Expose per-client and per-engine busyness under the previously added sysfs
client root.
The new files are one per-engine instance and located under the 'busy'
directory.
Each contains a monotonically increasing nano-second resolution times each
client's jobs were executing on the GPU.
$ cat /sys/class/drm/card0/clients/5/busy/rcs0
32516602
This data can serve as an interface to implement a top like utility for
GPU jobs. For instance I have prototyped a tool in IGT which produces
periodic output like:
neverball[ 6011]: rcs0: 41.01% bcs0: 0.00% vcs0: 0.00% vecs0: 0.00%
Xorg[ 5664]: rcs0: 31.16% bcs0: 0.00% vcs0: 0.00% vecs0: 0.00%
xfwm4[ 5727]: rcs0: 0.00% bcs0: 0.00% vcs0: 0.00% vecs0: 0.00%
This tools can also be extended to use the i915 PMU and show overall engine
busyness, and engine loads using the queue depth metric.
v2: Use intel_context_engine_get_busy_time.
v3: New directory structure.
v4: Rebase.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 8 ++++
drivers/gpu/drm/i915/i915_gem.c | 80 +++++++++++++++++++++++++++++++--
2 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d14798bff230..793565d7bdd0 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -318,6 +318,12 @@ struct drm_i915_private;
struct i915_mm_struct;
struct i915_mmu_object;
+struct i915_engine_busy_attribute {
+ struct device_attribute attr;
+ struct drm_i915_file_private *file_priv;
+ struct intel_engine_cs *engine;
+};
+
struct drm_i915_file_private {
struct drm_i915_private *dev_priv;
struct drm_file *file;
@@ -356,10 +362,12 @@ struct drm_i915_file_private {
char *name;
struct kobject *root;
+ struct kobject *busy_root;
struct {
struct device_attribute pid;
struct device_attribute name;
+ struct i915_engine_busy_attribute busy[I915_NUM_ENGINES];
} attr;
} client;
};
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index cbd5aa818cd4..5b8335871425 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -5673,6 +5673,37 @@ show_client_pid(struct device *kdev, struct device_attribute *attr, char *buf)
return snprintf(buf, PAGE_SIZE, "%u", file_priv->client.pid);
}
+struct busy_ctx {
+ struct intel_engine_cs *engine;
+ u64 total;
+};
+
+static int busy_add(int _id, void *p, void *data)
+{
+ struct busy_ctx *bc = data;
+ struct i915_gem_context *ctx = p;
+ struct intel_context *ce = to_intel_context(ctx, bc->engine);
+
+ bc->total += ktime_to_ns(intel_context_get_busy_time(ce));
+
+ return 0;
+}
+
+static ssize_t
+show_client_busy(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+ struct i915_engine_busy_attribute *i915_attr =
+ container_of(attr, typeof(*i915_attr), attr);
+ struct drm_i915_file_private *file_priv = i915_attr->file_priv;
+ struct busy_ctx bc = { .engine = i915_attr->engine };
+
+ rcu_read_lock();
+ idr_for_each(&file_priv->context_idr, busy_add, &bc);
+ rcu_read_unlock();
+
+ return snprintf(buf, PAGE_SIZE, "%llu\n", bc.total);
+}
+
int
i915_gem_add_client(struct drm_i915_private *i915,
struct drm_i915_file_private *file_priv,
@@ -5680,8 +5711,10 @@ i915_gem_add_client(struct drm_i915_private *i915,
unsigned int serial)
{
int ret = -ENOMEM;
+ struct intel_engine_cs *engine;
struct device_attribute *attr;
- char id[32];
+ enum intel_engine_id id, id2;
+ char idstr[32];
if (!i915->clients.root)
goto err_name;
@@ -5690,8 +5723,8 @@ i915_gem_add_client(struct drm_i915_private *i915,
if (!file_priv->client.name)
goto err_name;
- snprintf(id, sizeof(id), "%u", serial);
- file_priv->client.root = kobject_create_and_add(id,
+ snprintf(idstr, sizeof(idstr), "%u", serial);
+ file_priv->client.root = kobject_create_and_add(idstr,
i915->clients.root);
if (!file_priv->client.root)
goto err_client;
@@ -5716,10 +5749,41 @@ i915_gem_add_client(struct drm_i915_private *i915,
if (ret)
goto err_attr_pid;
+ file_priv->client.busy_root =
+ kobject_create_and_add("busy", file_priv->client.root);
+ if (!file_priv->client.busy_root)
+ goto err_busy_root;
+
+ for_each_engine(engine, i915, id) {
+ file_priv->client.attr.busy[id].file_priv = file_priv;
+ file_priv->client.attr.busy[id].engine = engine;
+ attr = &file_priv->client.attr.busy[id].attr;
+ attr->attr.name = engine->name;
+ attr->attr.mode = 0444;
+ attr->show = show_client_busy;
+
+ ret = sysfs_create_file(file_priv->client.busy_root,
+ (struct attribute *)attr);
+ if (ret)
+ goto err_attr_busy;
+ }
+
file_priv->client.pid = pid_nr(get_task_pid(task, PIDTYPE_PID));
return 0;
+err_attr_busy:
+ for_each_engine(engine, i915, id2) {
+ if (id2 == id)
+ break;
+
+ sysfs_remove_file(file_priv->client.busy_root,
+ (struct attribute *)&file_priv->client.attr.busy[id2]);
+ }
+ kobject_put(file_priv->client.busy_root);
+err_busy_root:
+ sysfs_remove_file(file_priv->client.root,
+ (struct attribute *)&file_priv->client.attr.pid);
err_attr_pid:
sysfs_remove_file(file_priv->client.root,
(struct attribute *)&file_priv->client.attr.name);
@@ -5733,10 +5797,20 @@ i915_gem_add_client(struct drm_i915_private *i915,
void i915_gem_remove_client(struct drm_i915_file_private *file_priv)
{
+ struct intel_engine_cs *engine;
+ enum intel_engine_id id;
+
+ for_each_engine(engine, file_priv->dev_priv, id)
+ sysfs_remove_file(file_priv->client.busy_root,
+ (struct attribute *)&file_priv->client.attr.busy[id]);
+
+ kobject_put(file_priv->client.busy_root);
+
sysfs_remove_file(file_priv->client.root,
(struct attribute *)&file_priv->client.attr.pid);
sysfs_remove_file(file_priv->client.root,
(struct attribute *)&file_priv->client.attr.name);
+
kobject_put(file_priv->client.root);
kfree(file_priv->client.name);
}
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread* [RFC 09/10] drm/i915: Add sysfs toggle to enable per-client engine stats
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (7 preceding siblings ...)
2018-05-22 12:30 ` [RFC 08/10] drm/i915: Expose per-engine client busyness Tvrtko Ursulin
@ 2018-05-22 12:30 ` Tvrtko Ursulin
2018-05-22 12:30 ` [RFC 10/10] drm/i915: Allow clients to query own per-engine busyness Tvrtko Ursulin
` (4 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
By default we are not collecting any per-engine and per-context
statistcs.
Add a new sysfs toggle to enable this facility:
$ echo 1 >/sys/class/drm/card0/clients/enable_stats
v2: Rebase.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 4 ++
drivers/gpu/drm/i915/i915_sysfs.c | 72 +++++++++++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 793565d7bdd0..f0ba8a046bd6 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2145,6 +2145,10 @@ struct drm_i915_private {
struct i915_drm_clients {
struct kobject *root;
atomic_t serial;
+ struct {
+ bool enabled;
+ struct device_attribute attr;
+ } stats;
} clients;
/*
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index d809259456ef..70115072d56f 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -576,9 +576,67 @@ static void i915_setup_error_capture(struct device *kdev) {}
static void i915_teardown_error_capture(struct device *kdev) {}
#endif
+static ssize_t
+show_client_stats(struct device *kdev, struct device_attribute *attr, char *buf)
+{
+ struct drm_i915_private *i915 =
+ container_of(attr, struct drm_i915_private, clients.stats.attr);
+
+ return snprintf(buf, PAGE_SIZE, "%u\n", i915->clients.stats.enabled);
+}
+
+static ssize_t
+store_client_stats(struct device *kdev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct drm_i915_private *i915 =
+ container_of(attr, struct drm_i915_private, clients.stats.attr);
+ bool disable = false;
+ bool enable = false;
+ bool val = false;
+ struct intel_engine_cs *engine;
+ enum intel_engine_id id;
+ int ret;
+
+ /* Use RCS as proxy for all engines. */
+ if (!intel_engine_supports_stats(i915->engine[RCS]))
+ return -EINVAL;
+
+ ret = kstrtobool(buf, &val);
+ if (ret)
+ return ret;
+
+ ret = i915_mutex_lock_interruptible(&i915->drm);
+ if (ret)
+ return ret;
+
+ if (val && !i915->clients.stats.enabled)
+ enable = true;
+ else if (!val && i915->clients.stats.enabled)
+ disable = true;
+
+ if (!enable && !disable)
+ goto out;
+
+ for_each_engine(engine, i915, id) {
+ if (enable)
+ WARN_ON_ONCE(intel_enable_engine_stats(engine));
+ else if (disable)
+ intel_disable_engine_stats(engine);
+ }
+
+ i915->clients.stats.enabled = val;
+
+out:
+ mutex_unlock(&i915->drm.struct_mutex);
+
+ return count;
+}
+
void i915_setup_sysfs(struct drm_i915_private *dev_priv)
{
struct device *kdev = dev_priv->drm.primary->kdev;
+ struct device_attribute *attr;
int ret;
dev_priv->clients.root =
@@ -586,6 +644,17 @@ void i915_setup_sysfs(struct drm_i915_private *dev_priv)
if (!dev_priv->clients.root)
DRM_ERROR("Per-client sysfs setup failed\n");
+ attr = &dev_priv->clients.stats.attr;
+ attr->attr.name = "enable_stats";
+ attr->attr.mode = 0664;
+ attr->show = show_client_stats;
+ attr->store = store_client_stats;
+
+ ret = sysfs_create_file(dev_priv->clients.root,
+ (struct attribute *)attr);
+ if (ret)
+ DRM_ERROR("Per-client sysfs setup failed! (%d)\n", ret);
+
#ifdef CONFIG_PM
if (HAS_RC6(dev_priv)) {
ret = sysfs_merge_group(&kdev->kobj,
@@ -647,6 +716,9 @@ void i915_teardown_sysfs(struct drm_i915_private *dev_priv)
sysfs_unmerge_group(&kdev->kobj, &rc6p_attr_group);
#endif
+ sysfs_remove_file(dev_priv->clients.root,
+ (struct attribute *)&dev_priv->clients.stats.attr);
+
if (dev_priv->clients.root)
kobject_put(dev_priv->clients.root);
}
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread* [RFC 10/10] drm/i915: Allow clients to query own per-engine busyness
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (8 preceding siblings ...)
2018-05-22 12:30 ` [RFC 09/10] drm/i915: Add sysfs toggle to enable per-client engine stats Tvrtko Ursulin
@ 2018-05-22 12:30 ` Tvrtko Ursulin
2018-05-22 12:54 ` ✗ Fi.CI.CHECKPATCH: warning for Per-context and per-client engine busyness (rev6) Patchwork
` (3 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Tvrtko Ursulin @ 2018-05-22 12:30 UTC (permalink / raw)
To: Intel-gfx; +Cc: gordon.kelly
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Some customers want to know how much of the GPU time are their clients
using in order to make dynamic load balancing decisions.
With the accounting infrastructure in place in the previous patch, we add
a new context param (I915_CONTEXT_GET_ENGINES_BUSY) which points to struct
drm_i915_context_engines_busy, followed by a variable number of structs
drm_i915_context_engine_busy.
Userspace needs to provide the number of attached structures in the
num_engines fields, as well as set args->size to byte size of the provided
buffer.
Attached drm_i915_context_engine_busy objects need to have the class and
instance of the engine which userspace wants to query busyness of
initialized.
Kernel will then report accumulated engine busyness as monotonically
increasing number of nano-seconds the engine spent executing jobs
belonging to this context.
v2:
* Use intel_context_engine_get_busy_time.
* Refactor to only use struct_mutex while initially enabling engine
stats.
v3:
* Fix stats enabling.
v4:
* Change uAPI to enable querying multiple engines at a time.
(Chris Wilson)
v5:
* Rebase.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: gordon.kelly@intel.com
---
drivers/gpu/drm/i915/i915_gem_context.c | 100 ++++++++++++++++++++++--
drivers/gpu/drm/i915/i915_gem_context.h | 1 +
include/uapi/drm/i915_drm.h | 21 +++++
3 files changed, 117 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 2fcae26f63bb..7279128becbd 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -117,9 +117,10 @@ static void lut_close(struct i915_gem_context *ctx)
static void i915_gem_context_free(struct i915_gem_context *ctx)
{
+ struct drm_i915_private *i915 = ctx->i915;
unsigned int n;
- lockdep_assert_held(&ctx->i915->drm.struct_mutex);
+ lockdep_assert_held(&i915->drm.struct_mutex);
GEM_BUG_ON(!i915_gem_context_is_closed(ctx));
i915_ppgtt_put(ctx->ppgtt);
@@ -127,6 +128,9 @@ static void i915_gem_context_free(struct i915_gem_context *ctx)
for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) {
struct intel_context *ce = &ctx->__engine[n];
+ if (i915->engine[n] && ce->stats.enabled)
+ intel_disable_engine_stats(i915->engine[n]);
+
if (ce->ops)
ce->ops->destroy(ce);
}
@@ -136,7 +140,7 @@ static void i915_gem_context_free(struct i915_gem_context *ctx)
list_del(&ctx->link);
- ida_simple_remove(&ctx->i915->contexts.hw_ida, ctx->hw_id);
+ ida_simple_remove(&i915->contexts.hw_ida, ctx->hw_id);
kfree_rcu(ctx, rcu);
}
@@ -733,11 +737,93 @@ int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
return 0;
}
+static int
+get_engines_busy(struct drm_i915_private *i915,
+ struct i915_gem_context *ctx,
+ struct drm_i915_gem_context_param *args)
+{
+ struct drm_i915_context_engine_busy __user *busy_user;
+ struct drm_i915_context_engines_busy engines;
+ struct drm_i915_context_engine_busy busy;
+ bool mutex = false;
+ unsigned int i;
+ int ret = 0;
+
+ if (args->size < sizeof(engines))
+ return -EINVAL;
+
+ if (copy_from_user(&engines, u64_to_user_ptr(args->value),
+ sizeof(engines)))
+ return -EFAULT;
+
+ if (engines.pad || engines.mbz)
+ return -EINVAL;
+
+ if (engines.num_engines == 0 || engines.num_engines > I915_NUM_ENGINES)
+ return -EINVAL;
+
+ if (!access_ok(VERIFY_WRITE, args->value,
+ sizeof(engines) + engines.num_engines * sizeof(busy)))
+ return -EFAULT;
+
+ busy_user = (struct drm_i915_context_engine_busy __user *)
+ ((char __user *)args->value + sizeof(engines));
+
+ for (i = 0; i < engines.num_engines; i++, busy_user++) {
+ struct intel_engine_cs *engine;
+ struct intel_context *ce;
+
+ __copy_from_user(busy_user, &busy, sizeof(busy));
+
+ if (busy.mbz || busy.flags || busy.busy) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ engine = intel_engine_lookup_user(i915,
+ busy.class, busy.instance);
+ if (!engine) {
+ ret = -EINVAL;
+ goto out;
+ }
+
+ /* Enable stats on first query. */
+ ce = to_intel_context(ctx, engine);
+ if (!READ_ONCE(ce->stats.enabled)) {
+ /* Grab mutex if need to enable engine stats. */
+ if (!mutex) {
+ ret = i915_mutex_lock_interruptible(&i915->drm);
+ if (!ret)
+ break;
+ mutex = true;
+ }
+
+ if (!ce->stats.enabled) {
+ ret = intel_enable_engine_stats(engine);
+ if (!ret)
+ goto out;
+ ce->stats.enabled = true;
+ }
+ }
+
+ busy.busy = ktime_to_ns(intel_context_get_busy_time(ce));
+
+ __copy_to_user(busy_user, &busy, sizeof(busy));
+ }
+
+out:
+ if (mutex)
+ mutex_unlock(&i915->drm.struct_mutex);
+
+ return ret;
+}
+
int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data,
struct drm_file *file)
{
struct drm_i915_file_private *file_priv = file->driver_priv;
struct drm_i915_gem_context_param *args = data;
+ struct drm_i915_private *i915 = to_i915(dev);
struct i915_gem_context *ctx;
int ret = 0;
@@ -756,10 +842,10 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data,
case I915_CONTEXT_PARAM_GTT_SIZE:
if (ctx->ppgtt)
args->value = ctx->ppgtt->base.total;
- else if (to_i915(dev)->mm.aliasing_ppgtt)
- args->value = to_i915(dev)->mm.aliasing_ppgtt->base.total;
+ else if (i915->mm.aliasing_ppgtt)
+ args->value = i915->mm.aliasing_ppgtt->base.total;
else
- args->value = to_i915(dev)->ggtt.base.total;
+ args->value = i915->ggtt.base.total;
break;
case I915_CONTEXT_PARAM_NO_ERROR_CAPTURE:
args->value = i915_gem_context_no_error_capture(ctx);
@@ -770,6 +856,9 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data,
case I915_CONTEXT_PARAM_PRIORITY:
args->value = ctx->sched.priority;
break;
+ case I915_CONTEXT_GET_ENGINES_BUSY:
+ ret = get_engines_busy(i915, ctx, args);
+ break;
default:
ret = -EINVAL;
break;
@@ -845,6 +934,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data,
}
break;
+ case I915_CONTEXT_GET_ENGINES_BUSY:
default:
ret = -EINVAL;
break;
diff --git a/drivers/gpu/drm/i915/i915_gem_context.h b/drivers/gpu/drm/i915/i915_gem_context.h
index e3d9948f7186..0567802beb1b 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.h
+++ b/drivers/gpu/drm/i915/i915_gem_context.h
@@ -163,6 +163,7 @@ struct i915_gem_context {
struct intel_context_stats {
seqlock_t lock;
+ bool enabled;
bool active;
ktime_t start;
ktime_t total;
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index a2ecb6cef2af..bdd4b94f4c9b 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -1450,6 +1450,26 @@ struct drm_i915_gem_userptr {
__u32 handle;
};
+struct drm_i915_context_engine_busy {
+ __u8 class; /* in/out */
+ __u8 instance; /* in/out */
+
+ __u16 mbz;
+
+ __u32 flags; /* in/out/mbz */
+
+ __u64 busy; /* out/mbz */
+};
+
+struct drm_i915_context_engines_busy {
+ __u32 num_engines; /* in */
+ __u32 pad; /* mbz */
+
+ __u64 mbz;
+
+ struct drm_i915_context_engine_busy engines[0];
+};
+
struct drm_i915_gem_context_param {
__u32 ctx_id;
__u32 size;
@@ -1463,6 +1483,7 @@ struct drm_i915_gem_context_param {
#define I915_CONTEXT_MAX_USER_PRIORITY 1023 /* inclusive */
#define I915_CONTEXT_DEFAULT_PRIORITY 0
#define I915_CONTEXT_MIN_USER_PRIORITY -1023 /* inclusive */
+#define I915_CONTEXT_GET_ENGINES_BUSY 0x7
__u64 value;
};
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread* ✗ Fi.CI.CHECKPATCH: warning for Per-context and per-client engine busyness (rev6)
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (9 preceding siblings ...)
2018-05-22 12:30 ` [RFC 10/10] drm/i915: Allow clients to query own per-engine busyness Tvrtko Ursulin
@ 2018-05-22 12:54 ` Patchwork
2018-05-22 12:58 ` ✗ Fi.CI.SPARSE: " Patchwork
` (2 subsequent siblings)
13 siblings, 0 replies; 20+ messages in thread
From: Patchwork @ 2018-05-22 12:54 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: Per-context and per-client engine busyness (rev6)
URL : https://patchwork.freedesktop.org/series/32645/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
7817526ffcfb drm/i915: Store engine backpointer in the intel_context
e39413c3a24f drm/i915: Include i915_scheduler.h from i915_gem_context.h
89c9c183360d drm/i915: Forward declare struct intel_context
312445e65040 drm/i915: Move intel_engine_context_in/out into intel_lrc.c
c51fae7085a5 drm/i915: Track per-context engine busyness
153d8b61ac31 drm/i915: Expose list of clients in sysfs
-:93: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#93: FILE: drivers/gpu/drm/i915/i915_gem.c:5677:
+i915_gem_add_client(struct drm_i915_private *i915,
+ struct drm_i915_file_private *file_priv,
total: 0 errors, 0 warnings, 1 checks, 197 lines checked
5a863a6a533e drm/i915: Update client name on context create
-:24: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#24: FILE: drivers/gpu/drm/i915/i915_drv.h:3219:
+i915_gem_add_client(struct drm_i915_private *i915,
+ struct drm_i915_file_private *file_priv,
total: 0 errors, 0 warnings, 1 checks, 66 lines checked
8ddf5537f960 drm/i915: Expose per-engine client busyness
-:22: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#22:
neverball[ 6011]: rcs0: 41.01% bcs0: 0.00% vcs0: 0.00% vecs0: 0.00%
-:148: ERROR:CODE_INDENT: code indent should use tabs where possible
#148: FILE: drivers/gpu/drm/i915/i915_gem.c:5765:
+^I^I^I^I (struct attribute *)attr);$
-:148: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#148: FILE: drivers/gpu/drm/i915/i915_gem.c:5765:
+ ret = sysfs_create_file(file_priv->client.busy_root,
+ (struct attribute *)attr);
total: 1 errors, 1 warnings, 1 checks, 143 lines checked
3bcb2a77339a drm/i915: Add sysfs toggle to enable per-client engine stats
2eefca086175 drm/i915: Allow clients to query own per-engine busyness
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread* ✗ Fi.CI.SPARSE: warning for Per-context and per-client engine busyness (rev6)
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (10 preceding siblings ...)
2018-05-22 12:54 ` ✗ Fi.CI.CHECKPATCH: warning for Per-context and per-client engine busyness (rev6) Patchwork
@ 2018-05-22 12:58 ` Patchwork
2018-05-22 13:10 ` ✓ Fi.CI.BAT: success " Patchwork
2018-05-22 18:15 ` ✓ Fi.CI.IGT: " Patchwork
13 siblings, 0 replies; 20+ messages in thread
From: Patchwork @ 2018-05-22 12:58 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: Per-context and per-client engine busyness (rev6)
URL : https://patchwork.freedesktop.org/series/32645/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Commit: drm/i915: Store engine backpointer in the intel_context
Okay!
Commit: drm/i915: Include i915_scheduler.h from i915_gem_context.h
Okay!
Commit: drm/i915: Forward declare struct intel_context
Okay!
Commit: drm/i915: Move intel_engine_context_in/out into intel_lrc.c
Okay!
Commit: drm/i915: Track per-context engine busyness
Okay!
Commit: drm/i915: Expose list of clients in sysfs
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3664:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3683:16: warning: expression using sizeof(void)
Commit: drm/i915: Update client name on context create
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3683:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3691:16: warning: expression using sizeof(void)
Commit: drm/i915: Expose per-engine client busyness
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3691:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3699:16: warning: expression using sizeof(void)
Commit: drm/i915: Add sysfs toggle to enable per-client engine stats
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3699:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3703:16: warning: expression using sizeof(void)
Commit: drm/i915: Allow clients to query own per-engine busyness
+drivers/gpu/drm/i915/i915_gem_context.c:765:14: expected void const volatile [noderef] <asn:1>*<noident>
+drivers/gpu/drm/i915/i915_gem_context.c:765:14: got unsigned long long [unsigned] [usertype] value
+drivers/gpu/drm/i915/i915_gem_context.c:765:14: warning: incorrect type in argument 1 (different base types)
+drivers/gpu/drm/i915/i915_gem_context.c:776:34: expected void *to
+drivers/gpu/drm/i915/i915_gem_context.c:776:34: got struct drm_i915_context_engine_busy [noderef] <asn:1>*[assigned] busy_user
+drivers/gpu/drm/i915/i915_gem_context.c:776:34: warning: incorrect type in argument 1 (different address spaces)
+drivers/gpu/drm/i915/i915_gem_context.c:776:46: expected void const [noderef] <asn:1>*from
+drivers/gpu/drm/i915/i915_gem_context.c:776:46: got struct drm_i915_context_engine_busy *<noident>
+drivers/gpu/drm/i915/i915_gem_context.c:776:46: warning: incorrect type in argument 2 (different address spaces)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread* ✓ Fi.CI.BAT: success for Per-context and per-client engine busyness (rev6)
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (11 preceding siblings ...)
2018-05-22 12:58 ` ✗ Fi.CI.SPARSE: " Patchwork
@ 2018-05-22 13:10 ` Patchwork
2018-05-22 18:15 ` ✓ Fi.CI.IGT: " Patchwork
13 siblings, 0 replies; 20+ messages in thread
From: Patchwork @ 2018-05-22 13:10 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: Per-context and per-client engine busyness (rev6)
URL : https://patchwork.freedesktop.org/series/32645/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4220 -> Patchwork_9081 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/32645/revisions/6/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9081:
=== IGT changes ===
==== Possible regressions ====
igt@gem_exec_suspend@basic-s3:
{fi-cfl-guc}: PASS -> FAIL +1
== Known issues ==
Here are the changes found in Patchwork_9081 that come from known issues:
=== IGT changes ===
==== Possible fixes ====
igt@gem_mmap_gtt@basic-wc:
fi-cnl-y3: INCOMPLETE (fdo#105086) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-cnl-psr: DMESG-WARN (fdo#104951) -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#105086 https://bugs.freedesktop.org/show_bug.cgi?id=105086
== Participating hosts (44 -> 38) ==
Missing (6): fi-ilk-m540 fi-bxt-dsi fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4220 -> Patchwork_9081
CI_DRM_4220: 9d7ce3ad8801a95461ad4fb63bd5374dfc2dff55 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4490: 0b381c7d1067a4fe520b72d4d391d4920834cbe0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9081: 2eefca086175319a176f44264df4751784fdbb3b @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4490: 6ab75f7eb5e1dccbb773e1739beeb2d7cbd6ad0d @ git://anongit.freedesktop.org/piglit
== Kernel 32bit build ==
Warning: Kernel 32bit buildtest failed:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9081/build_32bit.log
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CHK scripts/mod/devicetable-offsets.h
CHK include/generated/compile.h
CHK kernel/config_data.h
CC [M] drivers/gpu/drm/i915/i915_gem_context.o
scripts/Makefile.build:312: recipe for target 'drivers/gpu/drm/i915/i915_gem_context.o' failed
scripts/Makefile.build:559: recipe for target 'drivers/gpu/drm/i915' failed
scripts/Makefile.build:559: recipe for target 'drivers/gpu/drm' failed
scripts/Makefile.build:559: recipe for target 'drivers/gpu' failed
Makefile:1060: recipe for target 'drivers' failed
== Linux commits ==
2eefca086175 drm/i915: Allow clients to query own per-engine busyness
3bcb2a77339a drm/i915: Add sysfs toggle to enable per-client engine stats
8ddf5537f960 drm/i915: Expose per-engine client busyness
5a863a6a533e drm/i915: Update client name on context create
153d8b61ac31 drm/i915: Expose list of clients in sysfs
c51fae7085a5 drm/i915: Track per-context engine busyness
312445e65040 drm/i915: Move intel_engine_context_in/out into intel_lrc.c
89c9c183360d drm/i915: Forward declare struct intel_context
e39413c3a24f drm/i915: Include i915_scheduler.h from i915_gem_context.h
7817526ffcfb drm/i915: Store engine backpointer in the intel_context
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9081/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread* ✓ Fi.CI.IGT: success for Per-context and per-client engine busyness (rev6)
2018-05-22 12:30 [RFC v5 00/10] Per-context and per-client engine busyness Tvrtko Ursulin
` (12 preceding siblings ...)
2018-05-22 13:10 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2018-05-22 18:15 ` Patchwork
13 siblings, 0 replies; 20+ messages in thread
From: Patchwork @ 2018-05-22 18:15 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: Per-context and per-client engine busyness (rev6)
URL : https://patchwork.freedesktop.org/series/32645/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4220_full -> Patchwork_9081_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9081_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_9081_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/32645/revisions/6/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9081_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@deep-bsd1:
shard-kbl: SKIP -> PASS
igt@pm_rc6_residency@rc6-accuracy:
shard-snb: PASS -> SKIP
== Known issues ==
Here are the changes found in Patchwork_9081_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_gtt:
shard-kbl: PASS -> INCOMPLETE (fdo#103665)
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
shard-glk: PASS -> FAIL (fdo#105703)
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: PASS -> FAIL (fdo#105454, fdo#106509)
igt@kms_flip@2x-plain-flip-ts-check-interruptible:
shard-glk: PASS -> FAIL (fdo#100368) +1
igt@kms_flip@flip-vs-expired-vblank:
shard-glk: PASS -> FAIL (fdo#105707)
igt@kms_flip@plain-flip-ts-check-interruptible:
shard-hsw: PASS -> FAIL (fdo#100368)
igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
shard-snb: PASS -> DMESG-WARN (fdo#102365)
==== Possible fixes ====
igt@kms_cursor_crc@cursor-256x256-suspend:
shard-apl: FAIL (fdo#103375) -> PASS
igt@kms_flip@2x-flip-vs-blocking-wf-vblank:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip@2x-plain-flip-fb-recreate:
shard-hsw: FAIL (fdo#100368) -> PASS
igt@kms_flip_tiling@flip-to-x-tiled:
shard-glk: FAIL (fdo#103822, fdo#104724) -> PASS
igt@kms_rotation_crc@sprite-rotation-180:
shard-snb: FAIL (fdo#103925, fdo#104724) -> PASS
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#105703 https://bugs.freedesktop.org/show_bug.cgi?id=105703
fdo#105707 https://bugs.freedesktop.org/show_bug.cgi?id=105707
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (9 -> 9) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4220 -> Patchwork_9081
CI_DRM_4220: 9d7ce3ad8801a95461ad4fb63bd5374dfc2dff55 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4490: 0b381c7d1067a4fe520b72d4d391d4920834cbe0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9081: 2eefca086175319a176f44264df4751784fdbb3b @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4490: 6ab75f7eb5e1dccbb773e1739beeb2d7cbd6ad0d @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9081/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread