6.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dafna Hirschfeld dhirschfeld@habana.ai
[ Upstream commit 2efba0c095419f93f8913f1cbae8bf3fb030db20 ]
Fix memleak caused by missing xe_vm_put
Fixes: 852856e3b6f6 ("drm/xe: Use reserved copy engine for user binds on faulting devices") Signed-off-by: Dafna Hirschfeld dhirschfeld@habana.ai Reviewed-by: Nirmoy Das nirmoy.das@intel.com Link: https://patchwork.freedesktop.org/patch/msgid/20240901044227.1177211-1-dhirs... Signed-off-by: Rodrigo Vivi rodrigo.vivi@intel.com (cherry picked from commit 249df8cbecf0ab4877eab66cae857748631831a9) Signed-off-by: Lucas De Marchi lucas.demarchi@intel.com Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/gpu/drm/xe/xe_exec_queue.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c index c2953ddbd16e1..d0bbb1d9b1ac1 100644 --- a/drivers/gpu/drm/xe/xe_exec_queue.c +++ b/drivers/gpu/drm/xe/xe_exec_queue.c @@ -221,8 +221,10 @@ struct xe_exec_queue *xe_exec_queue_create_bind(struct xe_device *xe, gt->usm.reserved_bcs_instance, false);
- if (!hwe) + if (!hwe) { + xe_vm_put(migrate_vm); return ERR_PTR(-EINVAL); + }
q = xe_exec_queue_create(xe, migrate_vm, BIT(hwe->logical_instance), 1, hwe,