drm/amdkfd: Cleanup vm process info if init vm failed

If acquire_vm failed when initializing KFD vm, set vm->process_info to
NULL and free process info, otherwise, the future acquire_vm will
always fail as vm->process_info is not NULL.

Pass avm as parameter to remove the duplicate code.

Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
index 0040deaf8a83a31e1f7645abbe5499e6440b51c9..fb41869e357a56bf150e8f96035435c388fbf1e0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
@@ -271,9 +271,9 @@ int amdgpu_amdkfd_get_pcie_bandwidth_mbytes(struct amdgpu_device *adev, bool is_
                ((struct drm_file *)(drm_priv))->driver_priv)->vm)
 
 int amdgpu_amdkfd_gpuvm_set_vm_pasid(struct amdgpu_device *adev,
-                                    struct file *filp, u32 pasid);
+                                    struct amdgpu_vm *avm, u32 pasid);
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct amdgpu_device *adev,
-                                       struct file *filp,
+                                       struct amdgpu_vm *avm,
                                        void **process_info,
                                        struct dma_fence **ef);
 void amdgpu_amdkfd_gpuvm_release_process_vm(struct amdgpu_device *adev,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 3b5c53712d319c2ed43a51fab219d94a6e9d4988..cd5de5e08d2f94cc179f5e3a0f37b58bfbf9a3ee 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1430,18 +1430,11 @@ static void amdgpu_amdkfd_gpuvm_unpin_bo(struct amdgpu_bo *bo)
 }
 
 int amdgpu_amdkfd_gpuvm_set_vm_pasid(struct amdgpu_device *adev,
-                                    struct file *filp, u32 pasid)
+                                    struct amdgpu_vm *avm, u32 pasid)
 
 {
-       struct amdgpu_fpriv *drv_priv;
-       struct amdgpu_vm *avm;
        int ret;
 
-       ret = amdgpu_file_to_fpriv(filp, &drv_priv);
-       if (ret)
-               return ret;
-       avm = &drv_priv->vm;
-
        /* Free the original amdgpu allocated pasid,
         * will be replaced with kfd allocated pasid.
         */
@@ -1458,19 +1451,12 @@ int amdgpu_amdkfd_gpuvm_set_vm_pasid(struct amdgpu_device *adev,
 }
 
 int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct amdgpu_device *adev,
-                                          struct file *filp,
+                                          struct amdgpu_vm *avm,
                                           void **process_info,
                                           struct dma_fence **ef)
 {
-       struct amdgpu_fpriv *drv_priv;
-       struct amdgpu_vm *avm;
        int ret;
 
-       ret = amdgpu_file_to_fpriv(filp, &drv_priv);
-       if (ret)
-               return ret;
-       avm = &drv_priv->vm;
-
        /* Already a compute VM? */
        if (avm->process_info)
                return -EINVAL;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 51b1683ac5c1e157dd771a2c102a47e2fa5053e6..71db24fefe05c07ddc2f8fa5c985e84447ad8538 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -1563,6 +1563,8 @@ err_free_pdd:
 int kfd_process_device_init_vm(struct kfd_process_device *pdd,
                               struct file *drm_file)
 {
+       struct amdgpu_fpriv *drv_priv;
+       struct amdgpu_vm *avm;
        struct kfd_process *p;
        struct kfd_dev *dev;
        int ret;
@@ -1573,10 +1575,15 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,
        if (pdd->drm_priv)
                return -EBUSY;
 
+       ret = amdgpu_file_to_fpriv(drm_file, &drv_priv);
+       if (ret)
+               return ret;
+       avm = &drv_priv->vm;
+
        p = pdd->process;
        dev = pdd->dev;
 
-       ret = amdgpu_amdkfd_gpuvm_acquire_process_vm(dev->adev, drm_file,
+       ret = amdgpu_amdkfd_gpuvm_acquire_process_vm(dev->adev, avm,
                                                     &p->kgd_process_info,
                                                     &p->ef);
        if (ret) {
@@ -1593,7 +1600,7 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,
        if (ret)
                goto err_init_cwsr;
 
-       ret = amdgpu_amdkfd_gpuvm_set_vm_pasid(dev->adev, drm_file, p->pasid);
+       ret = amdgpu_amdkfd_gpuvm_set_vm_pasid(dev->adev, avm, p->pasid);
        if (ret)
                goto err_set_pasid;
 
@@ -1607,6 +1614,7 @@ err_init_cwsr:
        kfd_process_device_destroy_ib_mem(pdd);
 err_reserve_ib_mem:
        pdd->drm_priv = NULL;
+       amdgpu_amdkfd_gpuvm_destroy_cb(dev->adev, avm);
 
        return ret;
 }