drm/amdkfd: add pinned BOs to kfd_bo_list
Subsystems (3)
PATCH v2 1/1 drm/amdkfd: add pinned BOs to kfd_bo_list
The kfd_bo_list is used to restore process BOs after evictions. As page tables could be destroyed during evictions, we should also update pinned BOs' page tables during restoring to make sure they are valid.
So for pinned BOs,
1, Validating them and update their page tables. 2, Don't add eviction fence for them.
v2:
- Don't handle pinned ones specially in BO validation.(Felix)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +6 -7
@@ -1953,9 +1953,6 @@ int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct amdgpu_device *adev,return -EINVAL ; } -/* delete kgd_mem from kfd_bo_list to avoid re-validating -* this BO in BO's restoring after eviction. -*/ mutex_lock (&mem->process_info->lock); ret =amdgpu_bo_reserve (bo, true);
@@ -1978,7 +1975,6 @@ int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct amdgpu_device *adev,amdgpu_amdkfd_remove_eviction_fence ( bo, mem->process_info->eviction_fence); -list_del_init (&mem->validate_list.head);if (size) *size =amdgpu_bo_size (bo);
@@ -2542,12 +2538,15 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) process_info->eviction_fence = new_fence; *ef =dma_fence_get (&new_fence->base); -/* Attach new eviction fence to all BOs */ +/* Attach new eviction fence to all BOs except pinned ones */ list_for_each_entry (mem, &process_info->kfd_bo_list, - validate_list.head) + validate_list.head) { +if (mem->bo->tbo.pin_count) +continue ; +amdgpu_bo_fence (mem->bo, &process_info->eviction_fence->base, true); - + }/* Attach eviction fence to PD / PT BOs */ list_for_each_entry (peer_vm, &process_info->vm_list_head, vm_list_node) {
Signature · 1 line
2.25.1
Am 2022-05-31 um 21:39 schrieb Lang Yu:
Quoted 5 lines
The
kfd_bo_listis used to restore process BOs after evictions. As page tables could be destroyed during evictions, we should also update pinned BOs' page tables during restoring to make sure they are valid.
Quoted 8 lines
So for pinned BOs,
1, Validating them and update their page tables. 2, Don't add eviction fence for them.v2:
- Don't handle pinned ones specially in BO validation.(Felix)Signed-off-by Lang Yu <[email protected]>
Quoted 45 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +6
-7@@ -1953,9 +1953,6 @@ int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct amdgpu_device *adev,return -EINVAL ; } -/* delete kgd_mem from kfd_bo_list to avoid re-validating -* this BO in BO's restoring after eviction. -*/ mutex_lock (&mem->process_info->lock); ret =amdgpu_bo_reserve (bo, true);@@ -1978,7 +1975,6 @@ int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct amdgpu_device *adev,amdgpu_amdkfd_remove_eviction_fence ( bo, mem->process_info->eviction_fence); -list_del_init (&mem->validate_list.head);if (size) *size =amdgpu_bo_size (bo);@@ -2542,12 +2538,15 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) process_info->eviction_fence = new_fence; *ef =dma_fence_get (&new_fence->base); -/* Attach new eviction fence to all BOs */ +/* Attach new eviction fence to all BOs except pinned ones */ list_for_each_entry (mem, &process_info->kfd_bo_list, - validate_list.head) + validate_list.head) { +if (mem->bo->tbo.pin_count) +continue ; +amdgpu_bo_fence (mem->bo, &process_info->eviction_fence->base, true); - + }/* Attach eviction fence to PD / PT BOs */ list_for_each_entry (peer_vm, &process_info->vm_list_head, vm_list_node) {