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

drm/amdkfd: support concurrent userptr update for HMM 



Userptr restore may have concurrent userptr invalidation after
hmm_vma_fault adds the range to the hmm->ranges list, needs call
hmm_vma_range_done to remove the range from hmm->ranges list first,
then reschedule the restore worker. Otherwise hmm_vma_fault will add
same range to the list, this will cause loop in the list because
range->next point to range itself.

Add function untrack_invalid_user_pages to reduce code duplication.

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 1bd4e4ca

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

+19 −6
Original line number Diff line number Diff line
@@ -1731,6 +1731,23 @@ static int update_invalid_user_pages(struct amdkfd_process_info *process_info, 
	return 0;

}



/* Remove invalid userptr BOs from hmm track list

 *

 * Stop HMM track the userptr update

 */

static void untrack_invalid_user_pages(struct amdkfd_process_info *process_info)

{

	struct kgd_mem *mem, *tmp_mem;

	struct amdgpu_bo *bo;



	list_for_each_entry_safe(mem, tmp_mem,

				 &process_info->userptr_inval_list,

				 validate_list.head) {

		bo = mem->bo;

		amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);

	}

}



/* Validate invalid userptr BOs

 *

 * Validates BOs on the userptr_inval_list, and moves them back to the
@@ -1848,12 +1865,6 @@ unreserve_out: 
out_free:

	kfree(pd_bo_list_entries);

out_no_mem:

	list_for_each_entry_safe(mem, tmp_mem,

				 &process_info->userptr_inval_list,

				 validate_list.head) {

		bo = mem->bo;

		amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);

	}



	return ret;

}
@@ -1918,7 +1929,9 @@ static void amdgpu_amdkfd_restore_userptr_worker(struct work_struct *work) 
		 * hanging. No point trying again.

		 */

	}



unlock_out:

	untrack_invalid_user_pages(process_info);

	mutex_unlock(&process_info->lock);

	mmput(mm);

	put_task_struct(usertask);

CRA Git | Maintained and supported by SUSTech CRA and CCSE