| Message ID | 20241018133308.889-4-Yunxiang.Li@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | rework bo mem stats tracking | expand |
Am 18.10.24 um 15:33 schrieb Yunxiang Li: > Since on modern systems all of vram can be made visible anyways, to > simplify the new implementation, drops tracking how much memory is > visible for now. If this is really needed we can add it back on top of > the new implementation, or just report all the BOs as visible. > > Signed-off-by: Yunxiang Li <Yunxiang.Li@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 6 ------ > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 12 ++---------- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 10 ---------- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 11 ++++++++++- > 4 files changed, 12 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c > index 8281dd45faaa0..7a9573958d87c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c > @@ -103,16 +103,10 @@ void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file) > stats[TTM_PL_SYSTEM].drm.resident/1024UL); > > /* Amdgpu specific memory accounting keys: */ > - drm_printf(p, "amd-memory-visible-vram:\t%llu KiB\n", > - stats[TTM_PL_VRAM].visible/1024UL); > drm_printf(p, "amd-evicted-vram:\t%llu KiB\n", > stats[TTM_PL_VRAM].evicted/1024UL); > - drm_printf(p, "amd-evicted-visible-vram:\t%llu KiB\n", > - stats[TTM_PL_VRAM].evicted_visible/1024UL); > drm_printf(p, "amd-requested-vram:\t%llu KiB\n", > stats[TTM_PL_VRAM].requested/1024UL); > - drm_printf(p, "amd-requested-visible-vram:\t%llu KiB\n", > - stats[TTM_PL_VRAM].requested_visible/1024UL); > drm_printf(p, "amd-requested-gtt:\t%llu KiB\n", > stats[TTM_PL_TT].requested/1024UL); > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > index 2a53e72f3964f..2436b7c9ad12b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > @@ -40,6 +40,7 @@ > #include "amdgpu_trace.h" > #include "amdgpu_amdkfd.h" > #include "amdgpu_vram_mgr.h" > +#include "amdgpu_vm.h" > > /** > * DOC: amdgpu_object > @@ -1235,23 +1236,14 @@ void amdgpu_bo_get_memory(struct amdgpu_bo *bo, > stats[type].drm.active += size; > else if (bo->flags & AMDGPU_GEM_CREATE_DISCARDABLE) > stats[type].drm.purgeable += size; > - > - if (type == TTM_PL_VRAM && amdgpu_res_cpu_visible(adev, res)) > - stats[type].visible += size; > } > > /* amdgpu specific stats: */ > > if (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) { > stats[TTM_PL_VRAM].requested += size; > - if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) > - stats[TTM_PL_VRAM].requested_visible += size; > - > - if (type != TTM_PL_VRAM) { > + if (type != TTM_PL_VRAM) > stats[TTM_PL_VRAM].evicted += size; > - if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) > - stats[TTM_PL_VRAM].evicted_visible += size; > - } > } else if (bo->preferred_domains & AMDGPU_GEM_DOMAIN_GTT) { > stats[TTM_PL_TT].requested += size; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h > index a5653f474f85c..be6769852ece4 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h > @@ -139,16 +139,6 @@ struct amdgpu_bo_vm { > struct amdgpu_vm_bo_base entries[]; > }; > > -struct amdgpu_mem_stats { > - struct drm_memory_stats drm; > - > - uint64_t visible; > - uint64_t evicted; > - uint64_t evicted_visible; > - uint64_t requested; > - uint64_t requested_visible; > -}; > - > static inline struct amdgpu_bo *ttm_to_amdgpu_bo(struct ttm_buffer_object *tbo) > { > return container_of(tbo, struct amdgpu_bo, tbo); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > index 428f7379bd759..6a1b344e15e1b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > @@ -42,7 +42,6 @@ struct amdgpu_bo_va; > struct amdgpu_job; > struct amdgpu_bo_list_entry; > struct amdgpu_bo_vm; > -struct amdgpu_mem_stats; > > /* > * GPUVM handling > @@ -322,6 +321,16 @@ struct amdgpu_vm_fault_info { > unsigned int vmhub; > }; > > +struct amdgpu_mem_stats { > + struct drm_memory_stats drm; > + > + /* buffers that requested this placement */ > + uint64_t requested; > + /* buffers that requested this placement > + * but are currently evicted */ > + uint64_t evicted; > +}; > + > struct amdgpu_vm { > /* tree of virtual addresses mapped */ > struct rb_root_cached va;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c index 8281dd45faaa0..7a9573958d87c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c @@ -103,16 +103,10 @@ void amdgpu_show_fdinfo(struct drm_printer *p, struct drm_file *file) stats[TTM_PL_SYSTEM].drm.resident/1024UL); /* Amdgpu specific memory accounting keys: */ - drm_printf(p, "amd-memory-visible-vram:\t%llu KiB\n", - stats[TTM_PL_VRAM].visible/1024UL); drm_printf(p, "amd-evicted-vram:\t%llu KiB\n", stats[TTM_PL_VRAM].evicted/1024UL); - drm_printf(p, "amd-evicted-visible-vram:\t%llu KiB\n", - stats[TTM_PL_VRAM].evicted_visible/1024UL); drm_printf(p, "amd-requested-vram:\t%llu KiB\n", stats[TTM_PL_VRAM].requested/1024UL); - drm_printf(p, "amd-requested-visible-vram:\t%llu KiB\n", - stats[TTM_PL_VRAM].requested_visible/1024UL); drm_printf(p, "amd-requested-gtt:\t%llu KiB\n", stats[TTM_PL_TT].requested/1024UL); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 2a53e72f3964f..2436b7c9ad12b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -40,6 +40,7 @@ #include "amdgpu_trace.h" #include "amdgpu_amdkfd.h" #include "amdgpu_vram_mgr.h" +#include "amdgpu_vm.h" /** * DOC: amdgpu_object @@ -1235,23 +1236,14 @@ void amdgpu_bo_get_memory(struct amdgpu_bo *bo, stats[type].drm.active += size; else if (bo->flags & AMDGPU_GEM_CREATE_DISCARDABLE) stats[type].drm.purgeable += size; - - if (type == TTM_PL_VRAM && amdgpu_res_cpu_visible(adev, res)) - stats[type].visible += size; } /* amdgpu specific stats: */ if (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) { stats[TTM_PL_VRAM].requested += size; - if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) - stats[TTM_PL_VRAM].requested_visible += size; - - if (type != TTM_PL_VRAM) { + if (type != TTM_PL_VRAM) stats[TTM_PL_VRAM].evicted += size; - if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) - stats[TTM_PL_VRAM].evicted_visible += size; - } } else if (bo->preferred_domains & AMDGPU_GEM_DOMAIN_GTT) { stats[TTM_PL_TT].requested += size; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h index a5653f474f85c..be6769852ece4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h @@ -139,16 +139,6 @@ struct amdgpu_bo_vm { struct amdgpu_vm_bo_base entries[]; }; -struct amdgpu_mem_stats { - struct drm_memory_stats drm; - - uint64_t visible; - uint64_t evicted; - uint64_t evicted_visible; - uint64_t requested; - uint64_t requested_visible; -}; - static inline struct amdgpu_bo *ttm_to_amdgpu_bo(struct ttm_buffer_object *tbo) { return container_of(tbo, struct amdgpu_bo, tbo); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h index 428f7379bd759..6a1b344e15e1b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h @@ -42,7 +42,6 @@ struct amdgpu_bo_va; struct amdgpu_job; struct amdgpu_bo_list_entry; struct amdgpu_bo_vm; -struct amdgpu_mem_stats; /* * GPUVM handling @@ -322,6 +321,16 @@ struct amdgpu_vm_fault_info { unsigned int vmhub; }; +struct amdgpu_mem_stats { + struct drm_memory_stats drm; + + /* buffers that requested this placement */ + uint64_t requested; + /* buffers that requested this placement + * but are currently evicted */ + uint64_t evicted; +}; + struct amdgpu_vm { /* tree of virtual addresses mapped */ struct rb_root_cached va;
Since on modern systems all of vram can be made visible anyways, to simplify the new implementation, drops tracking how much memory is visible for now. If this is really needed we can add it back on top of the new implementation, or just report all the BOs as visible. Signed-off-by: Yunxiang Li <Yunxiang.Li@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 6 ------ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 12 ++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 10 ---------- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 11 ++++++++++- 4 files changed, 12 insertions(+), 27 deletions(-)