On 13/01/2023 21:29, John Harrison wrote:
On 1/13/2023 09:46, Hellstrom, Thomas wrote:
On Fri, 2023-01-13 at 09:51 +0000, Tvrtko Ursulin wrote:
On 12/01/2023 20:40, John Harrison wrote:
On 1/12/2023 02:01, Tvrtko Ursulin wrote:
On 12/01/2023 02:53, John.C.Harrison@xxxxxxxxx wrote:
[snip]
+ engine->name);
+ rq = NULL;
+ }
} else {
/*
* Getting here with GuC enabled means it is a forced
error
capture
@@ -1622,22 +1645,24 @@ capture_engine(struct intel_engine_cs
*engine,
flags);
}
}
- if (rq)
+ if (rq) {
rq = i915_request_get_rcu(rq);
+ capture = intel_engine_coredump_add_request(ee, rq,
ATOMIC_MAYFAIL);
+ } else if (ce) {
+ capture = engine_coredump_add_context(ee, ce,
ATOMIC_MAYFAIL);
+ }
- if (!rq)
- goto no_request_capture;
-
- capture = intel_engine_coredump_add_request(ee, rq,
ATOMIC_MAYFAIL);
if (!capture) {
- i915_request_put(rq);
+ if (rq)
+ i915_request_put(rq);
goto no_request_capture;
}
if (dump_flags & CORE_DUMP_FLAG_IS_GUC_CAPTURE)
intel_guc_capture_get_matching_node(engine->gt, ee,
ce);
This step requires non-NULL ce, so if you move it under the "else
if
(ce)" above then I *think* exit from the function can be
consolidated
to just:
if (capture) {
intel_engine_coredump_add_vma(ee, capture, compress);
if (rq)
i915_request_put(rq);
Is there any reason the rq ref needs to be held during the add_vma
call?
Can it now just be moved earlier to be:
if (rq) {
rq = i915_request_get_rcu(rq);
capture = intel_engine_coredump_add_request(ee, rq,
ATOMIC_MAYFAIL);
i915_request_put(rq);
}
The internals of the request object are only touched in the above
_add_request() code. The later _add_vma() call fiddles around with
vmas
that pulled from the request but the capture_vma code inside
_add_request() has already copied everything, hasn't it? Or rather,
it
has grabbed its own private vma resource locks. So there is no
requirement to keep the request itself around still?
That sounds correct. It was some time ago since I worked with this code
but when i started IIRC KASAN told me the request along with the whole
capture list could disappear under us due to a parallel capture.
So the request reference added then might cover a bit too much now that
we also hold references on vma resources, which it looks like we do in
intel_engine_coredump_add_vma().
So that means we end up with:
rq = intel_context_find_active_request(ce);
...
[test stuff like i915_request_started(rq)]
...
if (rq) {
rq = i915_request_get_rcu(rq);
capture = intel_engine_coredump_add_request(ee, rq,
ATOMIC_MAYFAIL);
i915_request_put(rq);
}
What is special about coredump_add_request() that it needs the request
to be extra locked for that call and only that call? If the request can
magically vanish after being found then what protects the _started()
query? For that matter, what stops the request_get_rcu() itself being
called on a pointer that is no longer valid? And if we do actually have
sufficient locking in place to prevent that, why doesn't that cover the
coredump_add_request() usage?
There is definitely a red flag there with the difference between the if
and else blocks at the top of capture_engine(). And funnily enough, the
first block appears to be GuC only. That is not obvious from the code
and should probably have a comment, or function names made self-documenting.
I guess the special thing about intel_engine_coredump_add_request() is
that it dereferences the rq. So it is possibly 573ba126aef3
("drm/i915/guc: Capture error state on context reset") which added a bug
where rq can be dereferenced with a reference held. Or perhaps with the
GuC backend there is a guarantee request cannot be retired from
elsewhere while error capture is examining it.
To unravel the error entry points into error capture, from execlists,
debugfs, ringbuffer, I don't have the time to remind myself how all that
works right now. Quite possibly at least some of those run async to the
GPU so must be safe against parallel request retirement. So I don't know
if the i915_request_get_rcu safe in all those cases without spending
some time to refresh my knowledge a bit.
Sounds like the best plan is not to change this too much - just leave
the scope of reference held as is and ideally eliminate the necessary
goto labels. AFAIR that should be doable without changing anything real
and unblock these improvements.
Regards,
Tvrtko
