drm/xe/guc: Add GuC log to devcoredump captures

Include the GuC log in devcoredump captures because they can be useful
with debugging certain types of bug.

v2: Fix kerneldoc
v3: Drop module parameter as now using more compact ascii85 encoding
rather than hexdump (although still not compressed) (review feedback
from Matthew B). Rebase onto recent refactoring of devcoredump code.
v4: Don't move the submission snapshot inside the GuC internals
structure 'cos it really doesn't belong there.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Julia Filipchuk <julia.filipchuk@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241003004611.2323493-11-John.C.Harrison@Intel.com

diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c b/drivers/gpu/drm/xe/xe_devcoredump.c
index 0884c49942fe6d0cdbfa8bdec1000d798cb29271..a2d81671348929e1cf05d12f6e9697e87de59db4 100644 (file)
--- a/drivers/gpu/drm/xe/xe_devcoredump.c
+++ b/drivers/gpu/drm/xe/xe_devcoredump.c
@@ -18,8 +18,10 @@
 #include "xe_gt.h"
 #include "xe_gt_printk.h"
 #include "xe_guc_ct.h"
+#include "xe_guc_log.h"
 #include "xe_guc_submit.h"
 #include "xe_hw_engine.h"
+#include "xe_module.h"
 #include "xe_sched_job.h"
 #include "xe_vm.h"
 
@@ -100,8 +102,10 @@ static ssize_t __xe_devcoredump_read(char *buffer, size_t count,
        drm_printf(&p, "\n**** GT #%d ****\n", ss->gt->info.id);
        drm_printf(&p, "\tTile: %d\n", ss->gt->tile->id);
 
+       drm_puts(&p, "\n**** GuC Log ****\n");
+       xe_guc_log_snapshot_print(ss->guc.log, &p);
        drm_puts(&p, "\n**** GuC CT ****\n");
-       xe_guc_ct_snapshot_print(ss->ct, &p);
+       xe_guc_ct_snapshot_print(ss->guc.ct, &p);
 
        drm_puts(&p, "\n**** Contexts ****\n");
        xe_guc_exec_queue_snapshot_print(ss->ge, &p);
@@ -124,8 +128,11 @@ static void xe_devcoredump_snapshot_free(struct xe_devcoredump_snapshot *ss)
 {
        int i;
 
-       xe_guc_ct_snapshot_free(ss->ct);
-       ss->ct = NULL;
+       xe_guc_log_snapshot_free(ss->guc.log);
+       ss->guc.log = NULL;
+
+       xe_guc_ct_snapshot_free(ss->guc.ct);
+       ss->guc.ct = NULL;
 
        xe_guc_exec_queue_snapshot_free(ss->ge);
        ss->ge = NULL;
@@ -253,7 +260,8 @@ static void devcoredump_snapshot(struct xe_devcoredump *coredump,
        if (xe_force_wake_get(gt_to_fw(q->gt), XE_FORCEWAKE_ALL))
                xe_gt_info(ss->gt, "failed to get forcewake for coredump capture\n");
 
-       ss->ct = xe_guc_ct_snapshot_capture(&guc->ct, true);
+       ss->guc.log = xe_guc_log_snapshot_capture(&guc->log, true);
+       ss->guc.ct = xe_guc_ct_snapshot_capture(&guc->ct, true);
        ss->ge = xe_guc_exec_queue_snapshot_capture(q);
        ss->job = xe_sched_job_snapshot_capture(job);
        ss->vm = xe_vm_snapshot_capture(q->vm);

diff --git a/drivers/gpu/drm/xe/xe_devcoredump_types.h b/drivers/gpu/drm/xe/xe_devcoredump_types.h
index 3cc2f095fdfbd12b59202a68ddcc25a0403ba60f..06ac75ce63dd4fb1b8298fbae4d4d5763a5beb11 100644 (file)
--- a/drivers/gpu/drm/xe/xe_devcoredump_types.h
+++ b/drivers/gpu/drm/xe/xe_devcoredump_types.h
@@ -34,9 +34,13 @@ struct xe_devcoredump_snapshot {
        /** @work: Workqueue for deferred capture outside of signaling context */
        struct work_struct work;
 
-       /* GuC snapshots */
-       /** @ct: GuC CT snapshot */
-       struct xe_guc_ct_snapshot *ct;
+       /** @guc: GuC snapshots */
+       struct {
+               /** @guc.ct: GuC CT snapshot */
+               struct xe_guc_ct_snapshot *ct;
+               /** @guc.log: GuC log snapshot */
+               struct xe_guc_log_snapshot *log;
+       } guc;
 
        /** @ge: GuC Submission Engine snapshot */
        struct xe_guc_submit_exec_queue_snapshot *ge;