Skip to content

Allow error capture without a request & fix locking issues

[email protected] dri-devel intel-gfx 6 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest8 patches 0 repliesNew
  2. v58 patches 2 repliesSuperseded
  3. v47 patches 12 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v36 patches9 repliesSuperseded
v25 patches9 repliesSuperseded
v14 patches18 repliesSuperseded

Patches in v6 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8drm/i915/guc: Fix locking when searching for a hung requestdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+11 -00 replies
2/8drm/i915: Fix request ref counting during error capture & debugfs dumpdrivers/gpu/drm/i915/gt/intel_context.c drivers/gpu/drm/i915/gt/intel_context.h drivers/gpu/drm/i915/gt/intel_engine_cs.c +2 more+17 -120 replies
3/8drm/i915: Fix up locking around dumping requests listsdrivers/gpu/drm/i915/gt/intel_engine.h drivers/gpu/drm/i915/gt/intel_engine_cs.c drivers/gpu/drm/i915/gt/intel_execlists_submission.c +2 more+73 -620 replies
4/8drm/i915: Allow error capture without a requestdrivers/gpu/drm/i915/i915_gpu_error.c+50 -240 replies
5/8drm/i915: Allow error capture of a pending requestdrivers/gpu/drm/i915/i915_gpu_error.c+1 -40 replies
6/8drm/i915/guc: Look for a guilty context when an engine reset failsdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+15 -20 replies
7/8drm/i915/guc: Add a debug print on GuC triggered resetdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+4 -00 replies
8/8drm/i915/guc: Rename GuC register state capture node to be more obviousdrivers/gpu/drm/i915/gt/uc/intel_guc_capture.c drivers/gpu/drm/i915/i915_gpu_error.h+5 -50 replies

Reviews trailers per patch

All 8 patches have a Reviewed-by or Acked-by.

PatchDaniele Ceraolo SpurioTvrtko UrsulinUmesh Nerlige Ramappa
1/8R-b A-b
2/8R-b A-b
3/8R-b A-b
4/8R-b A-b R-b
5/8R-b
6/8R-b A-b
7/8R-b
8/8R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v6 thread

Cover letter [PATCH v6 0/8] Allow error capture without a request & fix locking issues

From: John Harrison <[email protected]>

It is technically possible to get a hung context without a valid request. In such a situation, try to provide as much information in the error capture as possible rather than just aborting and capturing nothing.

Similarly, in the case of an engine reset failure the GuC is not able to report the guilty context. So try a manual search instead of reporting nothing.

While doing all this, it was noticed that the locking was broken in a number of places when searching for hung requests and dumping request info. So fix all that up as well.

v2: Tidy up code flow in error capture. Reword some comments/messages. (review feedback from Tvrtko)
Also fix up request locking issues from earlier changes noticed during code review of this change.
v3: Fix some potential null pointer derefs and a reference leak. Add new patch to refactor the duplicated hung request search code into a common backend agnostic wrapper function and use the correct spinlocks for the correct lists. Also tweak some of the patch descriptions for better accuracy.
v4: Shuffle some code around to more appropriate source files. Fix potential leak of GuC capture object after code flow re-org and pull improved info message earlier (Daniele). Also rename the GuC capture object to be more consistent.
v5: Split one self contained locking fix out into a separate patch and rename a function to be shorter (Tvrtko).
v6: s/locking/reference counting/ in message of patch #2 (Tvrtko)

John Harrison (8):
drm/i915/guc: Fix locking when searching for a hung request drm/i915: Fix request ref counting during error capture & debugfs dump drm/i915: Fix up locking around dumping requests lists drm/i915: Allow error capture without a request
drm/i915: Allow error capture of a pending request drm/i915/guc: Look for a guilty context when an engine reset fails drm/i915/guc: Add a debug print on GuC triggered reset drm/i915/guc: Rename GuC register state capture node to be more
obvious

 drivers/gpu/drm/i915/gt/intel_context.c       |  4 +-
 drivers/gpu/drm/i915/gt/intel_context.h       |  3 +-
 drivers/gpu/drm/i915/gt/intel_engine.h        |  4 +-
 drivers/gpu/drm/i915/gt/intel_engine_cs.c     | 74 ++++++++-------
 .../drm/i915/gt/intel_execlists_submission.c  | 27 ++++++
 .../drm/i915/gt/intel_execlists_submission.h  |  4 +
 .../gpu/drm/i915/gt/uc/intel_guc_capture.c    |  8 +-
 .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 35 ++++++-
 drivers/gpu/drm/i915/i915_gpu_error.c         | 92 ++++++++++---------
 drivers/gpu/drm/i915/i915_gpu_error.h         |  2 +-
 10 files changed, 160 insertions(+), 93 deletions(-)
Signature · 1 line
2.39.1