Skip to content

Commit d42a5b6

Browse files
amd-yangpalexdeucher
authored andcommitted
drm/amdgpu: reserve fence slot to update page table
Forgot to reserve a fence slot to use sdma to update page table, cause below kernel BUG backtrace to handle vm retry fault while application is exiting. [ 133.048143] kernel BUG at /home/yangp/git/compute_staging/kernel/drivers/dma-buf/dma-resv.c:281! [ 133.048487] Workqueue: events amdgpu_irq_handle_ih1 [amdgpu] [ 133.048506] RIP: 0010:dma_resv_add_shared_fence+0x204/0x280 [ 133.048672] amdgpu_vm_sdma_commit+0x134/0x220 [amdgpu] [ 133.048788] amdgpu_vm_bo_update_range+0x220/0x250 [amdgpu] [ 133.048905] amdgpu_vm_handle_fault+0x202/0x370 [amdgpu] [ 133.049031] gmc_v9_0_process_interrupt+0x1ab/0x310 [amdgpu] [ 133.049165] ? kgd2kfd_interrupt+0x9a/0x180 [amdgpu] [ 133.049289] ? amdgpu_irq_dispatch+0xb6/0x240 [amdgpu] [ 133.049408] amdgpu_irq_dispatch+0xb6/0x240 [amdgpu] [ 133.049534] amdgpu_ih_process+0x9b/0x1c0 [amdgpu] [ 133.049657] amdgpu_irq_handle_ih1+0x21/0x60 [amdgpu] [ 133.049669] process_one_work+0x29f/0x640 [ 133.049678] worker_thread+0x39/0x3f0 [ 133.049685] ? process_one_work+0x640/0x640 Signed-off-by: Philip Yang <Philip.Yang@amd.com> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org # 5.11.x
1 parent 796b556 commit d42a5b6

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3300,7 +3300,7 @@ bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid,
33003300
struct amdgpu_bo *root;
33013301
uint64_t value, flags;
33023302
struct amdgpu_vm *vm;
3303-
long r;
3303+
int r;
33043304

33053305
spin_lock(&adev->vm_manager.pasid_lock);
33063306
vm = idr_find(&adev->vm_manager.pasid_idr, pasid);
@@ -3349,6 +3349,12 @@ bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid,
33493349
value = 0;
33503350
}
33513351

3352+
r = dma_resv_reserve_shared(root->tbo.base.resv, 1);
3353+
if (r) {
3354+
pr_debug("failed %d to reserve fence slot\n", r);
3355+
goto error_unlock;
3356+
}
3357+
33523358
r = amdgpu_vm_bo_update_mapping(adev, adev, vm, true, false, NULL, addr,
33533359
addr, flags, value, NULL, NULL,
33543360
NULL);
@@ -3360,7 +3366,7 @@ bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid,
33603366
error_unlock:
33613367
amdgpu_bo_unreserve(root);
33623368
if (r < 0)
3363-
DRM_ERROR("Can't handle page fault (%ld)\n", r);
3369+
DRM_ERROR("Can't handle page fault (%d)\n", r);
33643370

33653371
error_unref:
33663372
amdgpu_bo_unref(&root);

0 commit comments

Comments
 (0)