* [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
@ 2019-11-13 11:10 Chris Wilson
2019-11-13 11:10 ` [Intel-gfx] " Chris Wilson
` (5 more replies)
0 siblings, 6 replies; 14+ messages in thread
From: Chris Wilson @ 2019-11-13 11:10 UTC (permalink / raw)
To: intel-gfx; +Cc: Matthew Auld
As we want to be able to run inside atomic context for retiring the
i915_active, and we are no longer allowed to abuse mutex_trylock, split
the tree management portion of i915_active.mutex into an irq-safe
spinlock.
References: a0855d24fc22d ("locking/mutex: Complain upon mutex API misuse in IRQ contexts")
References: https://bugs.freedesktop.org/show_bug.cgi?id=111626
Fixes: 274cbf20fd10 ("drm/i915: Push the i915_active.retire into a worker")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/i915_active.c | 54 +++++++++-----------
drivers/gpu/drm/i915/i915_active_types.h | 1 +
drivers/gpu/drm/i915/selftests/i915_active.c | 4 +-
3 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
index 207383dda84d..c09da4031889 100644
--- a/drivers/gpu/drm/i915/i915_active.c
+++ b/drivers/gpu/drm/i915/i915_active.c
@@ -91,14 +91,12 @@ static void debug_active_init(struct i915_active *ref)
static void debug_active_activate(struct i915_active *ref)
{
- lockdep_assert_held(&ref->mutex);
if (!atomic_read(&ref->count)) /* before the first inc */
debug_object_activate(ref, &active_debug_desc);
}
static void debug_active_deactivate(struct i915_active *ref)
{
- lockdep_assert_held(&ref->mutex);
if (!atomic_read(&ref->count)) /* after the last dec */
debug_object_deactivate(ref, &active_debug_desc);
}
@@ -128,29 +126,22 @@ __active_retire(struct i915_active *ref)
{
struct active_node *it, *n;
struct rb_root root;
- bool retire = false;
+ unsigned long flags;
- lockdep_assert_held(&ref->mutex);
GEM_BUG_ON(i915_active_is_idle(ref));
/* return the unused nodes to our slabcache -- flushing the allocator */
- if (atomic_dec_and_test(&ref->count)) {
- debug_active_deactivate(ref);
- root = ref->tree;
- ref->tree = RB_ROOT;
- ref->cache = NULL;
- retire = true;
- }
-
- mutex_unlock(&ref->mutex);
- if (!retire)
+ if (!atomic_dec_and_lock_irqsave(&ref->count, &ref->tree_lock, flags))
return;
GEM_BUG_ON(rcu_access_pointer(ref->excl.fence));
- rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
- GEM_BUG_ON(i915_active_fence_isset(&it->base));
- kmem_cache_free(global.slab_cache, it);
- }
+ debug_active_deactivate(ref);
+
+ root = ref->tree;
+ ref->tree = RB_ROOT;
+ ref->cache = NULL;
+
+ spin_unlock_irqrestore(&ref->tree_lock, flags);
/* After the final retire, the entire struct may be freed */
if (ref->retire)
@@ -158,6 +149,11 @@ __active_retire(struct i915_active *ref)
/* ... except if you wait on it, you must manage your own references! */
wake_up_var(ref);
+
+ rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
+ GEM_BUG_ON(i915_active_fence_isset(&it->base));
+ kmem_cache_free(global.slab_cache, it);
+ }
}
static void
@@ -169,7 +165,6 @@ active_work(struct work_struct *wrk)
if (atomic_add_unless(&ref->count, -1, 1))
return;
- mutex_lock(&ref->mutex);
__active_retire(ref);
}
@@ -180,9 +175,7 @@ active_retire(struct i915_active *ref)
if (atomic_add_unless(&ref->count, -1, 1))
return;
- /* If we are inside interrupt context (fence signaling), defer */
- if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS ||
- !mutex_trylock(&ref->mutex)) {
+ if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS) {
queue_work(system_unbound_wq, &ref->work);
return;
}
@@ -227,7 +220,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
if (!prealloc)
return NULL;
- mutex_lock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
GEM_BUG_ON(i915_active_is_idle(ref));
parent = NULL;
@@ -257,7 +250,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
out:
ref->cache = node;
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
BUILD_BUG_ON(offsetof(typeof(*node), base));
return &node->base;
@@ -278,8 +271,10 @@ void __i915_active_init(struct i915_active *ref,
if (bits & I915_ACTIVE_MAY_SLEEP)
ref->flags |= I915_ACTIVE_RETIRE_SLEEPS;
+ spin_lock_init(&ref->tree_lock);
ref->tree = RB_ROOT;
ref->cache = NULL;
+
init_llist_head(&ref->preallocated_barriers);
atomic_set(&ref->count, 0);
__mutex_init(&ref->mutex, "i915_active", key);
@@ -510,7 +505,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
if (RB_EMPTY_ROOT(&ref->tree))
return NULL;
- mutex_lock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
GEM_BUG_ON(i915_active_is_idle(ref));
/*
@@ -575,7 +570,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
goto match;
}
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
return NULL;
@@ -583,7 +578,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
rb_erase(p, &ref->tree); /* Hide from waits and sibling allocations */
if (p == &ref->cache->node)
ref->cache = NULL;
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
return rb_entry(p, struct active_node, node);
}
@@ -664,6 +659,7 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,
void i915_active_acquire_barrier(struct i915_active *ref)
{
struct llist_node *pos, *next;
+ unsigned long flags;
GEM_BUG_ON(i915_active_is_idle(ref));
@@ -673,7 +669,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
* populated by i915_request_add_active_barriers() to point to the
* request that will eventually release them.
*/
- mutex_lock_nested(&ref->mutex, SINGLE_DEPTH_NESTING);
+ spin_lock_irqsave_nested(&ref->tree_lock, flags, SINGLE_DEPTH_NESTING);
llist_for_each_safe(pos, next, take_preallocated_barriers(ref)) {
struct active_node *node = barrier_from_ll(pos);
struct intel_engine_cs *engine = barrier_to_engine(node);
@@ -699,7 +695,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
llist_add(barrier_to_ll(node), &engine->barrier_tasks);
intel_engine_pm_put(engine);
}
- mutex_unlock(&ref->mutex);
+ spin_unlock_irqrestore(&ref->tree_lock, flags);
}
void i915_request_add_active_barriers(struct i915_request *rq)
diff --git a/drivers/gpu/drm/i915/i915_active_types.h b/drivers/gpu/drm/i915/i915_active_types.h
index d89a74c142c6..96aed0ee700a 100644
--- a/drivers/gpu/drm/i915/i915_active_types.h
+++ b/drivers/gpu/drm/i915/i915_active_types.h
@@ -48,6 +48,7 @@ struct i915_active {
atomic_t count;
struct mutex mutex;
+ spinlock_t tree_lock;
struct active_node *cache;
struct rb_root tree;
diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c
index f3fa05c78d78..60290f78750d 100644
--- a/drivers/gpu/drm/i915/selftests/i915_active.c
+++ b/drivers/gpu/drm/i915/selftests/i915_active.c
@@ -277,8 +277,8 @@ void i915_active_unlock_wait(struct i915_active *ref)
}
/* And wait for the retire callback */
- mutex_lock(&ref->mutex);
- mutex_unlock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
+ spin_unlock_irq(&ref->tree_lock);
/* ... which may have been on a thread instead */
flush_work(&ref->work);
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Intel-gfx] [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
2019-11-13 11:10 [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree Chris Wilson
@ 2019-11-13 11:10 ` Chris Wilson
2019-11-13 15:40 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (4 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Chris Wilson @ 2019-11-13 11:10 UTC (permalink / raw)
To: intel-gfx; +Cc: Matthew Auld
As we want to be able to run inside atomic context for retiring the
i915_active, and we are no longer allowed to abuse mutex_trylock, split
the tree management portion of i915_active.mutex into an irq-safe
spinlock.
References: a0855d24fc22d ("locking/mutex: Complain upon mutex API misuse in IRQ contexts")
References: https://bugs.freedesktop.org/show_bug.cgi?id=111626
Fixes: 274cbf20fd10 ("drm/i915: Push the i915_active.retire into a worker")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/i915_active.c | 54 +++++++++-----------
drivers/gpu/drm/i915/i915_active_types.h | 1 +
drivers/gpu/drm/i915/selftests/i915_active.c | 4 +-
3 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
index 207383dda84d..c09da4031889 100644
--- a/drivers/gpu/drm/i915/i915_active.c
+++ b/drivers/gpu/drm/i915/i915_active.c
@@ -91,14 +91,12 @@ static void debug_active_init(struct i915_active *ref)
static void debug_active_activate(struct i915_active *ref)
{
- lockdep_assert_held(&ref->mutex);
if (!atomic_read(&ref->count)) /* before the first inc */
debug_object_activate(ref, &active_debug_desc);
}
static void debug_active_deactivate(struct i915_active *ref)
{
- lockdep_assert_held(&ref->mutex);
if (!atomic_read(&ref->count)) /* after the last dec */
debug_object_deactivate(ref, &active_debug_desc);
}
@@ -128,29 +126,22 @@ __active_retire(struct i915_active *ref)
{
struct active_node *it, *n;
struct rb_root root;
- bool retire = false;
+ unsigned long flags;
- lockdep_assert_held(&ref->mutex);
GEM_BUG_ON(i915_active_is_idle(ref));
/* return the unused nodes to our slabcache -- flushing the allocator */
- if (atomic_dec_and_test(&ref->count)) {
- debug_active_deactivate(ref);
- root = ref->tree;
- ref->tree = RB_ROOT;
- ref->cache = NULL;
- retire = true;
- }
-
- mutex_unlock(&ref->mutex);
- if (!retire)
+ if (!atomic_dec_and_lock_irqsave(&ref->count, &ref->tree_lock, flags))
return;
GEM_BUG_ON(rcu_access_pointer(ref->excl.fence));
- rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
- GEM_BUG_ON(i915_active_fence_isset(&it->base));
- kmem_cache_free(global.slab_cache, it);
- }
+ debug_active_deactivate(ref);
+
+ root = ref->tree;
+ ref->tree = RB_ROOT;
+ ref->cache = NULL;
+
+ spin_unlock_irqrestore(&ref->tree_lock, flags);
/* After the final retire, the entire struct may be freed */
if (ref->retire)
@@ -158,6 +149,11 @@ __active_retire(struct i915_active *ref)
/* ... except if you wait on it, you must manage your own references! */
wake_up_var(ref);
+
+ rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
+ GEM_BUG_ON(i915_active_fence_isset(&it->base));
+ kmem_cache_free(global.slab_cache, it);
+ }
}
static void
@@ -169,7 +165,6 @@ active_work(struct work_struct *wrk)
if (atomic_add_unless(&ref->count, -1, 1))
return;
- mutex_lock(&ref->mutex);
__active_retire(ref);
}
@@ -180,9 +175,7 @@ active_retire(struct i915_active *ref)
if (atomic_add_unless(&ref->count, -1, 1))
return;
- /* If we are inside interrupt context (fence signaling), defer */
- if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS ||
- !mutex_trylock(&ref->mutex)) {
+ if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS) {
queue_work(system_unbound_wq, &ref->work);
return;
}
@@ -227,7 +220,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
if (!prealloc)
return NULL;
- mutex_lock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
GEM_BUG_ON(i915_active_is_idle(ref));
parent = NULL;
@@ -257,7 +250,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
out:
ref->cache = node;
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
BUILD_BUG_ON(offsetof(typeof(*node), base));
return &node->base;
@@ -278,8 +271,10 @@ void __i915_active_init(struct i915_active *ref,
if (bits & I915_ACTIVE_MAY_SLEEP)
ref->flags |= I915_ACTIVE_RETIRE_SLEEPS;
+ spin_lock_init(&ref->tree_lock);
ref->tree = RB_ROOT;
ref->cache = NULL;
+
init_llist_head(&ref->preallocated_barriers);
atomic_set(&ref->count, 0);
__mutex_init(&ref->mutex, "i915_active", key);
@@ -510,7 +505,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
if (RB_EMPTY_ROOT(&ref->tree))
return NULL;
- mutex_lock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
GEM_BUG_ON(i915_active_is_idle(ref));
/*
@@ -575,7 +570,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
goto match;
}
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
return NULL;
@@ -583,7 +578,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
rb_erase(p, &ref->tree); /* Hide from waits and sibling allocations */
if (p == &ref->cache->node)
ref->cache = NULL;
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
return rb_entry(p, struct active_node, node);
}
@@ -664,6 +659,7 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,
void i915_active_acquire_barrier(struct i915_active *ref)
{
struct llist_node *pos, *next;
+ unsigned long flags;
GEM_BUG_ON(i915_active_is_idle(ref));
@@ -673,7 +669,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
* populated by i915_request_add_active_barriers() to point to the
* request that will eventually release them.
*/
- mutex_lock_nested(&ref->mutex, SINGLE_DEPTH_NESTING);
+ spin_lock_irqsave_nested(&ref->tree_lock, flags, SINGLE_DEPTH_NESTING);
llist_for_each_safe(pos, next, take_preallocated_barriers(ref)) {
struct active_node *node = barrier_from_ll(pos);
struct intel_engine_cs *engine = barrier_to_engine(node);
@@ -699,7 +695,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
llist_add(barrier_to_ll(node), &engine->barrier_tasks);
intel_engine_pm_put(engine);
}
- mutex_unlock(&ref->mutex);
+ spin_unlock_irqrestore(&ref->tree_lock, flags);
}
void i915_request_add_active_barriers(struct i915_request *rq)
diff --git a/drivers/gpu/drm/i915/i915_active_types.h b/drivers/gpu/drm/i915/i915_active_types.h
index d89a74c142c6..96aed0ee700a 100644
--- a/drivers/gpu/drm/i915/i915_active_types.h
+++ b/drivers/gpu/drm/i915/i915_active_types.h
@@ -48,6 +48,7 @@ struct i915_active {
atomic_t count;
struct mutex mutex;
+ spinlock_t tree_lock;
struct active_node *cache;
struct rb_root tree;
diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c
index f3fa05c78d78..60290f78750d 100644
--- a/drivers/gpu/drm/i915/selftests/i915_active.c
+++ b/drivers/gpu/drm/i915/selftests/i915_active.c
@@ -277,8 +277,8 @@ void i915_active_unlock_wait(struct i915_active *ref)
}
/* And wait for the retire callback */
- mutex_lock(&ref->mutex);
- mutex_unlock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
+ spin_unlock_irq(&ref->tree_lock);
/* ... which may have been on a thread instead */
flush_work(&ref->work);
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
2019-11-13 11:10 [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree Chris Wilson
2019-11-13 11:10 ` [Intel-gfx] " Chris Wilson
@ 2019-11-13 15:40 ` Patchwork
2019-11-13 15:40 ` [Intel-gfx] " Patchwork
2019-11-13 16:01 ` ✗ Fi.CI.BAT: failure " Patchwork
` (3 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Patchwork @ 2019-11-13 15:40 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
URL : https://patchwork.freedesktop.org/series/69399/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
68bd26fc5933 drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
-:12: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#12:
References: a0855d24fc22d ("locking/mutex: Complain upon mutex API misuse in IRQ contexts")
-:198: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment
#198: FILE: drivers/gpu/drm/i915/i915_active_types.h:51:
+ spinlock_t tree_lock;
total: 0 errors, 1 warnings, 1 checks, 170 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
2019-11-13 15:40 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2019-11-13 15:40 ` Patchwork
0 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2019-11-13 15:40 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
URL : https://patchwork.freedesktop.org/series/69399/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
68bd26fc5933 drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
-:12: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#12:
References: a0855d24fc22d ("locking/mutex: Complain upon mutex API misuse in IRQ contexts")
-:198: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment
#198: FILE: drivers/gpu/drm/i915/i915_active_types.h:51:
+ spinlock_t tree_lock;
total: 0 errors, 1 warnings, 1 checks, 170 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
2019-11-13 11:10 [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree Chris Wilson
2019-11-13 11:10 ` [Intel-gfx] " Chris Wilson
2019-11-13 15:40 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2019-11-13 16:01 ` Patchwork
2019-11-13 16:01 ` [Intel-gfx] " Patchwork
2019-11-13 18:53 ` [PATCH] " Chris Wilson
` (2 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Patchwork @ 2019-11-13 16:01 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
URL : https://patchwork.freedesktop.org/series/69399/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7331 -> Patchwork_15248
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15248 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_15248, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15248:
### IGT changes ###
#### Possible regressions ####
* igt@gem_ctx_create@basic-files:
- fi-skl-6770hq: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-skl-6770hq/igt@gem_ctx_create@basic-files.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-skl-6770hq/igt@gem_ctx_create@basic-files.html
* igt@gem_exec_create@basic:
- fi-icl-u3: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-u3/igt@gem_exec_create@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-u3/igt@gem_exec_create@basic.html
- fi-icl-dsi: [PASS][5] -> [DMESG-WARN][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-dsi/igt@gem_exec_create@basic.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-dsi/igt@gem_exec_create@basic.html
- fi-apl-guc: [PASS][7] -> [DMESG-WARN][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-apl-guc/igt@gem_exec_create@basic.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-apl-guc/igt@gem_exec_create@basic.html
- fi-icl-guc: [PASS][9] -> [DMESG-WARN][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-guc/igt@gem_exec_create@basic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-guc/igt@gem_exec_create@basic.html
* igt@gem_exec_fence@nb-await-default:
- fi-bsw-nick: [PASS][11] -> [DMESG-WARN][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-bsw-nick/igt@gem_exec_fence@nb-await-default.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-bsw-nick/igt@gem_exec_fence@nb-await-default.html
* igt@gem_exec_suspend@basic-s0:
- fi-kbl-guc: [PASS][13] -> [DMESG-WARN][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-kbl-guc/igt@gem_exec_suspend@basic-s0.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-kbl-guc/igt@gem_exec_suspend@basic-s0.html
- fi-icl-y: [PASS][15] -> [DMESG-WARN][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-y/igt@gem_exec_suspend@basic-s0.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-y/igt@gem_exec_suspend@basic-s0.html
- fi-icl-u2: [PASS][17] -> [DMESG-WARN][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-u2/igt@gem_exec_suspend@basic-s0.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-u2/igt@gem_exec_suspend@basic-s0.html
* igt@gem_exec_suspend@basic-s3:
- fi-bsw-kefka: [PASS][19] -> [DMESG-WARN][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-bsw-kefka/igt@gem_exec_suspend@basic-s3.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-bsw-kefka/igt@gem_exec_suspend@basic-s3.html
* igt@gem_exec_suspend@basic-s4-devices:
- fi-hsw-4770r: [PASS][21] -> [DMESG-WARN][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-hsw-4770r/igt@gem_exec_suspend@basic-s4-devices.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-hsw-4770r/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_selftest@live_gem_contexts:
- fi-skl-lmem: NOTRUN -> [DMESG-WARN][23]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-skl-lmem/igt@i915_selftest@live_gem_contexts.html
* igt@i915_selftest@live_hangcheck:
- fi-cfl-8700k: [PASS][24] -> [DMESG-WARN][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-cfl-8700k/igt@i915_selftest@live_hangcheck.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-cfl-8700k/igt@i915_selftest@live_hangcheck.html
- fi-cml-u2: [PASS][26] -> [DMESG-WARN][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-cml-u2/igt@i915_selftest@live_hangcheck.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-cml-u2/igt@i915_selftest@live_hangcheck.html
- fi-bsw-n3050: [PASS][28] -> [DMESG-WARN][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-bsw-n3050/igt@i915_selftest@live_hangcheck.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-bsw-n3050/igt@i915_selftest@live_hangcheck.html
* igt@i915_selftest@live_mman:
- fi-snb-2520m: [PASS][30] -> [DMESG-WARN][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-snb-2520m/igt@i915_selftest@live_mman.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-snb-2520m/igt@i915_selftest@live_mman.html
- fi-hsw-peppy: [PASS][32] -> [DMESG-WARN][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-hsw-peppy/igt@i915_selftest@live_mman.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-hsw-peppy/igt@i915_selftest@live_mman.html
- fi-byt-n2820: [PASS][34] -> [DMESG-WARN][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-byt-n2820/igt@i915_selftest@live_mman.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-byt-n2820/igt@i915_selftest@live_mman.html
* igt@i915_selftest@live_requests:
- fi-ivb-3770: [PASS][36] -> [DMESG-WARN][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-ivb-3770/igt@i915_selftest@live_requests.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-ivb-3770/igt@i915_selftest@live_requests.html
* igt@runner@aborted:
- fi-cml-u2: NOTRUN -> [FAIL][38]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-cml-u2/igt@runner@aborted.html
- fi-cfl-8700k: NOTRUN -> [FAIL][39]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-cfl-8700k/igt@runner@aborted.html
- fi-hsw-4770r: NOTRUN -> [FAIL][40]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-hsw-4770r/igt@runner@aborted.html
- fi-apl-guc: NOTRUN -> [FAIL][41]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-apl-guc/igt@runner@aborted.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@gem_exec_create@basic:
- {fi-tgl-u}: [PASS][42] -> [DMESG-WARN][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-tgl-u/igt@gem_exec_create@basic.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-tgl-u/igt@gem_exec_create@basic.html
Known issues
------------
Here are the changes found in Patchwork_15248 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-kbl-x1275: [PASS][44] -> [DMESG-WARN][45] ([fdo#107139])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html
- fi-kbl-soraka: [PASS][46] -> [DMESG-WARN][47] ([fdo#107139])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-kbl-soraka/igt@gem_exec_suspend@basic-s4-devices.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-kbl-soraka/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_selftest@live_gt_heartbeat:
- fi-cfl-8700k: [PASS][48] -> [DMESG-FAIL][49] ([fdo#112096])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-cfl-8700k/igt@i915_selftest@live_gt_heartbeat.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-cfl-8700k/igt@i915_selftest@live_gt_heartbeat.html
#### Possible fixes ####
* igt@i915_module_load@reload-no-display:
- fi-skl-lmem: [DMESG-WARN][50] ([fdo#112261]) -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-skl-lmem/igt@i915_module_load@reload-no-display.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-skl-lmem/igt@i915_module_load@reload-no-display.html
* igt@kms_chamelium@hdmi-edid-read:
- fi-kbl-7500u: [FAIL][52] ([fdo#109483]) -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-kbl-7500u/igt@kms_chamelium@hdmi-edid-read.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-kbl-7500u/igt@kms_chamelium@hdmi-edid-read.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][54] ([fdo#111045] / [fdo#111096]) -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
#### Warnings ####
* igt@runner@aborted:
- fi-icl-guc: [FAIL][56] ([fdo#110943] / [fdo#111093]) -> [FAIL][57] ([fdo#111093])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-guc/igt@runner@aborted.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-guc/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#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
[fdo#110943]: https://bugs.freedesktop.org/show_bug.cgi?id=110943
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111093]: https://bugs.freedesktop.org/show_bug.cgi?id=111093
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#112096]: https://bugs.freedesktop.org/show_bug.cgi?id=112096
[fdo#112261]: https://bugs.freedesktop.org/show_bug.cgi?id=112261
Participating hosts (53 -> 46)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7331 -> Patchwork_15248
CI-20190529: 20190529
CI_DRM_7331: 4ea40d641218a45e90dd213b89a207ce8bec34dd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5276: 868d38c2bc075b6756ebed486db6e7152ed2c5be @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15248: 68bd26fc59334f9a1005c470d518c573aa5c592b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
68bd26fc5933 drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
2019-11-13 16:01 ` ✗ Fi.CI.BAT: failure " Patchwork
@ 2019-11-13 16:01 ` Patchwork
0 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2019-11-13 16:01 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
URL : https://patchwork.freedesktop.org/series/69399/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7331 -> Patchwork_15248
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15248 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_15248, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15248:
### IGT changes ###
#### Possible regressions ####
* igt@gem_ctx_create@basic-files:
- fi-skl-6770hq: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-skl-6770hq/igt@gem_ctx_create@basic-files.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-skl-6770hq/igt@gem_ctx_create@basic-files.html
* igt@gem_exec_create@basic:
- fi-icl-u3: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-u3/igt@gem_exec_create@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-u3/igt@gem_exec_create@basic.html
- fi-icl-dsi: [PASS][5] -> [DMESG-WARN][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-dsi/igt@gem_exec_create@basic.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-dsi/igt@gem_exec_create@basic.html
- fi-apl-guc: [PASS][7] -> [DMESG-WARN][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-apl-guc/igt@gem_exec_create@basic.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-apl-guc/igt@gem_exec_create@basic.html
- fi-icl-guc: [PASS][9] -> [DMESG-WARN][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-guc/igt@gem_exec_create@basic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-guc/igt@gem_exec_create@basic.html
* igt@gem_exec_fence@nb-await-default:
- fi-bsw-nick: [PASS][11] -> [DMESG-WARN][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-bsw-nick/igt@gem_exec_fence@nb-await-default.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-bsw-nick/igt@gem_exec_fence@nb-await-default.html
* igt@gem_exec_suspend@basic-s0:
- fi-kbl-guc: [PASS][13] -> [DMESG-WARN][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-kbl-guc/igt@gem_exec_suspend@basic-s0.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-kbl-guc/igt@gem_exec_suspend@basic-s0.html
- fi-icl-y: [PASS][15] -> [DMESG-WARN][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-y/igt@gem_exec_suspend@basic-s0.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-y/igt@gem_exec_suspend@basic-s0.html
- fi-icl-u2: [PASS][17] -> [DMESG-WARN][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-u2/igt@gem_exec_suspend@basic-s0.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-u2/igt@gem_exec_suspend@basic-s0.html
* igt@gem_exec_suspend@basic-s3:
- fi-bsw-kefka: [PASS][19] -> [DMESG-WARN][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-bsw-kefka/igt@gem_exec_suspend@basic-s3.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-bsw-kefka/igt@gem_exec_suspend@basic-s3.html
* igt@gem_exec_suspend@basic-s4-devices:
- fi-hsw-4770r: [PASS][21] -> [DMESG-WARN][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-hsw-4770r/igt@gem_exec_suspend@basic-s4-devices.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-hsw-4770r/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_selftest@live_gem_contexts:
- fi-skl-lmem: NOTRUN -> [DMESG-WARN][23]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-skl-lmem/igt@i915_selftest@live_gem_contexts.html
* igt@i915_selftest@live_hangcheck:
- fi-cfl-8700k: [PASS][24] -> [DMESG-WARN][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-cfl-8700k/igt@i915_selftest@live_hangcheck.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-cfl-8700k/igt@i915_selftest@live_hangcheck.html
- fi-cml-u2: [PASS][26] -> [DMESG-WARN][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-cml-u2/igt@i915_selftest@live_hangcheck.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-cml-u2/igt@i915_selftest@live_hangcheck.html
- fi-bsw-n3050: [PASS][28] -> [DMESG-WARN][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-bsw-n3050/igt@i915_selftest@live_hangcheck.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-bsw-n3050/igt@i915_selftest@live_hangcheck.html
* igt@i915_selftest@live_mman:
- fi-snb-2520m: [PASS][30] -> [DMESG-WARN][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-snb-2520m/igt@i915_selftest@live_mman.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-snb-2520m/igt@i915_selftest@live_mman.html
- fi-hsw-peppy: [PASS][32] -> [DMESG-WARN][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-hsw-peppy/igt@i915_selftest@live_mman.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-hsw-peppy/igt@i915_selftest@live_mman.html
- fi-byt-n2820: [PASS][34] -> [DMESG-WARN][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-byt-n2820/igt@i915_selftest@live_mman.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-byt-n2820/igt@i915_selftest@live_mman.html
* igt@i915_selftest@live_requests:
- fi-ivb-3770: [PASS][36] -> [DMESG-WARN][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-ivb-3770/igt@i915_selftest@live_requests.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-ivb-3770/igt@i915_selftest@live_requests.html
* igt@runner@aborted:
- fi-cml-u2: NOTRUN -> [FAIL][38]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-cml-u2/igt@runner@aborted.html
- fi-cfl-8700k: NOTRUN -> [FAIL][39]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-cfl-8700k/igt@runner@aborted.html
- fi-hsw-4770r: NOTRUN -> [FAIL][40]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-hsw-4770r/igt@runner@aborted.html
- fi-apl-guc: NOTRUN -> [FAIL][41]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-apl-guc/igt@runner@aborted.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@gem_exec_create@basic:
- {fi-tgl-u}: [PASS][42] -> [DMESG-WARN][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-tgl-u/igt@gem_exec_create@basic.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-tgl-u/igt@gem_exec_create@basic.html
Known issues
------------
Here are the changes found in Patchwork_15248 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-kbl-x1275: [PASS][44] -> [DMESG-WARN][45] ([fdo#107139])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-kbl-x1275/igt@gem_exec_suspend@basic-s4-devices.html
- fi-kbl-soraka: [PASS][46] -> [DMESG-WARN][47] ([fdo#107139])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-kbl-soraka/igt@gem_exec_suspend@basic-s4-devices.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-kbl-soraka/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_selftest@live_gt_heartbeat:
- fi-cfl-8700k: [PASS][48] -> [DMESG-FAIL][49] ([fdo#112096])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-cfl-8700k/igt@i915_selftest@live_gt_heartbeat.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-cfl-8700k/igt@i915_selftest@live_gt_heartbeat.html
#### Possible fixes ####
* igt@i915_module_load@reload-no-display:
- fi-skl-lmem: [DMESG-WARN][50] ([fdo#112261]) -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-skl-lmem/igt@i915_module_load@reload-no-display.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-skl-lmem/igt@i915_module_load@reload-no-display.html
* igt@kms_chamelium@hdmi-edid-read:
- fi-kbl-7500u: [FAIL][52] ([fdo#109483]) -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-kbl-7500u/igt@kms_chamelium@hdmi-edid-read.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-kbl-7500u/igt@kms_chamelium@hdmi-edid-read.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][54] ([fdo#111045] / [fdo#111096]) -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
#### Warnings ####
* igt@runner@aborted:
- fi-icl-guc: [FAIL][56] ([fdo#110943] / [fdo#111093]) -> [FAIL][57] ([fdo#111093])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7331/fi-icl-guc/igt@runner@aborted.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/fi-icl-guc/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#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
[fdo#110943]: https://bugs.freedesktop.org/show_bug.cgi?id=110943
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111093]: https://bugs.freedesktop.org/show_bug.cgi?id=111093
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#112096]: https://bugs.freedesktop.org/show_bug.cgi?id=112096
[fdo#112261]: https://bugs.freedesktop.org/show_bug.cgi?id=112261
Participating hosts (53 -> 46)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7331 -> Patchwork_15248
CI-20190529: 20190529
CI_DRM_7331: 4ea40d641218a45e90dd213b89a207ce8bec34dd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5276: 868d38c2bc075b6756ebed486db6e7152ed2c5be @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15248: 68bd26fc59334f9a1005c470d518c573aa5c592b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
68bd26fc5933 drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15248/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
2019-11-13 11:10 [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree Chris Wilson
` (2 preceding siblings ...)
2019-11-13 16:01 ` ✗ Fi.CI.BAT: failure " Patchwork
@ 2019-11-13 18:53 ` Chris Wilson
2019-11-13 18:53 ` [Intel-gfx] " Chris Wilson
2019-11-14 16:55 ` Tvrtko Ursulin
2019-11-13 19:18 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2) Patchwork
2019-11-13 19:58 ` ✗ Fi.CI.BAT: failure " Patchwork
5 siblings, 2 replies; 14+ messages in thread
From: Chris Wilson @ 2019-11-13 18:53 UTC (permalink / raw)
To: intel-gfx; +Cc: Matthew Auld
As we want to be able to run inside atomic context for retiring the
i915_active, and we are no longer allowed to abuse mutex_trylock, split
the tree management portion of i915_active.mutex into an irq-safe
spinlock.
References: a0855d24fc22d ("locking/mutex: Complain upon mutex API misuse in IRQ contexts")
References: https://bugs.freedesktop.org/show_bug.cgi?id=111626
Fixes: 274cbf20fd10 ("drm/i915: Push the i915_active.retire into a worker")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/i915_active.c | 57 ++++++++++----------
drivers/gpu/drm/i915/i915_active_types.h | 1 +
drivers/gpu/drm/i915/selftests/i915_active.c | 4 +-
3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
index 207383dda84d..5448f37c8102 100644
--- a/drivers/gpu/drm/i915/i915_active.c
+++ b/drivers/gpu/drm/i915/i915_active.c
@@ -91,14 +91,15 @@ static void debug_active_init(struct i915_active *ref)
static void debug_active_activate(struct i915_active *ref)
{
- lockdep_assert_held(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
if (!atomic_read(&ref->count)) /* before the first inc */
debug_object_activate(ref, &active_debug_desc);
+ spin_unlock_irq(&ref->tree_lock);
}
static void debug_active_deactivate(struct i915_active *ref)
{
- lockdep_assert_held(&ref->mutex);
+ lockdep_assert_held(&ref->tree_lock);
if (!atomic_read(&ref->count)) /* after the last dec */
debug_object_deactivate(ref, &active_debug_desc);
}
@@ -128,29 +129,22 @@ __active_retire(struct i915_active *ref)
{
struct active_node *it, *n;
struct rb_root root;
- bool retire = false;
+ unsigned long flags;
- lockdep_assert_held(&ref->mutex);
GEM_BUG_ON(i915_active_is_idle(ref));
/* return the unused nodes to our slabcache -- flushing the allocator */
- if (atomic_dec_and_test(&ref->count)) {
- debug_active_deactivate(ref);
- root = ref->tree;
- ref->tree = RB_ROOT;
- ref->cache = NULL;
- retire = true;
- }
-
- mutex_unlock(&ref->mutex);
- if (!retire)
+ if (!atomic_dec_and_lock_irqsave(&ref->count, &ref->tree_lock, flags))
return;
GEM_BUG_ON(rcu_access_pointer(ref->excl.fence));
- rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
- GEM_BUG_ON(i915_active_fence_isset(&it->base));
- kmem_cache_free(global.slab_cache, it);
- }
+ debug_active_deactivate(ref);
+
+ root = ref->tree;
+ ref->tree = RB_ROOT;
+ ref->cache = NULL;
+
+ spin_unlock_irqrestore(&ref->tree_lock, flags);
/* After the final retire, the entire struct may be freed */
if (ref->retire)
@@ -158,6 +152,11 @@ __active_retire(struct i915_active *ref)
/* ... except if you wait on it, you must manage your own references! */
wake_up_var(ref);
+
+ rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
+ GEM_BUG_ON(i915_active_fence_isset(&it->base));
+ kmem_cache_free(global.slab_cache, it);
+ }
}
static void
@@ -169,7 +168,6 @@ active_work(struct work_struct *wrk)
if (atomic_add_unless(&ref->count, -1, 1))
return;
- mutex_lock(&ref->mutex);
__active_retire(ref);
}
@@ -180,9 +178,7 @@ active_retire(struct i915_active *ref)
if (atomic_add_unless(&ref->count, -1, 1))
return;
- /* If we are inside interrupt context (fence signaling), defer */
- if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS ||
- !mutex_trylock(&ref->mutex)) {
+ if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS) {
queue_work(system_unbound_wq, &ref->work);
return;
}
@@ -227,7 +223,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
if (!prealloc)
return NULL;
- mutex_lock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
GEM_BUG_ON(i915_active_is_idle(ref));
parent = NULL;
@@ -257,7 +253,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
out:
ref->cache = node;
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
BUILD_BUG_ON(offsetof(typeof(*node), base));
return &node->base;
@@ -278,8 +274,10 @@ void __i915_active_init(struct i915_active *ref,
if (bits & I915_ACTIVE_MAY_SLEEP)
ref->flags |= I915_ACTIVE_RETIRE_SLEEPS;
+ spin_lock_init(&ref->tree_lock);
ref->tree = RB_ROOT;
ref->cache = NULL;
+
init_llist_head(&ref->preallocated_barriers);
atomic_set(&ref->count, 0);
__mutex_init(&ref->mutex, "i915_active", key);
@@ -510,7 +508,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
if (RB_EMPTY_ROOT(&ref->tree))
return NULL;
- mutex_lock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
GEM_BUG_ON(i915_active_is_idle(ref));
/*
@@ -575,7 +573,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
goto match;
}
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
return NULL;
@@ -583,7 +581,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
rb_erase(p, &ref->tree); /* Hide from waits and sibling allocations */
if (p == &ref->cache->node)
ref->cache = NULL;
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
return rb_entry(p, struct active_node, node);
}
@@ -664,6 +662,7 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,
void i915_active_acquire_barrier(struct i915_active *ref)
{
struct llist_node *pos, *next;
+ unsigned long flags;
GEM_BUG_ON(i915_active_is_idle(ref));
@@ -673,7 +672,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
* populated by i915_request_add_active_barriers() to point to the
* request that will eventually release them.
*/
- mutex_lock_nested(&ref->mutex, SINGLE_DEPTH_NESTING);
+ spin_lock_irqsave_nested(&ref->tree_lock, flags, SINGLE_DEPTH_NESTING);
llist_for_each_safe(pos, next, take_preallocated_barriers(ref)) {
struct active_node *node = barrier_from_ll(pos);
struct intel_engine_cs *engine = barrier_to_engine(node);
@@ -699,7 +698,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
llist_add(barrier_to_ll(node), &engine->barrier_tasks);
intel_engine_pm_put(engine);
}
- mutex_unlock(&ref->mutex);
+ spin_unlock_irqrestore(&ref->tree_lock, flags);
}
void i915_request_add_active_barriers(struct i915_request *rq)
diff --git a/drivers/gpu/drm/i915/i915_active_types.h b/drivers/gpu/drm/i915/i915_active_types.h
index d89a74c142c6..96aed0ee700a 100644
--- a/drivers/gpu/drm/i915/i915_active_types.h
+++ b/drivers/gpu/drm/i915/i915_active_types.h
@@ -48,6 +48,7 @@ struct i915_active {
atomic_t count;
struct mutex mutex;
+ spinlock_t tree_lock;
struct active_node *cache;
struct rb_root tree;
diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c
index f3fa05c78d78..60290f78750d 100644
--- a/drivers/gpu/drm/i915/selftests/i915_active.c
+++ b/drivers/gpu/drm/i915/selftests/i915_active.c
@@ -277,8 +277,8 @@ void i915_active_unlock_wait(struct i915_active *ref)
}
/* And wait for the retire callback */
- mutex_lock(&ref->mutex);
- mutex_unlock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
+ spin_unlock_irq(&ref->tree_lock);
/* ... which may have been on a thread instead */
flush_work(&ref->work);
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Intel-gfx] [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
2019-11-13 18:53 ` [PATCH] " Chris Wilson
@ 2019-11-13 18:53 ` Chris Wilson
2019-11-14 16:55 ` Tvrtko Ursulin
1 sibling, 0 replies; 14+ messages in thread
From: Chris Wilson @ 2019-11-13 18:53 UTC (permalink / raw)
To: intel-gfx; +Cc: Matthew Auld
As we want to be able to run inside atomic context for retiring the
i915_active, and we are no longer allowed to abuse mutex_trylock, split
the tree management portion of i915_active.mutex into an irq-safe
spinlock.
References: a0855d24fc22d ("locking/mutex: Complain upon mutex API misuse in IRQ contexts")
References: https://bugs.freedesktop.org/show_bug.cgi?id=111626
Fixes: 274cbf20fd10 ("drm/i915: Push the i915_active.retire into a worker")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/i915_active.c | 57 ++++++++++----------
drivers/gpu/drm/i915/i915_active_types.h | 1 +
drivers/gpu/drm/i915/selftests/i915_active.c | 4 +-
3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
index 207383dda84d..5448f37c8102 100644
--- a/drivers/gpu/drm/i915/i915_active.c
+++ b/drivers/gpu/drm/i915/i915_active.c
@@ -91,14 +91,15 @@ static void debug_active_init(struct i915_active *ref)
static void debug_active_activate(struct i915_active *ref)
{
- lockdep_assert_held(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
if (!atomic_read(&ref->count)) /* before the first inc */
debug_object_activate(ref, &active_debug_desc);
+ spin_unlock_irq(&ref->tree_lock);
}
static void debug_active_deactivate(struct i915_active *ref)
{
- lockdep_assert_held(&ref->mutex);
+ lockdep_assert_held(&ref->tree_lock);
if (!atomic_read(&ref->count)) /* after the last dec */
debug_object_deactivate(ref, &active_debug_desc);
}
@@ -128,29 +129,22 @@ __active_retire(struct i915_active *ref)
{
struct active_node *it, *n;
struct rb_root root;
- bool retire = false;
+ unsigned long flags;
- lockdep_assert_held(&ref->mutex);
GEM_BUG_ON(i915_active_is_idle(ref));
/* return the unused nodes to our slabcache -- flushing the allocator */
- if (atomic_dec_and_test(&ref->count)) {
- debug_active_deactivate(ref);
- root = ref->tree;
- ref->tree = RB_ROOT;
- ref->cache = NULL;
- retire = true;
- }
-
- mutex_unlock(&ref->mutex);
- if (!retire)
+ if (!atomic_dec_and_lock_irqsave(&ref->count, &ref->tree_lock, flags))
return;
GEM_BUG_ON(rcu_access_pointer(ref->excl.fence));
- rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
- GEM_BUG_ON(i915_active_fence_isset(&it->base));
- kmem_cache_free(global.slab_cache, it);
- }
+ debug_active_deactivate(ref);
+
+ root = ref->tree;
+ ref->tree = RB_ROOT;
+ ref->cache = NULL;
+
+ spin_unlock_irqrestore(&ref->tree_lock, flags);
/* After the final retire, the entire struct may be freed */
if (ref->retire)
@@ -158,6 +152,11 @@ __active_retire(struct i915_active *ref)
/* ... except if you wait on it, you must manage your own references! */
wake_up_var(ref);
+
+ rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
+ GEM_BUG_ON(i915_active_fence_isset(&it->base));
+ kmem_cache_free(global.slab_cache, it);
+ }
}
static void
@@ -169,7 +168,6 @@ active_work(struct work_struct *wrk)
if (atomic_add_unless(&ref->count, -1, 1))
return;
- mutex_lock(&ref->mutex);
__active_retire(ref);
}
@@ -180,9 +178,7 @@ active_retire(struct i915_active *ref)
if (atomic_add_unless(&ref->count, -1, 1))
return;
- /* If we are inside interrupt context (fence signaling), defer */
- if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS ||
- !mutex_trylock(&ref->mutex)) {
+ if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS) {
queue_work(system_unbound_wq, &ref->work);
return;
}
@@ -227,7 +223,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
if (!prealloc)
return NULL;
- mutex_lock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
GEM_BUG_ON(i915_active_is_idle(ref));
parent = NULL;
@@ -257,7 +253,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
out:
ref->cache = node;
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
BUILD_BUG_ON(offsetof(typeof(*node), base));
return &node->base;
@@ -278,8 +274,10 @@ void __i915_active_init(struct i915_active *ref,
if (bits & I915_ACTIVE_MAY_SLEEP)
ref->flags |= I915_ACTIVE_RETIRE_SLEEPS;
+ spin_lock_init(&ref->tree_lock);
ref->tree = RB_ROOT;
ref->cache = NULL;
+
init_llist_head(&ref->preallocated_barriers);
atomic_set(&ref->count, 0);
__mutex_init(&ref->mutex, "i915_active", key);
@@ -510,7 +508,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
if (RB_EMPTY_ROOT(&ref->tree))
return NULL;
- mutex_lock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
GEM_BUG_ON(i915_active_is_idle(ref));
/*
@@ -575,7 +573,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
goto match;
}
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
return NULL;
@@ -583,7 +581,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
rb_erase(p, &ref->tree); /* Hide from waits and sibling allocations */
if (p == &ref->cache->node)
ref->cache = NULL;
- mutex_unlock(&ref->mutex);
+ spin_unlock_irq(&ref->tree_lock);
return rb_entry(p, struct active_node, node);
}
@@ -664,6 +662,7 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,
void i915_active_acquire_barrier(struct i915_active *ref)
{
struct llist_node *pos, *next;
+ unsigned long flags;
GEM_BUG_ON(i915_active_is_idle(ref));
@@ -673,7 +672,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
* populated by i915_request_add_active_barriers() to point to the
* request that will eventually release them.
*/
- mutex_lock_nested(&ref->mutex, SINGLE_DEPTH_NESTING);
+ spin_lock_irqsave_nested(&ref->tree_lock, flags, SINGLE_DEPTH_NESTING);
llist_for_each_safe(pos, next, take_preallocated_barriers(ref)) {
struct active_node *node = barrier_from_ll(pos);
struct intel_engine_cs *engine = barrier_to_engine(node);
@@ -699,7 +698,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
llist_add(barrier_to_ll(node), &engine->barrier_tasks);
intel_engine_pm_put(engine);
}
- mutex_unlock(&ref->mutex);
+ spin_unlock_irqrestore(&ref->tree_lock, flags);
}
void i915_request_add_active_barriers(struct i915_request *rq)
diff --git a/drivers/gpu/drm/i915/i915_active_types.h b/drivers/gpu/drm/i915/i915_active_types.h
index d89a74c142c6..96aed0ee700a 100644
--- a/drivers/gpu/drm/i915/i915_active_types.h
+++ b/drivers/gpu/drm/i915/i915_active_types.h
@@ -48,6 +48,7 @@ struct i915_active {
atomic_t count;
struct mutex mutex;
+ spinlock_t tree_lock;
struct active_node *cache;
struct rb_root tree;
diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c
index f3fa05c78d78..60290f78750d 100644
--- a/drivers/gpu/drm/i915/selftests/i915_active.c
+++ b/drivers/gpu/drm/i915/selftests/i915_active.c
@@ -277,8 +277,8 @@ void i915_active_unlock_wait(struct i915_active *ref)
}
/* And wait for the retire callback */
- mutex_lock(&ref->mutex);
- mutex_unlock(&ref->mutex);
+ spin_lock_irq(&ref->tree_lock);
+ spin_unlock_irq(&ref->tree_lock);
/* ... which may have been on a thread instead */
flush_work(&ref->work);
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2)
2019-11-13 11:10 [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree Chris Wilson
` (3 preceding siblings ...)
2019-11-13 18:53 ` [PATCH] " Chris Wilson
@ 2019-11-13 19:18 ` Patchwork
2019-11-13 19:18 ` [Intel-gfx] " Patchwork
2019-11-13 19:58 ` ✗ Fi.CI.BAT: failure " Patchwork
5 siblings, 1 reply; 14+ messages in thread
From: Patchwork @ 2019-11-13 19:18 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2)
URL : https://patchwork.freedesktop.org/series/69399/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
70ca71d22f04 drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
-:12: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#12:
References: a0855d24fc22d ("locking/mutex: Complain upon mutex API misuse in IRQ contexts")
-:201: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment
#201: FILE: drivers/gpu/drm/i915/i915_active_types.h:51:
+ spinlock_t tree_lock;
total: 0 errors, 1 warnings, 1 checks, 173 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2)
2019-11-13 19:18 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2) Patchwork
@ 2019-11-13 19:18 ` Patchwork
0 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2019-11-13 19:18 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2)
URL : https://patchwork.freedesktop.org/series/69399/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
70ca71d22f04 drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
-:12: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#12:
References: a0855d24fc22d ("locking/mutex: Complain upon mutex API misuse in IRQ contexts")
-:201: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment
#201: FILE: drivers/gpu/drm/i915/i915_active_types.h:51:
+ spinlock_t tree_lock;
total: 0 errors, 1 warnings, 1 checks, 173 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2)
2019-11-13 11:10 [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree Chris Wilson
` (4 preceding siblings ...)
2019-11-13 19:18 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2) Patchwork
@ 2019-11-13 19:58 ` Patchwork
2019-11-13 19:58 ` [Intel-gfx] " Patchwork
5 siblings, 1 reply; 14+ messages in thread
From: Patchwork @ 2019-11-13 19:58 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2)
URL : https://patchwork.freedesktop.org/series/69399/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7332 -> Patchwork_15253
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15253 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_15253, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15253:
### IGT changes ###
#### Possible regressions ####
* igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
Known issues
------------
Here are the changes found in Patchwork_15253 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic:
- fi-icl-guc: [PASS][3] -> [FAIL][4] ([fdo#111699])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-icl-guc/igt@gem_exec_suspend@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-icl-guc/igt@gem_exec_suspend@basic.html
* igt@i915_selftest@live_blt:
- fi-hsw-peppy: [PASS][5] -> [DMESG-FAIL][6] ([fdo#112147])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-hsw-peppy/igt@i915_selftest@live_blt.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-hsw-peppy/igt@i915_selftest@live_blt.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-icl-u2: [PASS][7] -> [FAIL][8] ([fdo#109635 ])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-skl-6770hq: [PASS][9] -> [WARN][10] ([fdo#112252])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-skl-6770hq/igt@kms_setmode@basic-clone-single-crtc.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-skl-6770hq/igt@kms_setmode@basic-clone-single-crtc.html
#### Possible fixes ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-hsw-4770: [SKIP][11] ([fdo#109271]) -> [PASS][12] +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-hsw-4770/igt@i915_pm_rpm@basic-pci-d3-state.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-hsw-4770/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@i915_pm_rpm@module-reload:
- fi-skl-lmem: [DMESG-WARN][13] ([fdo#112261]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-skl-lmem/igt@i915_pm_rpm@module-reload.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-skl-lmem/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live_hangcheck:
- fi-hsw-4770r: [DMESG-FAIL][15] ([fdo#111991]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-hsw-4770r/igt@i915_selftest@live_hangcheck.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-hsw-4770r/igt@i915_selftest@live_hangcheck.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][17] ([fdo#111407]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109635 ]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#109964]: https://bugs.freedesktop.org/show_bug.cgi?id=109964
[fdo#110343]: https://bugs.freedesktop.org/show_bug.cgi?id=110343
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[fdo#111699]: https://bugs.freedesktop.org/show_bug.cgi?id=111699
[fdo#111991]: https://bugs.freedesktop.org/show_bug.cgi?id=111991
[fdo#112147]: https://bugs.freedesktop.org/show_bug.cgi?id=112147
[fdo#112252]: https://bugs.freedesktop.org/show_bug.cgi?id=112252
[fdo#112261]: https://bugs.freedesktop.org/show_bug.cgi?id=112261
Participating hosts (52 -> 45)
------------------------------
Missing (7): fi-ilk-m540 fi-tgl-u fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7332 -> Patchwork_15253
CI-20190529: 20190529
CI_DRM_7332: e8c9ce4930c1451ad4a43449fdf2c882da8921e8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5276: 868d38c2bc075b6756ebed486db6e7152ed2c5be @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15253: 70ca71d22f046404f3adff15a5b85c34b574db46 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
70ca71d22f04 drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2)
2019-11-13 19:58 ` ✗ Fi.CI.BAT: failure " Patchwork
@ 2019-11-13 19:58 ` Patchwork
0 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2019-11-13 19:58 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2)
URL : https://patchwork.freedesktop.org/series/69399/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7332 -> Patchwork_15253
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15253 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_15253, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15253:
### IGT changes ###
#### Possible regressions ####
* igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
Known issues
------------
Here are the changes found in Patchwork_15253 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic:
- fi-icl-guc: [PASS][3] -> [FAIL][4] ([fdo#111699])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-icl-guc/igt@gem_exec_suspend@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-icl-guc/igt@gem_exec_suspend@basic.html
* igt@i915_selftest@live_blt:
- fi-hsw-peppy: [PASS][5] -> [DMESG-FAIL][6] ([fdo#112147])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-hsw-peppy/igt@i915_selftest@live_blt.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-hsw-peppy/igt@i915_selftest@live_blt.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-icl-u2: [PASS][7] -> [FAIL][8] ([fdo#109635 ])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-icl-u2/igt@kms_chamelium@hdmi-crc-fast.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-skl-6770hq: [PASS][9] -> [WARN][10] ([fdo#112252])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-skl-6770hq/igt@kms_setmode@basic-clone-single-crtc.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-skl-6770hq/igt@kms_setmode@basic-clone-single-crtc.html
#### Possible fixes ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-hsw-4770: [SKIP][11] ([fdo#109271]) -> [PASS][12] +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-hsw-4770/igt@i915_pm_rpm@basic-pci-d3-state.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-hsw-4770/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@i915_pm_rpm@module-reload:
- fi-skl-lmem: [DMESG-WARN][13] ([fdo#112261]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-skl-lmem/igt@i915_pm_rpm@module-reload.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-skl-lmem/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live_hangcheck:
- fi-hsw-4770r: [DMESG-FAIL][15] ([fdo#111991]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-hsw-4770r/igt@i915_selftest@live_hangcheck.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-hsw-4770r/igt@i915_selftest@live_hangcheck.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][17] ([fdo#111407]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7332/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109635 ]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#109964]: https://bugs.freedesktop.org/show_bug.cgi?id=109964
[fdo#110343]: https://bugs.freedesktop.org/show_bug.cgi?id=110343
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[fdo#111699]: https://bugs.freedesktop.org/show_bug.cgi?id=111699
[fdo#111991]: https://bugs.freedesktop.org/show_bug.cgi?id=111991
[fdo#112147]: https://bugs.freedesktop.org/show_bug.cgi?id=112147
[fdo#112252]: https://bugs.freedesktop.org/show_bug.cgi?id=112252
[fdo#112261]: https://bugs.freedesktop.org/show_bug.cgi?id=112261
Participating hosts (52 -> 45)
------------------------------
Missing (7): fi-ilk-m540 fi-tgl-u fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7332 -> Patchwork_15253
CI-20190529: 20190529
CI_DRM_7332: e8c9ce4930c1451ad4a43449fdf2c882da8921e8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5276: 868d38c2bc075b6756ebed486db6e7152ed2c5be @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15253: 70ca71d22f046404f3adff15a5b85c34b574db46 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
70ca71d22f04 drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15253/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
2019-11-13 18:53 ` [PATCH] " Chris Wilson
2019-11-13 18:53 ` [Intel-gfx] " Chris Wilson
@ 2019-11-14 16:55 ` Tvrtko Ursulin
2019-11-14 16:55 ` [Intel-gfx] " Tvrtko Ursulin
1 sibling, 1 reply; 14+ messages in thread
From: Tvrtko Ursulin @ 2019-11-14 16:55 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Matthew Auld
On 13/11/2019 18:53, Chris Wilson wrote:
> As we want to be able to run inside atomic context for retiring the
> i915_active, and we are no longer allowed to abuse mutex_trylock, split
> the tree management portion of i915_active.mutex into an irq-safe
> spinlock.
>
> References: a0855d24fc22d ("locking/mutex: Complain upon mutex API misuse in IRQ contexts")
> References: https://bugs.freedesktop.org/show_bug.cgi?id=111626
> Fixes: 274cbf20fd10 ("drm/i915: Push the i915_active.retire into a worker")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Cc: Matthew Auld <matthew.auld@intel.com>
> ---
> drivers/gpu/drm/i915/i915_active.c | 57 ++++++++++----------
> drivers/gpu/drm/i915/i915_active_types.h | 1 +
> drivers/gpu/drm/i915/selftests/i915_active.c | 4 +-
> 3 files changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
> index 207383dda84d..5448f37c8102 100644
> --- a/drivers/gpu/drm/i915/i915_active.c
> +++ b/drivers/gpu/drm/i915/i915_active.c
> @@ -91,14 +91,15 @@ static void debug_active_init(struct i915_active *ref)
>
> static void debug_active_activate(struct i915_active *ref)
> {
> - lockdep_assert_held(&ref->mutex);
> + spin_lock_irq(&ref->tree_lock);
> if (!atomic_read(&ref->count)) /* before the first inc */
> debug_object_activate(ref, &active_debug_desc);
> + spin_unlock_irq(&ref->tree_lock);
> }
>
> static void debug_active_deactivate(struct i915_active *ref)
> {
> - lockdep_assert_held(&ref->mutex);
> + lockdep_assert_held(&ref->tree_lock);
> if (!atomic_read(&ref->count)) /* after the last dec */
> debug_object_deactivate(ref, &active_debug_desc);
> }
> @@ -128,29 +129,22 @@ __active_retire(struct i915_active *ref)
> {
> struct active_node *it, *n;
> struct rb_root root;
> - bool retire = false;
> + unsigned long flags;
>
> - lockdep_assert_held(&ref->mutex);
> GEM_BUG_ON(i915_active_is_idle(ref));
>
> /* return the unused nodes to our slabcache -- flushing the allocator */
> - if (atomic_dec_and_test(&ref->count)) {
> - debug_active_deactivate(ref);
> - root = ref->tree;
> - ref->tree = RB_ROOT;
> - ref->cache = NULL;
> - retire = true;
> - }
> -
> - mutex_unlock(&ref->mutex);
> - if (!retire)
> + if (!atomic_dec_and_lock_irqsave(&ref->count, &ref->tree_lock, flags))
> return;
>
> GEM_BUG_ON(rcu_access_pointer(ref->excl.fence));
> - rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
> - GEM_BUG_ON(i915_active_fence_isset(&it->base));
> - kmem_cache_free(global.slab_cache, it);
> - }
> + debug_active_deactivate(ref);
> +
> + root = ref->tree;
> + ref->tree = RB_ROOT;
> + ref->cache = NULL;
> +
> + spin_unlock_irqrestore(&ref->tree_lock, flags);
>
> /* After the final retire, the entire struct may be freed */
> if (ref->retire)
> @@ -158,6 +152,11 @@ __active_retire(struct i915_active *ref)
>
> /* ... except if you wait on it, you must manage your own references! */
> wake_up_var(ref);
> +
> + rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
> + GEM_BUG_ON(i915_active_fence_isset(&it->base));
> + kmem_cache_free(global.slab_cache, it);
> + }
> }
>
> static void
> @@ -169,7 +168,6 @@ active_work(struct work_struct *wrk)
> if (atomic_add_unless(&ref->count, -1, 1))
> return;
>
> - mutex_lock(&ref->mutex);
> __active_retire(ref);
> }
>
> @@ -180,9 +178,7 @@ active_retire(struct i915_active *ref)
> if (atomic_add_unless(&ref->count, -1, 1))
> return;
>
> - /* If we are inside interrupt context (fence signaling), defer */
> - if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS ||
> - !mutex_trylock(&ref->mutex)) {
> + if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS) {
> queue_work(system_unbound_wq, &ref->work);
> return;
> }
> @@ -227,7 +223,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
> if (!prealloc)
> return NULL;
>
> - mutex_lock(&ref->mutex);
> + spin_lock_irq(&ref->tree_lock);
> GEM_BUG_ON(i915_active_is_idle(ref));
>
> parent = NULL;
> @@ -257,7 +253,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
>
> out:
> ref->cache = node;
> - mutex_unlock(&ref->mutex);
> + spin_unlock_irq(&ref->tree_lock);
>
> BUILD_BUG_ON(offsetof(typeof(*node), base));
> return &node->base;
> @@ -278,8 +274,10 @@ void __i915_active_init(struct i915_active *ref,
> if (bits & I915_ACTIVE_MAY_SLEEP)
> ref->flags |= I915_ACTIVE_RETIRE_SLEEPS;
>
> + spin_lock_init(&ref->tree_lock);
> ref->tree = RB_ROOT;
> ref->cache = NULL;
> +
> init_llist_head(&ref->preallocated_barriers);
> atomic_set(&ref->count, 0);
> __mutex_init(&ref->mutex, "i915_active", key);
> @@ -510,7 +508,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
> if (RB_EMPTY_ROOT(&ref->tree))
> return NULL;
>
> - mutex_lock(&ref->mutex);
> + spin_lock_irq(&ref->tree_lock);
> GEM_BUG_ON(i915_active_is_idle(ref));
>
> /*
> @@ -575,7 +573,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
> goto match;
> }
>
> - mutex_unlock(&ref->mutex);
> + spin_unlock_irq(&ref->tree_lock);
>
> return NULL;
>
> @@ -583,7 +581,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
> rb_erase(p, &ref->tree); /* Hide from waits and sibling allocations */
> if (p == &ref->cache->node)
> ref->cache = NULL;
> - mutex_unlock(&ref->mutex);
> + spin_unlock_irq(&ref->tree_lock);
>
> return rb_entry(p, struct active_node, node);
> }
> @@ -664,6 +662,7 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,
> void i915_active_acquire_barrier(struct i915_active *ref)
> {
> struct llist_node *pos, *next;
> + unsigned long flags;
>
> GEM_BUG_ON(i915_active_is_idle(ref));
>
> @@ -673,7 +672,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
> * populated by i915_request_add_active_barriers() to point to the
> * request that will eventually release them.
> */
> - mutex_lock_nested(&ref->mutex, SINGLE_DEPTH_NESTING);
> + spin_lock_irqsave_nested(&ref->tree_lock, flags, SINGLE_DEPTH_NESTING);
> llist_for_each_safe(pos, next, take_preallocated_barriers(ref)) {
> struct active_node *node = barrier_from_ll(pos);
> struct intel_engine_cs *engine = barrier_to_engine(node);
> @@ -699,7 +698,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
> llist_add(barrier_to_ll(node), &engine->barrier_tasks);
> intel_engine_pm_put(engine);
> }
> - mutex_unlock(&ref->mutex);
> + spin_unlock_irqrestore(&ref->tree_lock, flags);
> }
>
> void i915_request_add_active_barriers(struct i915_request *rq)
> diff --git a/drivers/gpu/drm/i915/i915_active_types.h b/drivers/gpu/drm/i915/i915_active_types.h
> index d89a74c142c6..96aed0ee700a 100644
> --- a/drivers/gpu/drm/i915/i915_active_types.h
> +++ b/drivers/gpu/drm/i915/i915_active_types.h
> @@ -48,6 +48,7 @@ struct i915_active {
> atomic_t count;
> struct mutex mutex;
>
> + spinlock_t tree_lock;
> struct active_node *cache;
> struct rb_root tree;
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c
> index f3fa05c78d78..60290f78750d 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_active.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_active.c
> @@ -277,8 +277,8 @@ void i915_active_unlock_wait(struct i915_active *ref)
> }
>
> /* And wait for the retire callback */
> - mutex_lock(&ref->mutex);
> - mutex_unlock(&ref->mutex);
> + spin_lock_irq(&ref->tree_lock);
> + spin_unlock_irq(&ref->tree_lock);
>
> /* ... which may have been on a thread instead */
> flush_work(&ref->work);
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree
2019-11-14 16:55 ` Tvrtko Ursulin
@ 2019-11-14 16:55 ` Tvrtko Ursulin
0 siblings, 0 replies; 14+ messages in thread
From: Tvrtko Ursulin @ 2019-11-14 16:55 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Matthew Auld
On 13/11/2019 18:53, Chris Wilson wrote:
> As we want to be able to run inside atomic context for retiring the
> i915_active, and we are no longer allowed to abuse mutex_trylock, split
> the tree management portion of i915_active.mutex into an irq-safe
> spinlock.
>
> References: a0855d24fc22d ("locking/mutex: Complain upon mutex API misuse in IRQ contexts")
> References: https://bugs.freedesktop.org/show_bug.cgi?id=111626
> Fixes: 274cbf20fd10 ("drm/i915: Push the i915_active.retire into a worker")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Cc: Matthew Auld <matthew.auld@intel.com>
> ---
> drivers/gpu/drm/i915/i915_active.c | 57 ++++++++++----------
> drivers/gpu/drm/i915/i915_active_types.h | 1 +
> drivers/gpu/drm/i915/selftests/i915_active.c | 4 +-
> 3 files changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
> index 207383dda84d..5448f37c8102 100644
> --- a/drivers/gpu/drm/i915/i915_active.c
> +++ b/drivers/gpu/drm/i915/i915_active.c
> @@ -91,14 +91,15 @@ static void debug_active_init(struct i915_active *ref)
>
> static void debug_active_activate(struct i915_active *ref)
> {
> - lockdep_assert_held(&ref->mutex);
> + spin_lock_irq(&ref->tree_lock);
> if (!atomic_read(&ref->count)) /* before the first inc */
> debug_object_activate(ref, &active_debug_desc);
> + spin_unlock_irq(&ref->tree_lock);
> }
>
> static void debug_active_deactivate(struct i915_active *ref)
> {
> - lockdep_assert_held(&ref->mutex);
> + lockdep_assert_held(&ref->tree_lock);
> if (!atomic_read(&ref->count)) /* after the last dec */
> debug_object_deactivate(ref, &active_debug_desc);
> }
> @@ -128,29 +129,22 @@ __active_retire(struct i915_active *ref)
> {
> struct active_node *it, *n;
> struct rb_root root;
> - bool retire = false;
> + unsigned long flags;
>
> - lockdep_assert_held(&ref->mutex);
> GEM_BUG_ON(i915_active_is_idle(ref));
>
> /* return the unused nodes to our slabcache -- flushing the allocator */
> - if (atomic_dec_and_test(&ref->count)) {
> - debug_active_deactivate(ref);
> - root = ref->tree;
> - ref->tree = RB_ROOT;
> - ref->cache = NULL;
> - retire = true;
> - }
> -
> - mutex_unlock(&ref->mutex);
> - if (!retire)
> + if (!atomic_dec_and_lock_irqsave(&ref->count, &ref->tree_lock, flags))
> return;
>
> GEM_BUG_ON(rcu_access_pointer(ref->excl.fence));
> - rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
> - GEM_BUG_ON(i915_active_fence_isset(&it->base));
> - kmem_cache_free(global.slab_cache, it);
> - }
> + debug_active_deactivate(ref);
> +
> + root = ref->tree;
> + ref->tree = RB_ROOT;
> + ref->cache = NULL;
> +
> + spin_unlock_irqrestore(&ref->tree_lock, flags);
>
> /* After the final retire, the entire struct may be freed */
> if (ref->retire)
> @@ -158,6 +152,11 @@ __active_retire(struct i915_active *ref)
>
> /* ... except if you wait on it, you must manage your own references! */
> wake_up_var(ref);
> +
> + rbtree_postorder_for_each_entry_safe(it, n, &root, node) {
> + GEM_BUG_ON(i915_active_fence_isset(&it->base));
> + kmem_cache_free(global.slab_cache, it);
> + }
> }
>
> static void
> @@ -169,7 +168,6 @@ active_work(struct work_struct *wrk)
> if (atomic_add_unless(&ref->count, -1, 1))
> return;
>
> - mutex_lock(&ref->mutex);
> __active_retire(ref);
> }
>
> @@ -180,9 +178,7 @@ active_retire(struct i915_active *ref)
> if (atomic_add_unless(&ref->count, -1, 1))
> return;
>
> - /* If we are inside interrupt context (fence signaling), defer */
> - if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS ||
> - !mutex_trylock(&ref->mutex)) {
> + if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS) {
> queue_work(system_unbound_wq, &ref->work);
> return;
> }
> @@ -227,7 +223,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
> if (!prealloc)
> return NULL;
>
> - mutex_lock(&ref->mutex);
> + spin_lock_irq(&ref->tree_lock);
> GEM_BUG_ON(i915_active_is_idle(ref));
>
> parent = NULL;
> @@ -257,7 +253,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl)
>
> out:
> ref->cache = node;
> - mutex_unlock(&ref->mutex);
> + spin_unlock_irq(&ref->tree_lock);
>
> BUILD_BUG_ON(offsetof(typeof(*node), base));
> return &node->base;
> @@ -278,8 +274,10 @@ void __i915_active_init(struct i915_active *ref,
> if (bits & I915_ACTIVE_MAY_SLEEP)
> ref->flags |= I915_ACTIVE_RETIRE_SLEEPS;
>
> + spin_lock_init(&ref->tree_lock);
> ref->tree = RB_ROOT;
> ref->cache = NULL;
> +
> init_llist_head(&ref->preallocated_barriers);
> atomic_set(&ref->count, 0);
> __mutex_init(&ref->mutex, "i915_active", key);
> @@ -510,7 +508,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
> if (RB_EMPTY_ROOT(&ref->tree))
> return NULL;
>
> - mutex_lock(&ref->mutex);
> + spin_lock_irq(&ref->tree_lock);
> GEM_BUG_ON(i915_active_is_idle(ref));
>
> /*
> @@ -575,7 +573,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
> goto match;
> }
>
> - mutex_unlock(&ref->mutex);
> + spin_unlock_irq(&ref->tree_lock);
>
> return NULL;
>
> @@ -583,7 +581,7 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
> rb_erase(p, &ref->tree); /* Hide from waits and sibling allocations */
> if (p == &ref->cache->node)
> ref->cache = NULL;
> - mutex_unlock(&ref->mutex);
> + spin_unlock_irq(&ref->tree_lock);
>
> return rb_entry(p, struct active_node, node);
> }
> @@ -664,6 +662,7 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,
> void i915_active_acquire_barrier(struct i915_active *ref)
> {
> struct llist_node *pos, *next;
> + unsigned long flags;
>
> GEM_BUG_ON(i915_active_is_idle(ref));
>
> @@ -673,7 +672,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
> * populated by i915_request_add_active_barriers() to point to the
> * request that will eventually release them.
> */
> - mutex_lock_nested(&ref->mutex, SINGLE_DEPTH_NESTING);
> + spin_lock_irqsave_nested(&ref->tree_lock, flags, SINGLE_DEPTH_NESTING);
> llist_for_each_safe(pos, next, take_preallocated_barriers(ref)) {
> struct active_node *node = barrier_from_ll(pos);
> struct intel_engine_cs *engine = barrier_to_engine(node);
> @@ -699,7 +698,7 @@ void i915_active_acquire_barrier(struct i915_active *ref)
> llist_add(barrier_to_ll(node), &engine->barrier_tasks);
> intel_engine_pm_put(engine);
> }
> - mutex_unlock(&ref->mutex);
> + spin_unlock_irqrestore(&ref->tree_lock, flags);
> }
>
> void i915_request_add_active_barriers(struct i915_request *rq)
> diff --git a/drivers/gpu/drm/i915/i915_active_types.h b/drivers/gpu/drm/i915/i915_active_types.h
> index d89a74c142c6..96aed0ee700a 100644
> --- a/drivers/gpu/drm/i915/i915_active_types.h
> +++ b/drivers/gpu/drm/i915/i915_active_types.h
> @@ -48,6 +48,7 @@ struct i915_active {
> atomic_t count;
> struct mutex mutex;
>
> + spinlock_t tree_lock;
> struct active_node *cache;
> struct rb_root tree;
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c
> index f3fa05c78d78..60290f78750d 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_active.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_active.c
> @@ -277,8 +277,8 @@ void i915_active_unlock_wait(struct i915_active *ref)
> }
>
> /* And wait for the retire callback */
> - mutex_lock(&ref->mutex);
> - mutex_unlock(&ref->mutex);
> + spin_lock_irq(&ref->tree_lock);
> + spin_unlock_irq(&ref->tree_lock);
>
> /* ... which may have been on a thread instead */
> flush_work(&ref->work);
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-11-14 16:55 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-13 11:10 [PATCH] drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree Chris Wilson
2019-11-13 11:10 ` [Intel-gfx] " Chris Wilson
2019-11-13 15:40 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-11-13 15:40 ` [Intel-gfx] " Patchwork
2019-11-13 16:01 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-11-13 16:01 ` [Intel-gfx] " Patchwork
2019-11-13 18:53 ` [PATCH] " Chris Wilson
2019-11-13 18:53 ` [Intel-gfx] " Chris Wilson
2019-11-14 16:55 ` Tvrtko Ursulin
2019-11-14 16:55 ` [Intel-gfx] " Tvrtko Ursulin
2019-11-13 19:18 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Split i915_active.mutex into an irq-safe spinlock for the rbtree (rev2) Patchwork
2019-11-13 19:18 ` [Intel-gfx] " Patchwork
2019-11-13 19:58 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-11-13 19:58 ` [Intel-gfx] " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).