Commit bf47afba authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

drm/amdkfd: Release an acquired process vm 



For compute vm acquired from amdgpu, vm.pasid is managed
by kfd. Decouple pasid from such vm on process destroy
to avoid duplicate pasid release.

Signed-off-by: default avatarOak Zeng <Oak.Zeng@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1685b01a

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct kgd_dev *kgd, 
void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev,

				struct amdgpu_vm *vm);

void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm);

void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd, void *vm);

uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *vm);

int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(

		struct kgd_dev *kgd, uint64_t va, uint64_t size,

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

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm,

	.acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm,

	.destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm,

	.release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm,

	.get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,

	.alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,

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

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm,

	.acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm,

	.destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm,

	.release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm,

	.get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,

	.alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,

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

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.create_process_vm = amdgpu_amdkfd_gpuvm_create_process_vm,

	.acquire_process_vm = amdgpu_amdkfd_gpuvm_acquire_process_vm,

	.destroy_process_vm = amdgpu_amdkfd_gpuvm_destroy_process_vm,

	.release_process_vm = amdgpu_amdkfd_gpuvm_release_process_vm,

	.get_process_page_dir = amdgpu_amdkfd_gpuvm_get_process_page_dir,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,

	.alloc_memory_of_gpu = amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu,

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

+19 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,25 @@ void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm) 
	kfree(vm);

}



void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd, void *vm)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

        struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;



	if (WARN_ON(!kgd || !vm))

                return;



        pr_debug("Releasing process vm %p\n", vm);



        /* The original pasid of amdgpu vm has already been

         * released during making a amdgpu vm to a compute vm

         * The current pasid is managed by kfd and will be

         * released on kfd process destroy. Set amdgpu pasid

         * to 0 to avoid duplicate release.

         */

	amdgpu_vm_release_compute(adev, avm);

}



uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *vm)

{

	struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE