Commit 393e5fea authored by Tomasz Lis's avatar Tomasz Lis Committed by Michal Wajdeczko
Browse files

drm/xe/queue: Call fini on exec queue creation fail 



Every call to queue init should have a corresponding fini call.
Skipping this would mean skipping removal of the queue from GuC list
(which is part of guc_id allocation). A damaged queue stored in
exec_queue_lookup list would lead to invalid memory reference,
sooner or later.

Call fini to free guc_id. This must be done before any internal
LRCs are freed.

Since the finalization with this extra call became very similar to
__xe_exec_queue_fini(), reuse that. To make this reuse possible,
alter xe_lrc_put() so it can survive NULL parameters, like other
similar functions.

v2: Reuse _xe_exec_queue_fini(). Make xe_lrc_put() aware of NULLs.

Fixes: 3c1fa4aa ("drm/xe: Move queue init before LRC creation")
Signed-off-by: default avatarTomasz Lis <tomasz.lis@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com> (v1)
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patch.msgid.link/20260226212701.2937065-2-tomasz.lis@intel.com
parent 223b2f51

drivers/gpu/drm/xe/xe_exec_queue.c

+11 −12
Original line number Diff line number Diff line
@@ -270,6 +270,16 @@ static struct xe_exec_queue *__xe_exec_queue_alloc(struct xe_device *xe, 
	return q;

}



static void __xe_exec_queue_fini(struct xe_exec_queue *q)

{

	int i;



	q->ops->fini(q);



	for (i = 0; i < q->width; ++i)

		xe_lrc_put(q->lrc[i]);

}



static int __xe_exec_queue_init(struct xe_exec_queue *q, u32 exec_queue_flags)

{

	int i, err;
@@ -324,21 +334,10 @@ static int __xe_exec_queue_init(struct xe_exec_queue *q, u32 exec_queue_flags) 
	return 0;



err_lrc:

	for (i = i - 1; i >= 0; --i)

		xe_lrc_put(q->lrc[i]);

	__xe_exec_queue_fini(q);

	return err;

}



static void __xe_exec_queue_fini(struct xe_exec_queue *q)

{

	int i;



	q->ops->fini(q);



	for (i = 0; i < q->width; ++i)

		xe_lrc_put(q->lrc[i]);

}



struct xe_exec_queue *xe_exec_queue_create(struct xe_device *xe, struct xe_vm *vm,

					   u32 logical_mask, u16 width,

					   struct xe_hw_engine *hwe, u32 flags,

drivers/gpu/drm/xe/xe_lrc.h

+2 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ static inline struct xe_lrc *xe_lrc_get(struct xe_lrc *lrc) 
 */

static inline void xe_lrc_put(struct xe_lrc *lrc)

{

	if (lrc)

		kref_put(&lrc->refcount, xe_lrc_destroy);

}