From: Shuicheng Lin <shuicheng.lin@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Shuicheng Lin <shuicheng.lin@intel.com>,
Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>,
Matthew Brost <matthew.brost@intel.com>
Subject: [PATCH] drm/xe/multi_queue: Fix error path skipping group xa cleanup
Date: Mon, 2 Mar 2026 21:24:47 +0000 [thread overview]
Message-ID: <20260302212447.208218-1-shuicheng.lin@intel.com> (raw)
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
next reply other threads:[~2026-03-02 21:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-02 21:24 Shuicheng Lin [this message]
2026-03-02 23:09 ` [PATCH] drm/xe/multi_queue: Fix error path skipping group xa cleanup 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
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=20260302212447.208218-1-shuicheng.lin@intel.com \
--to=shuicheng.lin@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=matthew.brost@intel.com \
--cc=niranjana.vishwanathapura@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