lkml.org 
[lkml]   [2019]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 135/171] drm/amdgpu: use spin_lock_irqsave to protect vm_manager.pasid_idr
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 0a5f49cbf9d6ad3721c16f8a6d823363ea7a160f ]

    amdgpu_vm_get_task_info is called from interrupt handler and sched timeout
    workqueue, we should use irq version spin_lock to avoid deadlock.

    Signed-off-by: Philip Yang <Philip.Yang@amd.com>
    Reviewed-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
    index 62df4bd0a0fc..16c83155ef5c 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
    @@ -3405,14 +3405,15 @@ void amdgpu_vm_get_task_info(struct amdgpu_device *adev, unsigned int pasid,
    struct amdgpu_task_info *task_info)
    {
    struct amdgpu_vm *vm;
    + unsigned long flags;

    - spin_lock(&adev->vm_manager.pasid_lock);
    + spin_lock_irqsave(&adev->vm_manager.pasid_lock, flags);

    vm = idr_find(&adev->vm_manager.pasid_idr, pasid);
    if (vm)
    *task_info = vm->task_info;

    - spin_unlock(&adev->vm_manager.pasid_lock);
    + spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags);
    }

    /**
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-12 19:02    [W:4.227 / U:0.668 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site