Skip to content

Commit 9c29282

Browse files
Lang Yualexdeucher
authored andcommitted
drm/amdkfd: reserve the BO before validating it
Fix a warning. v2: Avoid unmapping attachment repeatedly when ERESTARTSYS. v3: Lock the BO before accessing ttm->sg to avoid race conditions.(Felix) [ 41.708711] WARNING: CPU: 0 PID: 1463 at drivers/gpu/drm/ttm/ttm_bo.c:846 ttm_bo_validate+0x146/0x1b0 [ttm] [ 41.708989] Call Trace: [ 41.708992] <TASK> [ 41.708996] ? show_regs+0x6c/0x80 [ 41.709000] ? ttm_bo_validate+0x146/0x1b0 [ttm] [ 41.709008] ? __warn+0x93/0x190 [ 41.709014] ? ttm_bo_validate+0x146/0x1b0 [ttm] [ 41.709024] ? report_bug+0x1f9/0x210 [ 41.709035] ? handle_bug+0x46/0x80 [ 41.709041] ? exc_invalid_op+0x1d/0x80 [ 41.709048] ? asm_exc_invalid_op+0x1f/0x30 [ 41.709057] ? amdgpu_amdkfd_gpuvm_dmaunmap_mem+0x2c/0x80 [amdgpu] [ 41.709185] ? ttm_bo_validate+0x146/0x1b0 [ttm] [ 41.709197] ? amdgpu_amdkfd_gpuvm_dmaunmap_mem+0x2c/0x80 [amdgpu] [ 41.709337] ? srso_alias_return_thunk+0x5/0x7f [ 41.709346] kfd_mem_dmaunmap_attachment+0x9e/0x1e0 [amdgpu] [ 41.709467] amdgpu_amdkfd_gpuvm_dmaunmap_mem+0x56/0x80 [amdgpu] [ 41.709586] kfd_ioctl_unmap_memory_from_gpu+0x1b7/0x300 [amdgpu] [ 41.709710] kfd_ioctl+0x1ec/0x650 [amdgpu] [ 41.709822] ? __pfx_kfd_ioctl_unmap_memory_from_gpu+0x10/0x10 [amdgpu] [ 41.709945] ? srso_alias_return_thunk+0x5/0x7f [ 41.709949] ? tomoyo_file_ioctl+0x20/0x30 [ 41.709959] __x64_sys_ioctl+0x9c/0xd0 [ 41.709967] do_syscall_64+0x3f/0x90 [ 41.709973] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 Fixes: 101b810 ("drm/amdkfd: Move dma unmapping after TLB flush") Signed-off-by: Lang Yu <Lang.Yu@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 16da399 commit 9c29282

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(struct amdgpu_device *adev,
303303
struct kgd_mem *mem, void *drm_priv);
304304
int amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu(
305305
struct amdgpu_device *adev, struct kgd_mem *mem, void *drm_priv);
306-
void amdgpu_amdkfd_gpuvm_dmaunmap_mem(struct kgd_mem *mem, void *drm_priv);
306+
int amdgpu_amdkfd_gpuvm_dmaunmap_mem(struct kgd_mem *mem, void *drm_priv);
307307
int amdgpu_amdkfd_gpuvm_sync_memory(
308308
struct amdgpu_device *adev, struct kgd_mem *mem, bool intr);
309309
int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct kgd_mem *mem,

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,21 +2085,35 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
20852085
return ret;
20862086
}
20872087

2088-
void amdgpu_amdkfd_gpuvm_dmaunmap_mem(struct kgd_mem *mem, void *drm_priv)
2088+
int amdgpu_amdkfd_gpuvm_dmaunmap_mem(struct kgd_mem *mem, void *drm_priv)
20892089
{
20902090
struct kfd_mem_attachment *entry;
20912091
struct amdgpu_vm *vm;
2092+
int ret;
20922093

20932094
vm = drm_priv_to_vm(drm_priv);
20942095

20952096
mutex_lock(&mem->lock);
20962097

2098+
ret = amdgpu_bo_reserve(mem->bo, true);
2099+
if (ret)
2100+
goto out;
2101+
20972102
list_for_each_entry(entry, &mem->attachments, list) {
2098-
if (entry->bo_va->base.vm == vm)
2099-
kfd_mem_dmaunmap_attachment(mem, entry);
2103+
if (entry->bo_va->base.vm != vm)
2104+
continue;
2105+
if (entry->bo_va->base.bo->tbo.ttm &&
2106+
!entry->bo_va->base.bo->tbo.ttm->sg)
2107+
continue;
2108+
2109+
kfd_mem_dmaunmap_attachment(mem, entry);
21002110
}
21012111

2112+
amdgpu_bo_unreserve(mem->bo);
2113+
out:
21022114
mutex_unlock(&mem->lock);
2115+
2116+
return ret;
21032117
}
21042118

21052119
int amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu(

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1442,7 +1442,9 @@ static int kfd_ioctl_unmap_memory_from_gpu(struct file *filep,
14421442
kfd_flush_tlb(peer_pdd, TLB_FLUSH_HEAVYWEIGHT);
14431443

14441444
/* Remove dma mapping after tlb flush to avoid IO_PAGE_FAULT */
1445-
amdgpu_amdkfd_gpuvm_dmaunmap_mem(mem, peer_pdd->drm_priv);
1445+
err = amdgpu_amdkfd_gpuvm_dmaunmap_mem(mem, peer_pdd->drm_priv);
1446+
if (err)
1447+
goto sync_memory_failed;
14461448
}
14471449

14481450
mutex_unlock(&p->mutex);

0 commit comments

Comments
 (0)