Commit a899fe8b authored by Philip Yang's avatar Philip Yang Committed by Alex Deucher
Browse files

drm/amdkfd: err_pin_bo path leaks kfd_bo_list 



Refactor userptr and pin_bo path to make it less confusing, move
err_pin_bo label up to remove mem from process_info kfd_bo_list.

Signed-off-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ea6c6644

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c

+6 −8
Original line number Diff line number Diff line
@@ -1559,12 +1559,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
		ret = init_user_pages(*mem, user_addr);

		if (ret)

			goto allocate_init_user_pages_failed;

	}



	if (offset)

		*offset = amdgpu_bo_mmap_offset(bo);



	if (flags & (KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL |

	} else  if (flags & (KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL |

				KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP)) {

		ret = amdgpu_amdkfd_gpuvm_pin_bo(bo, AMDGPU_GEM_DOMAIN_GTT);

		if (ret) {
@@ -1575,11 +1570,14 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
		bo->preferred_domains = AMDGPU_GEM_DOMAIN_GTT;

	}



	if (offset)

		*offset = amdgpu_bo_mmap_offset(bo);



	return 0;



allocate_init_user_pages_failed:

	remove_kgd_mem_from_kfd_bo_list(*mem, avm->process_info);

err_pin_bo:

	remove_kgd_mem_from_kfd_bo_list(*mem, avm->process_info);

	drm_vma_node_revoke(&gobj->vma_node, drm_priv);

err_node_allow:

	/* Don't unreserve system mem limit twice */