From: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
To: Ashutosh Dixit <ashutosh.dixit@intel.com>
Cc: intel-xe@lists.freedesktop.org
Subject: Re: [PATCH 10/17] drm/xe/oa/uapi: Read file_operation
Date: Tue, 19 Dec 2023 19:01:57 -0800 [thread overview]
Message-ID: <ZYJZJeG3lUnFkCKU@unerlige-ril> (raw)
In-Reply-To: <20231208064329.2387604-11-ashutosh.dixit@intel.com>
On Thu, Dec 07, 2023 at 10:43:22PM -0800, Ashutosh Dixit wrote:
>Implement the OA stream read file_operation. Both blocking and non-blocking
>reads are supported. As part of read system call, the read copies OA perf
>data from the OA buffer to the user buffer, after appending packet headers
>for status and data packets.
>
>Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
>---
> drivers/gpu/drm/xe/xe_oa.c | 239 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 239 insertions(+)
>
>diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
>index b6e94dba5f525..5744436188dcd 100644
>--- a/drivers/gpu/drm/xe/xe_oa.c
>+++ b/drivers/gpu/drm/xe/xe_oa.c
>@@ -170,6 +170,14 @@ static u64 oa_report_id(struct xe_oa_stream *stream, void *report)
> return oa_report_header_64bit(stream) ? *(u64 *)report : *(u32 *)report;
> }
>
>+static void oa_report_id_clear(struct xe_oa_stream *stream, u32 *report)
>+{
>+ if (oa_report_header_64bit(stream))
>+ *(u64 *)report = 0;
>+ else
>+ *report = 0;
>+}
>+
> static u64 oa_timestamp(struct xe_oa_stream *stream, void *report)
> {
> return oa_report_header_64bit(stream) ?
>@@ -177,6 +185,14 @@ static u64 oa_timestamp(struct xe_oa_stream *stream, void *report)
> *((u32 *)report + 1);
> }
>
>+static void oa_timestamp_clear(struct xe_oa_stream *stream, u32 *report)
>+{
>+ if (oa_report_header_64bit(stream))
>+ *(u64 *)&report[2] = 0;
>+ else
>+ report[1] = 0;
>+}
>+
> static bool xe_oa_buffer_check_unlocked(struct xe_oa_stream *stream)
> {
> u32 gtt_offset = xe_bo_ggtt_addr(stream->oa_buffer.bo);
>@@ -251,6 +267,134 @@ static enum hrtimer_restart xe_oa_poll_check_timer_cb(struct hrtimer *hrtimer)
> return HRTIMER_RESTART;
> }
>
>+static int xe_oa_append_status(struct xe_oa_stream *stream, char __user *buf,
>+ size_t count, size_t *offset,
>+ enum drm_xe_oa_record_type type)
space/indent ^
>+{
>+ struct drm_xe_oa_record_header header = { type, 0, sizeof(header) };
>+
>+ if ((count - *offset) < header.size)
>+ return -ENOSPC;
>+
>+ if (copy_to_user(buf + *offset, &header, sizeof(header)))
>+ return -EFAULT;
>+
>+ *offset += header.size;
>+
>+ return 0;
>+}
>+
>+static int xe_oa_append_sample(struct xe_oa_stream *stream, char __user *buf,
>+ size_t count, size_t *offset, const u8 *report)
space/indent ^ and a couple more places, in this patch.
>+{
>+ int report_size = stream->oa_buffer.format->size;
>+ struct drm_xe_oa_record_header header;
>+ int report_size_partial;
>+ u8 *oa_buf_end;
>+
>+ header.type = DRM_XE_OA_RECORD_SAMPLE;
>+ header.pad = 0;
>+ header.size = stream->sample_size;
>+
>+ if ((count - *offset) < header.size)
>+ return -ENOSPC;
>+
>+ buf += *offset;
>+ if (copy_to_user(buf, &header, sizeof(header)))
>+ return -EFAULT;
>+ buf += sizeof(header);
>+
>+ oa_buf_end = stream->oa_buffer.vaddr + XE_OA_BUFFER_SIZE;
>+ report_size_partial = oa_buf_end - report;
>+
>+ if (report_size_partial < report_size) {
>+ if (copy_to_user(buf, report, report_size_partial))
>+ return -EFAULT;
>+ buf += report_size_partial;
>+
>+ if (copy_to_user(buf, stream->oa_buffer.vaddr,
>+ report_size - report_size_partial))
>+ return -EFAULT;
>+ } else if (copy_to_user(buf, report, report_size)) {
>+ return -EFAULT;
>+ }
>+
>+ *offset += header.size;
>+
>+ return 0;
>+}
>+
>+static int xe_oa_append_reports(struct xe_oa_stream *stream, char __user *buf,
>+ size_t count, size_t *offset)
>+{
>+ int report_size = stream->oa_buffer.format->size;
>+ u8 *oa_buf_base = stream->oa_buffer.vaddr;
>+ u32 gtt_offset = xe_bo_ggtt_addr(stream->oa_buffer.bo);
>+ u32 mask = (XE_OA_BUFFER_SIZE - 1);
>+ size_t start_offset = *offset;
>+ unsigned long flags;
>+ u32 head, tail;
>+ int ret = 0;
>+
>+ if (drm_WARN_ON(&stream->oa->xe->drm, !stream->enabled))
>+ return -EIO;
>+
>+ spin_lock_irqsave(&stream->oa_buffer.ptr_lock, flags);
>+
>+ head = stream->oa_buffer.head;
>+ tail = stream->oa_buffer.tail;
>+
>+ spin_unlock_irqrestore(&stream->oa_buffer.ptr_lock, flags);
>+
>+ /* An out of bounds or misaligned head or tail pointer implies a driver bug */
>+ if (drm_WARN_ONCE(&stream->oa->xe->drm,
>+ head > XE_OA_BUFFER_SIZE || tail > XE_OA_BUFFER_SIZE,
>+ "Inconsistent OA buffer pointers: head = %u, tail = %u\n",
>+ head, tail))
>+ return -EIO;
>+
>+ for (; OA_TAKEN(tail, head); head = (head + report_size) & mask) {
>+ u8 *report = oa_buf_base + head;
>+ u32 *report32 = (void *)report;
>+
>+ ret = xe_oa_append_sample(stream, buf, count, offset, report);
>+ if (ret)
>+ break;
>+
>+ if (is_power_of_2(report_size)) {
>+ /* Clear out report id and timestamp to detect unlanded reports */
>+ oa_report_id_clear(stream, report32);
>+ oa_timestamp_clear(stream, report32);
>+ } else {
>+ u8 *oa_buf_end = stream->oa_buffer.vaddr +
>+ XE_OA_BUFFER_SIZE;
>+ u32 part = oa_buf_end - (u8 *)report32;
>+
>+ /* Zero out the entire report */
>+ if (report_size <= part) {
>+ memset(report32, 0, report_size);
>+ } else {
>+ memset(report32, 0, part);
>+ memset(oa_buf_base, 0, report_size - part);
>+ }
>+ }
>+ }
>+
>+ if (start_offset != *offset) {
>+ struct xe_reg oaheadptr = __oa_regs(stream)->oa_head_ptr;
>+
>+ spin_lock_irqsave(&stream->oa_buffer.ptr_lock, flags);
>+
>+ xe_mmio_write32(stream->gt, oaheadptr,
>+ (head + gtt_offset) & OAG_OAHEADPTR_MASK);
>+ stream->oa_buffer.head = head;
>+
>+ spin_unlock_irqrestore(&stream->oa_buffer.ptr_lock, flags);
>+ }
>+
>+ return ret;
>+}
>+
> static void xe_oa_init_oa_buffer(struct xe_oa_stream *stream)
> {
> u32 gtt_offset = xe_bo_ggtt_addr(stream->oa_buffer.bo);
>@@ -321,6 +465,100 @@ static void xe_oa_disable(struct xe_oa_stream *stream)
> "wait for OA tlb invalidate timed out\n");
> }
>
>+static int __xe_oa_read(struct xe_oa_stream *stream, char __user *buf,
>+ size_t count, size_t *offset)
>+{
>+ struct xe_reg oastatus_reg = __oa_regs(stream)->oa_status;
>+ u32 oastatus;
>+ int ret;
>+
>+ if (drm_WARN_ON(&stream->oa->xe->drm, !stream->oa_buffer.vaddr))
>+ return -EIO;
>+
>+ oastatus = xe_mmio_read32(stream->gt, oastatus_reg);
>+
>+ /* We treat OABUFFER_OVERFLOW as a significant error */
>+ if (oastatus & OAG_OASTATUS_BUFFER_OVERFLOW) {
>+ ret = xe_oa_append_status(stream, buf, count, offset,
>+ DRM_XE_OA_RECORD_OA_BUFFER_LOST);
>+ if (ret)
>+ return ret;
>+
>+ drm_dbg(&stream->oa->xe->drm,
>+ "OA buffer overflow (exponent = %d): force restart\n",
>+ stream->period_exponent);
>+
>+ xe_oa_disable(stream);
>+ xe_oa_enable(stream);
>+
>+ /* oa_enable will re-init oabuffer and reset oastatus_reg */
>+ oastatus = xe_mmio_read32(stream->gt, oastatus_reg);
>+ }
>+
>+ if (oastatus & OAG_OASTATUS_REPORT_LOST) {
>+ ret = xe_oa_append_status(stream, buf, count, offset,
>+ DRM_XE_OA_RECORD_OA_REPORT_LOST);
>+ if (ret)
>+ return ret;
>+
>+ xe_mmio_rmw32(stream->gt, oastatus_reg,
>+ OAG_OASTATUS_COUNTER_OVERFLOW |
>+ OAG_OASTATUS_REPORT_LOST, 0);
>+ }
>+
>+ return xe_oa_append_reports(stream, buf, count, offset);
>+}
>+
>+static int xe_oa_wait_unlocked(struct xe_oa_stream *stream)
>+{
>+ /* We might wait indefinitely if periodic sampling is not enabled */
>+ if (!stream->periodic)
>+ return -EIO;
>+
>+ return wait_event_interruptible(stream->poll_wq,
>+ xe_oa_buffer_check_unlocked(stream));
>+}
>+
>+static ssize_t xe_oa_read(struct file *file, char __user *buf,
>+ size_t count, loff_t *ppos)
>+{
>+ struct xe_oa_stream *stream = file->private_data;
>+ size_t offset = 0;
>+ int ret;
>+
>+ /* Can't read from disabled streams */
>+ if (!stream->enabled || !stream->sample)
>+ return -EIO;
>+
>+ if (!(file->f_flags & O_NONBLOCK)) {
>+ do {
>+ ret = xe_oa_wait_unlocked(stream);
>+ if (ret)
>+ return ret;
>+
>+ mutex_lock(&stream->stream_lock);
>+ ret = __xe_oa_read(stream, buf, count, &offset);
>+ mutex_unlock(&stream->stream_lock);
>+ } while (!offset && !ret);
>+ } else {
>+ mutex_lock(&stream->stream_lock);
>+ ret = __xe_oa_read(stream, buf, count, &offset);
>+ mutex_unlock(&stream->stream_lock);
>+ }
>+
>+ /*
>+ * Typically we clear pollin here in order to wait for the new hrtimer callback
>+ * before unblocking. The exception to this is if __xe_oa_read returns -ENOSPC,
>+ * which means that more OA data is available than could fit in the user provided
>+ * buffer. In this case we want the next poll() call to not block.
>+ */
>+ if (ret != -ENOSPC)
>+ stream->pollin = false;
>+
>+ /* Possible values for ret are 0, -EFAULT, -ENOSPC, -EIO, ... */
>+ return offset ?: (ret ?: -EAGAIN);
>+}
>+
> static __poll_t xe_oa_poll_locked(struct xe_oa_stream *stream,
> struct file *file, poll_table *wait)
> {
>@@ -738,6 +976,7 @@ static const struct file_operations xe_oa_fops = {
> .llseek = no_llseek,
> .release = xe_oa_release,
> .poll = xe_oa_poll,
>+ .read = xe_oa_read,
> .unlocked_ioctl = xe_oa_ioctl,
> };
With some indents addressed, this is:
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
>
>--
>2.41.0
>
next prev parent reply other threads:[~2023-12-20 3:02 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-08 6:43 [PATCH v7 00/17] Add OA functionality to Xe Ashutosh Dixit
2023-12-08 6:43 ` [PATCH 01/17] drm/xe/perf/uapi: "Perf" layer to support multiple perf counter stream types Ashutosh Dixit
2023-12-08 6:43 ` [PATCH 02/17] drm/xe/perf/uapi: Add perf_stream_paranoid sysctl Ashutosh Dixit
2023-12-14 0:57 ` Umesh Nerlige Ramappa
2023-12-19 20:28 ` Dixit, Ashutosh
2024-01-20 2:35 ` Dixit, Ashutosh
2024-01-24 14:10 ` Joel Granados
2023-12-08 6:43 ` [PATCH 03/17] drm/xe/oa/uapi: Add oa_max_sample_rate sysctl Ashutosh Dixit
2023-12-14 0:58 ` Umesh Nerlige Ramappa
2024-01-20 2:36 ` Dixit, Ashutosh
2024-01-24 14:11 ` Joel Granados
2023-12-08 6:43 ` [PATCH 04/17] drm/xe/oa/uapi: Add OA data formats Ashutosh Dixit
2023-12-19 1:11 ` Umesh Nerlige Ramappa
2023-12-19 1:17 ` Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 05/17] drm/xe/oa/uapi: Initialize OA units Ashutosh Dixit
2023-12-19 16:11 ` Umesh Nerlige Ramappa
2024-01-20 2:43 ` Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 06/17] drm/xe/oa/uapi: Add/remove OA config perf ops Ashutosh Dixit
2023-12-19 19:10 ` Umesh Nerlige Ramappa
2024-01-20 2:44 ` Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 07/17] drm/xe/oa/uapi: Define and parse OA stream properties Ashutosh Dixit
2023-12-09 22:53 ` Dixit, Ashutosh
2023-12-19 2:59 ` Dixit, Ashutosh
2023-12-19 16:26 ` Umesh Nerlige Ramappa
2023-12-19 16:29 ` Lionel Landwerlin
2023-12-19 16:40 ` Umesh Nerlige Ramappa
2023-12-19 17:48 ` Lionel Landwerlin
2023-12-19 23:23 ` Umesh Nerlige Ramappa
2024-01-20 2:48 ` Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 08/17] drm/xe/oa: OA stream initialization (OAG) Ashutosh Dixit
2023-12-20 2:31 ` Umesh Nerlige Ramappa
2024-01-20 2:49 ` Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 09/17] drm/xe/oa/uapi: Expose OA stream fd Ashutosh Dixit
2023-12-20 2:52 ` Umesh Nerlige Ramappa
2024-01-20 2:50 ` Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 10/17] drm/xe/oa/uapi: Read file_operation Ashutosh Dixit
2023-12-20 3:01 ` Umesh Nerlige Ramappa [this message]
2024-01-20 2:51 ` Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 11/17] drm/xe/oa: Disable overrun mode for Xe2+ OAG Ashutosh Dixit
2023-12-20 3:05 ` Umesh Nerlige Ramappa
2024-01-20 2:51 ` Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 12/17] drm/xe/oa: Add OAR support Ashutosh Dixit
2023-12-20 4:37 ` Umesh Nerlige Ramappa
2023-12-08 6:43 ` [PATCH 13/17] drm/xe/oa: Add OAC support Ashutosh Dixit
2023-12-20 4:59 ` Umesh Nerlige Ramappa
2024-01-20 2:52 ` FIXME " Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 14/17] drm/xe/oa/uapi: Query OA unit properties Ashutosh Dixit
2023-12-23 0:40 ` Umesh Nerlige Ramappa
2024-01-20 3:10 ` Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 15/17] drm/xe/oa/uapi: OA buffer mmap Ashutosh Dixit
2023-12-23 2:39 ` Umesh Nerlige Ramappa
2024-01-20 3:11 ` Dixit, Ashutosh
2024-02-06 23:51 ` Umesh Nerlige Ramappa
2024-01-02 11:16 ` Thomas Hellström
2024-01-08 19:50 ` Umesh Nerlige Ramappa
2024-01-09 5:14 ` Dixit, Ashutosh
2023-12-08 6:43 ` [PATCH 16/17] drm/xe/oa: Add MMIO trigger support Ashutosh Dixit
2023-12-20 4:35 ` Umesh Nerlige Ramappa
2023-12-08 6:43 ` [PATCH 17/17] drm/xe/oa: Override GuC RC with OA on PVC Ashutosh Dixit
2023-12-08 9:22 ` ✗ CI.Patch_applied: failure for Add OA functionality to Xe (rev7) 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=ZYJZJeG3lUnFkCKU@unerlige-ril \
--to=umesh.nerlige.ramappa@intel.com \
--cc=ashutosh.dixit@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