Commit 89926812 authored by Prike Liang's avatar Prike Liang Committed by Alex Deucher
Browse files

drm/amdgpu: validate the queue va for resuming the queue 



It requires validating the userq VA whether is mapped before
trying to resume the queue.

Signed-off-by: default avatarPrike Liang <Prike.Liang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 873f44c3

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

+44 −0
Original line number Diff line number Diff line
@@ -97,6 +97,42 @@ int amdgpu_userq_input_va_validate(struct amdgpu_usermode_queue *queue, 
	return r;

}



static bool amdgpu_userq_buffer_va_mapped(struct amdgpu_vm *vm, u64 addr)

{

	struct amdgpu_bo_va_mapping *mapping;

	bool r;



	if (amdgpu_bo_reserve(vm->root.bo, false))

		return false;



	mapping = amdgpu_vm_bo_lookup_mapping(vm, addr);

	if (!IS_ERR_OR_NULL(mapping) && atomic_read(&mapping->bo_va->userq_va_mapped))

		r = true;

	else

		r = false;

	amdgpu_bo_unreserve(vm->root.bo);



	return r;

}



static bool amdgpu_userq_buffer_vas_mapped(struct amdgpu_usermode_queue *queue)

{

	struct amdgpu_userq_va_cursor *va_cursor, *tmp;

	int r = 0;



	list_for_each_entry_safe(va_cursor, tmp, &queue->userq_va_list, list) {

		r += amdgpu_userq_buffer_va_mapped(queue->vm, va_cursor->gpu_addr);

		dev_dbg(queue->userq_mgr->adev->dev,

			"validate the userq mapping:%p va:%llx r:%d\n",

			queue, va_cursor->gpu_addr, r);

	}



	if (r != 0)

		return true;



	return false;

}



static void amdgpu_userq_buffer_va_list_del(struct amdgpu_bo_va_mapping *mapping,

					    struct amdgpu_userq_va_cursor *va_cursor)

{
@@ -761,6 +797,14 @@ amdgpu_userq_restore_all(struct amdgpu_userq_mgr *uq_mgr) 


	/* Resume all the queues for this process */

	idr_for_each_entry(&uq_mgr->userq_idr, queue, queue_id) {



		if (!amdgpu_userq_buffer_vas_mapped(queue)) {

			drm_file_err(uq_mgr->file,

				     "trying restore queue without va mapping\n");

			queue->state = AMDGPU_USERQ_STATE_INVALID_VA;

			continue;

		}



		r = amdgpu_userq_restore_helper(uq_mgr, queue);

		if (r)

			ret = r;