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,
Michal.Wajdeczko@intel.com, michal.mrozek@intel.com
Subject: [PATCH v9 4/6] drm/xe/xe_gt_pagefault: Add address_type field to pagefaults
Date: Tue, 18 Mar 2025 17:11:31 +0000 [thread overview]
Message-ID: <20250318171146.78571-5-jonathan.cavitt@intel.com> (raw)
In-Reply-To: <20250318171146.78571-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_types.h | 2 ++
2 files changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c
index 37b4ab5135a8..483820be4e0a 100644
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
@@ -207,11 +207,13 @@ static int handle_pagefault(struct xe_gt *gt, struct xe_gt_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_GT_PAGEFAULT_ACCESS_TYPE_READ) {
+ pf->address_type = DRM_XE_FAULT_ADDRESS_TYPE_WRITE_INVALID_EXT;
err = -EPERM;
goto unlock_vm;
}
@@ -285,6 +287,7 @@ static bool get_pagefault(struct pf_queue *pf_queue, struct xe_gt_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_types.h b/drivers/gpu/drm/xe/xe_gt_pagefault_types.h
index 55c598c4a1bc..87ed7f54e050 100644
--- a/drivers/gpu/drm/xe/xe_gt_pagefault_types.h
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault_types.h
@@ -26,6 +26,8 @@ struct xe_gt_pagefault {
* from xe_gt_pagefault_access_type
*/
u8 access_type;
+ /** @address_type: Type of address access that resulted in fault */
+ u8 address_type;
/**
* @fault_type: fault type of this pagefault, as a value
* from xe_gt_pagefault_fault_type
--
2.43.0
next prev parent reply other threads:[~2025-03-18 17:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-18 17:11 [PATCH v9 0/6] drm/xe/xe_vm: Implement xe_vm_get_property_ioctl Jonathan Cavitt
2025-03-18 17:11 ` [PATCH v9 1/6] drm/xe/xe_gt_pagefault: Disallow writes to read-only VMAs Jonathan Cavitt
2025-03-18 17:11 ` [PATCH v9 2/6] drm/xe/xe_gt_pagefault: Move pagefault struct to header Jonathan Cavitt
2025-03-18 18:37 ` Michal Wajdeczko
2025-03-18 20:12 ` Cavitt, Jonathan
2025-03-18 22:01 ` Michal Wajdeczko
2025-03-19 15:26 ` Cavitt, Jonathan
2025-03-18 17:11 ` [PATCH v9 3/6] drm/xe/uapi: Define drm_xe_vm_get_property Jonathan Cavitt
2025-03-19 19:59 ` Jianxun Zhang
2025-03-19 20:13 ` Cavitt, Jonathan
2025-03-19 21:02 ` Zhang, Jianxun
2025-03-19 21:13 ` Cavitt, Jonathan
2025-03-19 22:33 ` Jianxun Zhang
2025-03-18 17:11 ` Jonathan Cavitt [this message]
2025-03-18 17:11 ` [PATCH v9 5/6] drm/xe/xe_vm: Add per VM fault info Jonathan Cavitt
2025-03-18 17:11 ` [PATCH v9 6/6] drm/xe/xe_vm: Implement xe_vm_get_property_ioctl Jonathan Cavitt
2025-03-18 17:16 ` ✓ CI.Patch_applied: success for drm/xe/xe_vm: Implement xe_vm_get_property_ioctl (rev10) Patchwork
2025-03-18 17:16 ` ✗ CI.checkpatch: warning " Patchwork
2025-03-18 17:17 ` ✓ CI.KUnit: success " Patchwork
2025-03-18 17:34 ` ✓ CI.Build: " Patchwork
2025-03-18 17:36 ` ✓ CI.Hooks: " Patchwork
2025-03-18 17:38 ` ✓ CI.checksparse: " Patchwork
2025-03-18 17:57 ` ✓ Xe.CI.BAT: " Patchwork
2025-03-18 18:55 ` ✗ 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=20250318171146.78571-5-jonathan.cavitt@intel.com \
--to=jonathan.cavitt@intel.com \
--cc=Michal.Wajdeczko@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=michal.mrozek@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