From: Shuicheng Lin <shuicheng.lin@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: matthew.brost@intel.com, Shuicheng Lin <shuicheng.lin@intel.com>
Subject: [PATCH v2 2/2] drm/xe: Release runtime pm for error path of xe_devcoredump_read()
Date: Thu, 3 Jul 2025 07:41:08 +0000 [thread overview]
Message-ID: <20250703074105.3461107-6-shuicheng.lin@intel.com> (raw)
In-Reply-To: <20250703074105.3461107-4-shuicheng.lin@intel.com>
xe_pm_runtime_put() is missed to be called for the error path in
xe_devcoredump_read().
Add function description comments for xe_devcoredump_read() to help
understand it.
v2: more detail function comments and refine goto logic (Matt)
Fixes: c4a2e5f865b7 ("drm/xe: Add devcoredump chunking")
Cc: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
drivers/gpu/drm/xe/xe_devcoredump.c | 38 +++++++++++++++++++++--------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c b/drivers/gpu/drm/xe/xe_devcoredump.c
index 94625010abc4..203e3038cc81 100644
--- a/drivers/gpu/drm/xe/xe_devcoredump.c
+++ b/drivers/gpu/drm/xe/xe_devcoredump.c
@@ -171,14 +171,32 @@ static void xe_devcoredump_snapshot_free(struct xe_devcoredump_snapshot *ss)
#define XE_DEVCOREDUMP_CHUNK_MAX (SZ_512M + SZ_1G)
+/**
+ * xe_devcoredump_read() - Read data from the Xe device coredump snapshot
+ * @buffer: Destination buffer to copy the coredump data into
+ * @offset: Offset in the coredump data to start reading from
+ * @count: Number of bytes to read
+ * @data: Pointer to the xe_devcoredump structure
+ * @datalen: Length of the data (unused)
+ *
+ * Reads a chunk of the coredump snapshot data into the provided buffer.
+ * If the devcoredump is smaller than 1.5 GB (XE_DEVCOREDUMP_CHUNK_MAX),
+ * it is read directly from a pre-written buffer. For larger devcoredumps,
+ * the pre-written buffer must be periodically repopulated from the snapshot
+ * state due to kmalloc size limitations.
+ *
+ * Return: Number of bytes copied on success, or a negative error code on failure.
+ */
static ssize_t xe_devcoredump_read(char *buffer, loff_t offset,
size_t count, void *data, size_t datalen)
{
struct xe_devcoredump *coredump = data;
struct xe_devcoredump_snapshot *ss;
- ssize_t byte_copied;
+ ssize_t byte_copied = 0;
u32 chunk_offset;
ssize_t new_chunk_position;
+ bool pm_needed = false;
+ int ret = 0;
if (!coredump)
return -ENODEV;
@@ -188,20 +206,19 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset,
/* Ensure delayed work is captured before continuing */
flush_work(&ss->work);
- if (ss->read.size > XE_DEVCOREDUMP_CHUNK_MAX)
+ pm_needed = ss->read.size > XE_DEVCOREDUMP_CHUNK_MAX;
+ if (pm_needed)
xe_pm_runtime_get(gt_to_xe(ss->gt));
mutex_lock(&coredump->lock);
if (!ss->read.buffer) {
- mutex_unlock(&coredump->lock);
- return -ENODEV;
+ ret = -ENODEV;
+ goto unlock;
}
- if (offset >= ss->read.size) {
- mutex_unlock(&coredump->lock);
- return 0;
- }
+ if (offset >= ss->read.size)
+ goto unlock;
new_chunk_position = div_u64_rem(offset,
XE_DEVCOREDUMP_CHUNK_MAX,
@@ -221,12 +238,13 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset,
ss->read.size - offset;
memcpy(buffer, ss->read.buffer + chunk_offset, byte_copied);
+unlock:
mutex_unlock(&coredump->lock);
- if (ss->read.size > XE_DEVCOREDUMP_CHUNK_MAX)
+ if (pm_needed)
xe_pm_runtime_put(gt_to_xe(ss->gt));
- return byte_copied;
+ return byte_copied ? byte_copied : ret;
}
static void xe_devcoredump_free(void *data)
--
2.49.0
next prev parent reply other threads:[~2025-07-03 7:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-03 6:20 [PATCH 0/2] Remove unused code in devcoredump_snapshot Shuicheng Lin
2025-07-03 6:20 ` [PATCH 1/2] drm/xe: Remove unused code in devcoredump_snapshot() Shuicheng Lin
2025-07-03 6:20 ` [PATCH 2/2] drm/xe: Release runtime pm for error path of xe_devcoredump_read() Shuicheng Lin
2025-07-03 6:57 ` Matthew Brost
2025-07-03 7:01 ` Matthew Brost
2025-07-03 6:29 ` ✗ CI.checkpatch: warning for Remove unused code in devcoredump_snapshot Patchwork
2025-07-03 6:30 ` ✓ CI.KUnit: success " Patchwork
2025-07-03 7:41 ` [PATCH v2 0/2] Remove unused code in devcoredump_snapshot() Shuicheng Lin
2025-07-03 7:41 ` [PATCH v2 1/2] drm/xe: " Shuicheng Lin
2025-07-03 14:38 ` Dong, Zhanjun
2025-07-03 15:35 ` Matthew Brost
2025-07-03 7:41 ` Shuicheng Lin [this message]
2025-07-03 15:34 ` [PATCH v2 2/2] drm/xe: Release runtime pm for error path of xe_devcoredump_read() Matthew Brost
2025-07-04 5:56 ` ✗ CI.checkpatch: warning for Remove unused code in devcoredump_snapshot (rev2) Patchwork
2025-07-04 5:57 ` ✓ CI.KUnit: success " Patchwork
2025-07-04 20:01 ` ✗ Xe.CI.Full: failure for Remove unused code in devcoredump_snapshot Patchwork
-- strict thread matches above, loose matches on Subject: below --
2025-07-03 8:32 [PATCH v2 0/2] Remove unused code in devcoredump_snapshot() Shuicheng Lin
2025-07-03 8:32 ` [PATCH v2 2/2] drm/xe: Release runtime pm for error path of xe_devcoredump_read() Shuicheng Lin
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=20250703074105.3461107-6-shuicheng.lin@intel.com \
--to=shuicheng.lin@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=matthew.brost@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