AMD General For Patch 3,4,5,6 . You can added me as acked-by :
Regards Shaoyun.liu -----Original Message----- From: Liang, Prike <[email protected]> Sent: Tuesday, November 10, 2026 8:05 AM To: [email protected] Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Chen, Michael <[email protected]>; Liu, Shaoyun <[email protected]>; Liang, Prike <[email protected]> Subject: [PATCH 3/6] drm/amdkfd: fix the MES gang context slot error paths In MES RS64 mode, init_user_queue() allocates a gang context slot for each queue after its gang context buffer, but two error paths don't release what has been allocated: - If no slot is available, init_user_queue() returns without freeing the gang context buffer. - If init_user_queue() succeeds but the DQM fails to create the queue, pqm_create_queue() only frees the queue struct. That leaks the slot, and also the gang context buffer and the wptr BO's GART mapping, which already leaked there before RS64. Fixes: e32b68c6b135 ("drm/amdkfd: enable rs64mem for kfd queue") Signed-off-by: Prike Liang <[email protected]> --- .../amd/amdkfd/kfd_process_queue_manager.c | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c index 4646dfbabe75..6cc0365e9b11 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c @@ -187,6 +187,13 @@ int pqm_init(struct process_queue_manager *pqm, struct kfd_process *p) return 0; } +static void pqm_free_mes_queue_res(struct kfd_node *dev, struct queue +*q) { + amdgpu_mes_free_gang_ctx_index(&dev->adev->mes, q->gang_ctx_array_index); + amdgpu_amdkfd_free_kernel_mem(dev->adev, &q->gang_ctx_bo); + amdgpu_amdkfd_free_kernel_mem(dev->adev, (void **)&q->wptr_bo_gart); } + static void pqm_clean_queue_resource(struct process_queue_manager *pqm, struct process_queue_node *pqn) { @@ -211,11 +218,8 @@ static void pqm_clean_queue_resource(struct process_queue_manager *pqm, pdd->qpd.num_gws = 0; } - if (dev->kfd->shared_resources.enable_mes) { - amdgpu_mes_free_gang_ctx_index(&dev->adev->mes, pqn->q->gang_ctx_array_index); - amdgpu_amdkfd_free_kernel_mem(dev->adev, &pqn->q->gang_ctx_bo); - amdgpu_amdkfd_free_kernel_mem(dev->adev, (void **)&pqn->q->wptr_bo_gart); - } + if (dev->kfd->shared_resources.enable_mes) + pqm_free_mes_queue_res(dev, pqn->q); } void pqm_uninit(struct process_queue_manager *pqm) @@ -270,7 +274,8 @@ static int init_user_queue(struct process_queue_manager *pqm, if (dev->kfd->shared_resources.enable_mes) { if (!q_properties->wptr_bo) { pr_debug("Queue initialization with shared MES requires queue buffers to be initialized\n"); - return -EINVAL; + retval = -EINVAL; + goto cleanup; } retval = amdgpu_amdkfd_alloc_kernel_mem(dev->adev, @@ -291,7 +296,7 @@ static int init_user_queue(struct process_queue_manager *pqm, &(*q)->gang_ctx_array_index); if (retval) { pr_err("failed to allocate gang context index slot\n"); - goto cleanup; + goto free_gang_ctx_bo; } } /* Starting with GFX11, wptr BOs must be mapped to GART for MES to determine work @@ -300,7 +305,7 @@ static int init_user_queue(struct process_queue_manager *pqm, if (dev->adev != amdgpu_ttm_adev(q_properties->wptr_bo->tbo.bdev)) { pr_err("Queue memory allocated to wrong device\n"); retval = -EINVAL; - goto free_gang_ctx_bo; + goto free_gang_ctx_index; } retval = amdgpu_amdkfd_map_gtt_bo_to_gart(q_properties->wptr_bo, @@ -308,15 +313,16 @@ static int init_user_queue(struct process_queue_manager *pqm, pqm->process->kgd_process_info); if (retval) { pr_err("Failed to map wptr bo to GART\n"); - goto free_gang_ctx_bo; + goto free_gang_ctx_index; } } pr_debug("PQM After init queue"); return 0; -free_gang_ctx_bo: +free_gang_ctx_index: amdgpu_mes_free_gang_ctx_index(&dev->adev->mes, (*q)->gang_ctx_array_index); +free_gang_ctx_bo: amdgpu_amdkfd_free_kernel_mem(dev->adev, &(*q)->gang_ctx_bo); cleanup: uninit_queue(*q); @@ -486,6 +492,8 @@ int pqm_create_queue(struct process_queue_manager *pqm, return retval; err_create_queue: + if (q && dev->kfd->shared_resources.enable_mes) + pqm_free_mes_queue_res(dev, q); uninit_queue(q); if (kq) kernel_queue_uninit(kq); -- 2.34.1
