* [Intel-gfx] [PATCH 02/10] drm/i915: Drop i915_request.lock serialisation around await_start
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
@ 2021-01-13 12:45 ` Chris Wilson
2021-01-14 3:01 ` Andi Shyti
2021-01-13 12:45 ` [Intel-gfx] [PATCH 03/10] drm/i915/gem: Reduce ctx->engine_mutex for reading the clone source Chris Wilson
` (12 subsequent siblings)
13 siblings, 1 reply; 27+ messages in thread
From: Chris Wilson @ 2021-01-13 12:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Originally, we used the signal->lock as a means of following the
previous link in its timeline and peeking at the previous fence.
However, we have replaced the explicit serialisation with a series of
very careful probes that anticipate the links being deleted and the
fences recycled before we are able to acquire a strong reference to it.
We do not need the signal->lock crutch anymore, nor want the contention.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_request.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index 784c05ac5cca..973eceabbcca 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -969,9 +969,16 @@ i915_request_await_start(struct i915_request *rq, struct i915_request *signal)
if (i915_request_started(signal))
return 0;
+ /*
+ * The caller holds a reference on @signal, but we do not serialise
+ * against it being retired and removed from the lists.
+ *
+ * We do not hold a reference to the request before @signal, and
+ * so must be very careful to ensure that it is not _recycled_ as
+ * we follow the link backwards.
+ */
fence = NULL;
rcu_read_lock();
- spin_lock_irq(&signal->lock);
do {
struct list_head *pos = READ_ONCE(signal->link.prev);
struct i915_request *prev;
@@ -1002,7 +1009,6 @@ i915_request_await_start(struct i915_request *rq, struct i915_request *signal)
fence = &prev->fence;
} while (0);
- spin_unlock_irq(&signal->lock);
rcu_read_unlock();
if (!fence)
return 0;
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Intel-gfx] [PATCH 03/10] drm/i915/gem: Reduce ctx->engine_mutex for reading the clone source
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
2021-01-13 12:45 ` [Intel-gfx] [PATCH 02/10] drm/i915: Drop i915_request.lock serialisation around await_start Chris Wilson
@ 2021-01-13 12:45 ` Chris Wilson
2021-01-14 3:01 ` Andi Shyti
2021-01-13 12:45 ` [Intel-gfx] [PATCH 04/10] drm/i915/gem: Reduce ctx->engines_mutex for get_engines() Chris Wilson
` (11 subsequent siblings)
13 siblings, 1 reply; 27+ messages in thread
From: Chris Wilson @ 2021-01-13 12:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
When cloning the engines from the source context, we need to ensure that
the engines are not freed as we copy them, and that the flags we clone
from the source correspond with the engines we copy across. To do this
we need only take a reference to the src->engines, rather than hold the
src->engine_mutex, so long as we verify that nothing changed under the
read.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gem/i915_gem_context.c | 24 +++++++++++++--------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index cac0c52fc681..4a709c625ccb 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -717,7 +717,8 @@ __create_context(struct drm_i915_private *i915)
}
static inline struct i915_gem_engines *
-__context_engines_await(const struct i915_gem_context *ctx)
+__context_engines_await(const struct i915_gem_context *ctx,
+ bool *user_engines)
{
struct i915_gem_engines *engines;
@@ -726,6 +727,10 @@ __context_engines_await(const struct i915_gem_context *ctx)
engines = rcu_dereference(ctx->engines);
GEM_BUG_ON(!engines);
+ if (user_engines)
+ *user_engines = i915_gem_context_user_engines(ctx);
+
+ /* successful await => strong mb */
if (unlikely(!i915_sw_fence_await(&engines->fence)))
continue;
@@ -749,7 +754,7 @@ context_apply_all(struct i915_gem_context *ctx,
struct intel_context *ce;
int err = 0;
- e = __context_engines_await(ctx);
+ e = __context_engines_await(ctx, NULL);
for_each_gem_engine(ce, e, it) {
err = fn(ce, data);
if (err)
@@ -1075,7 +1080,7 @@ static int context_barrier_task(struct i915_gem_context *ctx,
return err;
}
- e = __context_engines_await(ctx);
+ e = __context_engines_await(ctx, NULL);
if (!e) {
i915_active_release(&cb->base);
return -ENOENT;
@@ -2095,11 +2100,14 @@ static int copy_ring_size(struct intel_context *dst,
static int clone_engines(struct i915_gem_context *dst,
struct i915_gem_context *src)
{
- struct i915_gem_engines *e = i915_gem_context_lock_engines(src);
- struct i915_gem_engines *clone;
+ struct i915_gem_engines *clone, *e;
bool user_engines;
unsigned long n;
+ e = __context_engines_await(src, &user_engines);
+ if (!e)
+ return -ENOENT;
+
clone = alloc_engines(e->num_engines);
if (!clone)
goto err_unlock;
@@ -2141,9 +2149,7 @@ static int clone_engines(struct i915_gem_context *dst,
}
}
clone->num_engines = n;
-
- user_engines = i915_gem_context_user_engines(src);
- i915_gem_context_unlock_engines(src);
+ i915_sw_fence_complete(&e->fence);
/* Serialised by constructor */
engines_idle_release(dst, rcu_replace_pointer(dst->engines, clone, 1));
@@ -2154,7 +2160,7 @@ static int clone_engines(struct i915_gem_context *dst,
return 0;
err_unlock:
- i915_gem_context_unlock_engines(src);
+ i915_sw_fence_complete(&e->fence);
return -ENOMEM;
}
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [Intel-gfx] [PATCH 03/10] drm/i915/gem: Reduce ctx->engine_mutex for reading the clone source
2021-01-13 12:45 ` [Intel-gfx] [PATCH 03/10] drm/i915/gem: Reduce ctx->engine_mutex for reading the clone source Chris Wilson
@ 2021-01-14 3:01 ` Andi Shyti
0 siblings, 0 replies; 27+ messages in thread
From: Andi Shyti @ 2021-01-14 3:01 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
Hi Chris,
On Wed, Jan 13, 2021 at 12:45:53PM +0000, Chris Wilson wrote:
> When cloning the engines from the source context, we need to ensure that
> the engines are not freed as we copy them, and that the flags we clone
> from the source correspond with the engines we copy across. To do this
> we need only take a reference to the src->engines, rather than hold the
> src->engine_mutex, so long as we verify that nothing changed under the
> read.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Thanks,
Andi
> + if (user_engines)
> + *user_engines = i915_gem_context_user_engines(ctx);
> +
> + /* successful await => strong mb */
P.S.: mmhhh? :)
> if (unlikely(!i915_sw_fence_await(&engines->fence)))
> continue;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Intel-gfx] [PATCH 04/10] drm/i915/gem: Reduce ctx->engines_mutex for get_engines()
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
2021-01-13 12:45 ` [Intel-gfx] [PATCH 02/10] drm/i915: Drop i915_request.lock serialisation around await_start Chris Wilson
2021-01-13 12:45 ` [Intel-gfx] [PATCH 03/10] drm/i915/gem: Reduce ctx->engine_mutex for reading the clone source Chris Wilson
@ 2021-01-13 12:45 ` Chris Wilson
2021-01-14 3:01 ` Andi Shyti
2021-01-13 12:45 ` [Intel-gfx] [PATCH 05/10] drm/i915: Reduce test_and_set_bit to set_bit in i915_request_submit() Chris Wilson
` (10 subsequent siblings)
13 siblings, 1 reply; 27+ messages in thread
From: Chris Wilson @ 2021-01-13 12:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Take a snapshot of the ctx->engines, so we can avoid taking the
ctx->engines_mutex for a mere read in get_engines().
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gem/i915_gem_context.c | 39 +++++----------------
1 file changed, 8 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index 4a709c625ccb..4d2f40cf237b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -1843,27 +1843,6 @@ set_engines(struct i915_gem_context *ctx,
return 0;
}
-static struct i915_gem_engines *
-__copy_engines(struct i915_gem_engines *e)
-{
- struct i915_gem_engines *copy;
- unsigned int n;
-
- copy = alloc_engines(e->num_engines);
- if (!copy)
- return ERR_PTR(-ENOMEM);
-
- for (n = 0; n < e->num_engines; n++) {
- if (e->engines[n])
- copy->engines[n] = intel_context_get(e->engines[n]);
- else
- copy->engines[n] = NULL;
- }
- copy->num_engines = n;
-
- return copy;
-}
-
static int
get_engines(struct i915_gem_context *ctx,
struct drm_i915_gem_context_param *args)
@@ -1871,19 +1850,17 @@ get_engines(struct i915_gem_context *ctx,
struct i915_context_param_engines __user *user;
struct i915_gem_engines *e;
size_t n, count, size;
+ bool user_engines;
int err = 0;
- err = mutex_lock_interruptible(&ctx->engines_mutex);
- if (err)
- return err;
+ e = __context_engines_await(ctx, &user_engines);
+ if (!e)
+ return -ENOENT;
- e = NULL;
- if (i915_gem_context_user_engines(ctx))
- e = __copy_engines(i915_gem_context_engines(ctx));
- mutex_unlock(&ctx->engines_mutex);
- if (IS_ERR_OR_NULL(e)) {
+ if (!user_engines) {
+ i915_sw_fence_complete(&e->fence);
args->size = 0;
- return PTR_ERR_OR_ZERO(e);
+ return 0;
}
count = e->num_engines;
@@ -1934,7 +1911,7 @@ get_engines(struct i915_gem_context *ctx,
args->size = size;
err_free:
- free_engines(e);
+ i915_sw_fence_complete(&e->fence);
return err;
}
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Intel-gfx] [PATCH 05/10] drm/i915: Reduce test_and_set_bit to set_bit in i915_request_submit()
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (2 preceding siblings ...)
2021-01-13 12:45 ` [Intel-gfx] [PATCH 04/10] drm/i915/gem: Reduce ctx->engines_mutex for get_engines() Chris Wilson
@ 2021-01-13 12:45 ` Chris Wilson
2021-01-14 3:02 ` Andi Shyti
2021-01-13 12:45 ` [Intel-gfx] [PATCH 06/10] drm/i915/gt: Drop atomic for engine->fw_active tracking Chris Wilson
` (9 subsequent siblings)
13 siblings, 1 reply; 27+ messages in thread
From: Chris Wilson @ 2021-01-13 12:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Avoid the full blown memory barrier of test_and_set_bit() by noting the
completed request and removing it from the lists.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_request.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index 973eceabbcca..22e39d938f17 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -551,8 +551,10 @@ bool __i915_request_submit(struct i915_request *request)
* dropped upon retiring. (Otherwise if resubmit a *retired*
* request, this would be a horrible use-after-free.)
*/
- if (__i915_request_is_complete(request))
- goto xfer;
+ if (__i915_request_is_complete(request)) {
+ list_del_init(&request->sched.link);
+ goto active;
+ }
if (unlikely(intel_context_is_banned(request->context)))
i915_request_set_error_once(request, -EIO);
@@ -587,11 +589,11 @@ bool __i915_request_submit(struct i915_request *request)
engine->serial++;
result = true;
-xfer:
- if (!test_and_set_bit(I915_FENCE_FLAG_ACTIVE, &request->fence.flags)) {
- list_move_tail(&request->sched.link, &engine->active.requests);
- clear_bit(I915_FENCE_FLAG_PQUEUE, &request->fence.flags);
- }
+ GEM_BUG_ON(test_bit(I915_FENCE_FLAG_ACTIVE, &request->fence.flags));
+ list_move_tail(&request->sched.link, &engine->active.requests);
+active:
+ clear_bit(I915_FENCE_FLAG_PQUEUE, &request->fence.flags);
+ set_bit(I915_FENCE_FLAG_ACTIVE, &request->fence.flags);
/*
* XXX Rollback bonded-execution on __i915_request_unsubmit()?
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Intel-gfx] [PATCH 06/10] drm/i915/gt: Drop atomic for engine->fw_active tracking
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (3 preceding siblings ...)
2021-01-13 12:45 ` [Intel-gfx] [PATCH 05/10] drm/i915: Reduce test_and_set_bit to set_bit in i915_request_submit() Chris Wilson
@ 2021-01-13 12:45 ` Chris Wilson
2021-01-14 3:02 ` Andi Shyti
2021-01-13 12:45 ` [Intel-gfx] [PATCH 07/10] drm/i915/gt: Extract busy-stats for ring-scheduler Chris Wilson
` (8 subsequent siblings)
13 siblings, 1 reply; 27+ messages in thread
From: Chris Wilson @ 2021-01-13 12:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Since schedule-in/out is now entirely serialised by the tasklet bitlock,
we do not need to worry about concurrent in/out operations and so reduce
the atomic operations to plain instructions.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +-
drivers/gpu/drm/i915/gt/intel_engine_types.h | 2 +-
drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 7583b6e48a9d..005ae2c54273 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -1665,7 +1665,7 @@ void intel_engine_dump(struct intel_engine_cs *engine,
ktime_to_ms(intel_engine_get_busy_time(engine,
&dummy)));
drm_printf(m, "\tForcewake: %x domains, %d active\n",
- engine->fw_domain, atomic_read(&engine->fw_active));
+ engine->fw_domain, READ_ONCE(engine->fw_active));
rcu_read_lock();
rq = READ_ONCE(engine->heartbeat.systole);
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h
index df62e793e747..75c9093b5e7f 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h
@@ -319,7 +319,7 @@ struct intel_engine_cs {
* as possible.
*/
enum forcewake_domains fw_domain;
- atomic_t fw_active;
+ unsigned int fw_active;
unsigned long context_tag;
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index e28f32661df4..d5affdda6eb8 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -539,7 +539,7 @@ __execlists_schedule_in(struct i915_request *rq)
ce->lrc.ccid |= engine->execlists.ccid;
__intel_gt_pm_get(engine->gt);
- if (engine->fw_domain && !atomic_fetch_inc(&engine->fw_active))
+ if (engine->fw_domain && !engine->fw_active++)
intel_uncore_forcewake_get(engine->uncore, engine->fw_domain);
execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_IN);
intel_engine_context_in(engine);
@@ -645,7 +645,7 @@ static inline void __execlists_schedule_out(struct i915_request *rq)
lrc_update_runtime(ce);
intel_engine_context_out(engine);
execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_OUT);
- if (engine->fw_domain && !atomic_dec_return(&engine->fw_active))
+ if (engine->fw_domain && !--engine->fw_active)
intel_uncore_forcewake_put(engine->uncore, engine->fw_domain);
intel_gt_pm_put_async(engine->gt);
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Intel-gfx] [PATCH 07/10] drm/i915/gt: Extract busy-stats for ring-scheduler
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (4 preceding siblings ...)
2021-01-13 12:45 ` [Intel-gfx] [PATCH 06/10] drm/i915/gt: Drop atomic for engine->fw_active tracking Chris Wilson
@ 2021-01-13 12:45 ` Chris Wilson
2021-01-14 3:02 ` Andi Shyti
2021-01-13 12:45 ` [Intel-gfx] [PATCH 08/10] drm/i915/gt: Convert stats.active to plain unsigned int Chris Wilson
` (7 subsequent siblings)
13 siblings, 1 reply; 27+ messages in thread
From: Chris Wilson @ 2021-01-13 12:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Lift the busy-stats context-in/out implementation out of intel_lrc, so
that we can reuse it for other scheduler implementations.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_engine_stats.h | 49 +++++++++++++++++++
.../drm/i915/gt/intel_execlists_submission.c | 34 +------------
2 files changed, 50 insertions(+), 33 deletions(-)
create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_stats.h
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_stats.h b/drivers/gpu/drm/i915/gt/intel_engine_stats.h
new file mode 100644
index 000000000000..58491eae3482
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/intel_engine_stats.h
@@ -0,0 +1,49 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#ifndef __INTEL_ENGINE_STATS_H__
+#define __INTEL_ENGINE_STATS_H__
+
+#include <linux/atomic.h>
+#include <linux/ktime.h>
+#include <linux/seqlock.h>
+
+#include "i915_gem.h" /* GEM_BUG_ON */
+#include "intel_engine.h"
+
+static inline void intel_engine_context_in(struct intel_engine_cs *engine)
+{
+ unsigned long flags;
+
+ if (atomic_add_unless(&engine->stats.active, 1, 0))
+ return;
+
+ write_seqlock_irqsave(&engine->stats.lock, flags);
+ if (!atomic_add_unless(&engine->stats.active, 1, 0)) {
+ engine->stats.start = ktime_get();
+ atomic_inc(&engine->stats.active);
+ }
+ write_sequnlock_irqrestore(&engine->stats.lock, flags);
+}
+
+static inline void intel_engine_context_out(struct intel_engine_cs *engine)
+{
+ unsigned long flags;
+
+ GEM_BUG_ON(!atomic_read(&engine->stats.active));
+
+ if (atomic_add_unless(&engine->stats.active, -1, 1))
+ return;
+
+ write_seqlock_irqsave(&engine->stats.lock, flags);
+ if (atomic_dec_and_test(&engine->stats.active)) {
+ engine->stats.total =
+ ktime_add(engine->stats.total,
+ ktime_sub(ktime_get(), engine->stats.start));
+ }
+ write_sequnlock_irqrestore(&engine->stats.lock, flags);
+}
+
+#endif /* __INTEL_ENGINE_STATS_H__ */
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index d5affdda6eb8..d2dbbba446f5 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -115,6 +115,7 @@
#include "intel_breadcrumbs.h"
#include "intel_context.h"
#include "intel_engine_pm.h"
+#include "intel_engine_stats.h"
#include "intel_execlists_submission.h"
#include "intel_gt.h"
#include "intel_gt_pm.h"
@@ -432,39 +433,6 @@ execlists_context_status_change(struct i915_request *rq, unsigned long status)
status, rq);
}
-static void intel_engine_context_in(struct intel_engine_cs *engine)
-{
- unsigned long flags;
-
- if (atomic_add_unless(&engine->stats.active, 1, 0))
- return;
-
- write_seqlock_irqsave(&engine->stats.lock, flags);
- if (!atomic_add_unless(&engine->stats.active, 1, 0)) {
- engine->stats.start = ktime_get();
- atomic_inc(&engine->stats.active);
- }
- write_sequnlock_irqrestore(&engine->stats.lock, flags);
-}
-
-static void intel_engine_context_out(struct intel_engine_cs *engine)
-{
- unsigned long flags;
-
- GEM_BUG_ON(!atomic_read(&engine->stats.active));
-
- if (atomic_add_unless(&engine->stats.active, -1, 1))
- return;
-
- write_seqlock_irqsave(&engine->stats.lock, flags);
- if (atomic_dec_and_test(&engine->stats.active)) {
- engine->stats.total =
- ktime_add(engine->stats.total,
- ktime_sub(ktime_get(), engine->stats.start));
- }
- write_sequnlock_irqrestore(&engine->stats.lock, flags);
-}
-
static void reset_active(struct i915_request *rq,
struct intel_engine_cs *engine)
{
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [Intel-gfx] [PATCH 07/10] drm/i915/gt: Extract busy-stats for ring-scheduler
2021-01-13 12:45 ` [Intel-gfx] [PATCH 07/10] drm/i915/gt: Extract busy-stats for ring-scheduler Chris Wilson
@ 2021-01-14 3:02 ` Andi Shyti
2021-01-14 11:58 ` Chris Wilson
0 siblings, 1 reply; 27+ messages in thread
From: Andi Shyti @ 2021-01-14 3:02 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
Hi Chris,
On Wed, Jan 13, 2021 at 12:45:57PM +0000, Chris Wilson wrote:
> Lift the busy-stats context-in/out implementation out of intel_lrc, so
> that we can reuse it for other scheduler implementations.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/gt/intel_engine_stats.h | 49 +++++++++++++++++++
> .../drm/i915/gt/intel_execlists_submission.c | 34 +------------
> 2 files changed, 50 insertions(+), 33 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_stats.h
this looks like just a copy paste...
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Thanks,
Andi
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Intel-gfx] [PATCH 07/10] drm/i915/gt: Extract busy-stats for ring-scheduler
2021-01-14 3:02 ` Andi Shyti
@ 2021-01-14 11:58 ` Chris Wilson
0 siblings, 0 replies; 27+ messages in thread
From: Chris Wilson @ 2021-01-14 11:58 UTC (permalink / raw)
To: Andi Shyti; +Cc: intel-gfx
Quoting Andi Shyti (2021-01-14 03:02:25)
> Hi Chris,
>
> On Wed, Jan 13, 2021 at 12:45:57PM +0000, Chris Wilson wrote:
> > Lift the busy-stats context-in/out implementation out of intel_lrc, so
> > that we can reuse it for other scheduler implementations.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > ---
> > drivers/gpu/drm/i915/gt/intel_engine_stats.h | 49 +++++++++++++++++++
> > .../drm/i915/gt/intel_execlists_submission.c | 34 +------------
> > 2 files changed, 50 insertions(+), 33 deletions(-)
> > create mode 100644 drivers/gpu/drm/i915/gt/intel_engine_stats.h
>
> this looks like just a copy paste...
It's closer now indeed. It's not quite identical yet, as in one case we
have boolean, the other an uint counter. (There's a third case for class
runtime stats where it would be an atomic_t.) So not quite hitting the
rule of 3 for adequate generalisation, though maybe with some magic
macro constructors...
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Intel-gfx] [PATCH 08/10] drm/i915/gt: Convert stats.active to plain unsigned int
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (5 preceding siblings ...)
2021-01-13 12:45 ` [Intel-gfx] [PATCH 07/10] drm/i915/gt: Extract busy-stats for ring-scheduler Chris Wilson
@ 2021-01-13 12:45 ` Chris Wilson
2021-01-14 3:02 ` Andi Shyti
2021-01-13 12:45 ` [Intel-gfx] [PATCH 09/10] drm/i915/gt: Reduce engine runtime stats from seqlock to a latch Chris Wilson
` (6 subsequent siblings)
13 siblings, 1 reply; 27+ messages in thread
From: Chris Wilson @ 2021-01-13 12:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
As context-in/out is now always serialised, we do not have to worry
about concurrent enabling/disable of the busy-stats and can reduce the
atomic_t active to a plain unsigned int, and the seqlock to a seqcount.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 8 ++--
drivers/gpu/drm/i915/gt/intel_engine_stats.h | 45 ++++++++++++--------
drivers/gpu/drm/i915/gt/intel_engine_types.h | 4 +-
3 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 005ae2c54273..e85396cadcb8 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -342,7 +342,7 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)
engine->schedule = NULL;
ewma__engine_latency_init(&engine->latency);
- seqlock_init(&engine->stats.lock);
+ seqcount_init(&engine->stats.lock);
ATOMIC_INIT_NOTIFIER_HEAD(&engine->context_status_notifier);
@@ -1743,7 +1743,7 @@ static ktime_t __intel_engine_get_busy_time(struct intel_engine_cs *engine,
* add it to the total.
*/
*now = ktime_get();
- if (atomic_read(&engine->stats.active))
+ if (READ_ONCE(engine->stats.active))
total = ktime_add(total, ktime_sub(*now, engine->stats.start));
return total;
@@ -1762,9 +1762,9 @@ ktime_t intel_engine_get_busy_time(struct intel_engine_cs *engine, ktime_t *now)
ktime_t total;
do {
- seq = read_seqbegin(&engine->stats.lock);
+ seq = read_seqcount_begin(&engine->stats.lock);
total = __intel_engine_get_busy_time(engine, now);
- } while (read_seqretry(&engine->stats.lock, seq));
+ } while (read_seqcount_retry(&engine->stats.lock, seq));
return total;
}
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_stats.h b/drivers/gpu/drm/i915/gt/intel_engine_stats.h
index 58491eae3482..24fbdd94351a 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_stats.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_stats.h
@@ -17,33 +17,44 @@ static inline void intel_engine_context_in(struct intel_engine_cs *engine)
{
unsigned long flags;
- if (atomic_add_unless(&engine->stats.active, 1, 0))
+ if (engine->stats.active) {
+ engine->stats.active++;
return;
-
- write_seqlock_irqsave(&engine->stats.lock, flags);
- if (!atomic_add_unless(&engine->stats.active, 1, 0)) {
- engine->stats.start = ktime_get();
- atomic_inc(&engine->stats.active);
}
- write_sequnlock_irqrestore(&engine->stats.lock, flags);
+
+ /* The writer is serialised; but the pmu reader may be from hardirq */
+ local_irq_save(flags);
+ write_seqcount_begin(&engine->stats.lock);
+
+ engine->stats.start = ktime_get();
+ engine->stats.active++;
+
+ write_seqcount_end(&engine->stats.lock);
+ local_irq_restore(flags);
+
+ GEM_BUG_ON(!engine->stats.active);
}
static inline void intel_engine_context_out(struct intel_engine_cs *engine)
{
unsigned long flags;
- GEM_BUG_ON(!atomic_read(&engine->stats.active));
-
- if (atomic_add_unless(&engine->stats.active, -1, 1))
+ GEM_BUG_ON(!engine->stats.active);
+ if (engine->stats.active > 1) {
+ engine->stats.active--;
return;
-
- write_seqlock_irqsave(&engine->stats.lock, flags);
- if (atomic_dec_and_test(&engine->stats.active)) {
- engine->stats.total =
- ktime_add(engine->stats.total,
- ktime_sub(ktime_get(), engine->stats.start));
}
- write_sequnlock_irqrestore(&engine->stats.lock, flags);
+
+ local_irq_save(flags);
+ write_seqcount_begin(&engine->stats.lock);
+
+ engine->stats.active--;
+ engine->stats.total =
+ ktime_add(engine->stats.total,
+ ktime_sub(ktime_get(), engine->stats.start));
+
+ write_seqcount_end(&engine->stats.lock);
+ local_irq_restore(flags);
}
#endif /* __INTEL_ENGINE_STATS_H__ */
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h
index 75c9093b5e7f..d2346b425547 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h
@@ -516,12 +516,12 @@ struct intel_engine_cs {
/**
* @active: Number of contexts currently scheduled in.
*/
- atomic_t active;
+ unsigned int active;
/**
* @lock: Lock protecting the below fields.
*/
- seqlock_t lock;
+ seqcount_t lock;
/**
* @total: Total time this engine was busy.
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Intel-gfx] [PATCH 09/10] drm/i915/gt: Reduce engine runtime stats from seqlock to a latch
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (6 preceding siblings ...)
2021-01-13 12:45 ` [Intel-gfx] [PATCH 08/10] drm/i915/gt: Convert stats.active to plain unsigned int Chris Wilson
@ 2021-01-13 12:45 ` Chris Wilson
2021-01-14 3:02 ` Andi Shyti
2021-01-13 12:46 ` [Intel-gfx] [PATCH 10/10] drm/i915/gt: Reduce GT " Chris Wilson
` (5 subsequent siblings)
13 siblings, 1 reply; 27+ messages in thread
From: Chris Wilson @ 2021-01-13 12:45 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Since we can compute the elapsed time to add to the total, during the
PMU sample we only need to have a consistent view of the (start, total,
active) tuple to be able to locally determine the runtime. That can be
arrange by a pair of memory bariiers and carefully sequencing of the
writes and reads.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 33 ++++++--------------
drivers/gpu/drm/i915/gt/intel_engine_stats.h | 24 +++-----------
drivers/gpu/drm/i915/gt/intel_engine_types.h | 5 ---
3 files changed, 14 insertions(+), 48 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index e85396cadcb8..9142fefd5a17 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -342,7 +342,6 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)
engine->schedule = NULL;
ewma__engine_latency_init(&engine->latency);
- seqcount_init(&engine->stats.lock);
ATOMIC_INIT_NOTIFIER_HEAD(&engine->context_status_notifier);
@@ -1733,22 +1732,6 @@ void intel_engine_dump(struct intel_engine_cs *engine,
intel_engine_print_breadcrumbs(engine, m);
}
-static ktime_t __intel_engine_get_busy_time(struct intel_engine_cs *engine,
- ktime_t *now)
-{
- ktime_t total = engine->stats.total;
-
- /*
- * If the engine is executing something at the moment
- * add it to the total.
- */
- *now = ktime_get();
- if (READ_ONCE(engine->stats.active))
- total = ktime_add(total, ktime_sub(*now, engine->stats.start));
-
- return total;
-}
-
/**
* intel_engine_get_busy_time() - Return current accumulated engine busyness
* @engine: engine to report on
@@ -1758,13 +1741,17 @@ static ktime_t __intel_engine_get_busy_time(struct intel_engine_cs *engine,
*/
ktime_t intel_engine_get_busy_time(struct intel_engine_cs *engine, ktime_t *now)
{
- unsigned int seq;
- ktime_t total;
+ ktime_t total = engine->stats.total;
- do {
- seq = read_seqcount_begin(&engine->stats.lock);
- total = __intel_engine_get_busy_time(engine, now);
- } while (read_seqcount_retry(&engine->stats.lock, seq));
+ /*
+ * If the engine is executing something at the moment
+ * add it to the total.
+ */
+ *now = ktime_get();
+ if (READ_ONCE(engine->stats.active)) {
+ smp_rmb(); /* pairs with intel_engine_context_in/out */
+ total = ktime_add(total, ktime_sub(*now, engine->stats.start));
+ }
return total;
}
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_stats.h b/drivers/gpu/drm/i915/gt/intel_engine_stats.h
index 24fbdd94351a..1d8314257ffa 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_stats.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_stats.h
@@ -15,46 +15,30 @@
static inline void intel_engine_context_in(struct intel_engine_cs *engine)
{
- unsigned long flags;
-
if (engine->stats.active) {
engine->stats.active++;
return;
}
/* The writer is serialised; but the pmu reader may be from hardirq */
- local_irq_save(flags);
- write_seqcount_begin(&engine->stats.lock);
-
engine->stats.start = ktime_get();
- engine->stats.active++;
-
- write_seqcount_end(&engine->stats.lock);
- local_irq_restore(flags);
-
- GEM_BUG_ON(!engine->stats.active);
+ smp_wmb(); /* pairs with intel_engine_get_busy_time() */
+ WRITE_ONCE(engine->stats.active, 1);
}
static inline void intel_engine_context_out(struct intel_engine_cs *engine)
{
- unsigned long flags;
-
GEM_BUG_ON(!engine->stats.active);
if (engine->stats.active > 1) {
engine->stats.active--;
return;
}
- local_irq_save(flags);
- write_seqcount_begin(&engine->stats.lock);
-
- engine->stats.active--;
engine->stats.total =
ktime_add(engine->stats.total,
ktime_sub(ktime_get(), engine->stats.start));
-
- write_seqcount_end(&engine->stats.lock);
- local_irq_restore(flags);
+ smp_wmb(); /* pairs with intel_engine_get_busy_time() */
+ WRITE_ONCE(engine->stats.active, 0);
}
#endif /* __INTEL_ENGINE_STATS_H__ */
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h
index d2346b425547..ed13012b9338 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h
@@ -518,11 +518,6 @@ struct intel_engine_cs {
*/
unsigned int active;
- /**
- * @lock: Lock protecting the below fields.
- */
- seqcount_t lock;
-
/**
* @total: Total time this engine was busy.
*
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Intel-gfx] [PATCH 10/10] drm/i915/gt: Reduce GT runtime stats from seqlock to a latch
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (7 preceding siblings ...)
2021-01-13 12:45 ` [Intel-gfx] [PATCH 09/10] drm/i915/gt: Reduce engine runtime stats from seqlock to a latch Chris Wilson
@ 2021-01-13 12:46 ` Chris Wilson
2021-01-14 3:03 ` Andi Shyti
2021-01-13 13:18 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Patchwork
` (4 subsequent siblings)
13 siblings, 1 reply; 27+ messages in thread
From: Chris Wilson @ 2021-01-13 12:46 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
Since we can compute the elapsed time to add to the total, during the
PMU sample we only need to have a consistent view of the (start, total,
active) tuple to be able to locally determine the runtime. That can be
arrange by a pair of memory bariiers and carefully sequencing of the
writes and reads.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 34 ++++++------------------
drivers/gpu/drm/i915/gt/intel_gt_types.h | 5 ----
2 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index c94e8ac884eb..49aba3588fe7 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -41,24 +41,18 @@ static void user_forcewake(struct intel_gt *gt, bool suspend)
static void runtime_begin(struct intel_gt *gt)
{
- local_irq_disable();
- write_seqcount_begin(>->stats.lock);
gt->stats.start = ktime_get();
- gt->stats.active = true;
- write_seqcount_end(>->stats.lock);
- local_irq_enable();
+ smp_wmb(); /* pairs with intel_gt_get_busy_time() */
+ WRITE_ONCE(gt->stats.active, true);
}
static void runtime_end(struct intel_gt *gt)
{
- local_irq_disable();
- write_seqcount_begin(>->stats.lock);
- gt->stats.active = false;
gt->stats.total =
ktime_add(gt->stats.total,
ktime_sub(ktime_get(), gt->stats.start));
- write_seqcount_end(>->stats.lock);
- local_irq_enable();
+ smp_wmb(); /* pairs with intel_gt_get_busy_time() */
+ WRITE_ONCE(gt->stats.active, false);
}
static int __gt_unpark(struct intel_wakeref *wf)
@@ -130,7 +124,6 @@ static const struct intel_wakeref_ops wf_ops = {
void intel_gt_pm_init_early(struct intel_gt *gt)
{
intel_wakeref_init(>->wakeref, gt->uncore->rpm, &wf_ops);
- seqcount_mutex_init(>->stats.lock, >->wakeref.mutex);
}
void intel_gt_pm_init(struct intel_gt *gt)
@@ -364,26 +357,15 @@ int intel_gt_runtime_resume(struct intel_gt *gt)
return intel_uc_runtime_resume(>->uc);
}
-static ktime_t __intel_gt_get_awake_time(const struct intel_gt *gt)
+ktime_t intel_gt_get_awake_time(const struct intel_gt *gt)
{
ktime_t total = gt->stats.total;
- if (gt->stats.active)
+ if (READ_ONCE(gt->stats.active)) {
+ smp_rmb(); /* pairs with runtime_begin/end */
total = ktime_add(total,
ktime_sub(ktime_get(), gt->stats.start));
-
- return total;
-}
-
-ktime_t intel_gt_get_awake_time(const struct intel_gt *gt)
-{
- unsigned int seq;
- ktime_t total;
-
- do {
- seq = read_seqcount_begin(>->stats.lock);
- total = __intel_gt_get_awake_time(gt);
- } while (read_seqcount_retry(>->stats.lock, seq));
+ }
return total;
}
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h
index a83d3e18254d..4205c3f022ad 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h
@@ -91,11 +91,6 @@ struct intel_gt {
struct {
bool active;
- /**
- * @lock: Lock protecting the below fields.
- */
- seqcount_mutex_t lock;
-
/**
* @total: Total time this engine was busy.
*
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 27+ messages in thread* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (8 preceding siblings ...)
2021-01-13 12:46 ` [Intel-gfx] [PATCH 10/10] drm/i915/gt: Reduce GT " Chris Wilson
@ 2021-01-13 13:18 ` Patchwork
2021-01-13 13:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
` (3 subsequent siblings)
13 siblings, 0 replies; 27+ messages in thread
From: Patchwork @ 2021-01-13 13:18 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: series starting with [01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
URL : https://patchwork.freedesktop.org/series/85803/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
f916fef99165 drm/i915: Mark up protected uses of 'i915_request_completed'
194b07e485e2 drm/i915: Drop i915_request.lock serialisation around await_start
6103c5f91828 drm/i915/gem: Reduce ctx->engine_mutex for reading the clone source
92211d1cb256 drm/i915/gem: Reduce ctx->engines_mutex for get_engines()
c9cdc86bd411 drm/i915: Reduce test_and_set_bit to set_bit in i915_request_submit()
7e2285388a39 drm/i915/gt: Drop atomic for engine->fw_active tracking
39586d91fdb9 drm/i915/gt: Extract busy-stats for ring-scheduler
-:12: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#12:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 95 lines checked
ce188455388e drm/i915/gt: Convert stats.active to plain unsigned int
e36118043d45 drm/i915/gt: Reduce engine runtime stats from seqlock to a latch
d824af942340 drm/i915/gt: Reduce GT runtime stats from seqlock to a latch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 27+ messages in thread* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (9 preceding siblings ...)
2021-01-13 13:18 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Patchwork
@ 2021-01-13 13:20 ` Patchwork
2021-01-13 13:49 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
13 siblings, 0 replies; 27+ messages in thread
From: Patchwork @ 2021-01-13 13:20 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: series starting with [01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
URL : https://patchwork.freedesktop.org/series/85803/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
-./include/linux/seqlock.h:843:24: warning: trying to copy expression type 31
-./include/linux/seqlock.h:843:24: warning: trying to copy expression type 31
-./include/linux/seqlock.h:869:16: warning: trying to copy expression type 31
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 27+ messages in thread* [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (10 preceding siblings ...)
2021-01-13 13:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
@ 2021-01-13 13:49 ` Patchwork
2021-01-13 18:38 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-01-14 3:01 ` [Intel-gfx] [PATCH 01/10] " Andi Shyti
13 siblings, 0 replies; 27+ messages in thread
From: Patchwork @ 2021-01-13 13:49 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 4785 bytes --]
== Series Details ==
Series: series starting with [01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
URL : https://patchwork.freedesktop.org/series/85803/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9601 -> Patchwork_19331
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/index.html
Known issues
------------
Here are the changes found in Patchwork_19331 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@nop-compute0:
- fi-tgl-y: NOTRUN -> [SKIP][1] ([fdo#109315] / [i915#2575]) +10 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/fi-tgl-y/igt@amdgpu/amd_cs_nop@nop-compute0.html
* igt@debugfs_test@read_all_entries:
- fi-tgl-y: [PASS][2] -> [DMESG-WARN][3] ([i915#402]) +2 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/fi-tgl-y/igt@debugfs_test@read_all_entries.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/fi-tgl-y/igt@debugfs_test@read_all_entries.html
* igt@gem_exec_suspend@basic-s0:
- fi-tgl-u2: [PASS][4] -> [FAIL][5] ([i915#1888])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/fi-tgl-u2/igt@gem_exec_suspend@basic-s0.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/fi-tgl-u2/igt@gem_exec_suspend@basic-s0.html
* igt@gem_exec_suspend@basic-s3:
- fi-tgl-y: [PASS][6] -> [DMESG-WARN][7] ([i915#2411] / [i915#402])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/fi-tgl-y/igt@gem_exec_suspend@basic-s3.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/fi-tgl-y/igt@gem_exec_suspend@basic-s3.html
* igt@i915_pm_rpm@module-reload:
- fi-kbl-guc: [PASS][8] -> [FAIL][9] ([i915#579])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/fi-kbl-guc/igt@i915_pm_rpm@module-reload.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/fi-kbl-guc/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live@sanitycheck:
- fi-kbl-7500u: [PASS][10] -> [DMESG-WARN][11] ([i915#2605])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/fi-kbl-7500u/igt@i915_selftest@live@sanitycheck.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/fi-kbl-7500u/igt@i915_selftest@live@sanitycheck.html
#### Possible fixes ####
* igt@gem_close_race@basic-threads:
- fi-tgl-y: [DMESG-WARN][12] ([i915#402]) -> [PASS][13] +2 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/fi-tgl-y/igt@gem_close_race@basic-threads.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/fi-tgl-y/igt@gem_close_race@basic-threads.html
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2605]: https://gitlab.freedesktop.org/drm/intel/issues/2605
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#579]: https://gitlab.freedesktop.org/drm/intel/issues/579
Participating hosts (43 -> 39)
------------------------------
Missing (4): fi-ctg-p8600 fi-bsw-cyan fi-bdw-samus fi-hsw-4200u
Build changes
-------------
* Linux: CI_DRM_9601 -> Patchwork_19331
CI-20190529: 20190529
CI_DRM_9601: 35180379602fb11cc044e6a9a77f4f758e641aad @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5957: 2a2b3418f7458dfa1fac255cc5c71603f617690a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19331: d824af9423406f1bec5c7e3788bb31a465c2e6a4 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
d824af942340 drm/i915/gt: Reduce GT runtime stats from seqlock to a latch
e36118043d45 drm/i915/gt: Reduce engine runtime stats from seqlock to a latch
ce188455388e drm/i915/gt: Convert stats.active to plain unsigned int
39586d91fdb9 drm/i915/gt: Extract busy-stats for ring-scheduler
7e2285388a39 drm/i915/gt: Drop atomic for engine->fw_active tracking
c9cdc86bd411 drm/i915: Reduce test_and_set_bit to set_bit in i915_request_submit()
92211d1cb256 drm/i915/gem: Reduce ctx->engines_mutex for get_engines()
6103c5f91828 drm/i915/gem: Reduce ctx->engine_mutex for reading the clone source
194b07e485e2 drm/i915: Drop i915_request.lock serialisation around await_start
f916fef99165 drm/i915: Mark up protected uses of 'i915_request_completed'
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/index.html
[-- Attachment #1.2: Type: text/html, Size: 5748 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 27+ messages in thread* [Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (11 preceding siblings ...)
2021-01-13 13:49 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2021-01-13 18:38 ` Patchwork
2021-01-14 3:01 ` [Intel-gfx] [PATCH 01/10] " Andi Shyti
13 siblings, 0 replies; 27+ messages in thread
From: Patchwork @ 2021-01-13 18:38 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 20288 bytes --]
== Series Details ==
Series: series starting with [01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
URL : https://patchwork.freedesktop.org/series/85803/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9601_full -> Patchwork_19331_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_19331_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_19331_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_19331_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
- shard-kbl: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-kbl6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* {igt@gem_exec_fair@basic-pace-solo@rcs0}:
- shard-iclb: [FAIL][3] ([i915#2842]) -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-iclb5/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-iclb5/igt@gem_exec_fair@basic-pace-solo@rcs0.html
### Piglit changes ###
#### Possible regressions ####
* security@initialized-texmemory (NEW):
- pig-glk-j5005: NOTRUN -> [INCOMPLETE][5] +4 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/pig-glk-j5005/security@initialized-texmemory.html
New tests
---------
New tests have been introduced between CI_DRM_9601_full and Patchwork_19331_full:
### New Piglit tests (4) ###
* security@initialized-texmemory:
- Statuses : 1 incomplete(s)
- Exec time: [0.0] s
* spec@!opengl 1.1@clipflat:
- Statuses : 1 incomplete(s)
- Exec time: [0.0] s
* spec@!opengl 1.1@copypixels-draw-sync:
- Statuses : 1 incomplete(s)
- Exec time: [0.0] s
* spec@!opengl 1.1@streaming-texture-leak:
- Statuses : 1 incomplete(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_19331_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_params@no-vebox:
- shard-skl: NOTRUN -> [SKIP][6] ([fdo#109271]) +42 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl7/igt@gem_exec_params@no-vebox.html
* igt@gem_exec_reloc@basic-wide-active@bcs0:
- shard-glk: NOTRUN -> [FAIL][7] ([i915#2389]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-glk7/igt@gem_exec_reloc@basic-wide-active@bcs0.html
* igt@gem_exec_whisper@basic-queues-forked:
- shard-glk: [PASS][8] -> [DMESG-WARN][9] ([i915#118] / [i915#95])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-glk6/igt@gem_exec_whisper@basic-queues-forked.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-glk7/igt@gem_exec_whisper@basic-queues-forked.html
* igt@gen9_exec_parse@allowed-single:
- shard-skl: NOTRUN -> [DMESG-WARN][10] ([i915#1436] / [i915#716])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl10/igt@gen9_exec_parse@allowed-single.html
* igt@kms_big_joiner@invalid-modeset:
- shard-skl: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#2705])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl7/igt@kms_big_joiner@invalid-modeset.html
* igt@kms_ccs@pipe-c-crc-sprite-planes-basic:
- shard-skl: NOTRUN -> [SKIP][12] ([fdo#109271] / [fdo#111304])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl5/igt@kms_ccs@pipe-c-crc-sprite-planes-basic.html
* igt@kms_chamelium@hdmi-hpd:
- shard-glk: NOTRUN -> [SKIP][13] ([fdo#109271] / [fdo#111827]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-glk7/igt@kms_chamelium@hdmi-hpd.html
* igt@kms_color_chamelium@pipe-c-gamma:
- shard-skl: NOTRUN -> [SKIP][14] ([fdo#109271] / [fdo#111827]) +7 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl7/igt@kms_color_chamelium@pipe-c-gamma.html
* igt@kms_cursor_crc@pipe-b-cursor-128x128-onscreen:
- shard-skl: NOTRUN -> [FAIL][15] ([i915#54]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl7/igt@kms_cursor_crc@pipe-b-cursor-128x128-onscreen.html
* igt@kms_cursor_crc@pipe-c-cursor-64x64-random:
- shard-skl: [PASS][16] -> [FAIL][17] ([i915#54]) +7 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl1/igt@kms_cursor_crc@pipe-c-cursor-64x64-random.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl10/igt@kms_cursor_crc@pipe-c-cursor-64x64-random.html
* igt@kms_cursor_legacy@pipe-d-single-bo:
- shard-skl: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#533]) +1 similar issue
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl7/igt@kms_cursor_legacy@pipe-d-single-bo.html
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-tglb: [PASS][19] -> [FAIL][20] ([i915#2598])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-tglb8/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-tglb7/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1:
- shard-skl: [PASS][21] -> [FAIL][22] ([i915#2122])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl1/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl6/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html
* igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-cpu:
- shard-glk: NOTRUN -> [SKIP][23] ([fdo#109271]) +28 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-glk7/igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-cpu.html
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][24] -> [SKIP][25] ([fdo#109441]) +2 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-iclb8/igt@kms_psr@psr2_no_drrs.html
#### Possible fixes ####
* igt@gem_ctx_persistence@smoketest:
- shard-tglb: [FAIL][26] ([i915#2896]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-tglb6/igt@gem_ctx_persistence@smoketest.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-tglb3/igt@gem_ctx_persistence@smoketest.html
* {igt@gem_exec_fair@basic-none-share@rcs0}:
- shard-apl: [SKIP][28] ([fdo#109271]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-apl8/igt@gem_exec_fair@basic-none-share@rcs0.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-apl8/igt@gem_exec_fair@basic-none-share@rcs0.html
* {igt@gem_exec_fair@basic-none-solo@rcs0}:
- shard-glk: [FAIL][30] ([i915#2842]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-glk6/igt@gem_exec_fair@basic-none-solo@rcs0.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-glk9/igt@gem_exec_fair@basic-none-solo@rcs0.html
* {igt@gem_exec_fair@basic-none@vcs0}:
- shard-kbl: [FAIL][32] ([i915#2842]) -> [PASS][33] +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-kbl6/igt@gem_exec_fair@basic-none@vcs0.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-kbl3/igt@gem_exec_fair@basic-none@vcs0.html
- shard-apl: [FAIL][34] ([i915#2842]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-apl1/igt@gem_exec_fair@basic-none@vcs0.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-apl4/igt@gem_exec_fair@basic-none@vcs0.html
* {igt@gem_exec_fair@basic-pace@bcs0}:
- shard-tglb: [FAIL][36] ([i915#2842]) -> [PASS][37] +3 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-tglb5/igt@gem_exec_fair@basic-pace@bcs0.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-tglb8/igt@gem_exec_fair@basic-pace@bcs0.html
* {igt@gem_exec_fair@basic-pace@vcs0}:
- shard-iclb: [FAIL][38] ([i915#2842]) -> [PASS][39] +1 similar issue
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-iclb4/igt@gem_exec_fair@basic-pace@vcs0.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-iclb3/igt@gem_exec_fair@basic-pace@vcs0.html
* igt@gem_exec_whisper@basic-queues-forked-all:
- shard-glk: [DMESG-WARN][40] ([i915#118] / [i915#95]) -> [PASS][41] +1 similar issue
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-glk8/igt@gem_exec_whisper@basic-queues-forked-all.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-glk5/igt@gem_exec_whisper@basic-queues-forked-all.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-skl: [FAIL][42] ([i915#644]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl4/igt@gem_ppgtt@flink-and-close-vma-leak.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl10/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@gem_wait@write-wait@vecs0:
- shard-skl: [DMESG-WARN][44] ([i915#1982]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl10/igt@gem_wait@write-wait@vecs0.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl5/igt@gem_wait@write-wait@vecs0.html
* igt@kms_color@pipe-c-degamma:
- shard-skl: [FAIL][46] ([i915#71]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl9/igt@kms_color@pipe-c-degamma.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl7/igt@kms_color@pipe-c-degamma.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-skl: [INCOMPLETE][48] ([i915#2405] / [i915#300]) -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl9/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl7/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
* igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen:
- shard-skl: [FAIL][50] ([i915#54]) -> [PASS][51] +9 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl4/igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl10/igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-tglb: [FAIL][52] ([i915#79]) -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-tglb1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-tglb2/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html
* igt@kms_flip@flip-vs-suspend-interruptible@c-edp1:
- shard-skl: [INCOMPLETE][54] ([i915#2295]) -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl10/igt@kms_flip@flip-vs-suspend-interruptible@c-edp1.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl1/igt@kms_flip@flip-vs-suspend-interruptible@c-edp1.html
* igt@kms_flip@flip-vs-suspend@c-edp1:
- shard-skl: [INCOMPLETE][56] ([i915#198]) -> [PASS][57]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl1/igt@kms_flip@flip-vs-suspend@c-edp1.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl10/igt@kms_flip@flip-vs-suspend@c-edp1.html
* igt@kms_flip@plain-flip-fb-recreate@c-edp1:
- shard-skl: [FAIL][58] ([i915#2122]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl10/igt@kms_flip@plain-flip-fb-recreate@c-edp1.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl5/igt@kms_flip@plain-flip-fb-recreate@c-edp1.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][60] ([i915#1188]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl4/igt@kms_hdr@bpc-switch.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl10/igt@kms_hdr@bpc-switch.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][62] ([fdo#108145] / [i915#265]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl9/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl7/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][64] ([fdo#109642] / [fdo#111068]) -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-iclb1/igt@kms_psr2_su@frontbuffer.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][66] ([fdo#109441]) -> [PASS][67] +1 similar issue
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-iclb5/igt@kms_psr@psr2_primary_mmap_cpu.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@perf@short-reads:
- shard-skl: [FAIL][68] ([i915#51]) -> [PASS][69]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl8/igt@perf@short-reads.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl4/igt@perf@short-reads.html
#### Warnings ####
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][70] ([i915#2684]) -> [WARN][71] ([i915#1804] / [i915#2684])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-iclb2/igt@i915_pm_rc6_residency@rc6-fence.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-iclb4/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@runner@aborted:
- shard-kbl: [FAIL][72] ([i915#2295]) -> ([FAIL][73], [FAIL][74]) ([i915#2295] / [i915#2426])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-kbl3/igt@runner@aborted.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-kbl7/igt@runner@aborted.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-kbl3/igt@runner@aborted.html
- shard-tglb: ([FAIL][75], [FAIL][76]) ([i915#1764] / [i915#2295] / [i915#2426] / [i915#2667] / [i915#2803]) -> ([FAIL][77], [FAIL][78]) ([i915#2295] / [i915#2426] / [i915#2667] / [i915#2803])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-tglb3/igt@runner@aborted.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-tglb1/igt@runner@aborted.html
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-tglb1/igt@runner@aborted.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-tglb5/igt@runner@aborted.html
- shard-skl: [FAIL][79] ([i915#2295]) -> ([FAIL][80], [FAIL][81], [FAIL][82]) ([i915#1436] / [i915#2295] / [i915#2426])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9601/shard-skl6/igt@runner@aborted.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl8/igt@runner@aborted.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl3/igt@runner@aborted.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/shard-skl10/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111304]: https://bugs.freedesktop.org/show_bug.cgi?id=111304
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#1764]: https://gitlab.freedesktop.org/drm/intel/issues/1764
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2405]: https://gitlab.freedesktop.org/drm/intel/issues/2405
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2598]: https://gitlab.freedesktop.org/drm/intel/issues/2598
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2667]: https://gitlab.freedesktop.org/drm/intel/issues/2667
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#2803]: https://gitlab.freedesktop.org/drm/intel/issues/2803
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2896]: https://gitlab.freedesktop.org/drm/intel/issues/2896
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#51]: https://gitlab.freedesktop.org/drm/intel/issues/51
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#71]: https://gitlab.freedesktop.org/drm/intel/issues/71
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9601 -> Patchwork_19331
CI-20190529: 20190529
CI_DRM_9601: 35180379602fb11cc044e6a9a77f4f758e641aad @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5957: 2a2b3418f7458dfa1fac255cc5c71603f617690a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19331: d824af9423406f1bec5c7e3788bb31a465c2e6a4 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19331/index.html
[-- Attachment #1.2: Type: text/html, Size: 24372 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
2021-01-13 12:45 [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed' Chris Wilson
` (12 preceding siblings ...)
2021-01-13 18:38 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
@ 2021-01-14 3:01 ` Andi Shyti
2021-01-14 12:03 ` Chris Wilson
13 siblings, 1 reply; 27+ messages in thread
From: Andi Shyti @ 2021-01-14 3:01 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
Hi Chris,
> diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
> index 0b1a46a0d866..784c05ac5cca 100644
> --- a/drivers/gpu/drm/i915/i915_request.c
> +++ b/drivers/gpu/drm/i915/i915_request.c
> @@ -276,7 +276,7 @@ static void remove_from_engine(struct i915_request *rq)
>
> bool i915_request_retire(struct i915_request *rq)
> {
> - if (!i915_request_completed(rq))
> + if (!__i915_request_is_complete(rq))
> return false;
>
> RQ_TRACE(rq, "\n");
> @@ -342,8 +342,7 @@ void i915_request_retire_upto(struct i915_request *rq)
> struct i915_request *tmp;
>
> RQ_TRACE(rq, "\n");
> -
> - GEM_BUG_ON(!i915_request_completed(rq));
> + GEM_BUG_ON(!__i915_request_is_complete(rq));
I might be a bit shallow, but where is the lock here?
Andi
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
2021-01-14 3:01 ` [Intel-gfx] [PATCH 01/10] " Andi Shyti
@ 2021-01-14 12:03 ` Chris Wilson
2021-01-14 13:44 ` Andi Shyti
0 siblings, 1 reply; 27+ messages in thread
From: Chris Wilson @ 2021-01-14 12:03 UTC (permalink / raw)
To: Andi Shyti; +Cc: intel-gfx
Quoting Andi Shyti (2021-01-14 03:01:15)
> Hi Chris,
>
> > diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
> > index 0b1a46a0d866..784c05ac5cca 100644
> > --- a/drivers/gpu/drm/i915/i915_request.c
> > +++ b/drivers/gpu/drm/i915/i915_request.c
> > @@ -276,7 +276,7 @@ static void remove_from_engine(struct i915_request *rq)
> >
> > bool i915_request_retire(struct i915_request *rq)
> > {
> > - if (!i915_request_completed(rq))
> > + if (!__i915_request_is_complete(rq))
>
>
> > return false;
> >
> > RQ_TRACE(rq, "\n");
> > @@ -342,8 +342,7 @@ void i915_request_retire_upto(struct i915_request *rq)
> > struct i915_request *tmp;
> >
> > RQ_TRACE(rq, "\n");
> > -
> > - GEM_BUG_ON(!i915_request_completed(rq));
> > + GEM_BUG_ON(!__i915_request_is_complete(rq));
>
> I might be a bit shallow, but where is the lock here?
This holds the request->context->timeline->mutex.
The locking is basically split between frontend/backend:
construction/destruction - under the timeline->mutex
execution - under the engine->active.lock (coordinates with
timeline->mutex)
At all other times, RCU protected access (using the SLAB_TYPESAFE_BY_RCU
so approach with caution).
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 27+ messages in thread* Re: [Intel-gfx] [PATCH 01/10] drm/i915: Mark up protected uses of 'i915_request_completed'
2021-01-14 12:03 ` Chris Wilson
@ 2021-01-14 13:44 ` Andi Shyti
0 siblings, 0 replies; 27+ messages in thread
From: Andi Shyti @ 2021-01-14 13:44 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
Hi Chris,
> > > diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
> > > index 0b1a46a0d866..784c05ac5cca 100644
> > > --- a/drivers/gpu/drm/i915/i915_request.c
> > > +++ b/drivers/gpu/drm/i915/i915_request.c
> > > @@ -276,7 +276,7 @@ static void remove_from_engine(struct i915_request *rq)
> > >
> > > bool i915_request_retire(struct i915_request *rq)
> > > {
> > > - if (!i915_request_completed(rq))
> > > + if (!__i915_request_is_complete(rq))
> >
> >
> > > return false;
> > >
> > > RQ_TRACE(rq, "\n");
> > > @@ -342,8 +342,7 @@ void i915_request_retire_upto(struct i915_request *rq)
> > > struct i915_request *tmp;
> > >
> > > RQ_TRACE(rq, "\n");
> > > -
> > > - GEM_BUG_ON(!i915_request_completed(rq));
> > > + GEM_BUG_ON(!__i915_request_is_complete(rq));
> >
> > I might be a bit shallow, but where is the lock here?
>
> This holds the request->context->timeline->mutex.
>
> The locking is basically split between frontend/backend:
>
> construction/destruction - under the timeline->mutex
>
> execution - under the engine->active.lock (coordinates with
> timeline->mutex)
>
> At all other times, RCU protected access (using the SLAB_TYPESAFE_BY_RCU
> so approach with caution).
Right! Thanks!
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Andi
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 27+ messages in thread