From: Jonathan Cavitt <jonathan.cavitt@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: saurabhg.gupta@intel.com, alex.zuo@intel.com,
jonathan.cavitt@intel.com, joonas.lahtinen@linux.intel.com,
matthew.brost@intel.com, jianxun.zhang@intel.com,
shuicheng.lin@intel.com, dri-devel@lists.freedesktop.org
Subject: [PATCH v5 5/6] drm/xe/xe_gt_pagefault: Add address_type field to pagefaults
Date: Tue, 4 Mar 2025 17:08:53 +0000 [thread overview]
Message-ID: <20250304170854.67195-6-jonathan.cavitt@intel.com> (raw)
In-Reply-To: <20250304170854.67195-1-jonathan.cavitt@intel.com>
Add a new field to the xe_pagefault struct, address_type, that tracks
the type of fault the pagefault incurred.
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
---
drivers/gpu/drm/xe/xe_gt_pagefault.c | 3 +++
drivers/gpu/drm/xe/xe_gt_pagefault.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c
index 84907fb4295e..ecf9f76bd423 100644
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
@@ -204,11 +204,13 @@ static int handle_pagefault(struct xe_gt *gt, struct xe_pagefault *pf)
vma = lookup_vma(vm, pf->page_addr);
if (!vma) {
+ pf->address_type = DRM_XE_FAULT_ADDRESS_TYPE_NONE_EXT;
err = -EINVAL;
goto unlock_vm;
}
if (xe_vma_read_only(vma) && pf->access_type != XE_PAGEFAULT_ACCESS_TYPE_READ) {
+ pf->address_type = DRM_XE_FAULT_ADDRESS_TYPE_WRITE_INVALID_EXT;
err = -EPERM;
goto unlock_vm;
}
@@ -276,6 +278,7 @@ static bool get_pagefault(struct pf_queue *pf_queue, struct xe_pagefault *pf)
pf->asid = FIELD_GET(PFD_ASID, desc->dw1);
pf->vfid = FIELD_GET(PFD_VFID, desc->dw2);
pf->access_type = FIELD_GET(PFD_ACCESS_TYPE, desc->dw2);
+ pf->address_type = 0;
pf->fault_type = FIELD_GET(PFD_FAULT_TYPE, desc->dw2);
pf->page_addr = (u64)(FIELD_GET(PFD_VIRTUAL_ADDR_HI, desc->dw3)) <<
PFD_VIRTUAL_ADDR_HI_SHIFT;
diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.h b/drivers/gpu/drm/xe/xe_gt_pagefault.h
index 33616043d17a..969f7b458d3f 100644
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.h
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.h
@@ -17,6 +17,7 @@ struct xe_pagefault {
u16 pdata;
u8 vfid;
u8 access_type;
+ u8 address_type;
u8 fault_type;
u8 fault_level;
u8 engine_class;
--
2.43.0
next prev parent reply other threads:[~2025-03-04 17:09 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-04 17:08 [PATCH v5 0/6] drm/xe/xe_vm: Implement xe_vm_get_property_ioctl Jonathan Cavitt
2025-03-04 17:08 ` [PATCH v5 1/6] drm/xe/xe_gt_pagefault: Disallow writes to read-only VMAs Jonathan Cavitt
2025-03-07 10:34 ` Gwan-gyeong Mun
2025-03-07 22:05 ` Cavitt, Jonathan
2025-03-04 17:08 ` [PATCH v5 2/6] drm/xe/xe_gt_pagefault: Migrate pagefault struct to header Jonathan Cavitt
2025-03-04 17:08 ` [PATCH v5 3/6] drm/xe/xe_vm: Add per VM pagefault info Jonathan Cavitt
2025-03-04 21:52 ` Lin, Shuicheng
2025-03-07 12:39 ` Gwan-gyeong Mun
2025-03-07 22:05 ` Cavitt, Jonathan
2025-03-04 17:08 ` [PATCH v5 4/6] drm/xe/uapi: Define drm_xe_vm_get_property Jonathan Cavitt
2025-03-04 17:08 ` Jonathan Cavitt [this message]
2025-03-04 17:08 ` [PATCH v5 6/6] drm/xe/xe_vm: Implement xe_vm_get_property_ioctl Jonathan Cavitt
2025-03-04 20:37 ` Zhang, Jianxun
2025-03-04 22:27 ` Cavitt, Jonathan
2025-03-04 22:16 ` Lin, Shuicheng
2025-03-05 7:42 ` Cavitt, Jonathan
2025-03-04 18:17 ` ✓ CI.Patch_applied: success for drm/xe/xe_vm: Implement xe_vm_get_property_ioctl (rev6) Patchwork
2025-03-04 18:17 ` ✗ CI.checkpatch: warning " Patchwork
2025-03-04 18:18 ` ✓ CI.KUnit: success " Patchwork
2025-03-04 18:35 ` ✓ CI.Build: " Patchwork
2025-03-04 18:37 ` ✓ CI.Hooks: " Patchwork
2025-03-04 18:39 ` ✓ CI.checksparse: " Patchwork
2025-03-04 18:58 ` ✗ Xe.CI.BAT: failure " Patchwork
2025-03-04 20:59 ` ✗ Xe.CI.Full: " Patchwork
2025-03-04 23:46 ` ✗ CI.Patch_applied: failure for drm/xe/xe_vm: Implement xe_vm_get_property_ioctl (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=20250304170854.67195-6-jonathan.cavitt@intel.com \
--to=jonathan.cavitt@intel.com \
--cc=alex.zuo@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jianxun.zhang@intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=matthew.brost@intel.com \
--cc=saurabhg.gupta@intel.com \
--cc=shuicheng.lin@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