hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: Fix initial validation of PD BO for KFD VMs 

Make sure the PD BO is valid and attach the eviction fence during VM
creation. This ensures that the pd_phys_address is actually valid
and an eviction that would invalidate it triggers a KFD process
eviction like it should.

v2: Use uninterruptible waiting in initial PD validation

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
This commit is contained in:
Felix Kuehling 2018-03-15 17:27:41 -04:00 committed by Oded Gabbay
parent 5b21d3e5fd
commit 3486625bbf
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
View File

@ -812,7 +812,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
{ {
int ret; int ret;
struct amdgpu_vm *new_vm; struct amdgpu_vm *new_vm;
struct amdkfd_process_info *info; struct amdkfd_process_info *info = NULL;
struct amdgpu_device *adev = get_amdgpu_device(kgd); struct amdgpu_device *adev = get_amdgpu_device(kgd);
new_vm = kzalloc(sizeof(*new_vm), GFP_KERNEL); new_vm = kzalloc(sizeof(*new_vm), GFP_KERNEL);
@ -851,6 +851,23 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
new_vm->process_info = *process_info; new_vm->process_info = *process_info;
/* Validate page directory and attach eviction fence */
ret = amdgpu_bo_reserve(new_vm->root.base.bo, true);
if (ret)
goto reserve_pd_fail;
ret = vm_validate_pt_pd_bos(new_vm);
if (ret) {
pr_err("validate_pt_pd_bos() failed\n");
goto validate_pd_fail;
}
ret = ttm_bo_wait(&new_vm->root.base.bo->tbo, false, false);
if (ret)
goto wait_pd_fail;
amdgpu_bo_fence(new_vm->root.base.bo,
&new_vm->process_info->eviction_fence->base, true);
amdgpu_bo_unreserve(new_vm->root.base.bo);
/* Update process info */
mutex_lock(&new_vm->process_info->lock); mutex_lock(&new_vm->process_info->lock);
list_add_tail(&new_vm->vm_list_node, list_add_tail(&new_vm->vm_list_node,
&(new_vm->process_info->vm_list_head)); &(new_vm->process_info->vm_list_head));
@ -863,6 +880,10 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm,
return ret; return ret;
wait_pd_fail:
validate_pd_fail:
amdgpu_bo_unreserve(new_vm->root.base.bo);
reserve_pd_fail:
create_evict_fence_fail: create_evict_fence_fail:
mutex_destroy(&info->lock); mutex_destroy(&info->lock);
kfree(info); kfree(info);