From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Mallesh Koujalagi <mallesh.koujalagi@intel.com>
Cc: <intel-xe@lists.freedesktop.org>,
<dri-devel@lists.freedesktop.org>, <andrealmeid@igalia.com>,
<christian.koenig@amd.com>, <airlied@gmail.com>,
<simona.vetter@ffwll.ch>, <mripard@kernel.org>,
<maarten.lankhorst@linux.intel.com>, <tzimmermann@suse.de>,
<anshuman.gupta@intel.com>, <badal.nilawar@intel.com>,
<riana.tauro@intel.com>, <karthik.poosa@intel.com>,
<sk.anirban@intel.com>, <raag.jadav@intel.com>
Subject: Re: [PATCH v12 4/4] drm/xe/ras: Use fault-inject to trigger punit error handler
Date: Tue, 28 Jul 2026 15:25:03 -0400 [thread overview]
Message-ID: <amkCDzvNVZOXNz9N@intel.com> (raw)
In-Reply-To: <20260724100302.706685-10-mallesh.koujalagi@intel.com>
On Fri, Jul 24, 2026 at 03:33:07PM +0530, Mallesh Koujalagi wrote:
> Use fault-inject framework to trigger punit_error_handler()
> for testing.
>
> Usage:
> echo 100 > .../inject_punit_error/probability
> echo 1 > .../inject_punit_error/times
>
> Signed-off-by: Mallesh Koujalagi <mallesh.koujalagi@intel.com>
> ---
> drivers/gpu/drm/xe/xe_debugfs.c | 4 ++++
> drivers/gpu/drm/xe/xe_debugfs.h | 2 ++
> drivers/gpu/drm/xe/xe_ras.c | 17 +++++++++++++++++
> 3 files changed, 23 insertions(+)
>
> diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
> index 5a3877fcb0f0..5599d493feca 100644
> --- a/drivers/gpu/drm/xe/xe_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_debugfs.c
> @@ -42,6 +42,7 @@
>
> DECLARE_FAULT_ATTR(gt_reset_failure);
> DECLARE_FAULT_ATTR(inject_csc_hw_error);
> +DECLARE_FAULT_ATTR(inject_punit_error);
>
> static bool csc_hw_error_available(struct xe_device *xe)
> {
> @@ -62,6 +63,8 @@ static struct {
> { .name = "inject_csc_hw_error",
> .attr = &inject_csc_hw_error,
> .is_visible = csc_hw_error_available },
> + { .name = "inject_punit_error",
> + .attr = &inject_punit_error },
> };
>
> /*
> @@ -76,6 +79,7 @@ bool xe_fault_##name(void) \
>
> FAULT_ACTION(gt_reset, gt_reset_failure)
> FAULT_ACTION(csc_hw_error, inject_csc_hw_error)
> +FAULT_ACTION(punit_error, inject_punit_error)
>
> static void xe_fault_inject_debugfs_register(struct xe_device *xe,
> struct dentry *root)
> diff --git a/drivers/gpu/drm/xe/xe_debugfs.h b/drivers/gpu/drm/xe/xe_debugfs.h
> index cd56f7442b99..dd57914dd4f2 100644
> --- a/drivers/gpu/drm/xe/xe_debugfs.h
> +++ b/drivers/gpu/drm/xe/xe_debugfs.h
> @@ -13,10 +13,12 @@ struct xe_device;
> #ifdef CONFIG_DEBUG_FS
> bool xe_fault_gt_reset(void);
> bool xe_fault_csc_hw_error(void);
> +bool xe_fault_punit_error(void);
> void xe_debugfs_register(struct xe_device *xe);
> #else
> static inline bool xe_fault_gt_reset(void) { return false; }
> static inline bool xe_fault_csc_hw_error(void) { return false; }
> +static inline bool xe_fault_punit_error(void) { return false; }
> static inline void xe_debugfs_register(struct xe_device *xe) { }
> #endif
>
> diff --git a/drivers/gpu/drm/xe/xe_ras.c b/drivers/gpu/drm/xe/xe_ras.c
> index 92b4181026cb..da06c16cf7ed 100644
> --- a/drivers/gpu/drm/xe/xe_ras.c
> +++ b/drivers/gpu/drm/xe/xe_ras.c
> @@ -3,6 +3,7 @@
> * Copyright © 2026 Intel Corporation
> */
>
> +#include "xe_debugfs.h"
> #include "xe_device.h"
> #include "xe_drm_ras.h"
> #include "xe_pm.h"
> @@ -391,6 +392,22 @@ enum xe_ras_recovery_action xe_ras_process_errors(struct xe_device *xe)
> size_t rlen;
> int ret;
>
> + /*
> + * Only allow the injected PUNIT error once the DRM device is registered.
That entirely defeats the purpose! :)
Sashiko identified this corner case so I asked you to ensure that this is covered
and to prove that you should provide a fault-inject with test case.
But then you are skipping exactly the corner case. That makes absolutely no sense.
> + * xe_ras_process_errors() also runs during probe (via xe_ras_init()), before
> + * drm_dev_register() calls device_add() on the DRM minor's kdev. At that
> + * point kdev->kobj.parent is not yet linked into the sysfs hierarchy, so
> + * kobject_get_path() returns "/card0" instead of the real sysfs path.
> + * drm_dev_wedged_event() would then emit a KOBJ_CHANGE uevent with a wrong
> + * DEVPATH that udev cannot resolve, silently dropping the event and leaving
> + * the cold-reset recovery broken.
> + */
> + if (xe->drm.registered && xe_fault_punit_error()) {
> + xe_err(xe, "[RAS]: PUNIT error injected\n");
> + punit_error_handler(xe);
> + return XE_RAS_RECOVERY_ACTION_DISCONNECT;
> + }
> +
> if (!xe->info.has_sysctrl)
> return XE_RAS_RECOVERY_ACTION_RESET;
>
> --
> 2.48.1
>
prev parent reply other threads:[~2026-07-28 19:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-24 10:03 [PATCH v12 0/4] Introduce cold reset recovery method Mallesh Koujalagi
2026-07-24 10:03 ` [PATCH v12 1/4] drm: Add DRM_WEDGE_RECOVERY_COLD_RESET " Mallesh Koujalagi
2026-07-24 10:16 ` sashiko-bot
2026-07-24 10:03 ` [PATCH v12 2/4] drm/doc: Document " Mallesh Koujalagi
2026-07-24 10:13 ` sashiko-bot
2026-07-24 10:03 ` [PATCH v12 3/4] drm/xe: Handle PUNIT errors by requesting cold-reset recovery Mallesh Koujalagi
2026-07-24 10:29 ` sashiko-bot
2026-07-24 10:03 ` [PATCH v12 4/4] drm/xe/ras: Use fault-inject to trigger punit error handler Mallesh Koujalagi
2026-07-24 10:20 ` sashiko-bot
2026-07-28 8:32 ` Tauro, Riana
2026-07-28 19:25 ` Rodrigo Vivi [this message]
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=amkCDzvNVZOXNz9N@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=airlied@gmail.com \
--cc=andrealmeid@igalia.com \
--cc=anshuman.gupta@intel.com \
--cc=badal.nilawar@intel.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=karthik.poosa@intel.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mallesh.koujalagi@intel.com \
--cc=mripard@kernel.org \
--cc=raag.jadav@intel.com \
--cc=riana.tauro@intel.com \
--cc=simona.vetter@ffwll.ch \
--cc=sk.anirban@intel.com \
--cc=tzimmermann@suse.de \
/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