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 14/16] drm/xe/oa/uapi: OA buffer mmap
Date: Tue, 6 Feb 2024 15:53:02 -0800 [thread overview]
Message-ID: <ZcLGXsv+QdSKVA9T@unerlige-ril> (raw)
In-Reply-To: <20240120020026.1261201-15-ashutosh.dixit@intel.com>
On Fri, Jan 19, 2024 at 06:00:24PM -0800, Ashutosh Dixit wrote:
>Allow the OA buffer to be mmap'd to userspace. This is needed for the MMIO
>trigger use case. Even otherwise, with whitelisted OA head/tail ptr
>registers, userspace can receive/interpret OA data from the mmap'd buffer
>without issuing read()'s on the OA stream fd.
>
>v2: Remove unmap_mapping_range from xe_oa_release (Thomas H)
> Use vm_flags_mod (Umesh)
>
>Suggested-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
>Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
>---
> drivers/gpu/drm/xe/xe_oa.c | 46 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 46 insertions(+)
>
>diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
>index eed89649daa08..fd34314563dbf 100644
>--- a/drivers/gpu/drm/xe/xe_oa.c
>+++ b/drivers/gpu/drm/xe/xe_oa.c
>@@ -808,6 +808,8 @@ static int xe_oa_alloc_oa_buffer(struct xe_oa_stream *stream)
> return PTR_ERR(bo);
>
> stream->oa_buffer.bo = bo;
>+ /* mmap implementation requires OA buffer to be in system memory */
>+ xe_assert(stream->oa->xe, bo->vmap.is_iomem == 0);
> stream->oa_buffer.vaddr = bo->vmap.vaddr;
> return 0;
> }
>@@ -1074,6 +1076,49 @@ static int xe_oa_release(struct inode *inode, struct file *file)
> return 0;
> }
>
>+static int xe_oa_mmap(struct file *file, struct vm_area_struct *vma)
>+{
>+ struct xe_oa_stream *stream = file->private_data;
>+ struct xe_bo *bo = stream->oa_buffer.bo;
>+ unsigned long start = vma->vm_start;
>+ int i, ret;
>+
>+ if (xe_perf_stream_paranoid && !perfmon_capable()) {
>+ drm_dbg(&stream->oa->xe->drm, "Insufficient privilege to map OA buffer\n");
>+ return -EACCES;
>+ }
>+
>+ /* Can mmap the entire OA buffer or nothing (no partial OA buffer mmaps) */
>+ if (vma->vm_end - vma->vm_start != XE_OA_BUFFER_SIZE) {
>+ drm_dbg(&stream->oa->xe->drm, "Wrong mmap size, must be OA buffer size\n");
>+ return -EINVAL;
>+ }
>+
>+ /*
>+ * Only support VM_READ, enforce MAP_PRIVATE by checking for
>+ * VM_MAYSHARE, don't copy the vma on fork
>+ */
>+ if (vma->vm_flags & (VM_WRITE | VM_EXEC | VM_SHARED | VM_MAYSHARE)) {
>+ drm_dbg(&stream->oa->xe->drm, "mmap must be read only\n");
>+ return -EINVAL;
>+ }
>+ vm_flags_mod(vma, VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP | VM_DONTCOPY,
>+ VM_MAYWRITE | VM_MAYEXEC);
>+
>+ xe_assert(stream->oa->xe, bo->ttm.ttm->num_pages ==
>+ (vma->vm_end - vma->vm_start) >> PAGE_SHIFT);
>+ for (i = 0; i < bo->ttm.ttm->num_pages; i++) {
>+ ret = remap_pfn_range(vma, start, page_to_pfn(bo->ttm.ttm->pages[i]),
>+ PAGE_SIZE, vma->vm_page_prot);
>+ if (ret)
>+ break;
>+
>+ start += PAGE_SIZE;
>+ }
>+
>+ return ret;
>+}
LGTM,
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Thanks,
Umesh
>+
> static const struct file_operations xe_oa_fops = {
> .owner = THIS_MODULE,
> .llseek = no_llseek,
>@@ -1081,6 +1126,7 @@ static const struct file_operations xe_oa_fops = {
> .poll = xe_oa_poll,
> .read = xe_oa_read,
> .unlocked_ioctl = xe_oa_ioctl,
>+ .mmap = xe_oa_mmap,
> };
>
> static bool engine_supports_mi_query(struct xe_hw_engine *hwe)
>--
>2.41.0
>
next prev parent reply other threads:[~2024-02-06 23:53 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-20 2:00 [PATCH 00/16] Add OA functionality to Xe Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 01/16] drm/xe/perf/uapi: "Perf" layer to support multiple perf counter stream types Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 02/16] drm/xe/perf/uapi: Add perf_stream_paranoid sysctl Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 03/16] drm/xe/oa/uapi: Add OA data formats Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 04/16] drm/xe/oa/uapi: Initialize OA units Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 05/16] drm/xe/oa/uapi: Add/remove OA config perf ops Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 06/16] drm/xe/oa/uapi: Define and parse OA stream properties Ashutosh Dixit
2024-02-06 22:25 ` Umesh Nerlige Ramappa
2024-02-06 22:58 ` Dixit, Ashutosh
2024-01-20 2:00 ` [PATCH 07/16] drm/xe/oa: OA stream initialization (OAG) Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 08/16] drm/xe/oa/uapi: Expose OA stream fd Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 09/16] drm/xe/oa/uapi: Read file_operation Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 10/16] drm/xe/oa: Disable overrun mode for Xe2+ OAG Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 11/16] drm/xe/oa: Add OAR support Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 12/16] drm/xe/oa: Add OAC support Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 13/16] drm/xe/oa/uapi: Query OA unit properties Ashutosh Dixit
2024-02-06 23:00 ` Umesh Nerlige Ramappa
2024-02-08 6:05 ` Dixit, Ashutosh
2024-01-20 2:00 ` [PATCH 14/16] drm/xe/oa/uapi: OA buffer mmap Ashutosh Dixit
2024-02-06 23:53 ` Umesh Nerlige Ramappa [this message]
2024-01-20 2:00 ` [PATCH 15/16] drm/xe/oa: Add MMIO trigger support Ashutosh Dixit
2024-01-20 2:00 ` [PATCH 16/16] drm/xe/oa: Override GuC RC with OA on PVC Ashutosh Dixit
2024-01-20 2:04 ` ✓ CI.Patch_applied: success for Add OA functionality to Xe (rev8) Patchwork
2024-01-20 2:04 ` ✗ CI.checkpatch: warning " Patchwork
2024-01-20 2:05 ` ✓ CI.KUnit: success " Patchwork
2024-01-20 2:12 ` ✓ CI.Build: " Patchwork
2024-01-20 2:13 ` ✗ CI.Hooks: failure " Patchwork
2024-01-20 2:14 ` ✓ CI.checksparse: success " Patchwork
2024-01-20 2:37 ` ✓ CI.BAT: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2024-02-08 5:49 [PATCH 00/16] Add OA functionality to Xe Ashutosh Dixit
2024-02-08 5:49 ` [PATCH 14/16] drm/xe/oa/uapi: OA buffer mmap Ashutosh Dixit
2024-02-13 6:44 [PATCH 00/16] Add OA functionality to Xe Ashutosh Dixit
2024-02-13 6:44 ` [PATCH 14/16] drm/xe/oa/uapi: OA buffer mmap Ashutosh Dixit
2024-03-05 5:32 [PATCH 00/16] Add OA functionality to Xe Ashutosh Dixit
2024-03-05 5:32 ` [PATCH 14/16] drm/xe/oa/uapi: OA buffer mmap Ashutosh Dixit
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=ZcLGXsv+QdSKVA9T@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