From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: jose.souza@intel.com, lionel.g.landwerlin@intel.com,
carlos.santa@intel.com, rodrigo.vivi@intel.com
Subject: [RFC PATCH 5/6] drm/xe: Add replay_offset and replay_length lines to LRC HWCTX snapshot
Date: Wed, 22 Jan 2025 17:15:12 -0800 [thread overview]
Message-ID: <20250123011513.362430-6-matthew.brost@intel.com> (raw)
In-Reply-To: <20250123011513.362430-1-matthew.brost@intel.com>
Add replay_offset and replay_length lines to LRC HWCTX snapshot with the
idea being this information can be used extract the data which needs to
be pass to exec queue extension DRM_XE_EXEC_QUEUE_SET_HANG_REPLAY_STATE
so GPU hang can be replayed via a Mesa tool.
The additional lines look like:
[HWCTX].replay_offset: 0x%x
[HWCTX].replay_length: 0x%x
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
drivers/gpu/drm/xe/xe_lrc.c | 8 ++++++++
drivers/gpu/drm/xe/xe_lrc.h | 1 +
drivers/gpu/drm/xe/xe_lrc_types.h | 3 +++
3 files changed, 12 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index bbb9ffbf6367..1ad3ab59fce2 100644
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -896,6 +896,9 @@ static int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe,
kref_init(&lrc->refcount);
lrc->flags = 0;
+ lrc->replay_size = xe_gt_lrc_size(gt, hwe->class);
+ if (xe_gt_has_indirect_ring_state(gt))
+ lrc->replay_size -= LRC_INDIRECT_RING_STATE_SIZE;
lrc_size = ring_size + xe_gt_lrc_size(gt, hwe->class);
if (xe_gt_has_indirect_ring_state(gt))
lrc->flags |= XE_LRC_FLAG_INDIRECT_RING_STATE;
@@ -1671,6 +1674,8 @@ struct xe_lrc_snapshot *xe_lrc_snapshot_capture(struct xe_lrc *lrc)
snapshot->lrc_bo = xe_bo_get(lrc->bo);
snapshot->lrc_offset = xe_lrc_pphwsp_offset(lrc);
snapshot->lrc_size = lrc->bo->size - snapshot->lrc_offset;
+ snapshot->replay_offset = 0;
+ snapshot->replay_size = lrc->replay_size;
snapshot->lrc_snapshot = NULL;
snapshot->ctx_timestamp = xe_lrc_ctx_timestamp(lrc);
snapshot->ctx_job_timestamp = xe_lrc_ctx_job_timestamp(lrc);
@@ -1745,6 +1750,9 @@ void xe_lrc_snapshot_print(struct xe_lrc_snapshot *snapshot, struct drm_printer
}
drm_printf(p, "\n\t[HWCTX].length: 0x%lx\n", snapshot->lrc_size - LRC_PPHWSP_SIZE);
+ drm_printf(p, "\n\t[HWCTX].replay_offset: 0x%lx\n", snapshot->replay_offset);
+ drm_printf(p, "\n\t[HWCTX].replay_length: 0x%lx\n", snapshot->replay_size);
+
drm_puts(p, "\t[HWCTX].data: ");
for (; i < snapshot->lrc_size; i += sizeof(u32)) {
u32 *val = snapshot->lrc_snapshot + i;
diff --git a/drivers/gpu/drm/xe/xe_lrc.h b/drivers/gpu/drm/xe/xe_lrc.h
index 4206e6a8b50a..848d64511ca8 100644
--- a/drivers/gpu/drm/xe/xe_lrc.h
+++ b/drivers/gpu/drm/xe/xe_lrc.h
@@ -23,6 +23,7 @@ struct xe_lrc_snapshot {
struct xe_bo *lrc_bo;
void *lrc_snapshot;
unsigned long lrc_size, lrc_offset;
+ unsigned long replay_size, replay_offset;
u32 context_desc;
u32 ring_addr;
diff --git a/drivers/gpu/drm/xe/xe_lrc_types.h b/drivers/gpu/drm/xe/xe_lrc_types.h
index 71ecb453f811..c2766719ff77 100644
--- a/drivers/gpu/drm/xe/xe_lrc_types.h
+++ b/drivers/gpu/drm/xe/xe_lrc_types.h
@@ -25,6 +25,9 @@ struct xe_lrc {
/** @size: size of lrc including any indirect ring state page */
u32 size;
+ /** @replay_size: Size LRC needed for replaying a hang */
+ u32 replay_size;
+
/** @tile: tile which this LRC belongs to */
struct xe_tile *tile;
--
2.34.1
next prev parent reply other threads:[~2025-01-23 1:14 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-23 1:15 [RFC PATCH 0/6] Add support for Mesa GPU hang replay tool Matthew Brost
2025-01-23 1:15 ` [RFC PATCH 1/6] drm/xe: Add properties line to VM snapshot capture Matthew Brost
2025-01-23 17:38 ` Matthew Brost
2025-01-23 1:15 ` [RFC PATCH 2/6] drm/xe: Add "null_sparse" type to VM snap properties Matthew Brost
2025-01-23 1:15 ` [RFC PATCH 3/6] drm/xe: Add mem_region to properties line in VM snapshot capture Matthew Brost
2025-01-23 1:15 ` [RFC PATCH 4/6] drm/xe/uapi: Add DRM_XE_EXEC_QUEUE_SET_HANG_REPLAY_STATE Matthew Brost
2025-01-23 10:36 ` Rodrigo Vivi
2025-01-23 17:37 ` Matthew Brost
2025-01-23 1:15 ` Matthew Brost [this message]
2025-01-23 1:15 ` [RFC PATCH 6/6] drm/xe: Implement DRM_XE_EXEC_QUEUE_SET_HANG_REPLAY_STATE Matthew Brost
2025-01-23 17:40 ` Matthew Brost
2025-01-23 1:24 ` ✓ CI.Patch_applied: success for Add support for Mesa GPU hang replay tool Patchwork
2025-01-23 1:24 ` ✓ CI.checkpatch: " Patchwork
2025-01-23 1:25 ` ✓ CI.KUnit: " Patchwork
2025-01-23 1:42 ` ✓ CI.Build: " Patchwork
2025-01-23 1:44 ` ✓ CI.Hooks: " Patchwork
2025-01-23 1:46 ` ✓ CI.checksparse: " Patchwork
2025-01-23 2:12 ` ✓ Xe.CI.BAT: " Patchwork
2025-01-23 13:03 ` ✗ Xe.CI.Full: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250123011513.362430-6-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=carlos.santa@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=jose.souza@intel.com \
--cc=lionel.g.landwerlin@intel.com \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox