Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/xe/multi_queue: Fix error path skipping group xa cleanup
@ 2026-03-02 21:24 Shuicheng Lin
  2026-03-02 23:09 ` Matthew Brost
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Shuicheng Lin @ 2026-03-02 21:24 UTC (permalink / raw)
  To: intel-xe; +Cc: Shuicheng Lin, Niranjana Vishwanathapura, Matthew Brost

When xe_hw_engine_group_add_exec_queue() fails for a secondary
multi-queue queue, the error path jumped directly to put_exec_queue,
bypassing the delete_queue_group label.  This left the LRC reference
inserted by xe_exec_queue_group_add() sitting in the group's xarray
until the primary queue is eventually destroyed.

Jump to delete_queue_group instead so that xe_exec_queue_group_delete()
is called and the xarray entry is properly removed.

Fixes: d9ec63474648 ("drm/xe/multi_queue: Add user interface for multi queue support")
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---

Cc: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>

---
 drivers/gpu/drm/xe/xe_exec_queue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
index 1a7a4a37bbc6..fbe3ac399cae 100644
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
+++ b/drivers/gpu/drm/xe/xe_exec_queue.c
@@ -1298,7 +1298,7 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data,
 		if (q->vm && q->hwe->hw_engine_group) {
 			err = xe_hw_engine_group_add_exec_queue(q->hwe->hw_engine_group, q);
 			if (err)
-				goto put_exec_queue;
+				goto delete_queue_group;
 		}
 	}
 
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-03-03  9:53 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-02 21:24 [PATCH] drm/xe/multi_queue: Fix error path skipping group xa cleanup Shuicheng Lin
2026-03-02 23:09 ` Matthew Brost
2026-03-02 23:18   ` Lin, Shuicheng
2026-03-03  1:18 ` ✓ CI.KUnit: success for " Patchwork
2026-03-03  1:53 ` ✗ Xe.CI.BAT: failure " Patchwork
2026-03-03  9:53 ` ✓ Xe.CI.FULL: success " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox