aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-01-09 13:18:59 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-01-16 15:35:26 -0500
commitd958939afc39391c0d007a0ca43153856d63ec2a (patch)
tree05475346d99b445fe132a8c57e947be99621128d /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
parente2721595e4c3d8b63dcd85bc99ad1ea4821a8d88 (diff)
drm/amdgpu: fix amdgpu_vm_pasid_fault_credit
As soon as the lock is dropped the VM pointer can be invalid. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index cd1752b6afa9..9e266307ce63 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2478,17 +2478,21 @@ bool amdgpu_vm_pasid_fault_credit(struct amdgpu_device *adev,
2478 2478
2479 spin_lock(&adev->vm_manager.pasid_lock); 2479 spin_lock(&adev->vm_manager.pasid_lock);
2480 vm = idr_find(&adev->vm_manager.pasid_idr, pasid); 2480 vm = idr_find(&adev->vm_manager.pasid_idr, pasid);
2481 spin_unlock(&adev->vm_manager.pasid_lock); 2481 if (!vm) {
2482 if (!vm)
2483 /* VM not found, can't track fault credit */ 2482 /* VM not found, can't track fault credit */
2483 spin_unlock(&adev->vm_manager.pasid_lock);
2484 return true; 2484 return true;
2485 }
2485 2486
2486 /* No lock needed. only accessed by IRQ handler */ 2487 /* No lock needed. only accessed by IRQ handler */
2487 if (!vm->fault_credit) 2488 if (!vm->fault_credit) {
2488 /* Too many faults in this VM */ 2489 /* Too many faults in this VM */
2490 spin_unlock(&adev->vm_manager.pasid_lock);
2489 return false; 2491 return false;
2492 }
2490 2493
2491 vm->fault_credit--; 2494 vm->fault_credit--;
2495 spin_unlock(&adev->vm_manager.pasid_lock);
2492 return true; 2496 return true;
2493} 2497}
2494 2498