drm/amdkfd: Free gang_ctx_bo and wptr_bo in pqm_uninit

From ZhenGuo Yin
ccba042816400a82ed5d3d2f7b4ed79403d20c4c in linux-6.6.y/6.6.13
72838777aa38352e20301e123b97110c456cd38e in mainline linux

diff --git a/sys/dev/pci/drm/amd/amdkfd/kfd_process_queue_manager.c b/sys/dev/pci/drm/amd/amdkfd/kfd_process_queue_manager.c
index 7764939..77f4932 100644 (file)
--- a/sys/dev/pci/drm/amd/amdkfd/kfd_process_queue_manager.c
+++ b/sys/dev/pci/drm/amd/amdkfd/kfd_process_queue_manager.c
@@ -169,16 +169,43 @@ int pqm_init(struct process_queue_manager *pqm, struct kfd_process *p)
        return 0;
 }
 
+static void pqm_clean_queue_resource(struct process_queue_manager *pqm,
+                                    struct process_queue_node *pqn)
+{
+       struct kfd_node *dev;
+       struct kfd_process_device *pdd;
+
+       dev = pqn->q->device;
+
+       pdd = kfd_get_process_device_data(dev, pqm->process);
+       if (!pdd) {
+               pr_err("Process device data doesn't exist\n");
+               return;
+       }
+
+       if (pqn->q->gws) {
+               if (KFD_GC_VERSION(pqn->q->device) != IP_VERSION(9, 4, 3) &&
+                   !dev->kfd->shared_resources.enable_mes)
+                       amdgpu_amdkfd_remove_gws_from_process(
+                               pqm->process->kgd_process_info, pqn->q->gws);
+               pdd->qpd.num_gws = 0;
+       }
+
+       if (dev->kfd->shared_resources.enable_mes) {
+               amdgpu_amdkfd_free_gtt_mem(dev->adev, pqn->q->gang_ctx_bo);
+               if (pqn->q->wptr_bo)
+                       amdgpu_amdkfd_free_gtt_mem(dev->adev, pqn->q->wptr_bo);
+       }
+}
+
 void pqm_uninit(struct process_queue_manager *pqm)
 {
        struct process_queue_node *pqn, *next;
 
        list_for_each_entry_safe(pqn, next, &pqm->queues, process_queue_list) {
-               if (pqn->q && pqn->q->gws &&
-                   KFD_GC_VERSION(pqn->q->device) != IP_VERSION(9, 4, 3) &&
-                   !pqn->q->device->kfd->shared_resources.enable_mes)
-                       amdgpu_amdkfd_remove_gws_from_process(pqm->process->kgd_process_info,
-                               pqn->q->gws);
+               if (pqn->q)
+                       pqm_clean_queue_resource(pqm, pqn);
+
                kfd_procfs_del_queue(pqn->q);
                uninit_queue(pqn->q);
                list_del(&pqn->process_queue_list);
@@ -461,22 +488,7 @@ int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid)
                                goto err_destroy_queue;
                }
 
-               if (pqn->q->gws) {
-                       if (KFD_GC_VERSION(pqn->q->device) != IP_VERSION(9, 4, 3) &&
-                           !dev->kfd->shared_resources.enable_mes)
-                               amdgpu_amdkfd_remove_gws_from_process(
-                                               pqm->process->kgd_process_info,
-                                               pqn->q->gws);
-                       pdd->qpd.num_gws = 0;
-               }
-
-               if (dev->kfd->shared_resources.enable_mes) {
-                       amdgpu_amdkfd_free_gtt_mem(dev->adev,
-                                                  pqn->q->gang_ctx_bo);
-                       if (pqn->q->wptr_bo)
-                               amdgpu_amdkfd_free_gtt_mem(dev->adev, pqn->q->wptr_bo);
-
-               }
+               pqm_clean_queue_resource(pqm, pqn);
                uninit_queue(pqn->q);
        }