From: Francois Dugast <francois.dugast@intel.com>
To: Petr Pavlu <petr.pavlu@suse.com>
Cc: "Jens Axboe" <axboe@kernel.dk>,
"Jakub Kicinski" <kuba@kernel.org>,
"Andrew Lunn" <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Paolo Abeni" <pabeni@redhat.com>,
"Jani Nikula" <jani.nikula@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
"Tvrtko Ursulin" <tursulin@ursulin.net>,
"Matthew Brost" <matthew.brost@intel.com>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
"Simon Horman" <horms@kernel.org>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Luis Chamberlain" <mcgrof@kernel.org>,
"Daniel Gomez" <da.gomez@kernel.org>,
"Sami Tolvanen" <samitolvanen@google.com>,
"Aaron Tomlin" <atomlin@atomlin.com>,
linux-block@vger.kernel.org, netdev@vger.kernel.org,
linux-api@vger.kernel.org, intel-gfx@lists.freedesktop.org,
intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 5/6] drm/xe: Include error-injection.h for ALLOW_ERROR_INJECTION()
Date: Mon, 14 Sep 2026 09:41:46 +0200 [thread overview]
Message-ID: <aqelOvgLfacnxcJt@fdugast-desk> (raw)
In-Reply-To: <20260911-module-include-error_injection-v1-5-5da895d8c84d@suse.com>
On Fri, Sep 11, 2026 at 05:04:05PM +0200, Petr Pavlu wrote:
> Several drivers/gpu/drm/xe/*.c files use ALLOW_ERROR_INJECTION(), which is
> defined in asm-generic/error-injection.h. They currently rely on this
> header being included indirectly through linux/module.h ->
> linux/error-injection.h.
>
> Add the missing includes in preparation for removing the
> linux/error-injection.h include from linux/module.h.
>
> Remove also the linux/fault-injection.h include, which commit 91b2c42c214f
> ("drm/xe: Use fault injection infrastructure to find issues at probe time")
> mistakenly used to provide the definition of ALLOW_ERROR_INJECTION().
>
> Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
Reviewed-by: Francois Dugast <francois.dugast@intel.com>
> ---
> drivers/gpu/drm/xe/xe_device.c | 2 +-
> drivers/gpu/drm/xe/xe_exec_queue.c | 1 +
> drivers/gpu/drm/xe/xe_ggtt.c | 2 +-
> drivers/gpu/drm/xe/xe_guc.c | 1 +
> drivers/gpu/drm/xe/xe_guc_ads.c | 2 +-
> drivers/gpu/drm/xe/xe_guc_ct.c | 2 +-
> drivers/gpu/drm/xe/xe_guc_log.c | 2 +-
> drivers/gpu/drm/xe/xe_guc_relay.c | 2 +-
> drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 1 +
> drivers/gpu/drm/xe/xe_hw_engine_group.c | 2 ++
> drivers/gpu/drm/xe/xe_mmio.c | 1 +
> drivers/gpu/drm/xe/xe_oa.c | 1 +
> drivers/gpu/drm/xe/xe_pm.c | 2 +-
> drivers/gpu/drm/xe/xe_pt.c | 2 ++
> drivers/gpu/drm/xe/xe_pxp.c | 2 ++
> drivers/gpu/drm/xe/xe_sriov.c | 2 +-
> drivers/gpu/drm/xe/xe_sync.c | 1 +
> drivers/gpu/drm/xe/xe_tile.c | 2 +-
> drivers/gpu/drm/xe/xe_tuning.c | 2 ++
> drivers/gpu/drm/xe/xe_uc_fw.c | 2 +-
> drivers/gpu/drm/xe/xe_vm.c | 1 +
> drivers/gpu/drm/xe/xe_wa.c | 2 +-
> drivers/gpu/drm/xe/xe_wopcm.c | 2 +-
> 23 files changed, 27 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index ee732e5495f7..fcef8d5fc7ca 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -7,7 +7,7 @@
>
> #include <linux/aperture.h>
> #include <linux/delay.h>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
> #include <linux/units.h>
>
> #include <drm/drm_client.h>
> diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
> index cd053de3c6b5..3e46c14584c4 100644
> --- a/drivers/gpu/drm/xe/xe_exec_queue.c
> +++ b/drivers/gpu/drm/xe/xe_exec_queue.c
> @@ -5,6 +5,7 @@
>
> #include "xe_exec_queue.h"
>
> +#include <linux/error-injection.h>
> #include <linux/nospec.h>
>
> #include <drm/drm_device.h>
> diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c
> index 8ec23862477f..e05582ad098a 100644
> --- a/drivers/gpu/drm/xe/xe_ggtt.c
> +++ b/drivers/gpu/drm/xe/xe_ggtt.c
> @@ -6,7 +6,7 @@
> #include "xe_ggtt.h"
>
> #include <kunit/visibility.h>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
> #include <linux/io-64-nonatomic-lo-hi.h>
> #include <linux/sizes.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
> index 4286bd05c686..34e21a70d5ad 100644
> --- a/drivers/gpu/drm/xe/xe_guc.c
> +++ b/drivers/gpu/drm/xe/xe_guc.c
> @@ -5,6 +5,7 @@
>
> #include "xe_guc.h"
>
> +#include <linux/error-injection.h>
> #include <linux/iopoll.h>
> #include <drm/drm_managed.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
> index ff8eee3831aa..41a2b8c807d6 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ads.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ads.c
> @@ -5,7 +5,7 @@
>
> #include "xe_guc_ads.h"
>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
>
> #include <drm/drm_managed.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
> index fe70c0fd85c5..ac6cbbaa6cc0 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ct.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ct.c
> @@ -8,7 +8,7 @@
> #include <linux/bitfield.h>
> #include <linux/circ_buf.h>
> #include <linux/delay.h>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
>
> #include <kunit/static_stub.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_guc_log.c b/drivers/gpu/drm/xe/xe_guc_log.c
> index 538d4df0f7aa..6f0739204d9e 100644
> --- a/drivers/gpu/drm/xe/xe_guc_log.c
> +++ b/drivers/gpu/drm/xe/xe_guc_log.c
> @@ -5,7 +5,7 @@
>
> #include "xe_guc_log.h"
>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
>
> #include <linux/utsname.h>
> #include <drm/drm_managed.h>
> diff --git a/drivers/gpu/drm/xe/xe_guc_relay.c b/drivers/gpu/drm/xe/xe_guc_relay.c
> index eed0a750d2eb..e528d95ba7fe 100644
> --- a/drivers/gpu/drm/xe/xe_guc_relay.c
> +++ b/drivers/gpu/drm/xe/xe_guc_relay.c
> @@ -5,7 +5,7 @@
>
> #include <linux/bitfield.h>
> #include <linux/delay.h>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
>
> #include <drm/drm_managed.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c b/drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c
> index d42e263e0611..ac81f382e7dc 100644
> --- a/drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c
> +++ b/drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c
> @@ -4,6 +4,7 @@
> */
>
> #include <drm/drm_managed.h>
> +#include <linux/error-injection.h>
> #include <linux/kobject.h>
> #include <linux/sysfs.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_hw_engine_group.c b/drivers/gpu/drm/xe/xe_hw_engine_group.c
> index 0804b426b6f9..418ff427ae30 100644
> --- a/drivers/gpu/drm/xe/xe_hw_engine_group.c
> +++ b/drivers/gpu/drm/xe/xe_hw_engine_group.c
> @@ -3,6 +3,8 @@
> * Copyright © 2024 Intel Corporation
> */
>
> +#include <linux/error-injection.h>
> +
> #include <drm/drm_managed.h>
>
> #include "xe_assert.h"
> diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c
> index 7fa18dfcb5a2..d8f8a2453bb6 100644
> --- a/drivers/gpu/drm/xe/xe_mmio.c
> +++ b/drivers/gpu/drm/xe/xe_mmio.c
> @@ -6,6 +6,7 @@
> #include "xe_mmio.h"
>
> #include <linux/delay.h>
> +#include <linux/error-injection.h>
> #include <linux/io-64-nonatomic-lo-hi.h>
> #include <linux/minmax.h>
> #include <linux/pci.h>
> diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
> index ab09dcff5860..b15c96e35fab 100644
> --- a/drivers/gpu/drm/xe/xe_oa.c
> +++ b/drivers/gpu/drm/xe/xe_oa.c
> @@ -5,6 +5,7 @@
>
> #include <linux/anon_inodes.h>
> #include <linux/delay.h>
> +#include <linux/error-injection.h>
> #include <linux/nospec.h>
> #include <linux/poll.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
> index a5289a9df8d2..c0489a8d8a62 100644
> --- a/drivers/gpu/drm/xe/xe_pm.c
> +++ b/drivers/gpu/drm/xe/xe_pm.c
> @@ -5,7 +5,7 @@
>
> #include "xe_pm.h"
>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
> #include <linux/pm_runtime.h>
> #include <linux/suspend.h>
> #include <linux/dmi.h>
> diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
> index a07316a45d79..6c6d9be2717e 100644
> --- a/drivers/gpu/drm/xe/xe_pt.c
> +++ b/drivers/gpu/drm/xe/xe_pt.c
> @@ -5,6 +5,8 @@
>
> #include "xe_pt.h"
>
> +#include <linux/error-injection.h>
> +
> #include "regs/xe_gtt_defs.h"
> #include "xe_bo.h"
> #include "xe_device.h"
> diff --git a/drivers/gpu/drm/xe/xe_pxp.c b/drivers/gpu/drm/xe/xe_pxp.c
> index 2fef274a585e..2f3632ac201a 100644
> --- a/drivers/gpu/drm/xe/xe_pxp.c
> +++ b/drivers/gpu/drm/xe/xe_pxp.c
> @@ -5,6 +5,8 @@
>
> #include "xe_pxp.h"
>
> +#include <linux/error-injection.h>
> +
> #include <drm/drm_managed.h>
> #include <uapi/drm/xe_drm.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_sriov.c b/drivers/gpu/drm/xe/xe_sriov.c
> index f3835867fce5..ec254b950daf 100644
> --- a/drivers/gpu/drm/xe/xe_sriov.c
> +++ b/drivers/gpu/drm/xe/xe_sriov.c
> @@ -3,7 +3,7 @@
> * Copyright © 2023 Intel Corporation
> */
>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
>
> #include <drm/drm_managed.h>
>
> diff --git a/drivers/gpu/drm/xe/xe_sync.c b/drivers/gpu/drm/xe/xe_sync.c
> index 37866768d64c..711de22f4986 100644
> --- a/drivers/gpu/drm/xe/xe_sync.c
> +++ b/drivers/gpu/drm/xe/xe_sync.c
> @@ -6,6 +6,7 @@
> #include "xe_sync.h"
>
> #include <linux/dma-fence-array.h>
> +#include <linux/error-injection.h>
> #include <linux/kthread.h>
> #include <linux/sched/mm.h>
> #include <linux/uaccess.h>
> diff --git a/drivers/gpu/drm/xe/xe_tile.c b/drivers/gpu/drm/xe/xe_tile.c
> index 74d925a337b7..810dfd98d830 100644
> --- a/drivers/gpu/drm/xe/xe_tile.c
> +++ b/drivers/gpu/drm/xe/xe_tile.c
> @@ -3,7 +3,7 @@
> * Copyright © 2023 Intel Corporation
> */
>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
>
> #include <drm/drm_managed.h>
> #include <drm/drm_pagemap_util.h>
> diff --git a/drivers/gpu/drm/xe/xe_tuning.c b/drivers/gpu/drm/xe/xe_tuning.c
> index bcec40ca2d35..d3d38b4380be 100644
> --- a/drivers/gpu/drm/xe/xe_tuning.c
> +++ b/drivers/gpu/drm/xe/xe_tuning.c
> @@ -5,6 +5,8 @@
>
> #include "xe_tuning.h"
>
> +#include <linux/error-injection.h>
> +
> #include <kunit/visibility.h>
>
> #include <drm/drm_managed.h>
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
> index a8e6f18cc9b4..f17925ad53f5 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.c
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c
> @@ -4,7 +4,7 @@
> */
>
> #include <linux/bitfield.h>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
> #include <linux/firmware.h>
>
> #include <drm/drm_managed.h>
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index 23952ad8951e..f000564f1e59 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -6,6 +6,7 @@
> #include "xe_vm.h"
>
> #include <linux/dma-fence-array.h>
> +#include <linux/error-injection.h>
> #include <linux/nospec.h>
>
> #include <drm/drm_drv.h>
> diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c
> index 139434946f8f..98d2fdd3ba6f 100644
> --- a/drivers/gpu/drm/xe/xe_wa.c
> +++ b/drivers/gpu/drm/xe/xe_wa.c
> @@ -8,7 +8,7 @@
> #include <drm/drm_managed.h>
> #include <kunit/visibility.h>
> #include <linux/compiler_types.h>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
>
> #include <generated/xe_device_wa_oob.h>
> #include <generated/xe_wa_oob.h>
> diff --git a/drivers/gpu/drm/xe/xe_wopcm.c b/drivers/gpu/drm/xe/xe_wopcm.c
> index fe65ed246775..7da1e3ebc839 100644
> --- a/drivers/gpu/drm/xe/xe_wopcm.c
> +++ b/drivers/gpu/drm/xe/xe_wopcm.c
> @@ -5,7 +5,7 @@
>
> #include "xe_wopcm.h"
>
> -#include <linux/fault-inject.h>
> +#include <linux/error-injection.h>
>
> #include "regs/xe_guc_regs.h"
> #include "xe_device.h"
>
> --
> 2.55.0
next prev parent reply other threads:[~2026-09-14 7:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-11 15:04 [PATCH 0/6] Remove the error-injection.h include from linux/module.h Petr Pavlu
2026-09-11 15:04 ` [PATCH 1/6] block: Include error-injection.h for ALLOW_ERROR_INJECTION() Petr Pavlu
2026-09-11 15:10 ` Jens Axboe
2026-09-11 15:04 ` [PATCH 2/6] net: " Petr Pavlu
2026-09-11 15:04 ` [PATCH 3/6] syscalls: " Petr Pavlu
2026-09-11 15:04 ` [PATCH 4/6] drm/i915: " Petr Pavlu
2026-09-14 7:51 ` Francois Dugast
2026-09-14 12:03 ` Jani Nikula
2026-09-11 15:04 ` [PATCH 5/6] drm/xe: " Petr Pavlu
2026-09-14 7:41 ` Francois Dugast [this message]
2026-09-11 15:04 ` [PATCH 6/6] module: Remove the error-injection.h include from linux/module.h Petr Pavlu
2026-09-11 17:31 ` Aaron Tomlin
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=aqelOvgLfacnxcJt@fdugast-desk \
--to=francois.dugast@intel.com \
--cc=airlied@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=atomlin@atomlin.com \
--cc=axboe@kernel.dk \
--cc=da.gomez@kernel.org \
--cc=davem@davemloft.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=kuba@kernel.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=matthew.brost@intel.com \
--cc=mcgrof@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petr.pavlu@suse.com \
--cc=rodrigo.vivi@intel.com \
--cc=samitolvanen@google.com \
--cc=simona@ffwll.ch \
--cc=thomas.hellstrom@linux.intel.com \
--cc=tursulin@ursulin.net \
/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
all inboxes | Powered by JetHome®