lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 516/663] drm/amdkfd: Fix recursive lock warnings
    Date
    From: Felix Kuehling <Felix.Kuehling@amd.com>

    commit 1fb8b1fc4dd1035a264c81d15d41f05884cc8058 upstream.

    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: f920e413ff9c ("mm: track mmu notifiers in fs_reclaim_acquire/release")
    CC: Daniel Vetter <daniel.vetter@ffwll.ch>
    Reviewed-by: Philip Yang <Philip.Yang@amd.com>
    Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org # 5.10.x
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
    +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
    @@ -243,11 +243,11 @@ get_sh_mem_bases_nybble_64(struct kfd_pr
    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);
    }


    \
     
     \ /
      Last update: 2021-03-02 00:22    [W:2.886 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site