Skip to content

Commit 651065d

Browse files
committed
drm/xe: Increase log level for unhandled page faults
Set the kernel log level for unhandled page faults to match the log level (info) for engine resets. Currently, dmesg output can be confusing because it shows an engine reset without indicating the page fault that caused it. Without this change, the GuC log must be examined to determine the source of the engine reset. Signed-off-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Stuart Summers <stuart.summers@intel.com> Link: https://patch.msgid.link/20251218223745.4045207-1-matthew.brost@intel.com
1 parent 13fe9fa commit 651065d

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

drivers/gpu/drm/xe/xe_guc_submit.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3159,13 +3159,13 @@ int xe_guc_exec_queue_memory_cat_error_handler(struct xe_guc *guc, u32 *msg,
31593159
* See bspec 54047 and 72187 for details.
31603160
*/
31613161
if (type != XE_GUC_CAT_ERR_TYPE_INVALID)
3162-
xe_gt_dbg(gt,
3163-
"Engine memory CAT error [%u]: class=%s, logical_mask: 0x%x, guc_id=%d",
3164-
type, xe_hw_engine_class_to_str(q->class), q->logical_mask, guc_id);
3162+
xe_gt_info(gt,
3163+
"Engine memory CAT error [%u]: class=%s, logical_mask: 0x%x, guc_id=%d",
3164+
type, xe_hw_engine_class_to_str(q->class), q->logical_mask, guc_id);
31653165
else
3166-
xe_gt_dbg(gt,
3167-
"Engine memory CAT error: class=%s, logical_mask: 0x%x, guc_id=%d",
3168-
xe_hw_engine_class_to_str(q->class), q->logical_mask, guc_id);
3166+
xe_gt_info(gt,
3167+
"Engine memory CAT error: class=%s, logical_mask: 0x%x, guc_id=%d",
3168+
xe_hw_engine_class_to_str(q->class), q->logical_mask, guc_id);
31693169

31703170
trace_xe_exec_queue_memory_cat_error(q);
31713171

drivers/gpu/drm/xe/xe_pagefault.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -223,22 +223,22 @@ static bool xe_pagefault_queue_pop(struct xe_pagefault_queue *pf_queue,
223223

224224
static void xe_pagefault_print(struct xe_pagefault *pf)
225225
{
226-
xe_gt_dbg(pf->gt, "\n\tASID: %d\n"
227-
"\tFaulted Address: 0x%08x%08x\n"
228-
"\tFaultType: %d\n"
229-
"\tAccessType: %d\n"
230-
"\tFaultLevel: %d\n"
231-
"\tEngineClass: %d %s\n"
232-
"\tEngineInstance: %d\n",
233-
pf->consumer.asid,
234-
upper_32_bits(pf->consumer.page_addr),
235-
lower_32_bits(pf->consumer.page_addr),
236-
pf->consumer.fault_type,
237-
pf->consumer.access_type,
238-
pf->consumer.fault_level,
239-
pf->consumer.engine_class,
240-
xe_hw_engine_class_to_str(pf->consumer.engine_class),
241-
pf->consumer.engine_instance);
226+
xe_gt_info(pf->gt, "\n\tASID: %d\n"
227+
"\tFaulted Address: 0x%08x%08x\n"
228+
"\tFaultType: %d\n"
229+
"\tAccessType: %d\n"
230+
"\tFaultLevel: %d\n"
231+
"\tEngineClass: %d %s\n"
232+
"\tEngineInstance: %d\n",
233+
pf->consumer.asid,
234+
upper_32_bits(pf->consumer.page_addr),
235+
lower_32_bits(pf->consumer.page_addr),
236+
pf->consumer.fault_type,
237+
pf->consumer.access_type,
238+
pf->consumer.fault_level,
239+
pf->consumer.engine_class,
240+
xe_hw_engine_class_to_str(pf->consumer.engine_class),
241+
pf->consumer.engine_instance);
242242
}
243243

244244
static void xe_pagefault_queue_work(struct work_struct *w)
@@ -260,8 +260,8 @@ static void xe_pagefault_queue_work(struct work_struct *w)
260260
err = xe_pagefault_service(&pf);
261261
if (err) {
262262
xe_pagefault_print(&pf);
263-
xe_gt_dbg(pf.gt, "Fault response: Unsuccessful %pe\n",
264-
ERR_PTR(err));
263+
xe_gt_info(pf.gt, "Fault response: Unsuccessful %pe\n",
264+
ERR_PTR(err));
265265
}
266266

267267
pf.producer.ops->ack_fault(&pf, err);

0 commit comments

Comments
 (0)