Commit 1fb8b1fc 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")
CC: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.10.x
parent 41401ac6

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h

+2 −2
Original line number Diff line number Diff line
@@ -243,11 +243,11 @@ get_sh_mem_bases_nybble_64(struct kfd_process_device *pdd) 
static inline void dqm_lock(struct device_queue_manager *dqm)

{

	mutex_lock(&dqm->lock_hidden);

	dqm->saved_flags = memalloc_nofs_save();

	dqm->saved_flags = memalloc_noreclaim_save();

}

static inline void dqm_unlock(struct device_queue_manager *dqm)

{

	memalloc_nofs_restore(dqm->saved_flags);

	memalloc_noreclaim_restore(dqm->saved_flags);

	mutex_unlock(&dqm->lock_hidden);

}