[PATCH v7 1/2] drm/xe/pagefault: Add SRCID to pagefault struct
From: Jonathan Cavitt
Date: Wed Sep 02 2026 - 18:17:23 EST
Add SRCID information to pagefault struct for the purpose of reporting
the hardware unit that resulted in the pagefault.
v2:
- Squash SRCID with ASID to keep the struct compact (Matthew)
v3:
- Use BUILD_BUG_ON and move ASID definition in one function (Matthew)
v4:
- Various formatting fixes
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@xxxxxxxxx>
Reviewed-by: Matthew Brost <matthew.brost@xxxxxxxxx>
Cc: Matthew Brost <matthew.brost@xxxxxxxxx>
Cc: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>
Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
Cc: David Airlie <airlied@xxxxxxxxx>
Cc: Simona Vetter <simona@xxxxxxxx>
---
drivers/gpu/drm/xe/xe_guc_pagefault.c | 8 +++++++-
drivers/gpu/drm/xe/xe_pagefault.c | 24 +++++++++++++++---------
drivers/gpu/drm/xe/xe_pagefault_types.h | 9 +++++++--
3 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_guc_pagefault.c b/drivers/gpu/drm/xe/xe_guc_pagefault.c
index 8f8210a732e98..df237fd405519 100644
--- a/drivers/gpu/drm/xe/xe_guc_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_guc_pagefault.c
@@ -108,7 +108,13 @@ int xe_guc_pagefault_handler(struct xe_guc *guc, u32 *msg, u32 len)
<< PFD_VIRTUAL_ADDR_HI_SHIFT) |
(FIELD_GET(PFD_VIRTUAL_ADDR_LO, msg[2]) <<
PFD_VIRTUAL_ADDR_LO_SHIFT);
- pf.consumer.asid = FIELD_GET(PFD_ASID, msg[1]);
+
+ BUILD_BUG_ON(XE_MAX_ASID > XE_PAGEFAULT_ASID_MASK);
+
+ pf.consumer.id = FIELD_PREP(XE_PAGEFAULT_ASID_MASK,
+ FIELD_GET(PFD_ASID, msg[1])) |
+ FIELD_PREP(XE_PAGEFAULT_SRCID_MASK,
+ FIELD_GET(PFD_SRC_ID, msg[0]));
pf.consumer.access_type = FIELD_GET(PFD_ACCESS_TYPE, msg[2]) |
(FIELD_GET(PFD_PREFETCH, msg[2]) ? XE_PAGEFAULT_ACCESS_PREFETCH : 0);
if (FIELD_GET(XE2_PFD_TRVA_FAULT, msg[0]))
diff --git a/drivers/gpu/drm/xe/xe_pagefault.c b/drivers/gpu/drm/xe/xe_pagefault.c
index 2e415995f067b..e81ca24df37fc 100644
--- a/drivers/gpu/drm/xe/xe_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_pagefault.c
@@ -252,12 +252,13 @@ static int xe_pagefault_service(struct xe_pagefault *pf)
struct xe_vma *vma = NULL;
int err;
bool atomic;
+ u32 asid = FIELD_GET(XE_PAGEFAULT_ASID_MASK, pf->consumer.id);
/* Producer flagged this fault to be nacked */
if (pf->consumer.fault_type_level == XE_PAGEFAULT_TYPE_LEVEL_NACK)
return -EFAULT;
- vm = xe_pagefault_asid_to_vm(xe, pf->consumer.asid);
+ vm = xe_pagefault_asid_to_vm(xe, asid);
if (IS_ERR(vm))
return PTR_ERR(vm);
@@ -374,7 +375,7 @@ static bool xe_pagefault_match(struct xe_pagefault *pf, u64 start,
{
struct xe_device *xe = gt_to_xe(pf->gt);
u64 page_addr = pf->consumer.page_addr;
- u32 pf_asid = pf->consumer.asid;
+ u32 pf_asid = FIELD_GET(XE_PAGEFAULT_ASID_MASK, pf->consumer.id);
xe_assert(xe, pf->consumer.alloc_state !=
XE_PAGEFAULT_ALLOC_STATE_FREE);
@@ -499,7 +500,7 @@ static bool xe_pagefault_queue_pop(struct xe_pagefault_queue *pf_queue,
align = SZ_4K;
pf_work->cache.start = ALIGN_DOWN(lpf->consumer.page_addr, align);
pf_work->cache.end = pf_work->cache.start + align;
- pf_work->cache.asid = lpf->consumer.asid;
+ pf_work->cache.asid = FIELD_GET(XE_PAGEFAULT_ASID_MASK, lpf->consumer.id);
pf_work->cache.pf = lpf;
lpf->consumer.alloc_state = XE_PAGEFAULT_ALLOC_STATE_ACTIVE;
@@ -545,14 +546,16 @@ static void xe_pagefault_print(struct xe_pagefault *pf)
u8 engine_class = FIELD_GET(XE_PAGEFAULT_ENGINE_CLASS_MASK,
pf->consumer.engine_class_instance);
- xe_gt_info(pf->gt, "\n\tASID: %d\n"
+ xe_gt_info(pf->gt, "\n\tASID: %lu\n"
"\tFaulted Address: 0x%08x%08x\n"
"\tFaultType: %lu\n"
"\tAccessType: %lu\n"
"\tFaultLevel: %lu\n"
"\tEngineClass: %d %s\n"
- "\tEngineInstance: %lu\n",
- pf->consumer.asid,
+ "\tEngineInstance: %lu\n"
+ "\tSRCID: 0x%02lx\n",
+ FIELD_GET(XE_PAGEFAULT_ASID_MASK,
+ pf->consumer.id),
upper_32_bits(pf->consumer.page_addr),
lower_32_bits(pf->consumer.page_addr),
FIELD_GET(XE_PAGEFAULT_TYPE_MASK,
@@ -564,7 +567,9 @@ static void xe_pagefault_print(struct xe_pagefault *pf)
engine_class,
xe_hw_engine_class_to_str(engine_class),
FIELD_GET(XE_PAGEFAULT_ENGINE_INSTANCE_MASK,
- pf->consumer.engine_class_instance));
+ pf->consumer.engine_class_instance),
+ FIELD_GET(XE_PAGEFAULT_SRCID_MASK,
+ pf->consumer.id));
}
static void xe_pagefault_save_to_vm(struct xe_device *xe, struct xe_pagefault *pf)
@@ -577,7 +582,8 @@ static void xe_pagefault_save_to_vm(struct xe_device *xe, struct xe_pagefault *p
* mode, return VM anyways.
*/
down_read(&xe->usm.lock);
- vm = xa_load(&xe->usm.asid_to_vm, pf->consumer.asid);
+ vm = xa_load(&xe->usm.asid_to_vm,
+ FIELD_GET(XE_PAGEFAULT_ASID_MASK, pf->consumer.id));
if (vm)
xe_vm_get(vm);
else
@@ -611,7 +617,7 @@ static void xe_pagefault_queue_work(struct work_struct *w)
const struct xe_pagefault_ops *ops = pf->producer.ops;
void *private = pf->producer.private;
struct xe_gt *gt = pf->gt;
- u32 asid = pf->consumer.asid;
+ u32 asid = FIELD_GET(XE_PAGEFAULT_ASID_MASK, pf->consumer.id);
int err = 0;
bool invalidated = false;
diff --git a/drivers/gpu/drm/xe/xe_pagefault_types.h b/drivers/gpu/drm/xe/xe_pagefault_types.h
index efeba5c3a58ba..f16bab29bfc30 100644
--- a/drivers/gpu/drm/xe/xe_pagefault_types.h
+++ b/drivers/gpu/drm/xe/xe_pagefault_types.h
@@ -112,8 +112,13 @@ struct xe_pagefault {
u8 engine_class_instance;
#define XE_PAGEFAULT_ENGINE_CLASS_MASK GENMASK(3, 0)
#define XE_PAGEFAULT_ENGINE_INSTANCE_MASK GENMASK(7, 4)
- /** @consumer.asid: address space ID */
- u32 asid;
+ /**
+ * @consumer.id: address space ID and SRCID, folded into one
+ * to keep size compact
+ */
+ u32 id;
+#define XE_PAGEFAULT_ASID_MASK GENMASK(23, 0)
+#define XE_PAGEFAULT_SRCID_MASK GENMASK(31, 24)
};
/**
* @consumer.end_addr: end address of page fault,
--
2.53.0