Commit 7816e4a9 authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/amdkfd: Fix recursive lock warnings 



memalloc_nofs_save/restore are no longer sufficient to prevent recursive
lock warnings when holding locks that can be taken in MMU notifiers. Use
memalloc_noreclaim_save/restore instead.

Fixes: f920e413 ("mm: track mmu notifiers in fs_reclaim_acquire/release")
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 970fd197

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

+3 −3
Original line number Diff line number Diff line
@@ -93,13 +93,13 @@ struct amdgpu_prt_cb { 
static inline void amdgpu_vm_eviction_lock(struct amdgpu_vm *vm)

{

	mutex_lock(&vm->eviction_lock);

	vm->saved_flags = memalloc_nofs_save();

	vm->saved_flags = memalloc_noreclaim_save();

}



static inline int amdgpu_vm_eviction_trylock(struct amdgpu_vm *vm)

{

	if (mutex_trylock(&vm->eviction_lock)) {

		vm->saved_flags = memalloc_nofs_save();

		vm->saved_flags = memalloc_noreclaim_save();

		return 1;

	}

	return 0;
@@ -107,7 +107,7 @@ static inline int amdgpu_vm_eviction_trylock(struct amdgpu_vm *vm) 


static inline void amdgpu_vm_eviction_unlock(struct amdgpu_vm *vm)

{

	memalloc_nofs_restore(vm->saved_flags);

	memalloc_noreclaim_restore(vm->saved_flags);

	mutex_unlock(&vm->eviction_lock);

}