Commit 4cb1b327 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Thomas Hellström
Browse files

drm/xe/guc: Fix CFI violation in debugfs access. 



xe_guc_print_info is void-returning, but the function pointer it is
assigned to expects an int-returning function, leading to the following
CFI error:

[  206.873690] CFI failure at guc_debugfs_show+0xa1/0xf0 [xe]
(target: xe_guc_print_info+0x0/0x370 [xe]; expected type: 0xbe3bc66a)

Fix this by updating xe_guc_print_info to return an integer.

Fixes: e15826bb ("drm/xe/guc: Refactor GuC debugfs initialization")
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: George D Sworo <george.d.sworo@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patch.msgid.link/20260129182547.32899-2-daniele.ceraolospurio@intel.com


(cherry picked from commit dd8ea2f2)
Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
parent bb36170d

drivers/gpu/drm/xe/xe_guc.c

+4 −2
Original line number Diff line number Diff line
@@ -1618,7 +1618,7 @@ int xe_guc_start(struct xe_guc *guc) 
	return xe_guc_submit_start(guc);

}



void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p)

int xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p)

{

	struct xe_gt *gt = guc_to_gt(guc);

	unsigned int fw_ref;
@@ -1630,7 +1630,7 @@ void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p) 
	if (!IS_SRIOV_VF(gt_to_xe(gt))) {

		fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);

		if (!fw_ref)

			return;

			return -EIO;



		status = xe_mmio_read32(&gt->mmio, GUC_STATUS);
@@ -1658,6 +1658,8 @@ void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p) 


	drm_puts(p, "\n");

	xe_guc_submit_print(guc, p);



	return 0;

}



/**

drivers/gpu/drm/xe/xe_guc.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int xe_guc_self_cfg32(struct xe_guc *guc, u16 key, u32 val); 
int xe_guc_self_cfg64(struct xe_guc *guc, u16 key, u64 val);

void xe_guc_irq_handler(struct xe_guc *guc, const u16 iir);

void xe_guc_sanitize(struct xe_guc *guc);

void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p);

int xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p);

int xe_guc_reset_prepare(struct xe_guc *guc);

void xe_guc_reset_wait(struct xe_guc *guc);

void xe_guc_stop_prepare(struct xe_guc *guc);