* [PATCH 1/3] drm/amdgpu: remove the GART copy hack
@ 2017-08-23 9:02 Christian König
[not found] ` <1503478972-1533-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
0 siblings, 1 reply; 13+ messages in thread
From: Christian König @ 2017-08-23 9:02 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
From: Christian König <christian.koenig@amd.com>
This isn't used since we don't map evicted BOs to GART any more.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index ab6e03d..7a0656c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1615,7 +1615,6 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
*
* @adev: amdgpu_device pointer
* @exclusive: fence we need to sync to
- * @gtt_flags: flags as they are used for GTT
* @pages_addr: DMA addresses to use for mapping
* @vm: requested vm
* @mapping: mapped range and flags to use for the update
@@ -1629,7 +1628,6 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
*/
static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
struct dma_fence *exclusive,
- uint64_t gtt_flags,
dma_addr_t *pages_addr,
struct amdgpu_vm *vm,
struct amdgpu_bo_va_mapping *mapping,
@@ -1684,11 +1682,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev,
}
if (pages_addr) {
- if (flags == gtt_flags)
- src = adev->gart.table_addr +
- (addr >> AMDGPU_GPU_PAGE_SHIFT) * 8;
- else
- max_entries = min(max_entries, 16ull * 1024ull);
+ max_entries = min(max_entries, 16ull * 1024ull);
addr = 0;
} else if (flags & AMDGPU_PTE_VALID) {
addr += adev->vm_manager.vram_base_offset;
@@ -1733,10 +1727,10 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev,
struct amdgpu_vm *vm = bo_va->base.vm;
struct amdgpu_bo_va_mapping *mapping;
dma_addr_t *pages_addr = NULL;
- uint64_t gtt_flags, flags;
struct ttm_mem_reg *mem;
struct drm_mm_node *nodes;
struct dma_fence *exclusive;
+ uint64_t flags;
int r;
if (clear || !bo_va->base.bo) {
@@ -1756,15 +1750,10 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev,
exclusive = reservation_object_get_excl(bo->tbo.resv);
}
- if (bo) {
+ if (bo)
flags = amdgpu_ttm_tt_pte_flags(adev, bo->tbo.ttm, mem);
- gtt_flags = (amdgpu_ttm_is_bound(bo->tbo.ttm) &&
- adev == amdgpu_ttm_adev(bo->tbo.bdev)) ?
- flags : 0;
- } else {
+ else
flags = 0x0;
- gtt_flags = ~0x0;
- }
spin_lock(&vm->status_lock);
if (!list_empty(&bo_va->base.vm_status))
@@ -1772,8 +1761,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev,
spin_unlock(&vm->status_lock);
list_for_each_entry(mapping, &bo_va->invalids, list) {
- r = amdgpu_vm_bo_split_mapping(adev, exclusive,
- gtt_flags, pages_addr, vm,
+ r = amdgpu_vm_bo_split_mapping(adev, exclusive, pages_addr, vm,
mapping, flags, nodes,
&bo_va->last_pt_update);
if (r)
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread[parent not found: <1503478972-1533-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>]
* [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind [not found] ` <1503478972-1533-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> @ 2017-08-23 9:02 ` Christian König [not found] ` <1503478972-1533-2-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> 2017-08-23 9:02 ` [PATCH 3/3] drm/amdgpu: inline amdgpu_ttm_do_bind again Christian König ` (2 subsequent siblings) 3 siblings, 1 reply; 13+ messages in thread From: Christian König @ 2017-08-23 9:02 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW From: Christian König <christian.koenig@amd.com> Use ttm_bo_mem_space instead of manually allocating GART space. This allows us to evict BOs when there isn't enought GART space any more. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 14 +++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 +++++++++++++++++++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ---- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c index 9e05e25..0d15eb7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c @@ -108,10 +108,10 @@ bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem) * * Allocate the address space for a node. */ -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, - struct ttm_buffer_object *tbo, - const struct ttm_place *place, - struct ttm_mem_reg *mem) +static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, + struct ttm_buffer_object *tbo, + const struct ttm_place *place, + struct ttm_mem_reg *mem) { struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); struct amdgpu_gtt_mgr *mgr = man->priv; @@ -143,12 +143,8 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, fpfn, lpfn, mode); spin_unlock(&mgr->lock); - if (!r) { + if (!r) mem->start = node->start; - if (&tbo->mem == mem) - tbo->offset = (tbo->mem.start << PAGE_SHIFT) + - tbo->bdev->man[tbo->mem.mem_type].gpu_offset; - } return r; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 38d26a7..aa0b7f5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -809,20 +809,39 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm) int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem) { + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); struct ttm_tt *ttm = bo->ttm; + struct ttm_mem_reg tmp; + + struct ttm_placement placement; + struct ttm_place placements; int r; if (!ttm || amdgpu_ttm_is_bound(ttm)) return 0; - r = amdgpu_gtt_mgr_alloc(&bo->bdev->man[TTM_PL_TT], bo, - NULL, bo_mem); - if (r) { - DRM_ERROR("Failed to allocate GTT address space (%d)\n", r); + tmp = bo->mem; + tmp.mm_node = NULL; + placement.num_placement = 1; + placement.placement = &placements; + placement.num_busy_placement = 1; + placement.busy_placement = &placements; + placements.fpfn = 0; + placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT; + placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT; + + r = ttm_bo_mem_space(bo, &placement, &tmp, true, false); + if (unlikely(r)) return r; - } - return amdgpu_ttm_do_bind(ttm, bo_mem); + r = ttm_bo_move_ttm(bo, true, false, &tmp); + if (unlikely(r)) + ttm_bo_mem_put(bo, &tmp); + else + bo->offset = (bo->mem.start << PAGE_SHIFT) + + bo->bdev->man[bo->mem.mem_type].gpu_offset; + + return r; } int amdgpu_ttm_recover_gart(struct amdgpu_device *adev) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h index f22a475..43093bf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -62,10 +62,6 @@ extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func; extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func; bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem); -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, - struct ttm_buffer_object *tbo, - const struct ttm_place *place, - struct ttm_mem_reg *mem); uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man); uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man); -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <1503478972-1533-2-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>]
* Regression: Re: [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind [not found] ` <1503478972-1533-2-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> @ 2017-08-31 22:50 ` Felix Kuehling [not found] ` <ae6b3cd8-9b07-838d-ff61-9e9514ab20f8-5C7GfCeVMHo@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Felix Kuehling @ 2017-08-31 22:50 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Christian König Cc: Deucher, Alexander, Russell, Kent I believe this patch breaks pinned GTT BOs. It trips KFD tests that apply a lot of memory pressure on one of our test systems. I understand the cause of the problem (see my analysis below), but I'm not sure how to solve it, without reverting the patch. Christian, do you have any ideas? Should we at least revert this as a short-term fix? I added some WARNs in the code to understand what's happening: diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 72ad045..3ead155 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -930,6 +930,7 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, return; abo = container_of(bo, struct amdgpu_bo, tbo); + WARN(abo->pin_count, "Moving pinned bo"); amdgpu_vm_bo_invalidate(adev, abo); amdgpu_bo_kunmap(abo); diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index c934ad5..af9f40e 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -63,6 +63,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, ttm_tt_unbind(ttm); ttm_bo_free_old_node(bo); + WARN(old_mem->placement & TTM_PL_FLAG_NO_EVICT, "Stripping NO_EVICT flag from BO"); ttm_flag_masked(&old_mem->placement, TTM_PL_FLAG_SYSTEM, TTM_PL_MASK_MEM); old_mem->mem_type = TTM_PL_SYSTEM; With that I see the following scenario unfold in my kernel log, where pinned GTT BOs are swapped out and kunmapped under memory pressure. Eventually this leads to memory access faults while accessing ring buffers or IBs: [ 8.475453] Stripping NO_EVICT flag from BO [ 8.475461] ------------[ cut here ]------------ [ 8.475465] WARNING: CPU: 5 PID: 2186 at /home/fkuehlin/compute/kernel/drivers/gpu/drm/ttm/ttm_bo_util.c:66 ttm_bo_move_ttm+0x14a/0x160 [ttm] [ 8.475466] Modules linked in: amdkfd(E) amd_iommu_v2(E) amdgpu(E+) radeon(E) ttm(E) [ 8.475472] CPU: 5 PID: 2186 Comm: systemd-udevd Tainted: G W E 4.12.0-kfd-fkuehlin #1 [ 8.475473] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS 2006 04/07/2016 [ 8.475474] task: ffff91bf12a82e00 task.stack: ffffb8bd43600000 [ 8.475477] RIP: 0010:ttm_bo_move_ttm+0x14a/0x160 [ttm] [ 8.475478] RSP: 0018:ffffb8bd43603780 EFLAGS: 00010282 [ 8.475480] RAX: 000000000000001f RBX: ffff91bf0b0ee058 RCX: 0000000000000006 [ 8.475481] RDX: 0000000000000006 RSI: ffff91bf12a83678 RDI: 0000000000000202 [ 8.475482] RBP: ffffb8bd436037a0 R08: 0000000000000001 R09: 0000000000000000 [ 8.475483] R10: 0000000000000000 R11: 0000000000000000 R12: ffffb8bd436037e8 [ 8.475484] R13: 0000000000000000 R14: ffff91bf12c1bf00 R15: ffff91bf0b0ee000 [ 8.475485] FS: 00007f71b381b8c0(0000) GS:ffff91bf17340000(0000) knlGS:0000000000000000 [ 8.475486] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 8.475487] CR2: 0000557e2ad63a28 CR3: 000000060d153000 CR4: 00000000001406e0 [ 8.475488] Call Trace: [ 8.475514] amdgpu_ttm_bind+0x129/0x1a0 [amdgpu] [ 8.475518] ? ttm_bo_mem_compat+0x20/0x50 [ttm] [ 8.475522] ? sparse_add_one_section+0x166/0x167 [ 8.475547] amdgpu_bo_pin_restricted+0x1ca/0x2f0 [amdgpu] [ 8.475575] amdgpu_bo_create_reserved+0x95/0x220 [amdgpu] [ 8.475602] amdgpu_bo_create_kernel+0x10/0x70 [amdgpu] [ 8.475632] amdgpu_gfx_compute_mqd_sw_init+0xf2/0x170 [amdgpu] [ 8.475663] gfx_v8_0_sw_init+0xca8/0x15d0 [amdgpu] [ 8.475690] amdgpu_device_init+0xe6f/0x1620 [amdgpu] [ 8.475717] amdgpu_driver_load_kms+0x63/0x200 [amdgpu] [ 8.475720] drm_dev_register+0x143/0x1d0 [ 8.475744] amdgpu_pci_probe+0x110/0x140 [amdgpu] [ 8.475747] local_pci_probe+0x40/0xa0 [ 8.475749] ? pci_match_device+0xdb/0x100 [ 8.475752] pci_device_probe+0x136/0x160 [ 8.475755] driver_probe_device+0x299/0x440 [ 8.475757] __driver_attach+0xde/0xe0 [ 8.475759] ? driver_probe_device+0x440/0x440 [ 8.475761] bus_for_each_dev+0x61/0xa0 [ 8.475763] driver_attach+0x19/0x20 [ 8.475764] bus_add_driver+0x1f6/0x270 [ 8.475766] ? 0xffffffffc0839000 [ 8.475768] driver_register+0x5b/0xd0 [ 8.475769] ? 0xffffffffc0839000 [ 8.475771] __pci_register_driver+0x5b/0x60 [ 8.475799] amdgpu_init+0x8a/0x1000 [amdgpu] [ 8.475801] do_one_initcall+0x4e/0x190 [ 8.475804] ? kmem_cache_alloc+0xd8/0x170 [ 8.475807] do_init_module+0x55/0x1e9 [ 8.475810] load_module+0x2771/0x29c0 [ 8.475817] SYSC_finit_module+0xbc/0xf0 [ 8.475819] ? SYSC_finit_module+0xbc/0xf0 [ 8.475823] SyS_finit_module+0x9/0x10 [ 8.475825] entry_SYSCALL_64_fastpath+0x1f/0xbe [...] [ 278.693790] Moving pinned bo (this kunmaps the BO) [ 278.693802] ------------[ cut here ]------------ [ 278.693833] WARNING: CPU: 11 PID: 2145 at /home/fkuehlin/compute/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:933 amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] [ 278.693834] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) [ 278.693843] CPU: 11 PID: 2145 Comm: kworker/11:2 Tainted: G W E 4.12.0-kfd-fkuehlin #1 [ 278.693845] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS 2006 04/07/2016 [ 278.693851] Workqueue: kfd_process_wq kfd_process_wq_release [amdkfd] [ 278.693853] task: ffff91bf0dab1700 task.stack: ffffb8bd4495c000 [ 278.693880] RIP: 0010:amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] [ 278.693882] RSP: 0018:ffffb8bd4495fc20 EFLAGS: 00010282 [ 278.693884] RAX: 0000000000000010 RBX: ffff91bf0bec7058 RCX: 0000000000000006 [ 278.693885] RDX: 0000000000000006 RSI: ffff91bf0dab1f50 RDI: 0000000000000202 [ 278.693886] RBP: ffffb8bd4495fc40 R08: 0000000000000001 R09: 0000000000000000 [ 278.693887] R10: ffffb8bd4495fb98 R11: 0000000000000000 R12: ffff91bf0b0c2a68 [ 278.693889] R13: 0000000000000000 R14: ffff91bf0bec708c R15: ffff91bf104bb000 [ 278.693890] FS: 0000000000000000(0000) GS:ffff91bf174c0000(0000) knlGS:0000000000000000 [ 278.693891] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 278.693892] CR2: 0000000004199000 CR3: 00000001f3e0f000 CR4: 00000000001406e0 [ 278.693893] Call Trace: [ 278.693898] ttm_bo_cleanup_memtype_use+0x1f/0x70 [ttm] [ 278.693902] ttm_bo_unref+0x388/0x470 [ttm] [ 278.693931] amdgpu_bo_unref+0x25/0x40 [amdgpu] [ 278.693962] amdgpu_amdkfd_gpuvm_free_memory_of_gpu+0x1b5/0x260 [amdgpu] [ 278.693974] kfd_process_free_outstanding_kfd_bos+0xab/0xe0 [amdkfd] [ 278.693980] kfd_process_wq_release+0x56/0x110 [amdkfd] [ 278.693983] process_one_work+0x190/0x430 [ 278.693984] ? process_one_work+0x133/0x430 [ 278.693988] worker_thread+0x46/0x400 [ 278.693991] kthread+0x10a/0x140 [ 278.693993] ? process_one_work+0x430/0x430 [ 278.693995] ? kthread_create_on_node+0x40/0x40 [ 278.693996] ? umh_complete+0x40/0x40 [ 278.693998] ? call_usermodehelper_exec_async+0x137/0x140 [ 278.694000] ret_from_fork+0x2a/0x40 [...] [ 694.740232] BUG: unable to handle kernel paging request at ffffb8bd4354d540 [ 694.740387] IP: sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] [ 694.740430] PGD 616c23067 [ 694.740432] P4D 616c23067 [ 694.740454] PUD 616c24067 [ 694.740476] PMD 613704067 [ 694.740498] PTE 0 [ 694.740551] Oops: 0002 [#1] SMP [ 694.740576] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) [ 694.740667] CPU: 10 PID: 2213 Comm: sdma0 Tainted: G W E 4.12.0-kfd-fkuehlin #1 [ 694.740727] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS 2006 04/07/2016 [ 694.740782] task: ffff91bf0d989700 task.stack: ffffb8bd43730000 [ 694.740895] RIP: 0010:sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] [ 694.740941] RSP: 0018:ffffb8bd43733dc0 EFLAGS: 00010202 [ 694.740982] RAX: ffff91bf0b0c7770 RBX: ffff91bf0b0c7770 RCX: ffffb8bd4354d540 [ 694.741035] RDX: 0000000000001ac0 RSI: 00000000000006b0 RDI: ffff91bf0b0c0000 [ 694.741087] RBP: ffffb8bd43733dc0 R08: ffffffffc072bd60 R09: 0000000000000000 [ 694.741140] R10: ffff91bf0b0c0000 R11: ffffffffc064ef47 R12: ffff91bef6166000 [ 694.741192] R13: ffff91bef6166368 R14: 0000000000000001 R15: ffff91bf0b0c7770 [ 694.741246] FS: 0000000000000000(0000) GS:ffff91bf17480000(0000) knlGS:0000000000000000 [ 694.741305] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 694.741349] CR2: ffffb8bd4354d540 CR3: 000000060e4a6000 CR4: 00000000001406e0 [ 694.741401] Call Trace: [ 694.741480] amdgpu_ring_commit+0x3a/0x60 [amdgpu] [ 694.741575] amdgpu_ib_schedule+0x2c7/0x450 [amdgpu] [ 694.741687] amdgpu_job_run+0x72/0x110 [amdgpu] [ 694.741793] amd_sched_main+0x343/0x470 [amdgpu] [ 694.741838] ? wake_atomic_t_function+0x60/0x60 [ 694.741876] kthread+0x10a/0x140 [ 694.741969] ? amd_sched_process_job+0x60/0x60 [amdgpu] [ 694.742010] ? kthread_create_on_node+0x40/0x40 [ 694.742048] ret_from_fork+0x2a/0x40 On 2017-08-23 05:02 AM, Christian König wrote: > From: Christian König <christian.koenig@amd.com> > > Use ttm_bo_mem_space instead of manually allocating GART space. > > This allows us to evict BOs when there isn't enought GART space any more. > > Signed-off-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 14 +++++-------- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 +++++++++++++++++++++++------ > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ---- > 3 files changed, 30 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c > index 9e05e25..0d15eb7 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c > @@ -108,10 +108,10 @@ bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem) > * > * Allocate the address space for a node. > */ > -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, > - struct ttm_buffer_object *tbo, > - const struct ttm_place *place, > - struct ttm_mem_reg *mem) > +static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, > + struct ttm_buffer_object *tbo, > + const struct ttm_place *place, > + struct ttm_mem_reg *mem) > { > struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); > struct amdgpu_gtt_mgr *mgr = man->priv; > @@ -143,12 +143,8 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, > fpfn, lpfn, mode); > spin_unlock(&mgr->lock); > > - if (!r) { > + if (!r) > mem->start = node->start; > - if (&tbo->mem == mem) > - tbo->offset = (tbo->mem.start << PAGE_SHIFT) + > - tbo->bdev->man[tbo->mem.mem_type].gpu_offset; > - } > > return r; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index 38d26a7..aa0b7f5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -809,20 +809,39 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm) > > int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem) > { > + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); > struct ttm_tt *ttm = bo->ttm; > + struct ttm_mem_reg tmp; > + > + struct ttm_placement placement; > + struct ttm_place placements; > int r; > > if (!ttm || amdgpu_ttm_is_bound(ttm)) > return 0; > > - r = amdgpu_gtt_mgr_alloc(&bo->bdev->man[TTM_PL_TT], bo, > - NULL, bo_mem); > - if (r) { > - DRM_ERROR("Failed to allocate GTT address space (%d)\n", r); > + tmp = bo->mem; > + tmp.mm_node = NULL; > + placement.num_placement = 1; > + placement.placement = &placements; > + placement.num_busy_placement = 1; > + placement.busy_placement = &placements; > + placements.fpfn = 0; > + placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT; > + placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT; > + > + r = ttm_bo_mem_space(bo, &placement, &tmp, true, false); > + if (unlikely(r)) > return r; > - } > > - return amdgpu_ttm_do_bind(ttm, bo_mem); > + r = ttm_bo_move_ttm(bo, true, false, &tmp); > + if (unlikely(r)) > + ttm_bo_mem_put(bo, &tmp); > + else > + bo->offset = (bo->mem.start << PAGE_SHIFT) + > + bo->bdev->man[bo->mem.mem_type].gpu_offset; > + > + return r; > } > > int amdgpu_ttm_recover_gart(struct amdgpu_device *adev) > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h > index f22a475..43093bf 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h > @@ -62,10 +62,6 @@ extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func; > extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func; > > bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem); > -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, > - struct ttm_buffer_object *tbo, > - const struct ttm_place *place, > - struct ttm_mem_reg *mem); > uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man); > > uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man); _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <ae6b3cd8-9b07-838d-ff61-9e9514ab20f8-5C7GfCeVMHo@public.gmane.org>]
* Re: Regression: Re: [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind [not found] ` <ae6b3cd8-9b07-838d-ff61-9e9514ab20f8-5C7GfCeVMHo@public.gmane.org> @ 2017-09-01 7:17 ` Christian König [not found] ` <2d026de1-3bf1-e6ca-9767-917845e5b241-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Christian König @ 2017-09-01 7:17 UTC (permalink / raw) To: Felix Kuehling, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Christian König Cc: Deucher, Alexander, Russell, Kent Yeah, the bug is really obvious after you pointed it out. We just need to keep the placement flags. Going to send a fix to the list in a minute, Christian. Am 01.09.2017 um 00:50 schrieb Felix Kuehling: > I believe this patch breaks pinned GTT BOs. It trips KFD tests that > apply a lot of memory pressure on one of our test systems. > > I understand the cause of the problem (see my analysis below), but I'm > not sure how to solve it, without reverting the patch. Christian, do you > have any ideas? Should we at least revert this as a short-term fix? > > I added some WARNs in the code to understand what's happening: > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > index 72ad045..3ead155 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > @@ -930,6 +930,7 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, > return; > > abo = container_of(bo, struct amdgpu_bo, tbo); > + WARN(abo->pin_count, "Moving pinned bo"); > amdgpu_vm_bo_invalidate(adev, abo); > > amdgpu_bo_kunmap(abo); > diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c > index c934ad5..af9f40e 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_util.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c > @@ -63,6 +63,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, > > ttm_tt_unbind(ttm); > ttm_bo_free_old_node(bo); > + WARN(old_mem->placement & TTM_PL_FLAG_NO_EVICT, "Stripping NO_EVICT flag from BO"); > ttm_flag_masked(&old_mem->placement, TTM_PL_FLAG_SYSTEM, > TTM_PL_MASK_MEM); > old_mem->mem_type = TTM_PL_SYSTEM; > > With that I see the following scenario unfold in my kernel log, where > pinned GTT BOs are swapped out and kunmapped under memory pressure. > Eventually this leads to memory access faults while accessing ring > buffers or IBs: > > [ 8.475453] Stripping NO_EVICT flag from BO > [ 8.475461] ------------[ cut here ]------------ > [ 8.475465] WARNING: CPU: 5 PID: 2186 at /home/fkuehlin/compute/kernel/drivers/gpu/drm/ttm/ttm_bo_util.c:66 ttm_bo_move_ttm+0x14a/0x160 [ttm] > [ 8.475466] Modules linked in: amdkfd(E) amd_iommu_v2(E) amdgpu(E+) radeon(E) ttm(E) > [ 8.475472] CPU: 5 PID: 2186 Comm: systemd-udevd Tainted: G W E 4.12.0-kfd-fkuehlin #1 > [ 8.475473] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS 2006 04/07/2016 > [ 8.475474] task: ffff91bf12a82e00 task.stack: ffffb8bd43600000 > [ 8.475477] RIP: 0010:ttm_bo_move_ttm+0x14a/0x160 [ttm] > [ 8.475478] RSP: 0018:ffffb8bd43603780 EFLAGS: 00010282 > [ 8.475480] RAX: 000000000000001f RBX: ffff91bf0b0ee058 RCX: 0000000000000006 > [ 8.475481] RDX: 0000000000000006 RSI: ffff91bf12a83678 RDI: 0000000000000202 > [ 8.475482] RBP: ffffb8bd436037a0 R08: 0000000000000001 R09: 0000000000000000 > [ 8.475483] R10: 0000000000000000 R11: 0000000000000000 R12: ffffb8bd436037e8 > [ 8.475484] R13: 0000000000000000 R14: ffff91bf12c1bf00 R15: ffff91bf0b0ee000 > [ 8.475485] FS: 00007f71b381b8c0(0000) GS:ffff91bf17340000(0000) knlGS:0000000000000000 > [ 8.475486] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 8.475487] CR2: 0000557e2ad63a28 CR3: 000000060d153000 CR4: 00000000001406e0 > [ 8.475488] Call Trace: > [ 8.475514] amdgpu_ttm_bind+0x129/0x1a0 [amdgpu] > [ 8.475518] ? ttm_bo_mem_compat+0x20/0x50 [ttm] > [ 8.475522] ? sparse_add_one_section+0x166/0x167 > [ 8.475547] amdgpu_bo_pin_restricted+0x1ca/0x2f0 [amdgpu] > [ 8.475575] amdgpu_bo_create_reserved+0x95/0x220 [amdgpu] > [ 8.475602] amdgpu_bo_create_kernel+0x10/0x70 [amdgpu] > [ 8.475632] amdgpu_gfx_compute_mqd_sw_init+0xf2/0x170 [amdgpu] > [ 8.475663] gfx_v8_0_sw_init+0xca8/0x15d0 [amdgpu] > [ 8.475690] amdgpu_device_init+0xe6f/0x1620 [amdgpu] > [ 8.475717] amdgpu_driver_load_kms+0x63/0x200 [amdgpu] > [ 8.475720] drm_dev_register+0x143/0x1d0 > [ 8.475744] amdgpu_pci_probe+0x110/0x140 [amdgpu] > [ 8.475747] local_pci_probe+0x40/0xa0 > [ 8.475749] ? pci_match_device+0xdb/0x100 > [ 8.475752] pci_device_probe+0x136/0x160 > [ 8.475755] driver_probe_device+0x299/0x440 > [ 8.475757] __driver_attach+0xde/0xe0 > [ 8.475759] ? driver_probe_device+0x440/0x440 > [ 8.475761] bus_for_each_dev+0x61/0xa0 > [ 8.475763] driver_attach+0x19/0x20 > [ 8.475764] bus_add_driver+0x1f6/0x270 > [ 8.475766] ? 0xffffffffc0839000 > [ 8.475768] driver_register+0x5b/0xd0 > [ 8.475769] ? 0xffffffffc0839000 > [ 8.475771] __pci_register_driver+0x5b/0x60 > [ 8.475799] amdgpu_init+0x8a/0x1000 [amdgpu] > [ 8.475801] do_one_initcall+0x4e/0x190 > [ 8.475804] ? kmem_cache_alloc+0xd8/0x170 > [ 8.475807] do_init_module+0x55/0x1e9 > [ 8.475810] load_module+0x2771/0x29c0 > [ 8.475817] SYSC_finit_module+0xbc/0xf0 > [ 8.475819] ? SYSC_finit_module+0xbc/0xf0 > [ 8.475823] SyS_finit_module+0x9/0x10 > [ 8.475825] entry_SYSCALL_64_fastpath+0x1f/0xbe > [...] > [ 278.693790] Moving pinned bo (this kunmaps the BO) > [ 278.693802] ------------[ cut here ]------------ > [ 278.693833] WARNING: CPU: 11 PID: 2145 at /home/fkuehlin/compute/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:933 amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] > [ 278.693834] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) > [ 278.693843] CPU: 11 PID: 2145 Comm: kworker/11:2 Tainted: G W E 4.12.0-kfd-fkuehlin #1 > [ 278.693845] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS 2006 04/07/2016 > [ 278.693851] Workqueue: kfd_process_wq kfd_process_wq_release [amdkfd] > [ 278.693853] task: ffff91bf0dab1700 task.stack: ffffb8bd4495c000 > [ 278.693880] RIP: 0010:amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] > [ 278.693882] RSP: 0018:ffffb8bd4495fc20 EFLAGS: 00010282 > [ 278.693884] RAX: 0000000000000010 RBX: ffff91bf0bec7058 RCX: 0000000000000006 > [ 278.693885] RDX: 0000000000000006 RSI: ffff91bf0dab1f50 RDI: 0000000000000202 > [ 278.693886] RBP: ffffb8bd4495fc40 R08: 0000000000000001 R09: 0000000000000000 > [ 278.693887] R10: ffffb8bd4495fb98 R11: 0000000000000000 R12: ffff91bf0b0c2a68 > [ 278.693889] R13: 0000000000000000 R14: ffff91bf0bec708c R15: ffff91bf104bb000 > [ 278.693890] FS: 0000000000000000(0000) GS:ffff91bf174c0000(0000) knlGS:0000000000000000 > [ 278.693891] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 278.693892] CR2: 0000000004199000 CR3: 00000001f3e0f000 CR4: 00000000001406e0 > [ 278.693893] Call Trace: > [ 278.693898] ttm_bo_cleanup_memtype_use+0x1f/0x70 [ttm] > [ 278.693902] ttm_bo_unref+0x388/0x470 [ttm] > [ 278.693931] amdgpu_bo_unref+0x25/0x40 [amdgpu] > [ 278.693962] amdgpu_amdkfd_gpuvm_free_memory_of_gpu+0x1b5/0x260 [amdgpu] > [ 278.693974] kfd_process_free_outstanding_kfd_bos+0xab/0xe0 [amdkfd] > [ 278.693980] kfd_process_wq_release+0x56/0x110 [amdkfd] > [ 278.693983] process_one_work+0x190/0x430 > [ 278.693984] ? process_one_work+0x133/0x430 > [ 278.693988] worker_thread+0x46/0x400 > [ 278.693991] kthread+0x10a/0x140 > [ 278.693993] ? process_one_work+0x430/0x430 > [ 278.693995] ? kthread_create_on_node+0x40/0x40 > [ 278.693996] ? umh_complete+0x40/0x40 > [ 278.693998] ? call_usermodehelper_exec_async+0x137/0x140 > [ 278.694000] ret_from_fork+0x2a/0x40 > [...] > [ 694.740232] BUG: unable to handle kernel paging request at ffffb8bd4354d540 > [ 694.740387] IP: sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] > [ 694.740430] PGD 616c23067 > [ 694.740432] P4D 616c23067 > [ 694.740454] PUD 616c24067 > [ 694.740476] PMD 613704067 > [ 694.740498] PTE 0 > > [ 694.740551] Oops: 0002 [#1] SMP > [ 694.740576] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) > [ 694.740667] CPU: 10 PID: 2213 Comm: sdma0 Tainted: G W E 4.12.0-kfd-fkuehlin #1 > [ 694.740727] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS 2006 04/07/2016 > [ 694.740782] task: ffff91bf0d989700 task.stack: ffffb8bd43730000 > [ 694.740895] RIP: 0010:sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] > [ 694.740941] RSP: 0018:ffffb8bd43733dc0 EFLAGS: 00010202 > [ 694.740982] RAX: ffff91bf0b0c7770 RBX: ffff91bf0b0c7770 RCX: ffffb8bd4354d540 > [ 694.741035] RDX: 0000000000001ac0 RSI: 00000000000006b0 RDI: ffff91bf0b0c0000 > [ 694.741087] RBP: ffffb8bd43733dc0 R08: ffffffffc072bd60 R09: 0000000000000000 > [ 694.741140] R10: ffff91bf0b0c0000 R11: ffffffffc064ef47 R12: ffff91bef6166000 > [ 694.741192] R13: ffff91bef6166368 R14: 0000000000000001 R15: ffff91bf0b0c7770 > [ 694.741246] FS: 0000000000000000(0000) GS:ffff91bf17480000(0000) knlGS:0000000000000000 > [ 694.741305] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 694.741349] CR2: ffffb8bd4354d540 CR3: 000000060e4a6000 CR4: 00000000001406e0 > [ 694.741401] Call Trace: > [ 694.741480] amdgpu_ring_commit+0x3a/0x60 [amdgpu] > [ 694.741575] amdgpu_ib_schedule+0x2c7/0x450 [amdgpu] > [ 694.741687] amdgpu_job_run+0x72/0x110 [amdgpu] > [ 694.741793] amd_sched_main+0x343/0x470 [amdgpu] > [ 694.741838] ? wake_atomic_t_function+0x60/0x60 > [ 694.741876] kthread+0x10a/0x140 > [ 694.741969] ? amd_sched_process_job+0x60/0x60 [amdgpu] > [ 694.742010] ? kthread_create_on_node+0x40/0x40 > [ 694.742048] ret_from_fork+0x2a/0x40 > > > > On 2017-08-23 05:02 AM, Christian König wrote: >> From: Christian König <christian.koenig@amd.com> >> >> Use ttm_bo_mem_space instead of manually allocating GART space. >> >> This allows us to evict BOs when there isn't enought GART space any more. >> >> Signed-off-by: Christian König <christian.koenig@amd.com> >> --- >> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 14 +++++-------- >> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 +++++++++++++++++++++++------ >> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ---- >> 3 files changed, 30 insertions(+), 19 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >> index 9e05e25..0d15eb7 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >> @@ -108,10 +108,10 @@ bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem) >> * >> * Allocate the address space for a node. >> */ >> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >> - struct ttm_buffer_object *tbo, >> - const struct ttm_place *place, >> - struct ttm_mem_reg *mem) >> +static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >> + struct ttm_buffer_object *tbo, >> + const struct ttm_place *place, >> + struct ttm_mem_reg *mem) >> { >> struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); >> struct amdgpu_gtt_mgr *mgr = man->priv; >> @@ -143,12 +143,8 @@ int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >> fpfn, lpfn, mode); >> spin_unlock(&mgr->lock); >> >> - if (!r) { >> + if (!r) >> mem->start = node->start; >> - if (&tbo->mem == mem) >> - tbo->offset = (tbo->mem.start << PAGE_SHIFT) + >> - tbo->bdev->man[tbo->mem.mem_type].gpu_offset; >> - } >> >> return r; >> } >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >> index 38d26a7..aa0b7f5 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >> @@ -809,20 +809,39 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm) >> >> int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem) >> { >> + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); >> struct ttm_tt *ttm = bo->ttm; >> + struct ttm_mem_reg tmp; >> + >> + struct ttm_placement placement; >> + struct ttm_place placements; >> int r; >> >> if (!ttm || amdgpu_ttm_is_bound(ttm)) >> return 0; >> >> - r = amdgpu_gtt_mgr_alloc(&bo->bdev->man[TTM_PL_TT], bo, >> - NULL, bo_mem); >> - if (r) { >> - DRM_ERROR("Failed to allocate GTT address space (%d)\n", r); >> + tmp = bo->mem; >> + tmp.mm_node = NULL; >> + placement.num_placement = 1; >> + placement.placement = &placements; >> + placement.num_busy_placement = 1; >> + placement.busy_placement = &placements; >> + placements.fpfn = 0; >> + placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT; >> + placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT; >> + >> + r = ttm_bo_mem_space(bo, &placement, &tmp, true, false); >> + if (unlikely(r)) >> return r; >> - } >> >> - return amdgpu_ttm_do_bind(ttm, bo_mem); >> + r = ttm_bo_move_ttm(bo, true, false, &tmp); >> + if (unlikely(r)) >> + ttm_bo_mem_put(bo, &tmp); >> + else >> + bo->offset = (bo->mem.start << PAGE_SHIFT) + >> + bo->bdev->man[bo->mem.mem_type].gpu_offset; >> + >> + return r; >> } >> >> int amdgpu_ttm_recover_gart(struct amdgpu_device *adev) >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >> index f22a475..43093bf 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >> @@ -62,10 +62,6 @@ extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func; >> extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func; >> >> bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem); >> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >> - struct ttm_buffer_object *tbo, >> - const struct ttm_place *place, >> - struct ttm_mem_reg *mem); >> uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man); >> >> uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man); > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <2d026de1-3bf1-e6ca-9767-917845e5b241-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>]
* Re: Regression: Re: [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind [not found] ` <2d026de1-3bf1-e6ca-9767-917845e5b241-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> @ 2017-09-01 23:35 ` Felix Kuehling [not found] ` <41325db2-fbd4-6ca6-a8ad-13055ed2912b-5C7GfCeVMHo@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Felix Kuehling @ 2017-09-01 23:35 UTC (permalink / raw) To: Christian König, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Christian König Cc: Deucher, Alexander, Russell, Kent It also seems to break GART binding of userptr BOs. Since backend_bind doesn't do GART binding for userptr BOs, they now don't get GART bound at all. There is something else still broken in our IPC test for system memory also, but I'll have to rewrite that anyway to work for large BOs with a small GART. Regards, Felix On 2017-09-01 03:17 AM, Christian König wrote: > Yeah, the bug is really obvious after you pointed it out. We just need > to keep the placement flags. > > Going to send a fix to the list in a minute, > Christian. > > Am 01.09.2017 um 00:50 schrieb Felix Kuehling: >> I believe this patch breaks pinned GTT BOs. It trips KFD tests that >> apply a lot of memory pressure on one of our test systems. >> >> I understand the cause of the problem (see my analysis below), but I'm >> not sure how to solve it, without reverting the patch. Christian, do you >> have any ideas? Should we at least revert this as a short-term fix? >> >> I added some WARNs in the code to understand what's happening: >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >> index 72ad045..3ead155 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >> @@ -930,6 +930,7 @@ void amdgpu_bo_move_notify(struct >> ttm_buffer_object *bo, >> return; >> abo = container_of(bo, struct amdgpu_bo, tbo); >> + WARN(abo->pin_count, "Moving pinned bo"); >> amdgpu_vm_bo_invalidate(adev, abo); >> amdgpu_bo_kunmap(abo); >> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c >> b/drivers/gpu/drm/ttm/ttm_bo_util.c >> index c934ad5..af9f40e 100644 >> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c >> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c >> @@ -63,6 +63,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, >> ttm_tt_unbind(ttm); >> ttm_bo_free_old_node(bo); >> + WARN(old_mem->placement & TTM_PL_FLAG_NO_EVICT, >> "Stripping NO_EVICT flag from BO"); >> ttm_flag_masked(&old_mem->placement, >> TTM_PL_FLAG_SYSTEM, >> TTM_PL_MASK_MEM); >> old_mem->mem_type = TTM_PL_SYSTEM; >> >> With that I see the following scenario unfold in my kernel log, where >> pinned GTT BOs are swapped out and kunmapped under memory pressure. >> Eventually this leads to memory access faults while accessing ring >> buffers or IBs: >> >> [ 8.475453] Stripping NO_EVICT flag from BO >> [ 8.475461] ------------[ cut here ]------------ >> [ 8.475465] WARNING: CPU: 5 PID: 2186 at >> /home/fkuehlin/compute/kernel/drivers/gpu/drm/ttm/ttm_bo_util.c:66 >> ttm_bo_move_ttm+0x14a/0x160 [ttm] >> [ 8.475466] Modules linked in: amdkfd(E) amd_iommu_v2(E) >> amdgpu(E+) radeon(E) ttm(E) >> [ 8.475472] CPU: 5 PID: 2186 Comm: systemd-udevd Tainted: G >> W E 4.12.0-kfd-fkuehlin #1 >> [ 8.475473] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >> 2006 04/07/2016 >> [ 8.475474] task: ffff91bf12a82e00 task.stack: ffffb8bd43600000 >> [ 8.475477] RIP: 0010:ttm_bo_move_ttm+0x14a/0x160 [ttm] >> [ 8.475478] RSP: 0018:ffffb8bd43603780 EFLAGS: 00010282 >> [ 8.475480] RAX: 000000000000001f RBX: ffff91bf0b0ee058 RCX: >> 0000000000000006 >> [ 8.475481] RDX: 0000000000000006 RSI: ffff91bf12a83678 RDI: >> 0000000000000202 >> [ 8.475482] RBP: ffffb8bd436037a0 R08: 0000000000000001 R09: >> 0000000000000000 >> [ 8.475483] R10: 0000000000000000 R11: 0000000000000000 R12: >> ffffb8bd436037e8 >> [ 8.475484] R13: 0000000000000000 R14: ffff91bf12c1bf00 R15: >> ffff91bf0b0ee000 >> [ 8.475485] FS: 00007f71b381b8c0(0000) GS:ffff91bf17340000(0000) >> knlGS:0000000000000000 >> [ 8.475486] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >> [ 8.475487] CR2: 0000557e2ad63a28 CR3: 000000060d153000 CR4: >> 00000000001406e0 >> [ 8.475488] Call Trace: >> [ 8.475514] amdgpu_ttm_bind+0x129/0x1a0 [amdgpu] >> [ 8.475518] ? ttm_bo_mem_compat+0x20/0x50 [ttm] >> [ 8.475522] ? sparse_add_one_section+0x166/0x167 >> [ 8.475547] amdgpu_bo_pin_restricted+0x1ca/0x2f0 [amdgpu] >> [ 8.475575] amdgpu_bo_create_reserved+0x95/0x220 [amdgpu] >> [ 8.475602] amdgpu_bo_create_kernel+0x10/0x70 [amdgpu] >> [ 8.475632] amdgpu_gfx_compute_mqd_sw_init+0xf2/0x170 [amdgpu] >> [ 8.475663] gfx_v8_0_sw_init+0xca8/0x15d0 [amdgpu] >> [ 8.475690] amdgpu_device_init+0xe6f/0x1620 [amdgpu] >> [ 8.475717] amdgpu_driver_load_kms+0x63/0x200 [amdgpu] >> [ 8.475720] drm_dev_register+0x143/0x1d0 >> [ 8.475744] amdgpu_pci_probe+0x110/0x140 [amdgpu] >> [ 8.475747] local_pci_probe+0x40/0xa0 >> [ 8.475749] ? pci_match_device+0xdb/0x100 >> [ 8.475752] pci_device_probe+0x136/0x160 >> [ 8.475755] driver_probe_device+0x299/0x440 >> [ 8.475757] __driver_attach+0xde/0xe0 >> [ 8.475759] ? driver_probe_device+0x440/0x440 >> [ 8.475761] bus_for_each_dev+0x61/0xa0 >> [ 8.475763] driver_attach+0x19/0x20 >> [ 8.475764] bus_add_driver+0x1f6/0x270 >> [ 8.475766] ? 0xffffffffc0839000 >> [ 8.475768] driver_register+0x5b/0xd0 >> [ 8.475769] ? 0xffffffffc0839000 >> [ 8.475771] __pci_register_driver+0x5b/0x60 >> [ 8.475799] amdgpu_init+0x8a/0x1000 [amdgpu] >> [ 8.475801] do_one_initcall+0x4e/0x190 >> [ 8.475804] ? kmem_cache_alloc+0xd8/0x170 >> [ 8.475807] do_init_module+0x55/0x1e9 >> [ 8.475810] load_module+0x2771/0x29c0 >> [ 8.475817] SYSC_finit_module+0xbc/0xf0 >> [ 8.475819] ? SYSC_finit_module+0xbc/0xf0 >> [ 8.475823] SyS_finit_module+0x9/0x10 >> [ 8.475825] entry_SYSCALL_64_fastpath+0x1f/0xbe >> [...] >> [ 278.693790] Moving pinned bo (this kunmaps the BO) >> [ 278.693802] ------------[ cut here ]------------ >> [ 278.693833] WARNING: CPU: 11 PID: 2145 at >> /home/fkuehlin/compute/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:933 >> amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] >> [ 278.693834] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) >> amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) >> [ 278.693843] CPU: 11 PID: 2145 Comm: kworker/11:2 Tainted: G >> W E 4.12.0-kfd-fkuehlin #1 >> [ 278.693845] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >> 2006 04/07/2016 >> [ 278.693851] Workqueue: kfd_process_wq kfd_process_wq_release [amdkfd] >> [ 278.693853] task: ffff91bf0dab1700 task.stack: ffffb8bd4495c000 >> [ 278.693880] RIP: 0010:amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] >> [ 278.693882] RSP: 0018:ffffb8bd4495fc20 EFLAGS: 00010282 >> [ 278.693884] RAX: 0000000000000010 RBX: ffff91bf0bec7058 RCX: >> 0000000000000006 >> [ 278.693885] RDX: 0000000000000006 RSI: ffff91bf0dab1f50 RDI: >> 0000000000000202 >> [ 278.693886] RBP: ffffb8bd4495fc40 R08: 0000000000000001 R09: >> 0000000000000000 >> [ 278.693887] R10: ffffb8bd4495fb98 R11: 0000000000000000 R12: >> ffff91bf0b0c2a68 >> [ 278.693889] R13: 0000000000000000 R14: ffff91bf0bec708c R15: >> ffff91bf104bb000 >> [ 278.693890] FS: 0000000000000000(0000) GS:ffff91bf174c0000(0000) >> knlGS:0000000000000000 >> [ 278.693891] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >> [ 278.693892] CR2: 0000000004199000 CR3: 00000001f3e0f000 CR4: >> 00000000001406e0 >> [ 278.693893] Call Trace: >> [ 278.693898] ttm_bo_cleanup_memtype_use+0x1f/0x70 [ttm] >> [ 278.693902] ttm_bo_unref+0x388/0x470 [ttm] >> [ 278.693931] amdgpu_bo_unref+0x25/0x40 [amdgpu] >> [ 278.693962] amdgpu_amdkfd_gpuvm_free_memory_of_gpu+0x1b5/0x260 >> [amdgpu] >> [ 278.693974] kfd_process_free_outstanding_kfd_bos+0xab/0xe0 [amdkfd] >> [ 278.693980] kfd_process_wq_release+0x56/0x110 [amdkfd] >> [ 278.693983] process_one_work+0x190/0x430 >> [ 278.693984] ? process_one_work+0x133/0x430 >> [ 278.693988] worker_thread+0x46/0x400 >> [ 278.693991] kthread+0x10a/0x140 >> [ 278.693993] ? process_one_work+0x430/0x430 >> [ 278.693995] ? kthread_create_on_node+0x40/0x40 >> [ 278.693996] ? umh_complete+0x40/0x40 >> [ 278.693998] ? call_usermodehelper_exec_async+0x137/0x140 >> [ 278.694000] ret_from_fork+0x2a/0x40 >> [...] >> [ 694.740232] BUG: unable to handle kernel paging request at >> ffffb8bd4354d540 >> [ 694.740387] IP: sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] >> [ 694.740430] PGD 616c23067 >> [ 694.740432] P4D 616c23067 >> [ 694.740454] PUD 616c24067 >> [ 694.740476] PMD 613704067 >> [ 694.740498] PTE 0 >> >> [ 694.740551] Oops: 0002 [#1] SMP >> [ 694.740576] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) >> amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) >> [ 694.740667] CPU: 10 PID: 2213 Comm: sdma0 Tainted: G W >> E 4.12.0-kfd-fkuehlin #1 >> [ 694.740727] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >> 2006 04/07/2016 >> [ 694.740782] task: ffff91bf0d989700 task.stack: ffffb8bd43730000 >> [ 694.740895] RIP: 0010:sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] >> [ 694.740941] RSP: 0018:ffffb8bd43733dc0 EFLAGS: 00010202 >> [ 694.740982] RAX: ffff91bf0b0c7770 RBX: ffff91bf0b0c7770 RCX: >> ffffb8bd4354d540 >> [ 694.741035] RDX: 0000000000001ac0 RSI: 00000000000006b0 RDI: >> ffff91bf0b0c0000 >> [ 694.741087] RBP: ffffb8bd43733dc0 R08: ffffffffc072bd60 R09: >> 0000000000000000 >> [ 694.741140] R10: ffff91bf0b0c0000 R11: ffffffffc064ef47 R12: >> ffff91bef6166000 >> [ 694.741192] R13: ffff91bef6166368 R14: 0000000000000001 R15: >> ffff91bf0b0c7770 >> [ 694.741246] FS: 0000000000000000(0000) GS:ffff91bf17480000(0000) >> knlGS:0000000000000000 >> [ 694.741305] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >> [ 694.741349] CR2: ffffb8bd4354d540 CR3: 000000060e4a6000 CR4: >> 00000000001406e0 >> [ 694.741401] Call Trace: >> [ 694.741480] amdgpu_ring_commit+0x3a/0x60 [amdgpu] >> [ 694.741575] amdgpu_ib_schedule+0x2c7/0x450 [amdgpu] >> [ 694.741687] amdgpu_job_run+0x72/0x110 [amdgpu] >> [ 694.741793] amd_sched_main+0x343/0x470 [amdgpu] >> [ 694.741838] ? wake_atomic_t_function+0x60/0x60 >> [ 694.741876] kthread+0x10a/0x140 >> [ 694.741969] ? amd_sched_process_job+0x60/0x60 [amdgpu] >> [ 694.742010] ? kthread_create_on_node+0x40/0x40 >> [ 694.742048] ret_from_fork+0x2a/0x40 >> >> >> >> On 2017-08-23 05:02 AM, Christian König wrote: >>> From: Christian König <christian.koenig@amd.com> >>> >>> Use ttm_bo_mem_space instead of manually allocating GART space. >>> >>> This allows us to evict BOs when there isn't enought GART space any >>> more. >>> >>> Signed-off-by: Christian König <christian.koenig@amd.com> >>> --- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 14 +++++-------- >>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 >>> +++++++++++++++++++++++------ >>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ---- >>> 3 files changed, 30 insertions(+), 19 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>> index 9e05e25..0d15eb7 100644 >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>> @@ -108,10 +108,10 @@ bool amdgpu_gtt_mgr_is_allocated(struct >>> ttm_mem_reg *mem) >>> * >>> * Allocate the address space for a node. >>> */ >>> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>> - struct ttm_buffer_object *tbo, >>> - const struct ttm_place *place, >>> - struct ttm_mem_reg *mem) >>> +static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>> + struct ttm_buffer_object *tbo, >>> + const struct ttm_place *place, >>> + struct ttm_mem_reg *mem) >>> { >>> struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); >>> struct amdgpu_gtt_mgr *mgr = man->priv; >>> @@ -143,12 +143,8 @@ int amdgpu_gtt_mgr_alloc(struct >>> ttm_mem_type_manager *man, >>> fpfn, lpfn, mode); >>> spin_unlock(&mgr->lock); >>> - if (!r) { >>> + if (!r) >>> mem->start = node->start; >>> - if (&tbo->mem == mem) >>> - tbo->offset = (tbo->mem.start << PAGE_SHIFT) + >>> - tbo->bdev->man[tbo->mem.mem_type].gpu_offset; >>> - } >>> return r; >>> } >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>> index 38d26a7..aa0b7f5 100644 >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>> @@ -809,20 +809,39 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm) >>> int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct >>> ttm_mem_reg *bo_mem) >>> { >>> + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); >>> struct ttm_tt *ttm = bo->ttm; >>> + struct ttm_mem_reg tmp; >>> + >>> + struct ttm_placement placement; >>> + struct ttm_place placements; >>> int r; >>> if (!ttm || amdgpu_ttm_is_bound(ttm)) >>> return 0; >>> - r = amdgpu_gtt_mgr_alloc(&bo->bdev->man[TTM_PL_TT], bo, >>> - NULL, bo_mem); >>> - if (r) { >>> - DRM_ERROR("Failed to allocate GTT address space (%d)\n", r); >>> + tmp = bo->mem; >>> + tmp.mm_node = NULL; >>> + placement.num_placement = 1; >>> + placement.placement = &placements; >>> + placement.num_busy_placement = 1; >>> + placement.busy_placement = &placements; >>> + placements.fpfn = 0; >>> + placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT; >>> + placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT; >>> + >>> + r = ttm_bo_mem_space(bo, &placement, &tmp, true, false); >>> + if (unlikely(r)) >>> return r; >>> - } >>> - return amdgpu_ttm_do_bind(ttm, bo_mem); >>> + r = ttm_bo_move_ttm(bo, true, false, &tmp); >>> + if (unlikely(r)) >>> + ttm_bo_mem_put(bo, &tmp); >>> + else >>> + bo->offset = (bo->mem.start << PAGE_SHIFT) + >>> + bo->bdev->man[bo->mem.mem_type].gpu_offset; >>> + >>> + return r; >>> } >>> int amdgpu_ttm_recover_gart(struct amdgpu_device *adev) >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>> index f22a475..43093bf 100644 >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>> @@ -62,10 +62,6 @@ extern const struct ttm_mem_type_manager_func >>> amdgpu_gtt_mgr_func; >>> extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func; >>> bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem); >>> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>> - struct ttm_buffer_object *tbo, >>> - const struct ttm_place *place, >>> - struct ttm_mem_reg *mem); >>> uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man); >>> uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man); >> _______________________________________________ >> amd-gfx mailing list >> amd-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/amd-gfx > > _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <41325db2-fbd4-6ca6-a8ad-13055ed2912b-5C7GfCeVMHo@public.gmane.org>]
* Re: Regression: Re: [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind [not found] ` <41325db2-fbd4-6ca6-a8ad-13055ed2912b-5C7GfCeVMHo@public.gmane.org> @ 2017-09-01 23:46 ` Felix Kuehling [not found] ` <f97a917b-5a0e-b22e-c04e-6cbf981dcc55-5C7GfCeVMHo@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Felix Kuehling @ 2017-09-01 23:46 UTC (permalink / raw) To: Christian König, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Christian König Cc: Deucher, Alexander, Russell, Kent Actually, I read that wrong. It does GART bind userptr BOs. But it also unpins and repins them accidentally in the process, since ttm_bo_move_ttm calls backend_unbind and backend_bind callbacks. And ends up corrupting some kernel page state, because we had to move the pinning of user pages out of backend_bind. Maybe amdgpu_bind shouldn't be used for user mode BOs at all any more? Or does it need some safeguards for userptr BOs? Regards, Felix On 2017-09-01 07:35 PM, Felix Kuehling wrote: > It also seems to break GART binding of userptr BOs. Since backend_bind > doesn't do GART binding for userptr BOs, they now don't get GART bound > at all. > > There is something else still broken in our IPC test for system memory > also, but I'll have to rewrite that anyway to work for large BOs with a > small GART. > > Regards, > Felix > > > On 2017-09-01 03:17 AM, Christian König wrote: >> Yeah, the bug is really obvious after you pointed it out. We just need >> to keep the placement flags. >> >> Going to send a fix to the list in a minute, >> Christian. >> >> Am 01.09.2017 um 00:50 schrieb Felix Kuehling: >>> I believe this patch breaks pinned GTT BOs. It trips KFD tests that >>> apply a lot of memory pressure on one of our test systems. >>> >>> I understand the cause of the problem (see my analysis below), but I'm >>> not sure how to solve it, without reverting the patch. Christian, do you >>> have any ideas? Should we at least revert this as a short-term fix? >>> >>> I added some WARNs in the code to understand what's happening: >>> >>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>> index 72ad045..3ead155 100644 >>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>> @@ -930,6 +930,7 @@ void amdgpu_bo_move_notify(struct >>> ttm_buffer_object *bo, >>> return; >>> abo = container_of(bo, struct amdgpu_bo, tbo); >>> + WARN(abo->pin_count, "Moving pinned bo"); >>> amdgpu_vm_bo_invalidate(adev, abo); >>> amdgpu_bo_kunmap(abo); >>> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c >>> b/drivers/gpu/drm/ttm/ttm_bo_util.c >>> index c934ad5..af9f40e 100644 >>> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c >>> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c >>> @@ -63,6 +63,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, >>> ttm_tt_unbind(ttm); >>> ttm_bo_free_old_node(bo); >>> + WARN(old_mem->placement & TTM_PL_FLAG_NO_EVICT, >>> "Stripping NO_EVICT flag from BO"); >>> ttm_flag_masked(&old_mem->placement, >>> TTM_PL_FLAG_SYSTEM, >>> TTM_PL_MASK_MEM); >>> old_mem->mem_type = TTM_PL_SYSTEM; >>> >>> With that I see the following scenario unfold in my kernel log, where >>> pinned GTT BOs are swapped out and kunmapped under memory pressure. >>> Eventually this leads to memory access faults while accessing ring >>> buffers or IBs: >>> >>> [ 8.475453] Stripping NO_EVICT flag from BO >>> [ 8.475461] ------------[ cut here ]------------ >>> [ 8.475465] WARNING: CPU: 5 PID: 2186 at >>> /home/fkuehlin/compute/kernel/drivers/gpu/drm/ttm/ttm_bo_util.c:66 >>> ttm_bo_move_ttm+0x14a/0x160 [ttm] >>> [ 8.475466] Modules linked in: amdkfd(E) amd_iommu_v2(E) >>> amdgpu(E+) radeon(E) ttm(E) >>> [ 8.475472] CPU: 5 PID: 2186 Comm: systemd-udevd Tainted: G >>> W E 4.12.0-kfd-fkuehlin #1 >>> [ 8.475473] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>> 2006 04/07/2016 >>> [ 8.475474] task: ffff91bf12a82e00 task.stack: ffffb8bd43600000 >>> [ 8.475477] RIP: 0010:ttm_bo_move_ttm+0x14a/0x160 [ttm] >>> [ 8.475478] RSP: 0018:ffffb8bd43603780 EFLAGS: 00010282 >>> [ 8.475480] RAX: 000000000000001f RBX: ffff91bf0b0ee058 RCX: >>> 0000000000000006 >>> [ 8.475481] RDX: 0000000000000006 RSI: ffff91bf12a83678 RDI: >>> 0000000000000202 >>> [ 8.475482] RBP: ffffb8bd436037a0 R08: 0000000000000001 R09: >>> 0000000000000000 >>> [ 8.475483] R10: 0000000000000000 R11: 0000000000000000 R12: >>> ffffb8bd436037e8 >>> [ 8.475484] R13: 0000000000000000 R14: ffff91bf12c1bf00 R15: >>> ffff91bf0b0ee000 >>> [ 8.475485] FS: 00007f71b381b8c0(0000) GS:ffff91bf17340000(0000) >>> knlGS:0000000000000000 >>> [ 8.475486] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>> [ 8.475487] CR2: 0000557e2ad63a28 CR3: 000000060d153000 CR4: >>> 00000000001406e0 >>> [ 8.475488] Call Trace: >>> [ 8.475514] amdgpu_ttm_bind+0x129/0x1a0 [amdgpu] >>> [ 8.475518] ? ttm_bo_mem_compat+0x20/0x50 [ttm] >>> [ 8.475522] ? sparse_add_one_section+0x166/0x167 >>> [ 8.475547] amdgpu_bo_pin_restricted+0x1ca/0x2f0 [amdgpu] >>> [ 8.475575] amdgpu_bo_create_reserved+0x95/0x220 [amdgpu] >>> [ 8.475602] amdgpu_bo_create_kernel+0x10/0x70 [amdgpu] >>> [ 8.475632] amdgpu_gfx_compute_mqd_sw_init+0xf2/0x170 [amdgpu] >>> [ 8.475663] gfx_v8_0_sw_init+0xca8/0x15d0 [amdgpu] >>> [ 8.475690] amdgpu_device_init+0xe6f/0x1620 [amdgpu] >>> [ 8.475717] amdgpu_driver_load_kms+0x63/0x200 [amdgpu] >>> [ 8.475720] drm_dev_register+0x143/0x1d0 >>> [ 8.475744] amdgpu_pci_probe+0x110/0x140 [amdgpu] >>> [ 8.475747] local_pci_probe+0x40/0xa0 >>> [ 8.475749] ? pci_match_device+0xdb/0x100 >>> [ 8.475752] pci_device_probe+0x136/0x160 >>> [ 8.475755] driver_probe_device+0x299/0x440 >>> [ 8.475757] __driver_attach+0xde/0xe0 >>> [ 8.475759] ? driver_probe_device+0x440/0x440 >>> [ 8.475761] bus_for_each_dev+0x61/0xa0 >>> [ 8.475763] driver_attach+0x19/0x20 >>> [ 8.475764] bus_add_driver+0x1f6/0x270 >>> [ 8.475766] ? 0xffffffffc0839000 >>> [ 8.475768] driver_register+0x5b/0xd0 >>> [ 8.475769] ? 0xffffffffc0839000 >>> [ 8.475771] __pci_register_driver+0x5b/0x60 >>> [ 8.475799] amdgpu_init+0x8a/0x1000 [amdgpu] >>> [ 8.475801] do_one_initcall+0x4e/0x190 >>> [ 8.475804] ? kmem_cache_alloc+0xd8/0x170 >>> [ 8.475807] do_init_module+0x55/0x1e9 >>> [ 8.475810] load_module+0x2771/0x29c0 >>> [ 8.475817] SYSC_finit_module+0xbc/0xf0 >>> [ 8.475819] ? SYSC_finit_module+0xbc/0xf0 >>> [ 8.475823] SyS_finit_module+0x9/0x10 >>> [ 8.475825] entry_SYSCALL_64_fastpath+0x1f/0xbe >>> [...] >>> [ 278.693790] Moving pinned bo (this kunmaps the BO) >>> [ 278.693802] ------------[ cut here ]------------ >>> [ 278.693833] WARNING: CPU: 11 PID: 2145 at >>> /home/fkuehlin/compute/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:933 >>> amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] >>> [ 278.693834] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) >>> amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) >>> [ 278.693843] CPU: 11 PID: 2145 Comm: kworker/11:2 Tainted: G >>> W E 4.12.0-kfd-fkuehlin #1 >>> [ 278.693845] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>> 2006 04/07/2016 >>> [ 278.693851] Workqueue: kfd_process_wq kfd_process_wq_release [amdkfd] >>> [ 278.693853] task: ffff91bf0dab1700 task.stack: ffffb8bd4495c000 >>> [ 278.693880] RIP: 0010:amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] >>> [ 278.693882] RSP: 0018:ffffb8bd4495fc20 EFLAGS: 00010282 >>> [ 278.693884] RAX: 0000000000000010 RBX: ffff91bf0bec7058 RCX: >>> 0000000000000006 >>> [ 278.693885] RDX: 0000000000000006 RSI: ffff91bf0dab1f50 RDI: >>> 0000000000000202 >>> [ 278.693886] RBP: ffffb8bd4495fc40 R08: 0000000000000001 R09: >>> 0000000000000000 >>> [ 278.693887] R10: ffffb8bd4495fb98 R11: 0000000000000000 R12: >>> ffff91bf0b0c2a68 >>> [ 278.693889] R13: 0000000000000000 R14: ffff91bf0bec708c R15: >>> ffff91bf104bb000 >>> [ 278.693890] FS: 0000000000000000(0000) GS:ffff91bf174c0000(0000) >>> knlGS:0000000000000000 >>> [ 278.693891] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>> [ 278.693892] CR2: 0000000004199000 CR3: 00000001f3e0f000 CR4: >>> 00000000001406e0 >>> [ 278.693893] Call Trace: >>> [ 278.693898] ttm_bo_cleanup_memtype_use+0x1f/0x70 [ttm] >>> [ 278.693902] ttm_bo_unref+0x388/0x470 [ttm] >>> [ 278.693931] amdgpu_bo_unref+0x25/0x40 [amdgpu] >>> [ 278.693962] amdgpu_amdkfd_gpuvm_free_memory_of_gpu+0x1b5/0x260 >>> [amdgpu] >>> [ 278.693974] kfd_process_free_outstanding_kfd_bos+0xab/0xe0 [amdkfd] >>> [ 278.693980] kfd_process_wq_release+0x56/0x110 [amdkfd] >>> [ 278.693983] process_one_work+0x190/0x430 >>> [ 278.693984] ? process_one_work+0x133/0x430 >>> [ 278.693988] worker_thread+0x46/0x400 >>> [ 278.693991] kthread+0x10a/0x140 >>> [ 278.693993] ? process_one_work+0x430/0x430 >>> [ 278.693995] ? kthread_create_on_node+0x40/0x40 >>> [ 278.693996] ? umh_complete+0x40/0x40 >>> [ 278.693998] ? call_usermodehelper_exec_async+0x137/0x140 >>> [ 278.694000] ret_from_fork+0x2a/0x40 >>> [...] >>> [ 694.740232] BUG: unable to handle kernel paging request at >>> ffffb8bd4354d540 >>> [ 694.740387] IP: sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] >>> [ 694.740430] PGD 616c23067 >>> [ 694.740432] P4D 616c23067 >>> [ 694.740454] PUD 616c24067 >>> [ 694.740476] PMD 613704067 >>> [ 694.740498] PTE 0 >>> >>> [ 694.740551] Oops: 0002 [#1] SMP >>> [ 694.740576] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) >>> amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) >>> [ 694.740667] CPU: 10 PID: 2213 Comm: sdma0 Tainted: G W >>> E 4.12.0-kfd-fkuehlin #1 >>> [ 694.740727] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>> 2006 04/07/2016 >>> [ 694.740782] task: ffff91bf0d989700 task.stack: ffffb8bd43730000 >>> [ 694.740895] RIP: 0010:sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] >>> [ 694.740941] RSP: 0018:ffffb8bd43733dc0 EFLAGS: 00010202 >>> [ 694.740982] RAX: ffff91bf0b0c7770 RBX: ffff91bf0b0c7770 RCX: >>> ffffb8bd4354d540 >>> [ 694.741035] RDX: 0000000000001ac0 RSI: 00000000000006b0 RDI: >>> ffff91bf0b0c0000 >>> [ 694.741087] RBP: ffffb8bd43733dc0 R08: ffffffffc072bd60 R09: >>> 0000000000000000 >>> [ 694.741140] R10: ffff91bf0b0c0000 R11: ffffffffc064ef47 R12: >>> ffff91bef6166000 >>> [ 694.741192] R13: ffff91bef6166368 R14: 0000000000000001 R15: >>> ffff91bf0b0c7770 >>> [ 694.741246] FS: 0000000000000000(0000) GS:ffff91bf17480000(0000) >>> knlGS:0000000000000000 >>> [ 694.741305] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>> [ 694.741349] CR2: ffffb8bd4354d540 CR3: 000000060e4a6000 CR4: >>> 00000000001406e0 >>> [ 694.741401] Call Trace: >>> [ 694.741480] amdgpu_ring_commit+0x3a/0x60 [amdgpu] >>> [ 694.741575] amdgpu_ib_schedule+0x2c7/0x450 [amdgpu] >>> [ 694.741687] amdgpu_job_run+0x72/0x110 [amdgpu] >>> [ 694.741793] amd_sched_main+0x343/0x470 [amdgpu] >>> [ 694.741838] ? wake_atomic_t_function+0x60/0x60 >>> [ 694.741876] kthread+0x10a/0x140 >>> [ 694.741969] ? amd_sched_process_job+0x60/0x60 [amdgpu] >>> [ 694.742010] ? kthread_create_on_node+0x40/0x40 >>> [ 694.742048] ret_from_fork+0x2a/0x40 >>> >>> >>> >>> On 2017-08-23 05:02 AM, Christian König wrote: >>>> From: Christian König <christian.koenig@amd.com> >>>> >>>> Use ttm_bo_mem_space instead of manually allocating GART space. >>>> >>>> This allows us to evict BOs when there isn't enought GART space any >>>> more. >>>> >>>> Signed-off-by: Christian König <christian.koenig@amd.com> >>>> --- >>>> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 14 +++++-------- >>>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 >>>> +++++++++++++++++++++++------ >>>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ---- >>>> 3 files changed, 30 insertions(+), 19 deletions(-) >>>> >>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>> index 9e05e25..0d15eb7 100644 >>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>> @@ -108,10 +108,10 @@ bool amdgpu_gtt_mgr_is_allocated(struct >>>> ttm_mem_reg *mem) >>>> * >>>> * Allocate the address space for a node. >>>> */ >>>> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>> - struct ttm_buffer_object *tbo, >>>> - const struct ttm_place *place, >>>> - struct ttm_mem_reg *mem) >>>> +static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>> + struct ttm_buffer_object *tbo, >>>> + const struct ttm_place *place, >>>> + struct ttm_mem_reg *mem) >>>> { >>>> struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); >>>> struct amdgpu_gtt_mgr *mgr = man->priv; >>>> @@ -143,12 +143,8 @@ int amdgpu_gtt_mgr_alloc(struct >>>> ttm_mem_type_manager *man, >>>> fpfn, lpfn, mode); >>>> spin_unlock(&mgr->lock); >>>> - if (!r) { >>>> + if (!r) >>>> mem->start = node->start; >>>> - if (&tbo->mem == mem) >>>> - tbo->offset = (tbo->mem.start << PAGE_SHIFT) + >>>> - tbo->bdev->man[tbo->mem.mem_type].gpu_offset; >>>> - } >>>> return r; >>>> } >>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>> index 38d26a7..aa0b7f5 100644 >>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>> @@ -809,20 +809,39 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm) >>>> int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct >>>> ttm_mem_reg *bo_mem) >>>> { >>>> + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); >>>> struct ttm_tt *ttm = bo->ttm; >>>> + struct ttm_mem_reg tmp; >>>> + >>>> + struct ttm_placement placement; >>>> + struct ttm_place placements; >>>> int r; >>>> if (!ttm || amdgpu_ttm_is_bound(ttm)) >>>> return 0; >>>> - r = amdgpu_gtt_mgr_alloc(&bo->bdev->man[TTM_PL_TT], bo, >>>> - NULL, bo_mem); >>>> - if (r) { >>>> - DRM_ERROR("Failed to allocate GTT address space (%d)\n", r); >>>> + tmp = bo->mem; >>>> + tmp.mm_node = NULL; >>>> + placement.num_placement = 1; >>>> + placement.placement = &placements; >>>> + placement.num_busy_placement = 1; >>>> + placement.busy_placement = &placements; >>>> + placements.fpfn = 0; >>>> + placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT; >>>> + placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT; >>>> + >>>> + r = ttm_bo_mem_space(bo, &placement, &tmp, true, false); >>>> + if (unlikely(r)) >>>> return r; >>>> - } >>>> - return amdgpu_ttm_do_bind(ttm, bo_mem); >>>> + r = ttm_bo_move_ttm(bo, true, false, &tmp); >>>> + if (unlikely(r)) >>>> + ttm_bo_mem_put(bo, &tmp); >>>> + else >>>> + bo->offset = (bo->mem.start << PAGE_SHIFT) + >>>> + bo->bdev->man[bo->mem.mem_type].gpu_offset; >>>> + >>>> + return r; >>>> } >>>> int amdgpu_ttm_recover_gart(struct amdgpu_device *adev) >>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>> index f22a475..43093bf 100644 >>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>> @@ -62,10 +62,6 @@ extern const struct ttm_mem_type_manager_func >>>> amdgpu_gtt_mgr_func; >>>> extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func; >>>> bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem); >>>> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>> - struct ttm_buffer_object *tbo, >>>> - const struct ttm_place *place, >>>> - struct ttm_mem_reg *mem); >>>> uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man); >>>> uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man); >>> _______________________________________________ >>> amd-gfx mailing list >>> amd-gfx@lists.freedesktop.org >>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx >> > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <f97a917b-5a0e-b22e-c04e-6cbf981dcc55-5C7GfCeVMHo@public.gmane.org>]
* Re: Regression: Re: [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind [not found] ` <f97a917b-5a0e-b22e-c04e-6cbf981dcc55-5C7GfCeVMHo@public.gmane.org> @ 2017-09-02 7:52 ` Christian König [not found] ` <3960afa2-50af-81b5-dc7a-ad9776c43727-5C7GfCeVMHo@public.gmane.org> 0 siblings, 1 reply; 13+ messages in thread From: Christian König @ 2017-09-02 7:52 UTC (permalink / raw) To: Felix Kuehling, Christian König, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Cc: Deucher, Alexander, Russell, Kent Ah, crap yeah that won't work. Yeah, we should block userptr BOs in amdgpu_ttm_bind() for now. > There is something else still broken in our IPC test for system memory > also, but I'll have to rewrite that anyway to work for large BOs with a > small GART. Hui? Well userptr BOs can't be used for IPC, so how do you run into this issue? Regards, Christian. Am 02.09.2017 um 01:46 schrieb Felix Kuehling: > Actually, I read that wrong. It does GART bind userptr BOs. But it also > unpins and repins them accidentally in the process, since > ttm_bo_move_ttm calls backend_unbind and backend_bind callbacks. And > ends up corrupting some kernel page state, because we had to move the > pinning of user pages out of backend_bind. > > Maybe amdgpu_bind shouldn't be used for user mode BOs at all any more? > Or does it need some safeguards for userptr BOs? > > Regards, > Felix > > > On 2017-09-01 07:35 PM, Felix Kuehling wrote: >> It also seems to break GART binding of userptr BOs. Since backend_bind >> doesn't do GART binding for userptr BOs, they now don't get GART bound >> at all. >> >> There is something else still broken in our IPC test for system memory >> also, but I'll have to rewrite that anyway to work for large BOs with a >> small GART. >> >> Regards, >> Felix >> >> >> On 2017-09-01 03:17 AM, Christian König wrote: >>> Yeah, the bug is really obvious after you pointed it out. We just need >>> to keep the placement flags. >>> >>> Going to send a fix to the list in a minute, >>> Christian. >>> >>> Am 01.09.2017 um 00:50 schrieb Felix Kuehling: >>>> I believe this patch breaks pinned GTT BOs. It trips KFD tests that >>>> apply a lot of memory pressure on one of our test systems. >>>> >>>> I understand the cause of the problem (see my analysis below), but I'm >>>> not sure how to solve it, without reverting the patch. Christian, do you >>>> have any ideas? Should we at least revert this as a short-term fix? >>>> >>>> I added some WARNs in the code to understand what's happening: >>>> >>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>> index 72ad045..3ead155 100644 >>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>> @@ -930,6 +930,7 @@ void amdgpu_bo_move_notify(struct >>>> ttm_buffer_object *bo, >>>> return; >>>> abo = container_of(bo, struct amdgpu_bo, tbo); >>>> + WARN(abo->pin_count, "Moving pinned bo"); >>>> amdgpu_vm_bo_invalidate(adev, abo); >>>> amdgpu_bo_kunmap(abo); >>>> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c >>>> b/drivers/gpu/drm/ttm/ttm_bo_util.c >>>> index c934ad5..af9f40e 100644 >>>> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c >>>> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c >>>> @@ -63,6 +63,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, >>>> ttm_tt_unbind(ttm); >>>> ttm_bo_free_old_node(bo); >>>> + WARN(old_mem->placement & TTM_PL_FLAG_NO_EVICT, >>>> "Stripping NO_EVICT flag from BO"); >>>> ttm_flag_masked(&old_mem->placement, >>>> TTM_PL_FLAG_SYSTEM, >>>> TTM_PL_MASK_MEM); >>>> old_mem->mem_type = TTM_PL_SYSTEM; >>>> >>>> With that I see the following scenario unfold in my kernel log, where >>>> pinned GTT BOs are swapped out and kunmapped under memory pressure. >>>> Eventually this leads to memory access faults while accessing ring >>>> buffers or IBs: >>>> >>>> [ 8.475453] Stripping NO_EVICT flag from BO >>>> [ 8.475461] ------------[ cut here ]------------ >>>> [ 8.475465] WARNING: CPU: 5 PID: 2186 at >>>> /home/fkuehlin/compute/kernel/drivers/gpu/drm/ttm/ttm_bo_util.c:66 >>>> ttm_bo_move_ttm+0x14a/0x160 [ttm] >>>> [ 8.475466] Modules linked in: amdkfd(E) amd_iommu_v2(E) >>>> amdgpu(E+) radeon(E) ttm(E) >>>> [ 8.475472] CPU: 5 PID: 2186 Comm: systemd-udevd Tainted: G >>>> W E 4.12.0-kfd-fkuehlin #1 >>>> [ 8.475473] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>>> 2006 04/07/2016 >>>> [ 8.475474] task: ffff91bf12a82e00 task.stack: ffffb8bd43600000 >>>> [ 8.475477] RIP: 0010:ttm_bo_move_ttm+0x14a/0x160 [ttm] >>>> [ 8.475478] RSP: 0018:ffffb8bd43603780 EFLAGS: 00010282 >>>> [ 8.475480] RAX: 000000000000001f RBX: ffff91bf0b0ee058 RCX: >>>> 0000000000000006 >>>> [ 8.475481] RDX: 0000000000000006 RSI: ffff91bf12a83678 RDI: >>>> 0000000000000202 >>>> [ 8.475482] RBP: ffffb8bd436037a0 R08: 0000000000000001 R09: >>>> 0000000000000000 >>>> [ 8.475483] R10: 0000000000000000 R11: 0000000000000000 R12: >>>> ffffb8bd436037e8 >>>> [ 8.475484] R13: 0000000000000000 R14: ffff91bf12c1bf00 R15: >>>> ffff91bf0b0ee000 >>>> [ 8.475485] FS: 00007f71b381b8c0(0000) GS:ffff91bf17340000(0000) >>>> knlGS:0000000000000000 >>>> [ 8.475486] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>>> [ 8.475487] CR2: 0000557e2ad63a28 CR3: 000000060d153000 CR4: >>>> 00000000001406e0 >>>> [ 8.475488] Call Trace: >>>> [ 8.475514] amdgpu_ttm_bind+0x129/0x1a0 [amdgpu] >>>> [ 8.475518] ? ttm_bo_mem_compat+0x20/0x50 [ttm] >>>> [ 8.475522] ? sparse_add_one_section+0x166/0x167 >>>> [ 8.475547] amdgpu_bo_pin_restricted+0x1ca/0x2f0 [amdgpu] >>>> [ 8.475575] amdgpu_bo_create_reserved+0x95/0x220 [amdgpu] >>>> [ 8.475602] amdgpu_bo_create_kernel+0x10/0x70 [amdgpu] >>>> [ 8.475632] amdgpu_gfx_compute_mqd_sw_init+0xf2/0x170 [amdgpu] >>>> [ 8.475663] gfx_v8_0_sw_init+0xca8/0x15d0 [amdgpu] >>>> [ 8.475690] amdgpu_device_init+0xe6f/0x1620 [amdgpu] >>>> [ 8.475717] amdgpu_driver_load_kms+0x63/0x200 [amdgpu] >>>> [ 8.475720] drm_dev_register+0x143/0x1d0 >>>> [ 8.475744] amdgpu_pci_probe+0x110/0x140 [amdgpu] >>>> [ 8.475747] local_pci_probe+0x40/0xa0 >>>> [ 8.475749] ? pci_match_device+0xdb/0x100 >>>> [ 8.475752] pci_device_probe+0x136/0x160 >>>> [ 8.475755] driver_probe_device+0x299/0x440 >>>> [ 8.475757] __driver_attach+0xde/0xe0 >>>> [ 8.475759] ? driver_probe_device+0x440/0x440 >>>> [ 8.475761] bus_for_each_dev+0x61/0xa0 >>>> [ 8.475763] driver_attach+0x19/0x20 >>>> [ 8.475764] bus_add_driver+0x1f6/0x270 >>>> [ 8.475766] ? 0xffffffffc0839000 >>>> [ 8.475768] driver_register+0x5b/0xd0 >>>> [ 8.475769] ? 0xffffffffc0839000 >>>> [ 8.475771] __pci_register_driver+0x5b/0x60 >>>> [ 8.475799] amdgpu_init+0x8a/0x1000 [amdgpu] >>>> [ 8.475801] do_one_initcall+0x4e/0x190 >>>> [ 8.475804] ? kmem_cache_alloc+0xd8/0x170 >>>> [ 8.475807] do_init_module+0x55/0x1e9 >>>> [ 8.475810] load_module+0x2771/0x29c0 >>>> [ 8.475817] SYSC_finit_module+0xbc/0xf0 >>>> [ 8.475819] ? SYSC_finit_module+0xbc/0xf0 >>>> [ 8.475823] SyS_finit_module+0x9/0x10 >>>> [ 8.475825] entry_SYSCALL_64_fastpath+0x1f/0xbe >>>> [...] >>>> [ 278.693790] Moving pinned bo (this kunmaps the BO) >>>> [ 278.693802] ------------[ cut here ]------------ >>>> [ 278.693833] WARNING: CPU: 11 PID: 2145 at >>>> /home/fkuehlin/compute/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:933 >>>> amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] >>>> [ 278.693834] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) >>>> amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) >>>> [ 278.693843] CPU: 11 PID: 2145 Comm: kworker/11:2 Tainted: G >>>> W E 4.12.0-kfd-fkuehlin #1 >>>> [ 278.693845] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>>> 2006 04/07/2016 >>>> [ 278.693851] Workqueue: kfd_process_wq kfd_process_wq_release [amdkfd] >>>> [ 278.693853] task: ffff91bf0dab1700 task.stack: ffffb8bd4495c000 >>>> [ 278.693880] RIP: 0010:amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] >>>> [ 278.693882] RSP: 0018:ffffb8bd4495fc20 EFLAGS: 00010282 >>>> [ 278.693884] RAX: 0000000000000010 RBX: ffff91bf0bec7058 RCX: >>>> 0000000000000006 >>>> [ 278.693885] RDX: 0000000000000006 RSI: ffff91bf0dab1f50 RDI: >>>> 0000000000000202 >>>> [ 278.693886] RBP: ffffb8bd4495fc40 R08: 0000000000000001 R09: >>>> 0000000000000000 >>>> [ 278.693887] R10: ffffb8bd4495fb98 R11: 0000000000000000 R12: >>>> ffff91bf0b0c2a68 >>>> [ 278.693889] R13: 0000000000000000 R14: ffff91bf0bec708c R15: >>>> ffff91bf104bb000 >>>> [ 278.693890] FS: 0000000000000000(0000) GS:ffff91bf174c0000(0000) >>>> knlGS:0000000000000000 >>>> [ 278.693891] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>>> [ 278.693892] CR2: 0000000004199000 CR3: 00000001f3e0f000 CR4: >>>> 00000000001406e0 >>>> [ 278.693893] Call Trace: >>>> [ 278.693898] ttm_bo_cleanup_memtype_use+0x1f/0x70 [ttm] >>>> [ 278.693902] ttm_bo_unref+0x388/0x470 [ttm] >>>> [ 278.693931] amdgpu_bo_unref+0x25/0x40 [amdgpu] >>>> [ 278.693962] amdgpu_amdkfd_gpuvm_free_memory_of_gpu+0x1b5/0x260 >>>> [amdgpu] >>>> [ 278.693974] kfd_process_free_outstanding_kfd_bos+0xab/0xe0 [amdkfd] >>>> [ 278.693980] kfd_process_wq_release+0x56/0x110 [amdkfd] >>>> [ 278.693983] process_one_work+0x190/0x430 >>>> [ 278.693984] ? process_one_work+0x133/0x430 >>>> [ 278.693988] worker_thread+0x46/0x400 >>>> [ 278.693991] kthread+0x10a/0x140 >>>> [ 278.693993] ? process_one_work+0x430/0x430 >>>> [ 278.693995] ? kthread_create_on_node+0x40/0x40 >>>> [ 278.693996] ? umh_complete+0x40/0x40 >>>> [ 278.693998] ? call_usermodehelper_exec_async+0x137/0x140 >>>> [ 278.694000] ret_from_fork+0x2a/0x40 >>>> [...] >>>> [ 694.740232] BUG: unable to handle kernel paging request at >>>> ffffb8bd4354d540 >>>> [ 694.740387] IP: sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] >>>> [ 694.740430] PGD 616c23067 >>>> [ 694.740432] P4D 616c23067 >>>> [ 694.740454] PUD 616c24067 >>>> [ 694.740476] PMD 613704067 >>>> [ 694.740498] PTE 0 >>>> >>>> [ 694.740551] Oops: 0002 [#1] SMP >>>> [ 694.740576] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) >>>> amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) >>>> [ 694.740667] CPU: 10 PID: 2213 Comm: sdma0 Tainted: G W >>>> E 4.12.0-kfd-fkuehlin #1 >>>> [ 694.740727] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>>> 2006 04/07/2016 >>>> [ 694.740782] task: ffff91bf0d989700 task.stack: ffffb8bd43730000 >>>> [ 694.740895] RIP: 0010:sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] >>>> [ 694.740941] RSP: 0018:ffffb8bd43733dc0 EFLAGS: 00010202 >>>> [ 694.740982] RAX: ffff91bf0b0c7770 RBX: ffff91bf0b0c7770 RCX: >>>> ffffb8bd4354d540 >>>> [ 694.741035] RDX: 0000000000001ac0 RSI: 00000000000006b0 RDI: >>>> ffff91bf0b0c0000 >>>> [ 694.741087] RBP: ffffb8bd43733dc0 R08: ffffffffc072bd60 R09: >>>> 0000000000000000 >>>> [ 694.741140] R10: ffff91bf0b0c0000 R11: ffffffffc064ef47 R12: >>>> ffff91bef6166000 >>>> [ 694.741192] R13: ffff91bef6166368 R14: 0000000000000001 R15: >>>> ffff91bf0b0c7770 >>>> [ 694.741246] FS: 0000000000000000(0000) GS:ffff91bf17480000(0000) >>>> knlGS:0000000000000000 >>>> [ 694.741305] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>>> [ 694.741349] CR2: ffffb8bd4354d540 CR3: 000000060e4a6000 CR4: >>>> 00000000001406e0 >>>> [ 694.741401] Call Trace: >>>> [ 694.741480] amdgpu_ring_commit+0x3a/0x60 [amdgpu] >>>> [ 694.741575] amdgpu_ib_schedule+0x2c7/0x450 [amdgpu] >>>> [ 694.741687] amdgpu_job_run+0x72/0x110 [amdgpu] >>>> [ 694.741793] amd_sched_main+0x343/0x470 [amdgpu] >>>> [ 694.741838] ? wake_atomic_t_function+0x60/0x60 >>>> [ 694.741876] kthread+0x10a/0x140 >>>> [ 694.741969] ? amd_sched_process_job+0x60/0x60 [amdgpu] >>>> [ 694.742010] ? kthread_create_on_node+0x40/0x40 >>>> [ 694.742048] ret_from_fork+0x2a/0x40 >>>> >>>> >>>> >>>> On 2017-08-23 05:02 AM, Christian König wrote: >>>>> From: Christian König <christian.koenig@amd.com> >>>>> >>>>> Use ttm_bo_mem_space instead of manually allocating GART space. >>>>> >>>>> This allows us to evict BOs when there isn't enought GART space any >>>>> more. >>>>> >>>>> Signed-off-by: Christian König <christian.koenig@amd.com> >>>>> --- >>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 14 +++++-------- >>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 >>>>> +++++++++++++++++++++++------ >>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ---- >>>>> 3 files changed, 30 insertions(+), 19 deletions(-) >>>>> >>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>> index 9e05e25..0d15eb7 100644 >>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>> @@ -108,10 +108,10 @@ bool amdgpu_gtt_mgr_is_allocated(struct >>>>> ttm_mem_reg *mem) >>>>> * >>>>> * Allocate the address space for a node. >>>>> */ >>>>> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>>> - struct ttm_buffer_object *tbo, >>>>> - const struct ttm_place *place, >>>>> - struct ttm_mem_reg *mem) >>>>> +static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>>> + struct ttm_buffer_object *tbo, >>>>> + const struct ttm_place *place, >>>>> + struct ttm_mem_reg *mem) >>>>> { >>>>> struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); >>>>> struct amdgpu_gtt_mgr *mgr = man->priv; >>>>> @@ -143,12 +143,8 @@ int amdgpu_gtt_mgr_alloc(struct >>>>> ttm_mem_type_manager *man, >>>>> fpfn, lpfn, mode); >>>>> spin_unlock(&mgr->lock); >>>>> - if (!r) { >>>>> + if (!r) >>>>> mem->start = node->start; >>>>> - if (&tbo->mem == mem) >>>>> - tbo->offset = (tbo->mem.start << PAGE_SHIFT) + >>>>> - tbo->bdev->man[tbo->mem.mem_type].gpu_offset; >>>>> - } >>>>> return r; >>>>> } >>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>> index 38d26a7..aa0b7f5 100644 >>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>> @@ -809,20 +809,39 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm) >>>>> int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct >>>>> ttm_mem_reg *bo_mem) >>>>> { >>>>> + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); >>>>> struct ttm_tt *ttm = bo->ttm; >>>>> + struct ttm_mem_reg tmp; >>>>> + >>>>> + struct ttm_placement placement; >>>>> + struct ttm_place placements; >>>>> int r; >>>>> if (!ttm || amdgpu_ttm_is_bound(ttm)) >>>>> return 0; >>>>> - r = amdgpu_gtt_mgr_alloc(&bo->bdev->man[TTM_PL_TT], bo, >>>>> - NULL, bo_mem); >>>>> - if (r) { >>>>> - DRM_ERROR("Failed to allocate GTT address space (%d)\n", r); >>>>> + tmp = bo->mem; >>>>> + tmp.mm_node = NULL; >>>>> + placement.num_placement = 1; >>>>> + placement.placement = &placements; >>>>> + placement.num_busy_placement = 1; >>>>> + placement.busy_placement = &placements; >>>>> + placements.fpfn = 0; >>>>> + placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT; >>>>> + placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT; >>>>> + >>>>> + r = ttm_bo_mem_space(bo, &placement, &tmp, true, false); >>>>> + if (unlikely(r)) >>>>> return r; >>>>> - } >>>>> - return amdgpu_ttm_do_bind(ttm, bo_mem); >>>>> + r = ttm_bo_move_ttm(bo, true, false, &tmp); >>>>> + if (unlikely(r)) >>>>> + ttm_bo_mem_put(bo, &tmp); >>>>> + else >>>>> + bo->offset = (bo->mem.start << PAGE_SHIFT) + >>>>> + bo->bdev->man[bo->mem.mem_type].gpu_offset; >>>>> + >>>>> + return r; >>>>> } >>>>> int amdgpu_ttm_recover_gart(struct amdgpu_device *adev) >>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>> index f22a475..43093bf 100644 >>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>> @@ -62,10 +62,6 @@ extern const struct ttm_mem_type_manager_func >>>>> amdgpu_gtt_mgr_func; >>>>> extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func; >>>>> bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem); >>>>> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>>> - struct ttm_buffer_object *tbo, >>>>> - const struct ttm_place *place, >>>>> - struct ttm_mem_reg *mem); >>>>> uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man); >>>>> uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man); >>>> _______________________________________________ >>>> amd-gfx mailing list >>>> amd-gfx@lists.freedesktop.org >>>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx >> _______________________________________________ >> amd-gfx mailing list >> amd-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <3960afa2-50af-81b5-dc7a-ad9776c43727-5C7GfCeVMHo@public.gmane.org>]
* Re: Regression: Re: [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind [not found] ` <3960afa2-50af-81b5-dc7a-ad9776c43727-5C7GfCeVMHo@public.gmane.org> @ 2017-09-02 11:23 ` Christian König 2017-09-05 15:31 ` Felix Kuehling 1 sibling, 0 replies; 13+ messages in thread From: Christian König @ 2017-09-02 11:23 UTC (permalink / raw) To: Christian König, Felix Kuehling, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Cc: Deucher, Alexander, Russell, Kent Thinking more about this it looks like a general bug in the userptr put_page handling. Patch to fix this is on the list, Christian. Am 02.09.2017 um 09:52 schrieb Christian König: > Ah, crap yeah that won't work. > > Yeah, we should block userptr BOs in amdgpu_ttm_bind() for now. > >> There is something else still broken in our IPC test for system memory >> also, but I'll have to rewrite that anyway to work for large BOs with a >> small GART. > Hui? Well userptr BOs can't be used for IPC, so how do you run into > this issue? > > Regards, > Christian. > > Am 02.09.2017 um 01:46 schrieb Felix Kuehling: >> Actually, I read that wrong. It does GART bind userptr BOs. But it also >> unpins and repins them accidentally in the process, since >> ttm_bo_move_ttm calls backend_unbind and backend_bind callbacks. And >> ends up corrupting some kernel page state, because we had to move the >> pinning of user pages out of backend_bind. >> >> Maybe amdgpu_bind shouldn't be used for user mode BOs at all any more? >> Or does it need some safeguards for userptr BOs? >> >> Regards, >> Felix >> >> >> On 2017-09-01 07:35 PM, Felix Kuehling wrote: >>> It also seems to break GART binding of userptr BOs. Since backend_bind >>> doesn't do GART binding for userptr BOs, they now don't get GART bound >>> at all. >>> >>> There is something else still broken in our IPC test for system memory >>> also, but I'll have to rewrite that anyway to work for large BOs with a >>> small GART. >>> >>> Regards, >>> Felix >>> >>> >>> On 2017-09-01 03:17 AM, Christian König wrote: >>>> Yeah, the bug is really obvious after you pointed it out. We just need >>>> to keep the placement flags. >>>> >>>> Going to send a fix to the list in a minute, >>>> Christian. >>>> >>>> Am 01.09.2017 um 00:50 schrieb Felix Kuehling: >>>>> I believe this patch breaks pinned GTT BOs. It trips KFD tests that >>>>> apply a lot of memory pressure on one of our test systems. >>>>> >>>>> I understand the cause of the problem (see my analysis below), but >>>>> I'm >>>>> not sure how to solve it, without reverting the patch. Christian, >>>>> do you >>>>> have any ideas? Should we at least revert this as a short-term fix? >>>>> >>>>> I added some WARNs in the code to understand what's happening: >>>>> >>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>>> index 72ad045..3ead155 100644 >>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>>> @@ -930,6 +930,7 @@ void amdgpu_bo_move_notify(struct >>>>> ttm_buffer_object *bo, >>>>> return; >>>>> abo = container_of(bo, struct amdgpu_bo, tbo); >>>>> + WARN(abo->pin_count, "Moving pinned bo"); >>>>> amdgpu_vm_bo_invalidate(adev, abo); >>>>> amdgpu_bo_kunmap(abo); >>>>> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c >>>>> b/drivers/gpu/drm/ttm/ttm_bo_util.c >>>>> index c934ad5..af9f40e 100644 >>>>> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c >>>>> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c >>>>> @@ -63,6 +63,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, >>>>> ttm_tt_unbind(ttm); >>>>> ttm_bo_free_old_node(bo); >>>>> + WARN(old_mem->placement & TTM_PL_FLAG_NO_EVICT, >>>>> "Stripping NO_EVICT flag from BO"); >>>>> ttm_flag_masked(&old_mem->placement, >>>>> TTM_PL_FLAG_SYSTEM, >>>>> TTM_PL_MASK_MEM); >>>>> old_mem->mem_type = TTM_PL_SYSTEM; >>>>> >>>>> With that I see the following scenario unfold in my kernel log, where >>>>> pinned GTT BOs are swapped out and kunmapped under memory pressure. >>>>> Eventually this leads to memory access faults while accessing ring >>>>> buffers or IBs: >>>>> >>>>> [ 8.475453] Stripping NO_EVICT flag from BO >>>>> [ 8.475461] ------------[ cut here ]------------ >>>>> [ 8.475465] WARNING: CPU: 5 PID: 2186 at >>>>> /home/fkuehlin/compute/kernel/drivers/gpu/drm/ttm/ttm_bo_util.c:66 >>>>> ttm_bo_move_ttm+0x14a/0x160 [ttm] >>>>> [ 8.475466] Modules linked in: amdkfd(E) amd_iommu_v2(E) >>>>> amdgpu(E+) radeon(E) ttm(E) >>>>> [ 8.475472] CPU: 5 PID: 2186 Comm: systemd-udevd Tainted: G >>>>> W E 4.12.0-kfd-fkuehlin #1 >>>>> [ 8.475473] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>>>> 2006 04/07/2016 >>>>> [ 8.475474] task: ffff91bf12a82e00 task.stack: ffffb8bd43600000 >>>>> [ 8.475477] RIP: 0010:ttm_bo_move_ttm+0x14a/0x160 [ttm] >>>>> [ 8.475478] RSP: 0018:ffffb8bd43603780 EFLAGS: 00010282 >>>>> [ 8.475480] RAX: 000000000000001f RBX: ffff91bf0b0ee058 RCX: >>>>> 0000000000000006 >>>>> [ 8.475481] RDX: 0000000000000006 RSI: ffff91bf12a83678 RDI: >>>>> 0000000000000202 >>>>> [ 8.475482] RBP: ffffb8bd436037a0 R08: 0000000000000001 R09: >>>>> 0000000000000000 >>>>> [ 8.475483] R10: 0000000000000000 R11: 0000000000000000 R12: >>>>> ffffb8bd436037e8 >>>>> [ 8.475484] R13: 0000000000000000 R14: ffff91bf12c1bf00 R15: >>>>> ffff91bf0b0ee000 >>>>> [ 8.475485] FS: 00007f71b381b8c0(0000) GS:ffff91bf17340000(0000) >>>>> knlGS:0000000000000000 >>>>> [ 8.475486] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>>>> [ 8.475487] CR2: 0000557e2ad63a28 CR3: 000000060d153000 CR4: >>>>> 00000000001406e0 >>>>> [ 8.475488] Call Trace: >>>>> [ 8.475514] amdgpu_ttm_bind+0x129/0x1a0 [amdgpu] >>>>> [ 8.475518] ? ttm_bo_mem_compat+0x20/0x50 [ttm] >>>>> [ 8.475522] ? sparse_add_one_section+0x166/0x167 >>>>> [ 8.475547] amdgpu_bo_pin_restricted+0x1ca/0x2f0 [amdgpu] >>>>> [ 8.475575] amdgpu_bo_create_reserved+0x95/0x220 [amdgpu] >>>>> [ 8.475602] amdgpu_bo_create_kernel+0x10/0x70 [amdgpu] >>>>> [ 8.475632] amdgpu_gfx_compute_mqd_sw_init+0xf2/0x170 [amdgpu] >>>>> [ 8.475663] gfx_v8_0_sw_init+0xca8/0x15d0 [amdgpu] >>>>> [ 8.475690] amdgpu_device_init+0xe6f/0x1620 [amdgpu] >>>>> [ 8.475717] amdgpu_driver_load_kms+0x63/0x200 [amdgpu] >>>>> [ 8.475720] drm_dev_register+0x143/0x1d0 >>>>> [ 8.475744] amdgpu_pci_probe+0x110/0x140 [amdgpu] >>>>> [ 8.475747] local_pci_probe+0x40/0xa0 >>>>> [ 8.475749] ? pci_match_device+0xdb/0x100 >>>>> [ 8.475752] pci_device_probe+0x136/0x160 >>>>> [ 8.475755] driver_probe_device+0x299/0x440 >>>>> [ 8.475757] __driver_attach+0xde/0xe0 >>>>> [ 8.475759] ? driver_probe_device+0x440/0x440 >>>>> [ 8.475761] bus_for_each_dev+0x61/0xa0 >>>>> [ 8.475763] driver_attach+0x19/0x20 >>>>> [ 8.475764] bus_add_driver+0x1f6/0x270 >>>>> [ 8.475766] ? 0xffffffffc0839000 >>>>> [ 8.475768] driver_register+0x5b/0xd0 >>>>> [ 8.475769] ? 0xffffffffc0839000 >>>>> [ 8.475771] __pci_register_driver+0x5b/0x60 >>>>> [ 8.475799] amdgpu_init+0x8a/0x1000 [amdgpu] >>>>> [ 8.475801] do_one_initcall+0x4e/0x190 >>>>> [ 8.475804] ? kmem_cache_alloc+0xd8/0x170 >>>>> [ 8.475807] do_init_module+0x55/0x1e9 >>>>> [ 8.475810] load_module+0x2771/0x29c0 >>>>> [ 8.475817] SYSC_finit_module+0xbc/0xf0 >>>>> [ 8.475819] ? SYSC_finit_module+0xbc/0xf0 >>>>> [ 8.475823] SyS_finit_module+0x9/0x10 >>>>> [ 8.475825] entry_SYSCALL_64_fastpath+0x1f/0xbe >>>>> [...] >>>>> [ 278.693790] Moving pinned bo (this kunmaps the BO) >>>>> [ 278.693802] ------------[ cut here ]------------ >>>>> [ 278.693833] WARNING: CPU: 11 PID: 2145 at >>>>> /home/fkuehlin/compute/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:933 >>>>> >>>>> amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] >>>>> [ 278.693834] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) >>>>> amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) >>>>> [ 278.693843] CPU: 11 PID: 2145 Comm: kworker/11:2 Tainted: G >>>>> W E 4.12.0-kfd-fkuehlin #1 >>>>> [ 278.693845] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>>>> 2006 04/07/2016 >>>>> [ 278.693851] Workqueue: kfd_process_wq kfd_process_wq_release >>>>> [amdkfd] >>>>> [ 278.693853] task: ffff91bf0dab1700 task.stack: ffffb8bd4495c000 >>>>> [ 278.693880] RIP: 0010:amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] >>>>> [ 278.693882] RSP: 0018:ffffb8bd4495fc20 EFLAGS: 00010282 >>>>> [ 278.693884] RAX: 0000000000000010 RBX: ffff91bf0bec7058 RCX: >>>>> 0000000000000006 >>>>> [ 278.693885] RDX: 0000000000000006 RSI: ffff91bf0dab1f50 RDI: >>>>> 0000000000000202 >>>>> [ 278.693886] RBP: ffffb8bd4495fc40 R08: 0000000000000001 R09: >>>>> 0000000000000000 >>>>> [ 278.693887] R10: ffffb8bd4495fb98 R11: 0000000000000000 R12: >>>>> ffff91bf0b0c2a68 >>>>> [ 278.693889] R13: 0000000000000000 R14: ffff91bf0bec708c R15: >>>>> ffff91bf104bb000 >>>>> [ 278.693890] FS: 0000000000000000(0000) GS:ffff91bf174c0000(0000) >>>>> knlGS:0000000000000000 >>>>> [ 278.693891] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>>>> [ 278.693892] CR2: 0000000004199000 CR3: 00000001f3e0f000 CR4: >>>>> 00000000001406e0 >>>>> [ 278.693893] Call Trace: >>>>> [ 278.693898] ttm_bo_cleanup_memtype_use+0x1f/0x70 [ttm] >>>>> [ 278.693902] ttm_bo_unref+0x388/0x470 [ttm] >>>>> [ 278.693931] amdgpu_bo_unref+0x25/0x40 [amdgpu] >>>>> [ 278.693962] amdgpu_amdkfd_gpuvm_free_memory_of_gpu+0x1b5/0x260 >>>>> [amdgpu] >>>>> [ 278.693974] kfd_process_free_outstanding_kfd_bos+0xab/0xe0 >>>>> [amdkfd] >>>>> [ 278.693980] kfd_process_wq_release+0x56/0x110 [amdkfd] >>>>> [ 278.693983] process_one_work+0x190/0x430 >>>>> [ 278.693984] ? process_one_work+0x133/0x430 >>>>> [ 278.693988] worker_thread+0x46/0x400 >>>>> [ 278.693991] kthread+0x10a/0x140 >>>>> [ 278.693993] ? process_one_work+0x430/0x430 >>>>> [ 278.693995] ? kthread_create_on_node+0x40/0x40 >>>>> [ 278.693996] ? umh_complete+0x40/0x40 >>>>> [ 278.693998] ? call_usermodehelper_exec_async+0x137/0x140 >>>>> [ 278.694000] ret_from_fork+0x2a/0x40 >>>>> [...] >>>>> [ 694.740232] BUG: unable to handle kernel paging request at >>>>> ffffb8bd4354d540 >>>>> [ 694.740387] IP: sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] >>>>> [ 694.740430] PGD 616c23067 >>>>> [ 694.740432] P4D 616c23067 >>>>> [ 694.740454] PUD 616c24067 >>>>> [ 694.740476] PMD 613704067 >>>>> [ 694.740498] PTE 0 >>>>> >>>>> [ 694.740551] Oops: 0002 [#1] SMP >>>>> [ 694.740576] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) >>>>> amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) >>>>> [ 694.740667] CPU: 10 PID: 2213 Comm: sdma0 Tainted: G W >>>>> E 4.12.0-kfd-fkuehlin #1 >>>>> [ 694.740727] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>>>> 2006 04/07/2016 >>>>> [ 694.740782] task: ffff91bf0d989700 task.stack: ffffb8bd43730000 >>>>> [ 694.740895] RIP: 0010:sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] >>>>> [ 694.740941] RSP: 0018:ffffb8bd43733dc0 EFLAGS: 00010202 >>>>> [ 694.740982] RAX: ffff91bf0b0c7770 RBX: ffff91bf0b0c7770 RCX: >>>>> ffffb8bd4354d540 >>>>> [ 694.741035] RDX: 0000000000001ac0 RSI: 00000000000006b0 RDI: >>>>> ffff91bf0b0c0000 >>>>> [ 694.741087] RBP: ffffb8bd43733dc0 R08: ffffffffc072bd60 R09: >>>>> 0000000000000000 >>>>> [ 694.741140] R10: ffff91bf0b0c0000 R11: ffffffffc064ef47 R12: >>>>> ffff91bef6166000 >>>>> [ 694.741192] R13: ffff91bef6166368 R14: 0000000000000001 R15: >>>>> ffff91bf0b0c7770 >>>>> [ 694.741246] FS: 0000000000000000(0000) GS:ffff91bf17480000(0000) >>>>> knlGS:0000000000000000 >>>>> [ 694.741305] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>>>> [ 694.741349] CR2: ffffb8bd4354d540 CR3: 000000060e4a6000 CR4: >>>>> 00000000001406e0 >>>>> [ 694.741401] Call Trace: >>>>> [ 694.741480] amdgpu_ring_commit+0x3a/0x60 [amdgpu] >>>>> [ 694.741575] amdgpu_ib_schedule+0x2c7/0x450 [amdgpu] >>>>> [ 694.741687] amdgpu_job_run+0x72/0x110 [amdgpu] >>>>> [ 694.741793] amd_sched_main+0x343/0x470 [amdgpu] >>>>> [ 694.741838] ? wake_atomic_t_function+0x60/0x60 >>>>> [ 694.741876] kthread+0x10a/0x140 >>>>> [ 694.741969] ? amd_sched_process_job+0x60/0x60 [amdgpu] >>>>> [ 694.742010] ? kthread_create_on_node+0x40/0x40 >>>>> [ 694.742048] ret_from_fork+0x2a/0x40 >>>>> >>>>> >>>>> >>>>> On 2017-08-23 05:02 AM, Christian König wrote: >>>>>> From: Christian König <christian.koenig@amd.com> >>>>>> >>>>>> Use ttm_bo_mem_space instead of manually allocating GART space. >>>>>> >>>>>> This allows us to evict BOs when there isn't enought GART space any >>>>>> more. >>>>>> >>>>>> Signed-off-by: Christian König <christian.koenig@amd.com> >>>>>> --- >>>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 14 +++++-------- >>>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 >>>>>> +++++++++++++++++++++++------ >>>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ---- >>>>>> 3 files changed, 30 insertions(+), 19 deletions(-) >>>>>> >>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>>> index 9e05e25..0d15eb7 100644 >>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>>> @@ -108,10 +108,10 @@ bool amdgpu_gtt_mgr_is_allocated(struct >>>>>> ttm_mem_reg *mem) >>>>>> * >>>>>> * Allocate the address space for a node. >>>>>> */ >>>>>> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>>>> - struct ttm_buffer_object *tbo, >>>>>> - const struct ttm_place *place, >>>>>> - struct ttm_mem_reg *mem) >>>>>> +static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>>>> + struct ttm_buffer_object *tbo, >>>>>> + const struct ttm_place *place, >>>>>> + struct ttm_mem_reg *mem) >>>>>> { >>>>>> struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); >>>>>> struct amdgpu_gtt_mgr *mgr = man->priv; >>>>>> @@ -143,12 +143,8 @@ int amdgpu_gtt_mgr_alloc(struct >>>>>> ttm_mem_type_manager *man, >>>>>> fpfn, lpfn, mode); >>>>>> spin_unlock(&mgr->lock); >>>>>> - if (!r) { >>>>>> + if (!r) >>>>>> mem->start = node->start; >>>>>> - if (&tbo->mem == mem) >>>>>> - tbo->offset = (tbo->mem.start << PAGE_SHIFT) + >>>>>> - tbo->bdev->man[tbo->mem.mem_type].gpu_offset; >>>>>> - } >>>>>> return r; >>>>>> } >>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>>> index 38d26a7..aa0b7f5 100644 >>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>>> @@ -809,20 +809,39 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm) >>>>>> int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct >>>>>> ttm_mem_reg *bo_mem) >>>>>> { >>>>>> + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); >>>>>> struct ttm_tt *ttm = bo->ttm; >>>>>> + struct ttm_mem_reg tmp; >>>>>> + >>>>>> + struct ttm_placement placement; >>>>>> + struct ttm_place placements; >>>>>> int r; >>>>>> if (!ttm || amdgpu_ttm_is_bound(ttm)) >>>>>> return 0; >>>>>> - r = amdgpu_gtt_mgr_alloc(&bo->bdev->man[TTM_PL_TT], bo, >>>>>> - NULL, bo_mem); >>>>>> - if (r) { >>>>>> - DRM_ERROR("Failed to allocate GTT address space (%d)\n", >>>>>> r); >>>>>> + tmp = bo->mem; >>>>>> + tmp.mm_node = NULL; >>>>>> + placement.num_placement = 1; >>>>>> + placement.placement = &placements; >>>>>> + placement.num_busy_placement = 1; >>>>>> + placement.busy_placement = &placements; >>>>>> + placements.fpfn = 0; >>>>>> + placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT; >>>>>> + placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT; >>>>>> + >>>>>> + r = ttm_bo_mem_space(bo, &placement, &tmp, true, false); >>>>>> + if (unlikely(r)) >>>>>> return r; >>>>>> - } >>>>>> - return amdgpu_ttm_do_bind(ttm, bo_mem); >>>>>> + r = ttm_bo_move_ttm(bo, true, false, &tmp); >>>>>> + if (unlikely(r)) >>>>>> + ttm_bo_mem_put(bo, &tmp); >>>>>> + else >>>>>> + bo->offset = (bo->mem.start << PAGE_SHIFT) + >>>>>> + bo->bdev->man[bo->mem.mem_type].gpu_offset; >>>>>> + >>>>>> + return r; >>>>>> } >>>>>> int amdgpu_ttm_recover_gart(struct amdgpu_device *adev) >>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>>> index f22a475..43093bf 100644 >>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>>> @@ -62,10 +62,6 @@ extern const struct ttm_mem_type_manager_func >>>>>> amdgpu_gtt_mgr_func; >>>>>> extern const struct ttm_mem_type_manager_func >>>>>> amdgpu_vram_mgr_func; >>>>>> bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem); >>>>>> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>>>> - struct ttm_buffer_object *tbo, >>>>>> - const struct ttm_place *place, >>>>>> - struct ttm_mem_reg *mem); >>>>>> uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man); >>>>>> uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager >>>>>> *man); >>>>> _______________________________________________ >>>>> amd-gfx mailing list >>>>> amd-gfx@lists.freedesktop.org >>>>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx >>> _______________________________________________ >>> amd-gfx mailing list >>> amd-gfx@lists.freedesktop.org >>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx > > _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Regression: Re: [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind [not found] ` <3960afa2-50af-81b5-dc7a-ad9776c43727-5C7GfCeVMHo@public.gmane.org> 2017-09-02 11:23 ` Christian König @ 2017-09-05 15:31 ` Felix Kuehling 1 sibling, 0 replies; 13+ messages in thread From: Felix Kuehling @ 2017-09-05 15:31 UTC (permalink / raw) To: Christian König, Christian König, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Cc: Deucher, Alexander, Russell, Kent On 2017-09-02 03:52 AM, Christian König wrote: > Ah, crap yeah that won't work. > > Yeah, we should block userptr BOs in amdgpu_ttm_bind() for now. > >> There is something else still broken in our IPC test for system memory >> also, but I'll have to rewrite that anyway to work for large BOs with a >> small GART. > Hui? Well userptr BOs can't be used for IPC, so how do you run into > this issue? Different IPC. This one doesn't share buffers between processes, but copies from one process to another (similar to process_vm_readv and process_vm_writev) using SDMA. It works with VRAM, GTT and userptr BOs. The SDMA copy is done in kernel mode, so we need to GART map the BOs. Like I said, we still need to change that to use a transfer window that maps only part of the BOs at a time. Regards, Felix > > Regards, > Christian. > > Am 02.09.2017 um 01:46 schrieb Felix Kuehling: >> Actually, I read that wrong. It does GART bind userptr BOs. But it also >> unpins and repins them accidentally in the process, since >> ttm_bo_move_ttm calls backend_unbind and backend_bind callbacks. And >> ends up corrupting some kernel page state, because we had to move the >> pinning of user pages out of backend_bind. >> >> Maybe amdgpu_bind shouldn't be used for user mode BOs at all any more? >> Or does it need some safeguards for userptr BOs? >> >> Regards, >> Felix >> >> >> On 2017-09-01 07:35 PM, Felix Kuehling wrote: >>> It also seems to break GART binding of userptr BOs. Since backend_bind >>> doesn't do GART binding for userptr BOs, they now don't get GART bound >>> at all. >>> >>> There is something else still broken in our IPC test for system memory >>> also, but I'll have to rewrite that anyway to work for large BOs with a >>> small GART. >>> >>> Regards, >>> Felix >>> >>> >>> On 2017-09-01 03:17 AM, Christian König wrote: >>>> Yeah, the bug is really obvious after you pointed it out. We just need >>>> to keep the placement flags. >>>> >>>> Going to send a fix to the list in a minute, >>>> Christian. >>>> >>>> Am 01.09.2017 um 00:50 schrieb Felix Kuehling: >>>>> I believe this patch breaks pinned GTT BOs. It trips KFD tests that >>>>> apply a lot of memory pressure on one of our test systems. >>>>> >>>>> I understand the cause of the problem (see my analysis below), but >>>>> I'm >>>>> not sure how to solve it, without reverting the patch. Christian, >>>>> do you >>>>> have any ideas? Should we at least revert this as a short-term fix? >>>>> >>>>> I added some WARNs in the code to understand what's happening: >>>>> >>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>>> index 72ad045..3ead155 100644 >>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >>>>> @@ -930,6 +930,7 @@ void amdgpu_bo_move_notify(struct >>>>> ttm_buffer_object *bo, >>>>> return; >>>>> abo = container_of(bo, struct amdgpu_bo, tbo); >>>>> + WARN(abo->pin_count, "Moving pinned bo"); >>>>> amdgpu_vm_bo_invalidate(adev, abo); >>>>> amdgpu_bo_kunmap(abo); >>>>> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c >>>>> b/drivers/gpu/drm/ttm/ttm_bo_util.c >>>>> index c934ad5..af9f40e 100644 >>>>> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c >>>>> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c >>>>> @@ -63,6 +63,7 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, >>>>> ttm_tt_unbind(ttm); >>>>> ttm_bo_free_old_node(bo); >>>>> + WARN(old_mem->placement & TTM_PL_FLAG_NO_EVICT, >>>>> "Stripping NO_EVICT flag from BO"); >>>>> ttm_flag_masked(&old_mem->placement, >>>>> TTM_PL_FLAG_SYSTEM, >>>>> TTM_PL_MASK_MEM); >>>>> old_mem->mem_type = TTM_PL_SYSTEM; >>>>> >>>>> With that I see the following scenario unfold in my kernel log, where >>>>> pinned GTT BOs are swapped out and kunmapped under memory pressure. >>>>> Eventually this leads to memory access faults while accessing ring >>>>> buffers or IBs: >>>>> >>>>> [ 8.475453] Stripping NO_EVICT flag from BO >>>>> [ 8.475461] ------------[ cut here ]------------ >>>>> [ 8.475465] WARNING: CPU: 5 PID: 2186 at >>>>> /home/fkuehlin/compute/kernel/drivers/gpu/drm/ttm/ttm_bo_util.c:66 >>>>> ttm_bo_move_ttm+0x14a/0x160 [ttm] >>>>> [ 8.475466] Modules linked in: amdkfd(E) amd_iommu_v2(E) >>>>> amdgpu(E+) radeon(E) ttm(E) >>>>> [ 8.475472] CPU: 5 PID: 2186 Comm: systemd-udevd Tainted: G >>>>> W E 4.12.0-kfd-fkuehlin #1 >>>>> [ 8.475473] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>>>> 2006 04/07/2016 >>>>> [ 8.475474] task: ffff91bf12a82e00 task.stack: ffffb8bd43600000 >>>>> [ 8.475477] RIP: 0010:ttm_bo_move_ttm+0x14a/0x160 [ttm] >>>>> [ 8.475478] RSP: 0018:ffffb8bd43603780 EFLAGS: 00010282 >>>>> [ 8.475480] RAX: 000000000000001f RBX: ffff91bf0b0ee058 RCX: >>>>> 0000000000000006 >>>>> [ 8.475481] RDX: 0000000000000006 RSI: ffff91bf12a83678 RDI: >>>>> 0000000000000202 >>>>> [ 8.475482] RBP: ffffb8bd436037a0 R08: 0000000000000001 R09: >>>>> 0000000000000000 >>>>> [ 8.475483] R10: 0000000000000000 R11: 0000000000000000 R12: >>>>> ffffb8bd436037e8 >>>>> [ 8.475484] R13: 0000000000000000 R14: ffff91bf12c1bf00 R15: >>>>> ffff91bf0b0ee000 >>>>> [ 8.475485] FS: 00007f71b381b8c0(0000) GS:ffff91bf17340000(0000) >>>>> knlGS:0000000000000000 >>>>> [ 8.475486] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>>>> [ 8.475487] CR2: 0000557e2ad63a28 CR3: 000000060d153000 CR4: >>>>> 00000000001406e0 >>>>> [ 8.475488] Call Trace: >>>>> [ 8.475514] amdgpu_ttm_bind+0x129/0x1a0 [amdgpu] >>>>> [ 8.475518] ? ttm_bo_mem_compat+0x20/0x50 [ttm] >>>>> [ 8.475522] ? sparse_add_one_section+0x166/0x167 >>>>> [ 8.475547] amdgpu_bo_pin_restricted+0x1ca/0x2f0 [amdgpu] >>>>> [ 8.475575] amdgpu_bo_create_reserved+0x95/0x220 [amdgpu] >>>>> [ 8.475602] amdgpu_bo_create_kernel+0x10/0x70 [amdgpu] >>>>> [ 8.475632] amdgpu_gfx_compute_mqd_sw_init+0xf2/0x170 [amdgpu] >>>>> [ 8.475663] gfx_v8_0_sw_init+0xca8/0x15d0 [amdgpu] >>>>> [ 8.475690] amdgpu_device_init+0xe6f/0x1620 [amdgpu] >>>>> [ 8.475717] amdgpu_driver_load_kms+0x63/0x200 [amdgpu] >>>>> [ 8.475720] drm_dev_register+0x143/0x1d0 >>>>> [ 8.475744] amdgpu_pci_probe+0x110/0x140 [amdgpu] >>>>> [ 8.475747] local_pci_probe+0x40/0xa0 >>>>> [ 8.475749] ? pci_match_device+0xdb/0x100 >>>>> [ 8.475752] pci_device_probe+0x136/0x160 >>>>> [ 8.475755] driver_probe_device+0x299/0x440 >>>>> [ 8.475757] __driver_attach+0xde/0xe0 >>>>> [ 8.475759] ? driver_probe_device+0x440/0x440 >>>>> [ 8.475761] bus_for_each_dev+0x61/0xa0 >>>>> [ 8.475763] driver_attach+0x19/0x20 >>>>> [ 8.475764] bus_add_driver+0x1f6/0x270 >>>>> [ 8.475766] ? 0xffffffffc0839000 >>>>> [ 8.475768] driver_register+0x5b/0xd0 >>>>> [ 8.475769] ? 0xffffffffc0839000 >>>>> [ 8.475771] __pci_register_driver+0x5b/0x60 >>>>> [ 8.475799] amdgpu_init+0x8a/0x1000 [amdgpu] >>>>> [ 8.475801] do_one_initcall+0x4e/0x190 >>>>> [ 8.475804] ? kmem_cache_alloc+0xd8/0x170 >>>>> [ 8.475807] do_init_module+0x55/0x1e9 >>>>> [ 8.475810] load_module+0x2771/0x29c0 >>>>> [ 8.475817] SYSC_finit_module+0xbc/0xf0 >>>>> [ 8.475819] ? SYSC_finit_module+0xbc/0xf0 >>>>> [ 8.475823] SyS_finit_module+0x9/0x10 >>>>> [ 8.475825] entry_SYSCALL_64_fastpath+0x1f/0xbe >>>>> [...] >>>>> [ 278.693790] Moving pinned bo (this kunmaps the BO) >>>>> [ 278.693802] ------------[ cut here ]------------ >>>>> [ 278.693833] WARNING: CPU: 11 PID: 2145 at >>>>> /home/fkuehlin/compute/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:933 >>>>> >>>>> amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] >>>>> [ 278.693834] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) >>>>> amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) >>>>> [ 278.693843] CPU: 11 PID: 2145 Comm: kworker/11:2 Tainted: G >>>>> W E 4.12.0-kfd-fkuehlin #1 >>>>> [ 278.693845] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>>>> 2006 04/07/2016 >>>>> [ 278.693851] Workqueue: kfd_process_wq kfd_process_wq_release >>>>> [amdkfd] >>>>> [ 278.693853] task: ffff91bf0dab1700 task.stack: ffffb8bd4495c000 >>>>> [ 278.693880] RIP: 0010:amdgpu_bo_move_notify+0x7c/0x90 [amdgpu] >>>>> [ 278.693882] RSP: 0018:ffffb8bd4495fc20 EFLAGS: 00010282 >>>>> [ 278.693884] RAX: 0000000000000010 RBX: ffff91bf0bec7058 RCX: >>>>> 0000000000000006 >>>>> [ 278.693885] RDX: 0000000000000006 RSI: ffff91bf0dab1f50 RDI: >>>>> 0000000000000202 >>>>> [ 278.693886] RBP: ffffb8bd4495fc40 R08: 0000000000000001 R09: >>>>> 0000000000000000 >>>>> [ 278.693887] R10: ffffb8bd4495fb98 R11: 0000000000000000 R12: >>>>> ffff91bf0b0c2a68 >>>>> [ 278.693889] R13: 0000000000000000 R14: ffff91bf0bec708c R15: >>>>> ffff91bf104bb000 >>>>> [ 278.693890] FS: 0000000000000000(0000) GS:ffff91bf174c0000(0000) >>>>> knlGS:0000000000000000 >>>>> [ 278.693891] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>>>> [ 278.693892] CR2: 0000000004199000 CR3: 00000001f3e0f000 CR4: >>>>> 00000000001406e0 >>>>> [ 278.693893] Call Trace: >>>>> [ 278.693898] ttm_bo_cleanup_memtype_use+0x1f/0x70 [ttm] >>>>> [ 278.693902] ttm_bo_unref+0x388/0x470 [ttm] >>>>> [ 278.693931] amdgpu_bo_unref+0x25/0x40 [amdgpu] >>>>> [ 278.693962] amdgpu_amdkfd_gpuvm_free_memory_of_gpu+0x1b5/0x260 >>>>> [amdgpu] >>>>> [ 278.693974] kfd_process_free_outstanding_kfd_bos+0xab/0xe0 >>>>> [amdkfd] >>>>> [ 278.693980] kfd_process_wq_release+0x56/0x110 [amdkfd] >>>>> [ 278.693983] process_one_work+0x190/0x430 >>>>> [ 278.693984] ? process_one_work+0x133/0x430 >>>>> [ 278.693988] worker_thread+0x46/0x400 >>>>> [ 278.693991] kthread+0x10a/0x140 >>>>> [ 278.693993] ? process_one_work+0x430/0x430 >>>>> [ 278.693995] ? kthread_create_on_node+0x40/0x40 >>>>> [ 278.693996] ? umh_complete+0x40/0x40 >>>>> [ 278.693998] ? call_usermodehelper_exec_async+0x137/0x140 >>>>> [ 278.694000] ret_from_fork+0x2a/0x40 >>>>> [...] >>>>> [ 694.740232] BUG: unable to handle kernel paging request at >>>>> ffffb8bd4354d540 >>>>> [ 694.740387] IP: sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] >>>>> [ 694.740430] PGD 616c23067 >>>>> [ 694.740432] P4D 616c23067 >>>>> [ 694.740454] PUD 616c24067 >>>>> [ 694.740476] PMD 613704067 >>>>> [ 694.740498] PTE 0 >>>>> >>>>> [ 694.740551] Oops: 0002 [#1] SMP >>>>> [ 694.740576] Modules linked in: fuse(E) x86_pkg_temp_thermal(E) >>>>> amdkfd(E) amd_iommu_v2(E) amdgpu(E) radeon(E) ttm(E) >>>>> [ 694.740667] CPU: 10 PID: 2213 Comm: sdma0 Tainted: G W >>>>> E 4.12.0-kfd-fkuehlin #1 >>>>> [ 694.740727] Hardware name: ASUS All Series/X99-E WS/USB 3.1, BIOS >>>>> 2006 04/07/2016 >>>>> [ 694.740782] task: ffff91bf0d989700 task.stack: ffffb8bd43730000 >>>>> [ 694.740895] RIP: 0010:sdma_v3_0_ring_set_wptr+0x64/0x80 [amdgpu] >>>>> [ 694.740941] RSP: 0018:ffffb8bd43733dc0 EFLAGS: 00010202 >>>>> [ 694.740982] RAX: ffff91bf0b0c7770 RBX: ffff91bf0b0c7770 RCX: >>>>> ffffb8bd4354d540 >>>>> [ 694.741035] RDX: 0000000000001ac0 RSI: 00000000000006b0 RDI: >>>>> ffff91bf0b0c0000 >>>>> [ 694.741087] RBP: ffffb8bd43733dc0 R08: ffffffffc072bd60 R09: >>>>> 0000000000000000 >>>>> [ 694.741140] R10: ffff91bf0b0c0000 R11: ffffffffc064ef47 R12: >>>>> ffff91bef6166000 >>>>> [ 694.741192] R13: ffff91bef6166368 R14: 0000000000000001 R15: >>>>> ffff91bf0b0c7770 >>>>> [ 694.741246] FS: 0000000000000000(0000) GS:ffff91bf17480000(0000) >>>>> knlGS:0000000000000000 >>>>> [ 694.741305] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >>>>> [ 694.741349] CR2: ffffb8bd4354d540 CR3: 000000060e4a6000 CR4: >>>>> 00000000001406e0 >>>>> [ 694.741401] Call Trace: >>>>> [ 694.741480] amdgpu_ring_commit+0x3a/0x60 [amdgpu] >>>>> [ 694.741575] amdgpu_ib_schedule+0x2c7/0x450 [amdgpu] >>>>> [ 694.741687] amdgpu_job_run+0x72/0x110 [amdgpu] >>>>> [ 694.741793] amd_sched_main+0x343/0x470 [amdgpu] >>>>> [ 694.741838] ? wake_atomic_t_function+0x60/0x60 >>>>> [ 694.741876] kthread+0x10a/0x140 >>>>> [ 694.741969] ? amd_sched_process_job+0x60/0x60 [amdgpu] >>>>> [ 694.742010] ? kthread_create_on_node+0x40/0x40 >>>>> [ 694.742048] ret_from_fork+0x2a/0x40 >>>>> >>>>> >>>>> >>>>> On 2017-08-23 05:02 AM, Christian König wrote: >>>>>> From: Christian König <christian.koenig@amd.com> >>>>>> >>>>>> Use ttm_bo_mem_space instead of manually allocating GART space. >>>>>> >>>>>> This allows us to evict BOs when there isn't enought GART space any >>>>>> more. >>>>>> >>>>>> Signed-off-by: Christian König <christian.koenig@amd.com> >>>>>> --- >>>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 14 +++++-------- >>>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 31 >>>>>> +++++++++++++++++++++++------ >>>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 ---- >>>>>> 3 files changed, 30 insertions(+), 19 deletions(-) >>>>>> >>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>>> index 9e05e25..0d15eb7 100644 >>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c >>>>>> @@ -108,10 +108,10 @@ bool amdgpu_gtt_mgr_is_allocated(struct >>>>>> ttm_mem_reg *mem) >>>>>> * >>>>>> * Allocate the address space for a node. >>>>>> */ >>>>>> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>>>> - struct ttm_buffer_object *tbo, >>>>>> - const struct ttm_place *place, >>>>>> - struct ttm_mem_reg *mem) >>>>>> +static int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>>>> + struct ttm_buffer_object *tbo, >>>>>> + const struct ttm_place *place, >>>>>> + struct ttm_mem_reg *mem) >>>>>> { >>>>>> struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev); >>>>>> struct amdgpu_gtt_mgr *mgr = man->priv; >>>>>> @@ -143,12 +143,8 @@ int amdgpu_gtt_mgr_alloc(struct >>>>>> ttm_mem_type_manager *man, >>>>>> fpfn, lpfn, mode); >>>>>> spin_unlock(&mgr->lock); >>>>>> - if (!r) { >>>>>> + if (!r) >>>>>> mem->start = node->start; >>>>>> - if (&tbo->mem == mem) >>>>>> - tbo->offset = (tbo->mem.start << PAGE_SHIFT) + >>>>>> - tbo->bdev->man[tbo->mem.mem_type].gpu_offset; >>>>>> - } >>>>>> return r; >>>>>> } >>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>>> index 38d26a7..aa0b7f5 100644 >>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c >>>>>> @@ -809,20 +809,39 @@ bool amdgpu_ttm_is_bound(struct ttm_tt *ttm) >>>>>> int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct >>>>>> ttm_mem_reg *bo_mem) >>>>>> { >>>>>> + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); >>>>>> struct ttm_tt *ttm = bo->ttm; >>>>>> + struct ttm_mem_reg tmp; >>>>>> + >>>>>> + struct ttm_placement placement; >>>>>> + struct ttm_place placements; >>>>>> int r; >>>>>> if (!ttm || amdgpu_ttm_is_bound(ttm)) >>>>>> return 0; >>>>>> - r = amdgpu_gtt_mgr_alloc(&bo->bdev->man[TTM_PL_TT], bo, >>>>>> - NULL, bo_mem); >>>>>> - if (r) { >>>>>> - DRM_ERROR("Failed to allocate GTT address space (%d)\n", >>>>>> r); >>>>>> + tmp = bo->mem; >>>>>> + tmp.mm_node = NULL; >>>>>> + placement.num_placement = 1; >>>>>> + placement.placement = &placements; >>>>>> + placement.num_busy_placement = 1; >>>>>> + placement.busy_placement = &placements; >>>>>> + placements.fpfn = 0; >>>>>> + placements.lpfn = adev->mc.gart_size >> PAGE_SHIFT; >>>>>> + placements.flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT; >>>>>> + >>>>>> + r = ttm_bo_mem_space(bo, &placement, &tmp, true, false); >>>>>> + if (unlikely(r)) >>>>>> return r; >>>>>> - } >>>>>> - return amdgpu_ttm_do_bind(ttm, bo_mem); >>>>>> + r = ttm_bo_move_ttm(bo, true, false, &tmp); >>>>>> + if (unlikely(r)) >>>>>> + ttm_bo_mem_put(bo, &tmp); >>>>>> + else >>>>>> + bo->offset = (bo->mem.start << PAGE_SHIFT) + >>>>>> + bo->bdev->man[bo->mem.mem_type].gpu_offset; >>>>>> + >>>>>> + return r; >>>>>> } >>>>>> int amdgpu_ttm_recover_gart(struct amdgpu_device *adev) >>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>>> index f22a475..43093bf 100644 >>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h >>>>>> @@ -62,10 +62,6 @@ extern const struct ttm_mem_type_manager_func >>>>>> amdgpu_gtt_mgr_func; >>>>>> extern const struct ttm_mem_type_manager_func >>>>>> amdgpu_vram_mgr_func; >>>>>> bool amdgpu_gtt_mgr_is_allocated(struct ttm_mem_reg *mem); >>>>>> -int amdgpu_gtt_mgr_alloc(struct ttm_mem_type_manager *man, >>>>>> - struct ttm_buffer_object *tbo, >>>>>> - const struct ttm_place *place, >>>>>> - struct ttm_mem_reg *mem); >>>>>> uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man); >>>>>> uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager >>>>>> *man); >>>>> _______________________________________________ >>>>> amd-gfx mailing list >>>>> amd-gfx@lists.freedesktop.org >>>>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx >>> _______________________________________________ >>> amd-gfx mailing list >>> amd-gfx@lists.freedesktop.org >>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx > > _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/3] drm/amdgpu: inline amdgpu_ttm_do_bind again [not found] ` <1503478972-1533-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> 2017-08-23 9:02 ` [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind Christian König @ 2017-08-23 9:02 ` Christian König [not found] ` <1503478972-1533-3-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> 2017-08-23 11:04 ` [PATCH 1/3] drm/amdgpu: remove the GART copy hack He, Roger 2017-08-23 15:51 ` Deucher, Alexander 3 siblings, 1 reply; 13+ messages in thread From: Christian König @ 2017-08-23 9:02 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW From: Christian König <christian.koenig@amd.com> The function is called only once and doesn't do anything special. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 45 +++++++++++++-------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index aa0b7f5..b91a888 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -746,35 +746,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm) sg_free_table(ttm->sg); } -static int amdgpu_ttm_do_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem) -{ - struct amdgpu_ttm_tt *gtt = (void *)ttm; - uint64_t flags; - int r; - - spin_lock(>t->adev->gtt_list_lock); - flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, mem); - gtt->offset = (u64)mem->start << PAGE_SHIFT; - r = amdgpu_gart_bind(gtt->adev, gtt->offset, ttm->num_pages, - ttm->pages, gtt->ttm.dma_address, flags); - - if (r) { - DRM_ERROR("failed to bind %lu pages at 0x%08llX\n", - ttm->num_pages, gtt->offset); - goto error_gart_bind; - } - - list_add_tail(>t->list, >t->adev->gtt_list); -error_gart_bind: - spin_unlock(>t->adev->gtt_list_lock); - return r; - -} - static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem) { struct amdgpu_ttm_tt *gtt = (void*)ttm; + uint64_t flags; int r = 0; if (gtt->userptr) { @@ -794,9 +770,24 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm, bo_mem->mem_type == AMDGPU_PL_OA) return -EINVAL; - if (amdgpu_gtt_mgr_is_allocated(bo_mem)) - r = amdgpu_ttm_do_bind(ttm, bo_mem); + if (!amdgpu_gtt_mgr_is_allocated(bo_mem)) + return 0; + + spin_lock(>t->adev->gtt_list_lock); + flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, bo_mem); + gtt->offset = (u64)bo_mem->start << PAGE_SHIFT; + r = amdgpu_gart_bind(gtt->adev, gtt->offset, ttm->num_pages, + ttm->pages, gtt->ttm.dma_address, flags); + + if (r) { + DRM_ERROR("failed to bind %lu pages at 0x%08llX\n", + ttm->num_pages, gtt->offset); + goto error_gart_bind; + } + list_add_tail(>t->list, >t->adev->gtt_list); +error_gart_bind: + spin_unlock(>t->adev->gtt_list_lock); return r; } -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <1503478972-1533-3-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>]
* RE: [PATCH 3/3] drm/amdgpu: inline amdgpu_ttm_do_bind again [not found] ` <1503478972-1533-3-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> @ 2017-08-23 11:32 ` He, Roger 0 siblings, 0 replies; 13+ messages in thread From: He, Roger @ 2017-08-23 11:32 UTC (permalink / raw) To: Christian König, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Reviewed-by: Roger He <Hongbo.He@amd.com> Thanks Roger(Hongbo.He) -----Original Message----- From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Christian K?nig Sent: Wednesday, August 23, 2017 5:03 PM To: amd-gfx@lists.freedesktop.org Subject: [PATCH 3/3] drm/amdgpu: inline amdgpu_ttm_do_bind again From: Christian König <christian.koenig@amd.com> The function is called only once and doesn't do anything special. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 45 +++++++++++++-------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index aa0b7f5..b91a888 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -746,35 +746,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm) sg_free_table(ttm->sg); } -static int amdgpu_ttm_do_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem) -{ - struct amdgpu_ttm_tt *gtt = (void *)ttm; - uint64_t flags; - int r; - - spin_lock(>t->adev->gtt_list_lock); - flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, mem); - gtt->offset = (u64)mem->start << PAGE_SHIFT; - r = amdgpu_gart_bind(gtt->adev, gtt->offset, ttm->num_pages, - ttm->pages, gtt->ttm.dma_address, flags); - - if (r) { - DRM_ERROR("failed to bind %lu pages at 0x%08llX\n", - ttm->num_pages, gtt->offset); - goto error_gart_bind; - } - - list_add_tail(>t->list, >t->adev->gtt_list); -error_gart_bind: - spin_unlock(>t->adev->gtt_list_lock); - return r; - -} - static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem) { struct amdgpu_ttm_tt *gtt = (void*)ttm; + uint64_t flags; int r = 0; if (gtt->userptr) { @@ -794,9 +770,24 @@ static int amdgpu_ttm_backend_bind(struct ttm_tt *ttm, bo_mem->mem_type == AMDGPU_PL_OA) return -EINVAL; - if (amdgpu_gtt_mgr_is_allocated(bo_mem)) - r = amdgpu_ttm_do_bind(ttm, bo_mem); + if (!amdgpu_gtt_mgr_is_allocated(bo_mem)) + return 0; + + spin_lock(>t->adev->gtt_list_lock); + flags = amdgpu_ttm_tt_pte_flags(gtt->adev, ttm, bo_mem); + gtt->offset = (u64)bo_mem->start << PAGE_SHIFT; + r = amdgpu_gart_bind(gtt->adev, gtt->offset, ttm->num_pages, + ttm->pages, gtt->ttm.dma_address, flags); + + if (r) { + DRM_ERROR("failed to bind %lu pages at 0x%08llX\n", + ttm->num_pages, gtt->offset); + goto error_gart_bind; + } + list_add_tail(>t->list, >t->adev->gtt_list); +error_gart_bind: + spin_unlock(>t->adev->gtt_list_lock); return r; } -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
* RE: [PATCH 1/3] drm/amdgpu: remove the GART copy hack [not found] ` <1503478972-1533-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> 2017-08-23 9:02 ` [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind Christian König 2017-08-23 9:02 ` [PATCH 3/3] drm/amdgpu: inline amdgpu_ttm_do_bind again Christian König @ 2017-08-23 11:04 ` He, Roger 2017-08-23 15:51 ` Deucher, Alexander 3 siblings, 0 replies; 13+ messages in thread From: He, Roger @ 2017-08-23 11:04 UTC (permalink / raw) To: Christian König, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Reviewed-by: Roger He <Hongbo.He@amd.com> Thanks Roger(Hongbo.He) -----Original Message----- From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf Of Christian K?nig Sent: Wednesday, August 23, 2017 5:03 PM To: amd-gfx@lists.freedesktop.org Subject: [PATCH 1/3] drm/amdgpu: remove the GART copy hack From: Christian König <christian.koenig@amd.com> This isn't used since we don't map evicted BOs to GART any more. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index ab6e03d..7a0656c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1615,7 +1615,6 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, * * @adev: amdgpu_device pointer * @exclusive: fence we need to sync to - * @gtt_flags: flags as they are used for GTT * @pages_addr: DMA addresses to use for mapping * @vm: requested vm * @mapping: mapped range and flags to use for the update @@ -1629,7 +1628,6 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, */ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, struct dma_fence *exclusive, - uint64_t gtt_flags, dma_addr_t *pages_addr, struct amdgpu_vm *vm, struct amdgpu_bo_va_mapping *mapping, @@ -1684,11 +1682,7 @@ static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, } if (pages_addr) { - if (flags == gtt_flags) - src = adev->gart.table_addr + - (addr >> AMDGPU_GPU_PAGE_SHIFT) * 8; - else - max_entries = min(max_entries, 16ull * 1024ull); + max_entries = min(max_entries, 16ull * 1024ull); addr = 0; } else if (flags & AMDGPU_PTE_VALID) { addr += adev->vm_manager.vram_base_offset; @@ -1733,10 +1727,10 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_vm *vm = bo_va->base.vm; struct amdgpu_bo_va_mapping *mapping; dma_addr_t *pages_addr = NULL; - uint64_t gtt_flags, flags; struct ttm_mem_reg *mem; struct drm_mm_node *nodes; struct dma_fence *exclusive; + uint64_t flags; int r; if (clear || !bo_va->base.bo) { @@ -1756,15 +1750,10 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, exclusive = reservation_object_get_excl(bo->tbo.resv); } - if (bo) { + if (bo) flags = amdgpu_ttm_tt_pte_flags(adev, bo->tbo.ttm, mem); - gtt_flags = (amdgpu_ttm_is_bound(bo->tbo.ttm) && - adev == amdgpu_ttm_adev(bo->tbo.bdev)) ? - flags : 0; - } else { + else flags = 0x0; - gtt_flags = ~0x0; - } spin_lock(&vm->status_lock); if (!list_empty(&bo_va->base.vm_status)) @@ -1772,8 +1761,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, spin_unlock(&vm->status_lock); list_for_each_entry(mapping, &bo_va->invalids, list) { - r = amdgpu_vm_bo_split_mapping(adev, exclusive, - gtt_flags, pages_addr, vm, + r = amdgpu_vm_bo_split_mapping(adev, exclusive, pages_addr, vm, mapping, flags, nodes, &bo_va->last_pt_update); if (r) -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 13+ messages in thread
* RE: [PATCH 1/3] drm/amdgpu: remove the GART copy hack [not found] ` <1503478972-1533-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> ` (2 preceding siblings ...) 2017-08-23 11:04 ` [PATCH 1/3] drm/amdgpu: remove the GART copy hack He, Roger @ 2017-08-23 15:51 ` Deucher, Alexander 3 siblings, 0 replies; 13+ messages in thread From: Deucher, Alexander @ 2017-08-23 15:51 UTC (permalink / raw) To: 'Christian König', amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW > -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf > Of Christian König > Sent: Wednesday, August 23, 2017 5:03 AM > To: amd-gfx@lists.freedesktop.org > Subject: [PATCH 1/3] drm/amdgpu: remove the GART copy hack > > From: Christian König <christian.koenig@amd.com> > > This isn't used since we don't map evicted BOs to GART any more. > > Signed-off-by: Christian König <christian.koenig@amd.com> Series is: Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 22 +++++----------------- > 1 file changed, 5 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > index ab6e03d..7a0656c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > @@ -1615,7 +1615,6 @@ static int amdgpu_vm_bo_update_mapping(struct > amdgpu_device *adev, > * > * @adev: amdgpu_device pointer > * @exclusive: fence we need to sync to > - * @gtt_flags: flags as they are used for GTT > * @pages_addr: DMA addresses to use for mapping > * @vm: requested vm > * @mapping: mapped range and flags to use for the update > @@ -1629,7 +1628,6 @@ static int amdgpu_vm_bo_update_mapping(struct > amdgpu_device *adev, > */ > static int amdgpu_vm_bo_split_mapping(struct amdgpu_device *adev, > struct dma_fence *exclusive, > - uint64_t gtt_flags, > dma_addr_t *pages_addr, > struct amdgpu_vm *vm, > struct amdgpu_bo_va_mapping > *mapping, > @@ -1684,11 +1682,7 @@ static int amdgpu_vm_bo_split_mapping(struct > amdgpu_device *adev, > } > > if (pages_addr) { > - if (flags == gtt_flags) > - src = adev->gart.table_addr + > - (addr >> > AMDGPU_GPU_PAGE_SHIFT) * 8; > - else > - max_entries = min(max_entries, 16ull * > 1024ull); > + max_entries = min(max_entries, 16ull * 1024ull); > addr = 0; > } else if (flags & AMDGPU_PTE_VALID) { > addr += adev->vm_manager.vram_base_offset; > @@ -1733,10 +1727,10 @@ int amdgpu_vm_bo_update(struct > amdgpu_device *adev, > struct amdgpu_vm *vm = bo_va->base.vm; > struct amdgpu_bo_va_mapping *mapping; > dma_addr_t *pages_addr = NULL; > - uint64_t gtt_flags, flags; > struct ttm_mem_reg *mem; > struct drm_mm_node *nodes; > struct dma_fence *exclusive; > + uint64_t flags; > int r; > > if (clear || !bo_va->base.bo) { > @@ -1756,15 +1750,10 @@ int amdgpu_vm_bo_update(struct > amdgpu_device *adev, > exclusive = reservation_object_get_excl(bo->tbo.resv); > } > > - if (bo) { > + if (bo) > flags = amdgpu_ttm_tt_pte_flags(adev, bo->tbo.ttm, mem); > - gtt_flags = (amdgpu_ttm_is_bound(bo->tbo.ttm) && > - adev == amdgpu_ttm_adev(bo->tbo.bdev)) ? > - flags : 0; > - } else { > + else > flags = 0x0; > - gtt_flags = ~0x0; > - } > > spin_lock(&vm->status_lock); > if (!list_empty(&bo_va->base.vm_status)) > @@ -1772,8 +1761,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device > *adev, > spin_unlock(&vm->status_lock); > > list_for_each_entry(mapping, &bo_va->invalids, list) { > - r = amdgpu_vm_bo_split_mapping(adev, exclusive, > - gtt_flags, pages_addr, vm, > + r = amdgpu_vm_bo_split_mapping(adev, exclusive, > pages_addr, vm, > mapping, flags, nodes, > &bo_va->last_pt_update); > if (r) > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-09-05 15:31 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-23 9:02 [PATCH 1/3] drm/amdgpu: remove the GART copy hack Christian König
[not found] ` <1503478972-1533-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
2017-08-23 9:02 ` [PATCH 2/3] drm/amdgpu: fix amdgpu_ttm_bind Christian König
[not found] ` <1503478972-1533-2-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
2017-08-31 22:50 ` Regression: " Felix Kuehling
[not found] ` <ae6b3cd8-9b07-838d-ff61-9e9514ab20f8-5C7GfCeVMHo@public.gmane.org>
2017-09-01 7:17 ` Christian König
[not found] ` <2d026de1-3bf1-e6ca-9767-917845e5b241-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
2017-09-01 23:35 ` Felix Kuehling
[not found] ` <41325db2-fbd4-6ca6-a8ad-13055ed2912b-5C7GfCeVMHo@public.gmane.org>
2017-09-01 23:46 ` Felix Kuehling
[not found] ` <f97a917b-5a0e-b22e-c04e-6cbf981dcc55-5C7GfCeVMHo@public.gmane.org>
2017-09-02 7:52 ` Christian König
[not found] ` <3960afa2-50af-81b5-dc7a-ad9776c43727-5C7GfCeVMHo@public.gmane.org>
2017-09-02 11:23 ` Christian König
2017-09-05 15:31 ` Felix Kuehling
2017-08-23 9:02 ` [PATCH 3/3] drm/amdgpu: inline amdgpu_ttm_do_bind again Christian König
[not found] ` <1503478972-1533-3-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
2017-08-23 11:32 ` He, Roger
2017-08-23 11:04 ` [PATCH 1/3] drm/amdgpu: remove the GART copy hack He, Roger
2017-08-23 15:51 ` Deucher, Alexander
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.