From: Zhanjun Dong <zhanjun.dong@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Zhanjun Dong <zhanjun.dong@intel.com>
Subject: [PATCH v2 1/3] drm/xe/guc: Compress GuC log and CTB dump with zstd
Date: Mon, 11 May 2026 15:49:22 -0400 [thread overview]
Message-ID: <20260511194924.2016315-2-zhanjun.dong@intel.com> (raw)
In-Reply-To: <20260511194924.2016315-1-zhanjun.dong@intel.com>
Replace the raw ascii85 dumps of GuC log snapshots with a
zstd-compressed ascii85 stream and reuse the same helper for CTB
snapshot output.
Use zstd streaming with default level-3 parameters and an estimated
source size of 0 so the compression workspace stays bounded even for
multi-megabyte logs.
Select ZSTD_COMPRESS in DRM_XE so the xe module pulls in the zstd
compressor when built.
Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>
---
drivers/gpu/drm/xe/Kconfig | 2 +
drivers/gpu/drm/xe/xe_guc_ct.c | 9 ++-
drivers/gpu/drm/xe/xe_guc_log.c | 110 ++++++++++++++++++++++++++++----
drivers/gpu/drm/xe/xe_guc_log.h | 3 +
4 files changed, 106 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
index 4d7dcaff2b91..a6fbd7233c09 100644
--- a/drivers/gpu/drm/xe/Kconfig
+++ b/drivers/gpu/drm/xe/Kconfig
@@ -33,6 +33,8 @@ config DRM_XE
select ACPI_WMI if X86 && ACPI
select SYNC_FILE
select CRC32
+ select ZSTD_COMPRESS
+ select ZSTD_DECOMPRESS
select SND_HDA_I915 if SND_HDA_CORE
select CEC_CORE if CEC_NOTIFIER
select VMAP_PFN
diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
index 21e0dad9a481..d1f2fd597ebd 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@ -2112,11 +2112,10 @@ void xe_guc_ct_snapshot_print(struct xe_guc_ct_snapshot *snapshot,
drm_printf(p, "\tg2h outstanding: %d\n",
snapshot->g2h_outstanding);
- if (snapshot->ctb) {
- drm_printf(p, "[CTB].length: 0x%zx\n", snapshot->ctb_size);
- xe_print_blob_ascii85(p, "[CTB].data", '\n',
- snapshot->ctb, 0, snapshot->ctb_size);
- }
+ if (snapshot->ctb)
+ xe_guc_print_blob_zstd(p, "[CTB]", "[CTB].data",
+ &snapshot->ctb, 1,
+ snapshot->ctb_size, snapshot->ctb_size);
} else {
drm_puts(p, "CT disabled\n");
}
diff --git a/drivers/gpu/drm/xe/xe_guc_log.c b/drivers/gpu/drm/xe/xe_guc_log.c
index 538d4df0f7aa..abcafce0349a 100644
--- a/drivers/gpu/drm/xe/xe_guc_log.c
+++ b/drivers/gpu/drm/xe/xe_guc_log.c
@@ -6,6 +6,7 @@
#include "xe_guc_log.h"
#include <linux/fault-inject.h>
+#include <linux/zstd.h>
#include <linux/utsname.h>
#include <drm/drm_managed.h>
@@ -225,6 +226,99 @@ struct xe_guc_log_snapshot *xe_guc_log_snapshot_capture(struct xe_guc_log *log,
return snapshot;
}
+/**
+ * xe_guc_print_blob_zstd - Compress binary data with zstd streaming and emit it as ascii85
+ * @p: drm_printer for output
+ * @length_label: label prefix for the length/metadata line (e.g. "[LOG]" or "[CTB]")
+ * @data_label: label for the ascii85 blob (e.g. "[LOG].data" or "[CTB].data")
+ * @chunks: array of pointers to source data chunks
+ * @num_chunks: number of elements in @chunks
+ * @chunk_size: nominal size of each chunk; the last chunk may hold fewer valid bytes
+ * @total_size: total uncompressed byte count across all chunks
+ *
+ * Compresses @total_size bytes using zstd level-3 streaming compression and
+ * prints the result via @p using ascii85 encoding. On failure the function
+ * returns without printing the data blob.
+ */
+void xe_guc_print_blob_zstd(struct drm_printer *p, const char *length_label,
+ const char *data_label, void **chunks, int num_chunks,
+ size_t chunk_size, size_t total_size)
+{
+ zstd_parameters params;
+ zstd_cstream *cstream;
+ zstd_out_buffer outbuf;
+ size_t wksp_size, dst_size;
+ size_t remain;
+ void *wksp;
+ size_t ret;
+ char *dst;
+ int i;
+
+ /*
+ * Pass 0 as estimated_src_size to use zstd level-3 defaults
+ * (windowLog=18, 256KB window). Passing the full total_size would
+ * cause zstd to inflate windowLog proportionally (e.g. windowLog=24
+ * for a 19MB log), making the workspace tens of MB. With 0, the
+ * workspace stays ~1.5MB, well within kmalloc limits.
+ */
+ params = zstd_get_params(3, 0);
+
+ wksp_size = zstd_cstream_workspace_bound(¶ms.cParams);
+ wksp = kvzalloc(wksp_size, GFP_KERNEL);
+ if (!wksp)
+ return;
+
+ dst_size = zstd_compress_bound(total_size);
+ dst = kvzalloc(dst_size, GFP_KERNEL);
+ if (!dst)
+ goto err_wksp;
+
+ cstream = zstd_init_cstream(¶ms, 0, wksp, wksp_size);
+ if (!cstream) {
+ pr_err("xe_guc: failed to init zstd cstream\n");
+ goto err_dst;
+ }
+
+ outbuf.dst = dst;
+ outbuf.size = dst_size;
+ outbuf.pos = 0;
+
+ remain = total_size;
+ for (i = 0; i < num_chunks && remain; i++) {
+ size_t size = min(chunk_size, remain);
+ zstd_in_buffer inbuf = { .src = chunks[i], .size = size, .pos = 0 };
+
+ while (inbuf.pos < inbuf.size) {
+ ret = zstd_compress_stream(cstream, &outbuf, &inbuf);
+ if (zstd_is_error(ret)) {
+ pr_err("xe_guc: zstd_compress_stream failed: %s\n",
+ zstd_get_error_name(ret));
+ goto err_dst;
+ }
+ }
+ remain -= size;
+ }
+
+ do {
+ ret = zstd_end_stream(cstream, &outbuf);
+ if (zstd_is_error(ret)) {
+ pr_err("xe_guc: zstd_end_stream failed: %s\n",
+ zstd_get_error_name(ret));
+ goto err_dst;
+ }
+ } while (ret > 0 && outbuf.pos < outbuf.size);
+
+ drm_printf(p, "%s.length: 0x%zx -> 0x%zx Algo: ZSTD\n",
+ length_label, total_size, outbuf.pos);
+ xe_print_blob_ascii85(p, data_label, '\n', dst, 0,
+ DIV_ROUND_UP(outbuf.pos, sizeof(u32)) * sizeof(u32));
+
+err_dst:
+ kvfree(dst);
+err_wksp:
+ kvfree(wksp);
+}
+
/**
* xe_guc_log_snapshot_print - dump a previously saved copy of the GuC log to some useful location
* @snapshot: a snapshot of the GuC log
@@ -232,9 +326,6 @@ struct xe_guc_log_snapshot *xe_guc_log_snapshot_capture(struct xe_guc_log *log,
*/
void xe_guc_log_snapshot_print(struct xe_guc_log_snapshot *snapshot, struct drm_printer *p)
{
- size_t remain;
- int i;
-
if (!snapshot) {
drm_printf(p, "GuC log snapshot not allocated!\n");
return;
@@ -248,16 +339,9 @@ void xe_guc_log_snapshot_print(struct xe_guc_log_snapshot *snapshot, struct drm_
drm_printf(p, "GuC timestamp: 0x%08llX [%llu]\n", snapshot->stamp, snapshot->stamp);
drm_printf(p, "Log level: %u\n", snapshot->level);
- drm_printf(p, "[LOG].length: 0x%zx\n", snapshot->size);
- remain = snapshot->size;
- for (i = 0; i < snapshot->num_chunks; i++) {
- size_t size = min(GUC_LOG_CHUNK_SIZE, remain);
- const char *prefix = i ? NULL : "[LOG].data";
- char suffix = i == snapshot->num_chunks - 1 ? '\n' : 0;
-
- xe_print_blob_ascii85(p, prefix, suffix, snapshot->copy[i], 0, size);
- remain -= size;
- }
+ xe_guc_print_blob_zstd(p, "[LOG]", "[LOG].data",
+ snapshot->copy, snapshot->num_chunks,
+ GUC_LOG_CHUNK_SIZE, snapshot->size);
}
static inline void lfd_output_binary(struct drm_printer *p, char *buf, int buf_size)
diff --git a/drivers/gpu/drm/xe/xe_guc_log.h b/drivers/gpu/drm/xe/xe_guc_log.h
index 4649a260755e..d231def50692 100644
--- a/drivers/gpu/drm/xe/xe_guc_log.h
+++ b/drivers/gpu/drm/xe/xe_guc_log.h
@@ -59,6 +59,9 @@ void xe_guc_log_print(struct xe_guc_log *log, struct drm_printer *p);
void xe_guc_log_print_lfd(struct xe_guc_log *log, struct drm_printer *p);
void xe_guc_log_print_dmesg(struct xe_guc_log *log);
struct xe_guc_log_snapshot *xe_guc_log_snapshot_capture(struct xe_guc_log *log, bool atomic);
+void xe_guc_print_blob_zstd(struct drm_printer *p, const char *length_label,
+ const char *data_label, void **chunks, int num_chunks,
+ size_t chunk_size, size_t total_size);
void xe_guc_log_snapshot_print(struct xe_guc_log_snapshot *snapshot, struct drm_printer *p);
void xe_guc_log_snapshot_free(struct xe_guc_log_snapshot *snapshot);
--
2.34.1
next prev parent reply other threads:[~2026-05-11 19:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-11 19:49 [PATCH v2 0/3] drm/xe: shrink and compress GuC snapshot dumps Zhanjun Dong
2026-05-11 19:49 ` Zhanjun Dong [this message]
2026-05-11 19:49 ` [PATCH v2 2/3] drm/xe: Remove extra newlines from LRC snapshot dump Zhanjun Dong
2026-05-11 19:49 ` [PATCH v2 3/3] drm/xe/guc: Reduce GuC log size from 8MB to 2MB Zhanjun Dong
2026-05-12 7:41 ` ✗ CI.checkpatch: warning for drm/xe: shrink and compress GuC snapshot dumps (rev2) Patchwork
2026-05-12 7:42 ` ✓ CI.KUnit: success " Patchwork
2026-05-12 7:58 ` ✗ CI.checksparse: warning " Patchwork
2026-05-12 9:11 ` ✓ Xe.CI.BAT: success " Patchwork
2026-05-12 17:09 ` ✗ 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=20260511194924.2016315-2-zhanjun.dong@intel.com \
--to=zhanjun.dong@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/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