@@ -788,8 +788,13 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
* node kept alive (as we reuse before parking). We prefer to reuse
* completely idle barriers (less hassle in manipulating the llists),
* but otherwise any will do.
+ *
+ * We reuse the request field to mark this as being our proto-node.
*/
- if (ref->cache && is_idle_barrier(ref->cache, idx)) {
+ if (ref->cache && is_idle_barrier(ref->cache, idx) &&
+ !cmpxchg(__active_fence_slot(&ref->cache->base), NULL,
+ ERR_PTR(-EAGAIN))) {
+ __i915_active_acquire(ref);
p = &ref->cache->node;
goto match;
}
@@ -800,8 +805,12 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
struct active_node *node =
rb_entry(p, struct active_node, node);
- if (is_idle_barrier(node, idx))
+ if (is_idle_barrier(node, idx) &&
+ !cmpxchg(__active_fence_slot(&node->base), NULL,
+ ERR_PTR(-EAGAIN))) {
+ __i915_active_acquire(ref);
goto match;
+ }
prev = p;
if (node->timeline < idx)
@@ -827,8 +836,12 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)
if (node->timeline < idx)
continue;
- if (is_idle_barrier(node, idx))
+ if (is_idle_barrier(node, idx) &&
+ !cmpxchg(__active_fence_slot(&node->base), NULL,
+ ERR_PTR(-EAGAIN))) {
+ __i915_active_acquire(ref);
goto match;
+ }
/*
* The list of pending barriers is protected by the
@@ -889,29 +902,24 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,
if (!node)
goto unwind;
- RCU_INIT_POINTER(node->base.fence, NULL);
+ /* Mark this as being our unconnected proto-node */
+ RCU_INIT_POINTER(node->base.fence, ERR_PTR(-EAGAIN));
node->base.cb.func = node_retire;
node->timeline = idx;
node->ref = ref;
- }
-
- if (!i915_active_fence_isset(&node->base)) {
- /*
- * Mark this as being *our* unconnected proto-node.
- *
- * Since this node is not in any list, and we have
- * decoupled it from the rbtree, we can reuse the
- * request to indicate this is an idle-barrier node
- * and then we can use the rb_node and list pointers
- * for our tracking of the pending barrier.
- */
- RCU_INIT_POINTER(node->base.fence, ERR_PTR(-EAGAIN));
- node->base.cb.node.prev = (void *)engine;
__i915_active_acquire(ref);
+ } else {
+ GEM_BUG_ON(rcu_access_pointer(node->base.fence) !=
+ ERR_PTR(-EAGAIN));
}
- GEM_BUG_ON(rcu_access_pointer(node->base.fence) != ERR_PTR(-EAGAIN));
- GEM_BUG_ON(barrier_to_engine(node) != engine);
+ /*
+ * Since this node is not in any list, we have decoupled it
+ * from the rbtree, and we reuse the request to indicate
+ * this is a barrier node, then we can use list pointers
+ * for our tracking of the pending barrier.
+ */
+ node->base.cb.node.prev = (void *)engine;
first = barrier_to_ll(node);
first->next = prev;
if (!last)
@@ -920,7 +928,7 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,
}
GEM_BUG_ON(!llist_empty(&ref->preallocated_barriers));
- llist_add_batch(first, last, &ref->preallocated_barriers);
+ GEM_BUG_ON(!llist_add_batch(first, last, &ref->preallocated_barriers));
return 0;
When we collect barriers for preallocating them, we reuse either idle or non-idle ones, whichever we find. In case of non-idle barriers, we depend on their successful deletion from their barrier tasks lists as an indication of them not being claimed by another thread. However, in case of idle barriers, we neither perform any similar checks nor take any preventive countermeasures against unexpected races with other threads. We may then end up adding the same barrier to two independent preallocated lists, and then adding it twice back to the same engine's barrier tasks list, thus effectively creating a loop of llist nodes. As a result, searches through that barrier tasks llist may start spinning indefinitely. Occurrences of that issue were never observed on CI nor reported by users. However, deep code analysis revealed a silent, most probably not intended workaround that actively breaks those loops by rebuilding barrier tasks llists in reverse order inside our local implementation of llist node deletion. A simple patch that replaces that reverse order rebuild with just an update of next pointer of a node preceding the one to be deleted helps to reproduce the race, though still not easily. As soon as we have the race fixed, we may want to consider such update for the code to be more clear and more predictable. To fix the issue, whenever an idle barrier is selected for preallocation, mark it immediately as non-idle with our ERR_PTR(-EAGAIN) barrier mark, so other threads are no longer able to claim it, neither as idle nor as non-idle since not a member of respective barrier tasks list. Serialize that claim operation against other potential concurrent updates of active fence pointer, and skip the node in favor of allocating a new one if it occurs claimed meanwhile by another competing thread. Once claimed, increase active count of its composite tracker host immediately, as long as we still know that was an idle barrier. While being at it, fortify now still marginally racy check for preallocated_barriers llist being still empty when we populate it with collected proto-barriers (assuming we need that check). Fixes: 9ff33bbcda25 ("drm/i915: Reduce locking around i915_active_acquire_preallocate_barrier()") Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> --- drivers/gpu/drm/i915/i915_active.c | 50 +++++++++++++++++------------- 1 file changed, 29 insertions(+), 21 deletions(-)