From: Arvind Yadav <arvind.yadav@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [PATCH v3 1/3] CI-ONLY Hold a device reference across deferred VM destruction
Date: Sun, 15 Nov 2026 14:25:16 +0530 [thread overview]
Message-ID: <20261115085518.1135138-2-arvind.yadav@intel.com> (raw)
In-Reply-To: <20261115085518.1135138-1-arvind.yadav@intel.com>
xe_vm_free() queues vm_destroy_work_func() and returns.
drm_gpuvm_free() then drops its device reference, but the worker
still accesses device state while finishing VM destruction.
Take a device reference before queueing the work and release it
after the worker has finished using the device.
Run the worker on the module-lifetime destroy workqueue. Releasing
the last device reference can call xe_device_destroy(), which drains
xe->destroy_wq. Running on that per-device workqueue would make the
worker wait for itself.
v3:
- Move final VM destruction to the module-lifetime destroy workqueue
in this patch to avoid self-deadlock on the last device put. (Sashiko)
Fixes: 61e18525023a ("drm/xe: Route deferred xe_vma/xe_vm teardown off system_dfl_wq")
Signed-off-by: Arvind Yadav <arvind.yadav@intel.com>
---
drivers/gpu/drm/xe/xe_vm.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index dd855876f571..12afb3363e79 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -2109,6 +2109,8 @@ static void vm_destroy_work_func(struct work_struct *w)
xe_file_put(vm->xef);
kfree(vm);
+
+ drm_dev_put(&xe->drm);
}
static void xe_vm_free(struct drm_gpuvm *gpuvm)
@@ -2116,11 +2118,18 @@ static void xe_vm_free(struct drm_gpuvm *gpuvm)
struct xe_vm *vm = container_of(gpuvm, struct xe_vm, gpuvm);
/*
- * To destroy the VM we need to be able to sleep.
- * drm_gpuvm keeps at least one device reference at this
- * point so xe->destroy_wq must still be alive.
+ * drm_gpuvm drops its device reference as soon as this callback
+ * returns, but vm_destroy_work_func() still uses device state. Hold a
+ * reference across the deferred work.
+ */
+ drm_dev_get(&vm->xe->drm);
+
+ /*
+ * The worker may release the last device reference. Use the
+ * module-lifetime workqueue so device destruction cannot drain
+ * the workqueue running this worker.
*/
- queue_work(vm->xe->destroy_wq, &vm->destroy_work);
+ xe_destroy_wq_queue(&vm->destroy_work);
}
struct xe_vm *xe_vm_lookup(struct xe_file *xef, u32 id)
--
2.43.0
next prev parent reply other threads:[~2026-11-15 8:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-15 8:55 [PATCH v3 0/3] CI-ONLY Fix VM teardown and migration queue recovery Arvind Yadav
2026-11-15 8:55 ` Arvind Yadav [this message]
2026-11-15 8:55 ` [PATCH v3 2/3] CI-ONLY Mark VMs as closing before queue cleanup Arvind Yadav
2026-11-15 8:55 ` [PATCH v3 3/3] CI-ONLY:Defer VM teardown until exec " Arvind Yadav
2026-11-15 9:36 ` sashiko-bot
2026-11-15 9:03 ` ✗ CI.checkpatch: warning for CI-ONLY Fix VM teardown and migration queue recovery (rev4) Patchwork
2026-11-15 9:05 ` ✓ CI.KUnit: success " Patchwork
2026-11-15 9:39 ` ✓ Xe.CI.BAT: " Patchwork
2026-11-15 10:51 ` ✓ Xe.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=20261115085518.1135138-2-arvind.yadav@intel.com \
--to=arvind.yadav@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/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