Commit f101c13a authored by Liu01 Tong's avatar Liu01 Tong Committed by Alex Deucher
Browse files

drm/amdgpu: fix task hang from failed job submission during process kill 



During process kill, drm_sched_entity_flush() will kill the vm
entities. The following job submissions of this process will fail, and
the resources of these jobs have not been released, nor have the fences
been signalled, causing tasks to hang and timeout.

Fix by check entity status in amdgpu_vm_ready() and avoid submit jobs to
stopped entity.

v2: add amdgpu_vm_ready() check before amdgpu_vm_clear_freed() in
function amdgpu_cs_vm_handling().

Signed-off-by: default avatarLiu01 Tong <Tong.Liu01@amd.com>
Signed-off-by: default avatarLin.Cao <lincao12@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b08425fa

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

+3 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,9 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
		}

	}



	if (!amdgpu_vm_ready(vm))

		return -EINVAL;



	r = amdgpu_vm_clear_freed(adev, vm, NULL);

	if (r)

		return r;

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

+11 −4
Original line number Diff line number Diff line
@@ -654,11 +654,10 @@ int amdgpu_vm_validate(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
 * Check if all VM PDs/PTs are ready for updates

 *

 * Returns:

 * True if VM is not evicting.

 * True if VM is not evicting and all VM entities are not stopped

 */

bool amdgpu_vm_ready(struct amdgpu_vm *vm)

{

	bool empty;

	bool ret;



	amdgpu_vm_eviction_lock(vm);
@@ -666,10 +665,18 @@ bool amdgpu_vm_ready(struct amdgpu_vm *vm) 
	amdgpu_vm_eviction_unlock(vm);



	spin_lock(&vm->status_lock);

	empty = list_empty(&vm->evicted);

	ret &= list_empty(&vm->evicted);

	spin_unlock(&vm->status_lock);



	return ret && empty;

	spin_lock(&vm->immediate.lock);

	ret &= !vm->immediate.stopped;

	spin_unlock(&vm->immediate.lock);



	spin_lock(&vm->delayed.lock);

	ret &= !vm->delayed.stopped;

	spin_unlock(&vm->delayed.lock);



	return ret;

}



/**