When gmc_v*_sw_init() fails after amdgpu_bo_init(), the GMC block's status.sw stays false, so amdgpu_device_ip_fini() skips its sw_fini and amdgpu_bo_fini() (and thus ttm_device_fini()) is never called. The freed device is left on ttm_glob.device_list.
Unwind on the failure paths after amdgpu_bo_init(): GART init failures call amdgpu_bo_fini(); later failures (RAS sw init on v9-v12, vm_fault_info allocation on v7/v8) also call amdgpu_vm_manager_fini(). Signed-off-by: Mario Limonciello <[email protected]> --- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 10 ++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 10 ++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 10 ++++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 6 +++++- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 14 +++++++++++--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 14 +++++++++++--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 10 ++++++++-- 7 files changed, 59 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c index 49f593fe2a876..e59fee3955af0 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c @@ -861,7 +861,7 @@ static int gmc_v10_0_sw_init(struct amdgpu_ip_block *ip_block) r = gmc_v10_0_gart_init(adev); if (r) - return r; + goto err_bo_fini; /* * number of VMs @@ -880,9 +880,15 @@ static int gmc_v10_0_sw_init(struct amdgpu_ip_block *ip_block) r = amdgpu_gmc_ras_sw_init(adev); if (r) - return r; + goto err_vm_fini; return 0; + +err_vm_fini: + amdgpu_vm_manager_fini(adev); +err_bo_fini: + amdgpu_bo_fini(adev); + return r; } /** diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c index bc3b1ffb54886..e492a8fd8eb21 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c @@ -859,7 +859,7 @@ static int gmc_v11_0_sw_init(struct amdgpu_ip_block *ip_block) r = gmc_v11_0_gart_init(adev); if (r) - return r; + goto err_bo_fini; /* * number of VMs @@ -879,9 +879,15 @@ static int gmc_v11_0_sw_init(struct amdgpu_ip_block *ip_block) r = amdgpu_gmc_ras_sw_init(adev); if (r) - return r; + goto err_vm_fini; return 0; + +err_vm_fini: + amdgpu_vm_manager_fini(adev); +err_bo_fini: + amdgpu_bo_fini(adev); + return r; } /** diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c index 3bb13cfed92fe..acebd6697372f 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c @@ -987,7 +987,7 @@ static int gmc_v12_0_sw_init(struct amdgpu_ip_block *ip_block) r = gmc_v12_0_gart_init(adev); if (r) - return r; + goto err_bo_fini; if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 1, 0)) gmc_v12_1_init_nps_details(adev); @@ -1021,12 +1021,18 @@ static int gmc_v12_0_sw_init(struct amdgpu_ip_block *ip_block) r = amdgpu_gmc_ras_sw_init(adev); if (r) - return r; + goto err_vm_fini; if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(12, 1, 0)) amdgpu_gmc_sysfs_init(adev); return 0; + +err_vm_fini: + amdgpu_vm_manager_fini(adev); +err_bo_fini: + amdgpu_bo_fini(adev); + return r; } /** diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c index a7c353d1ac09d..925e9e243a143 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c @@ -817,7 +817,7 @@ static int gmc_v6_0_sw_init(struct amdgpu_ip_block *ip_block) r = gmc_v6_0_gart_init(adev); if (r) - return r; + goto err_bo_fini; /* * number of VMs @@ -840,6 +840,10 @@ static int gmc_v6_0_sw_init(struct amdgpu_ip_block *ip_block) } return 0; + +err_bo_fini: + amdgpu_bo_fini(adev); + return r; } static int gmc_v6_0_sw_fini(struct amdgpu_ip_block *ip_block) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c index c09f5153679ea..3f3e4105bf3e6 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c @@ -999,7 +999,7 @@ static int gmc_v7_0_sw_init(struct amdgpu_ip_block *ip_block) r = gmc_v7_0_gart_init(adev); if (r) - return r; + goto err_bo_fini; /* * number of VMs @@ -1026,11 +1026,19 @@ static int gmc_v7_0_sw_init(struct amdgpu_ip_block *ip_block) } adev->gmc.vm_fault_info = kmalloc_obj(struct kfd_vm_fault_info); - if (!adev->gmc.vm_fault_info) - return -ENOMEM; + if (!adev->gmc.vm_fault_info) { + r = -ENOMEM; + goto err_vm_fini; + } atomic_set_release(&adev->gmc.vm_fault_info_updated, 0); return 0; + +err_vm_fini: + amdgpu_vm_manager_fini(adev); +err_bo_fini: + amdgpu_bo_fini(adev); + return r; } static int gmc_v7_0_sw_fini(struct amdgpu_ip_block *ip_block) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index 15592027e7c0c..cb6d6e2259f3b 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c @@ -1114,7 +1114,7 @@ static int gmc_v8_0_sw_init(struct amdgpu_ip_block *ip_block) r = gmc_v8_0_gart_init(adev); if (r) - return r; + goto err_bo_fini; /* * number of VMs @@ -1141,11 +1141,19 @@ static int gmc_v8_0_sw_init(struct amdgpu_ip_block *ip_block) } adev->gmc.vm_fault_info = kmalloc_obj(struct kfd_vm_fault_info); - if (!adev->gmc.vm_fault_info) - return -ENOMEM; + if (!adev->gmc.vm_fault_info) { + r = -ENOMEM; + goto err_vm_fini; + } atomic_set_release(&adev->gmc.vm_fault_info_updated, 0); return 0; + +err_vm_fini: + amdgpu_vm_manager_fini(adev); +err_bo_fini: + amdgpu_bo_fini(adev); + return r; } static int gmc_v8_0_sw_fini(struct amdgpu_ip_block *ip_block) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index a705830ef436c..136e4130b7926 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c @@ -2026,7 +2026,7 @@ static int gmc_v9_0_sw_init(struct amdgpu_ip_block *ip_block) r = gmc_v9_0_gart_init(adev); if (r) - return r; + goto err_bo_fini; gmc_v9_0_init_nps_details(adev); /* @@ -2066,12 +2066,18 @@ static int gmc_v9_0_sw_init(struct amdgpu_ip_block *ip_block) r = amdgpu_gmc_ras_sw_init(adev); if (r) - return r; + goto err_vm_fini; if (amdgpu_is_multi_aid(adev)) amdgpu_gmc_sysfs_init(adev); return 0; + +err_vm_fini: + amdgpu_vm_manager_fini(adev); +err_bo_fini: + amdgpu_bo_fini(adev); + return r; } static int gmc_v9_0_sw_fini(struct amdgpu_ip_block *ip_block) -- 2.43.0
