From: Matthew Auld <matthew.auld@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Andrzej Hajda <andrzej.hajda@intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [CI v2 11/18] drm/xe/coredump: move over to devm
Date: Mon, 20 May 2024 16:43:00 +0100 [thread overview]
Message-ID: <20240520154249.52888-29-matthew.auld@intel.com> (raw)
In-Reply-To: <20240520154249.52888-19-matthew.auld@intel.com>
Here we are using drmm to ensure we release the coredump when unloading
the module, however the coredump is very much tied to the struct device
underneath. We can see this when we hotunplug the device, for which we
have already got a coredump attached. In such a case the coredump still
remains and adding another is not possible. However we still register
the release action via xe_driver_devcoredump_fini(), so in effect two or
more releases for one dump. The other consideration is that the
coredump state is embedded in the xe_driver instance, so technically
once the drmm release action fires we might free the coredumpe state
from a different driver instance, assuming we have two release actions
and they can race. Rather use devm here to remove the coredump when the
device is released.
References: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1679
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
---
drivers/gpu/drm/xe/xe_devcoredump.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c b/drivers/gpu/drm/xe/xe_devcoredump.c
index 3d7980232be1..e70aef797193 100644
--- a/drivers/gpu/drm/xe/xe_devcoredump.c
+++ b/drivers/gpu/drm/xe/xe_devcoredump.c
@@ -238,13 +238,15 @@ void xe_devcoredump(struct xe_sched_job *job)
xe_devcoredump_read, xe_devcoredump_free);
}
-static void xe_driver_devcoredump_fini(struct drm_device *drm, void *arg)
+static void xe_driver_devcoredump_fini(void *arg)
{
+ struct drm_device *drm = arg;
+
dev_coredump_put(drm->dev);
}
int xe_devcoredump_init(struct xe_device *xe)
{
- return drmm_add_action_or_reset(&xe->drm, xe_driver_devcoredump_fini, xe);
+ return devm_add_action_or_reset(xe->drm.dev, xe_driver_devcoredump_fini, &xe->drm);
}
#endif
--
2.45.1
next prev parent reply other threads:[~2024-05-20 15:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-20 15:42 [CI v2 01/18] drm/xe/pci: remove broken driver_release Matthew Auld
2024-05-20 15:42 ` [CI v2 02/18] drm/xe: covert sysfs over to devm Matthew Auld
2024-05-20 15:42 ` [CI v2 03/18] drm/xe/ggtt: use drm_dev_enter to mark device section Matthew Auld
2024-05-20 15:42 ` [CI v2 04/18] drm/xe/guc: move guc_fini over to devm Matthew Auld
2024-05-20 15:42 ` [CI v2 05/18] drm/xe/guc: s/guc_fini/guc_fini_hw/ Matthew Auld
2024-05-20 15:42 ` [CI v2 06/18] drm/xe/guc_pc: move pc_fini to devm Matthew Auld
2024-05-20 15:42 ` [CI v2 07/18] drm/xe/guc_pc: s/pc_fini/pc_fini_hw/ Matthew Auld
2024-05-20 15:42 ` [CI v2 08/18] drm/xe/irq: move irq_uninstall over to devm Matthew Auld
2024-05-20 15:42 ` [CI v2 09/18] drm/xe/device: move flr " Matthew Auld
2024-05-20 15:42 ` [CI v2 10/18] drm/xe/device: move xe_device_sanitize over " Matthew Auld
2024-05-20 15:43 ` Matthew Auld [this message]
2024-05-20 15:43 ` [CI v2 12/18] drm/xe/gt: break out gt_fini into sw vs hw state Matthew Auld
2024-05-20 15:43 ` [CI v2 13/18] drm/xe: make gt_remove use devm Matthew Auld
2024-05-20 15:43 ` [CI v2 14/18] drm/xe/mmio: move mmio_fini over to devm Matthew Auld
2024-05-20 15:43 ` [CI v2 15/18] drm/xe: reset mmio mappings with devm Matthew Auld
2024-05-20 15:43 ` [CI v2 16/18] drm/xe/display: move display fini stuff to devm Matthew Auld
2024-05-20 15:43 ` [CI v2 17/18] drm/xe/display: stop calling domains_driver_remove twice Matthew Auld
2024-05-20 15:43 ` [CI v2 18/18] drm/xe/display: move device_remove over to drmm Matthew Auld
2024-05-20 15:51 ` ✓ CI.Patch_applied: success for series starting with [CI,v2,01/18] drm/xe/pci: remove broken driver_release Patchwork
2024-05-20 15:51 ` ✗ CI.checkpatch: warning " Patchwork
2024-05-20 15:52 ` ✓ CI.KUnit: success " Patchwork
2024-05-20 16:04 ` ✓ CI.Build: " Patchwork
2024-05-20 16:06 ` ✗ CI.Hooks: failure " Patchwork
2024-05-20 16:08 ` ✓ CI.checksparse: success " Patchwork
2024-05-20 16:30 ` ✓ CI.BAT: " Patchwork
2024-05-20 18:18 ` ✓ CI.FULL: " Patchwork
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=20240520154249.52888-29-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--cc=andrzej.hajda@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/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