drm/amdgpu: add debugfs for kfd system and ttm mem used

This keeps track of kfd system mem used and kfd ttm mem used.

Signed-off-by: Alex Sierra <alex.sierra@amd.com>
Reviewed-by: Philip Yang <Philip.Yang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
index 83d955f0c52f582d94b84666e44d849f5c5256b7..3c09dcc0986ee96ee8350378a671c4638cae2011 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
@@ -172,6 +172,9 @@ int amdgpu_queue_mask_bit_to_set_resource_bit(struct amdgpu_device *adev,
 struct amdgpu_amdkfd_fence *amdgpu_amdkfd_fence_create(u64 context,
                                struct mm_struct *mm,
                                struct svm_range_bo *svm_bo);
+#if defined(CONFIG_DEBUG_FS)
+int kfd_debugfs_kfd_mem_limits(struct seq_file *m, void *data);
+#endif
 #if IS_ENABLED(CONFIG_HSA_AMD)
 bool amdkfd_fence_check_mm(struct dma_fence *f, struct mm_struct *mm);
 struct amdgpu_amdkfd_fence *to_amdgpu_amdkfd_fence(struct dma_fence *f);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 1d4982471f8d42690ccf8c42ea0f6c81614376dc..acc513a7a8faa66d845e6d475ae0db6c3efc2f0a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -2888,3 +2888,22 @@ bool amdgpu_amdkfd_bo_mapped_to_dev(struct amdgpu_device *adev, struct kgd_mem *
        }
        return false;
 }
+
+#if defined(CONFIG_DEBUG_FS)
+
+int kfd_debugfs_kfd_mem_limits(struct seq_file *m, void *data)
+{
+
+       spin_lock(&kfd_mem_limit.mem_limit_lock);
+       seq_printf(m, "System mem used %lldM out of %lluM\n",
+                 (kfd_mem_limit.system_mem_used >> 20),
+                 (kfd_mem_limit.max_system_mem_limit >> 20));
+       seq_printf(m, "TTM mem used %lldM out of %lluM\n",
+                 (kfd_mem_limit.ttm_mem_used >> 20),
+                 (kfd_mem_limit.max_ttm_mem_limit >> 20));
+       spin_unlock(&kfd_mem_limit.mem_limit_lock);
+
+       return 0;
+}
+
+#endif

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c b/drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c
index 581c3a30fee1e9daee31b6bf08566b8c9dc90858..ad5a40a685aca87dab92a71e184ea60fbac7421f 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c
@@ -101,6 +101,8 @@ void kfd_debugfs_init(void)
                            kfd_debugfs_rls_by_device, &kfd_debugfs_fops);
        debugfs_create_file("hang_hws", S_IFREG | 0200, debugfs_root,
                            kfd_debugfs_hang_hws_read, &kfd_debugfs_hang_hws_fops);
+       debugfs_create_file("mem_limit", S_IFREG | 0200, debugfs_root,
+                           kfd_debugfs_kfd_mem_limits, &kfd_debugfs_fops);
 }
 
 void kfd_debugfs_fini(void)