* [PATCH] drm/amdgpu: Add show_fdinfo() interface
@ 2021-04-06 9:49 Roy Sun
2021-04-06 10:54 ` Nirmoy
0 siblings, 1 reply; 4+ messages in thread
From: Roy Sun @ 2021-04-06 9:49 UTC (permalink / raw)
To: amd-gfx; +Cc: Alexander.Deucher, Roy Sun, David M Nieto
Tracking devices, process info and fence info using
/proc/pid/fdinfo
Signed-off-by: David M Nieto <David.Nieto@amd.com>
Signed-off-by: Roy Sun <Roy.Sun@amd.com>
---
drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +
.../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 15 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 282 ++++++++++++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 58 ++++
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +
drivers/gpu/drm/scheduler/sched_main.c | 11 +-
8 files changed, 371 insertions(+), 8 deletions(-)
create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
index ee85e8aba636..f9de1acc65dd 100644
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -55,7 +55,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \
amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \
amdgpu_gmc.o amdgpu_mmhub.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \
amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \
- amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \
+ amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o amdgpu_fdinfo.o\
amdgpu_fw_attestation.o amdgpu_securedisplay.o
amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 616c85a01299..35843c8d133d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -107,6 +107,7 @@
#include "amdgpu_gfxhub.h"
#include "amdgpu_df.h"
#include "amdgpu_smuio.h"
+#include "amdgpu_fdinfo.h"
#define MAX_GPU_INSTANCE 16
@@ -477,6 +478,8 @@ struct amdgpu_fpriv {
struct mutex bo_list_lock;
struct idr bo_list_handles;
struct amdgpu_ctx_mgr ctx_mgr;
+ struct drm_file *file;
+ struct amdgpu_proc *proc;
};
int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index e93850f2f3b1..702fd9054883 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1042,13 +1042,15 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,
struct dma_fence **ef)
{
struct amdgpu_device *adev = get_amdgpu_device(kgd);
+ struct amdgpu_fpriv *fpriv;
struct amdgpu_vm *new_vm;
int ret;
- new_vm = kzalloc(sizeof(*new_vm), GFP_KERNEL);
- if (!new_vm)
+ fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL);
+ if (!fpriv)
return -ENOMEM;
+ new_vm = &fpriv->vm;
/* Initialize AMDGPU part of the VM */
ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, pasid);
if (ret) {
@@ -1063,12 +1065,14 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,
*vm = (void *) new_vm;
+ amdgpu_fdinfo_init(adev, fpriv, pasid);
+
return 0;
init_kfd_vm_fail:
amdgpu_vm_fini(adev, new_vm);
amdgpu_vm_init_fail:
- kfree(new_vm);
+ kfree(fpriv);
return ret;
}
@@ -1142,6 +1146,8 @@ void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)
{
struct amdgpu_device *adev = get_amdgpu_device(kgd);
struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;
+ struct amdgpu_fpriv *fpriv =
+ container_of(avm, struct amdgpu_fpriv, vm);
if (WARN_ON(!kgd || !vm))
return;
@@ -1149,8 +1155,9 @@ void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)
pr_debug("Destroying process vm %p\n", vm);
/* Release the VM context */
+ amdgpu_fdinfo_fini(adev, fpriv);
amdgpu_vm_fini(adev, avm);
- kfree(vm);
+ kfree(fpriv);
}
void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd, void *vm)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 4bcc03c4c6c5..07aed377dec8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -42,7 +42,7 @@
#include "amdgpu_irq.h"
#include "amdgpu_dma_buf.h"
#include "amdgpu_sched.h"
-
+#include "amdgpu_fdinfo.h"
#include "amdgpu_amdkfd.h"
#include "amdgpu_ras.h"
@@ -1691,6 +1691,9 @@ static const struct file_operations amdgpu_driver_kms_fops = {
#ifdef CONFIG_COMPAT
.compat_ioctl = amdgpu_kms_compat_ioctl,
#endif
+#ifdef CONFIG_PROC_FS
+ .show_fdinfo = amdgpu_show_fdinfo
+#endif
};
int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
new file mode 100644
index 000000000000..5208fab6e35d
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2021 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include <linux/debugfs.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/uaccess.h>
+#include <linux/reboot.h>
+#include <linux/syscalls.h>
+
+#include <drm/amdgpu_drm.h>
+#include <drm/drm_debugfs.h>
+
+#include "amdgpu.h"
+#include "amdgpu_fdinfo.h"
+
+
+static const char *amdgpu_ip_name[AMDGPU_HW_IP_NUM] = {
+ [AMDGPU_HW_IP_GFX] = "gfx",
+ [AMDGPU_HW_IP_COMPUTE] = "compute",
+ [AMDGPU_HW_IP_DMA] = "dma",
+ [AMDGPU_HW_IP_UVD] = "dec",
+ [AMDGPU_HW_IP_VCE] = "enc",
+ [AMDGPU_HW_IP_UVD_ENC] = "enc_1",
+ [AMDGPU_HW_IP_VCN_DEC] = "dec",
+ [AMDGPU_HW_IP_VCN_ENC] = "enc",
+ [AMDGPU_HW_IP_VCN_JPEG] = "jpeg",
+};
+
+struct amdgpu_proc {
+ struct amdgpu_device *adev;
+ struct amdgpu_fpriv *priv;
+ int pasid;
+};
+
+int amdgpu_fdinfo_init(struct amdgpu_device *adev,
+ struct amdgpu_fpriv *fpriv, int pasid)
+{
+ struct amdgpu_proc *proc;
+
+ proc = kzalloc(sizeof(*proc), GFP_KERNEL);
+ if (!proc)
+ return -ENOMEM;
+ proc->pasid = pasid;
+ proc->adev = adev;
+ proc->priv = fpriv;
+ fpriv->proc = proc;
+
+ return 0;
+}
+
+int amdgpu_fdinfo_fini(struct amdgpu_device *adev,
+ struct amdgpu_fpriv *fpriv)
+{
+ struct amdgpu_proc *proc = fpriv->proc;
+
+ if (proc)
+ kfree(proc);
+
+ fpriv->proc = NULL;
+ return 0;
+}
+
+uint64_t amdgpu_get_proc_mem(struct amdgpu_fpriv *fpriv)
+{
+ int id;
+ struct drm_gem_object *gobj;
+ uint64_t total = 0;
+
+ spin_lock(&fpriv->file->table_lock);
+ idr_for_each_entry(&fpriv->file->object_idr, gobj, id) {
+ struct amdgpu_bo *bo = gem_to_amdgpu_bo(gobj);
+ unsigned int domain = amdgpu_mem_type_to_domain(
+ bo->tbo.mem.mem_type);
+
+ if (domain == AMDGPU_GEM_DOMAIN_VRAM)
+ total += amdgpu_bo_size(bo);
+ }
+ spin_unlock(&fpriv->file->table_lock);
+
+ if (fpriv->vm.process_info) {
+ struct kgd_mem *mem;
+
+ mutex_lock(&fpriv->vm.process_info->lock);
+ list_for_each_entry(mem, &fpriv->vm.process_info->kfd_bo_list,
+ validate_list.head) {
+ struct amdgpu_bo *bo = mem->bo;
+ unsigned int domain = amdgpu_mem_type_to_domain(
+ bo->tbo.mem.mem_type);
+
+ if (domain == AMDGPU_GEM_DOMAIN_VRAM)
+ total += amdgpu_bo_size(bo);
+ }
+
+ list_for_each_entry(mem, &fpriv->vm.process_info->userptr_valid_list,
+ validate_list.head) {
+ struct amdgpu_bo *bo = mem->bo;
+ unsigned int domain = amdgpu_mem_type_to_domain(
+ bo->tbo.mem.mem_type);
+
+ if (domain == AMDGPU_GEM_DOMAIN_VRAM)
+ total += amdgpu_bo_size(bo);
+ }
+
+ mutex_unlock(&fpriv->vm.process_info->lock);
+ }
+
+ return total;
+}
+
+uint64_t amdgpu_get_fence_usage(struct amdgpu_fpriv *fpriv, uint32_t hwip,
+ uint32_t idx, uint64_t *elapsed)
+{
+ struct amdgpu_ctx_entity *centity;
+ struct idr *idp;
+ struct amdgpu_ctx *ctx;
+ uint32_t id, i;
+ uint64_t now, t1, t2;
+ uint64_t total = 0, min = 0;
+
+
+ if (idx >= AMDGPU_MAX_ENTITY_NUM)
+ return 0;
+
+ idp = &fpriv->ctx_mgr.ctx_handles;
+
+ mutex_lock(&fpriv->ctx_mgr.lock);
+ idr_for_each_entry(idp, ctx, id) {
+ if (!ctx->entities[hwip][idx])
+ continue;
+
+ centity = ctx->entities[hwip][idx];
+
+ for (i = 0; i < amdgpu_sched_jobs; i++) {
+ struct dma_fence *fence;
+ struct drm_sched_fence *s_fence;
+
+ spin_lock(&ctx->ring_lock);
+ fence = dma_fence_get(centity->fences[i]);
+ spin_unlock(&ctx->ring_lock);
+ if (!fence)
+ continue;
+ s_fence = to_drm_sched_fence(fence);
+ if (!dma_fence_is_signaled(&s_fence->scheduled))
+ continue;
+ now = ktime_to_ns(ktime_get());
+ t1 = ktime_to_ns(s_fence->scheduled.timestamp);
+ t2 = !dma_fence_is_signaled(&s_fence->finished) ?
+ 0 : ktime_to_ns(s_fence->finished.timestamp);
+ dma_fence_put(fence);
+
+ t1 = now - t1;
+ t2 = (t2 == 0) ? 0 : now - t2;
+ total += t1 - t2;
+ if (t1 > min)
+ min = t1;
+ }
+
+ }
+
+ mutex_unlock(&fpriv->ctx_mgr.lock);
+
+ if (elapsed)
+ *elapsed = min;
+
+ return total;
+}
+
+uint32_t amdgpu_get_ip_count(struct amdgpu_device *adev, int id)
+{
+ enum amd_ip_block_type type;
+ uint32_t count = 0;
+ int i;
+
+ switch (id) {
+ case AMDGPU_HW_IP_GFX:
+ type = AMD_IP_BLOCK_TYPE_GFX;
+ break;
+ case AMDGPU_HW_IP_COMPUTE:
+ type = AMD_IP_BLOCK_TYPE_GFX;
+ break;
+ case AMDGPU_HW_IP_DMA:
+ type = AMD_IP_BLOCK_TYPE_SDMA;
+ break;
+ case AMDGPU_HW_IP_UVD:
+ type = AMD_IP_BLOCK_TYPE_UVD;
+ break;
+ case AMDGPU_HW_IP_VCE:
+ type = AMD_IP_BLOCK_TYPE_VCE;
+ break;
+ case AMDGPU_HW_IP_UVD_ENC:
+ type = AMD_IP_BLOCK_TYPE_UVD;
+ break;
+ case AMDGPU_HW_IP_VCN_DEC:
+ case AMDGPU_HW_IP_VCN_ENC:
+ type = AMD_IP_BLOCK_TYPE_VCN;
+ break;
+ case AMDGPU_HW_IP_VCN_JPEG:
+ type = (amdgpu_device_ip_get_ip_block(adev,
+ AMD_IP_BLOCK_TYPE_JPEG)) ?
+ AMD_IP_BLOCK_TYPE_JPEG : AMD_IP_BLOCK_TYPE_VCN;
+ break;
+ default:
+ return 0;
+ }
+
+ for (i = 0; i < adev->num_ip_blocks; i++)
+ if (adev->ip_blocks[i].version->type == type &&
+ adev->ip_blocks[i].status.valid &&
+ count < AMDGPU_HW_IP_INSTANCE_MAX_COUNT)
+ count++;
+ return count;
+
+}
+
+#ifdef CONFIG_PROC_FS
+void amdgpu_show_fdinfo(struct seq_file *m, struct file *f)
+{
+ struct amdgpu_fpriv *fpriv;
+ struct amdgpu_device *adev;
+ uint32_t bus, dev, fn, i;
+
+ if (amdgpu_file_to_fpriv(f, &fpriv))
+ return;
+
+ adev = fpriv->proc->adev;
+ bus = adev->pdev->bus->number;
+ dev = PCI_SLOT(adev->pdev->devfn);
+ fn = PCI_FUNC(adev->pdev->devfn);
+ seq_printf(m, "amdgpu_%02x:%02x.%d:pasid:\t%u\n", bus, dev, fn,
+ fpriv->proc->pasid);
+
+ seq_printf(m, "amdgpu_%02x:%02x.%d:mem:\t%llu kB\n", bus, dev, fn,
+ amdgpu_get_proc_mem(fpriv)/1024UL);
+
+ for (i = 0; i < AMDGPU_HW_IP_NUM; i++) {
+ uint32_t enabled = amdgpu_get_ip_count(adev, i);
+ uint32_t count = amdgpu_ctx_num_entities[i];
+ int idx = 0;
+ uint64_t total = 0, min = 0;
+ uint32_t perc, frac;
+
+ if (enabled) {
+ for (idx = 0; idx < count; idx++) {
+ total = amdgpu_get_fence_usage(fpriv,
+ i, idx, &min);
+
+ if ((total == 0) || (min == 0))
+ continue;
+
+ perc = div64_u64(10000 * total, min);
+ frac = perc % 100;
+
+ seq_printf(m, "amdgpu_%02x:%02x.%d:%s%d:\t%d.%d%%\n",
+ bus, dev, fn,
+ amdgpu_ip_name[i],
+ idx, perc/100, frac);
+ }
+ }
+ }
+}
+#endif
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
new file mode 100644
index 000000000000..1f776b3a5f45
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2021 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: David Nieto
+ */
+#ifndef __AMDGPU_SMI_H__
+#define __AMDGPU_SMI_H__
+
+#include <linux/idr.h>
+#include <linux/kfifo.h>
+#include <linux/rbtree.h>
+#include <drm/gpu_scheduler.h>
+#include <drm/drm_file.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <linux/sched/mm.h>
+
+#include "amdgpu_sync.h"
+#include "amdgpu_ring.h"
+#include "amdgpu_ids.h"
+
+struct amdgpu_proc;
+struct amdgpu_ctx;
+uint32_t amdgpu_get_ip_count(struct amdgpu_device *adev, int id);
+
+uint64_t amdgpu_get_fence_usage(struct amdgpu_fpriv *fpriv, uint32_t hwip,
+ uint32_t idx, uint64_t *elapsed);
+
+uint64_t amdgpu_get_proc_mem(struct amdgpu_fpriv *fpriv);
+
+int amdgpu_fdinfo_init(struct amdgpu_device *adev,
+ struct amdgpu_fpriv *fpriv, int pasid);
+
+int amdgpu_fdinfo_fini(struct amdgpu_device *adev,
+ struct amdgpu_fpriv *fpriv);
+
+#ifdef CONFIG_PROC_FS
+void amdgpu_show_fdinfo(struct seq_file *m, struct file *f);
+#endif
+
+#endif
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 39ee88d29cca..c2407c08b2ad 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -41,6 +41,7 @@
#include "amdgpu_gem.h"
#include "amdgpu_display.h"
#include "amdgpu_ras.h"
+#include "amdgpu_fdinfo.h"
void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev)
{
@@ -1139,6 +1140,8 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
amdgpu_ctx_mgr_init(&fpriv->ctx_mgr);
file_priv->driver_priv = fpriv;
+ fpriv->file = file_priv;
+ amdgpu_fdinfo_init(adev, fpriv, pasid);
goto out_suspend;
error_vm:
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index 92d8de24d0a1..4e5d8d4af010 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -515,7 +515,7 @@ void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched)
EXPORT_SYMBOL(drm_sched_resubmit_jobs);
/**
- * drm_sched_resubmit_jobs_ext - helper to relunch certain number of jobs from mirror ring list
+ * drm_sched_resubmit_jobs_ext - helper to relunch certain number of jobs from pending list
*
* @sched: scheduler instance
* @max: job numbers to relaunch
@@ -671,7 +671,7 @@ drm_sched_select_entity(struct drm_gpu_scheduler *sched)
static struct drm_sched_job *
drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
{
- struct drm_sched_job *job;
+ struct drm_sched_job *job, *next;
/*
* Don't destroy jobs while the timeout worker is running OR thread
@@ -690,6 +690,13 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
if (job && dma_fence_is_signaled(&job->s_fence->finished)) {
/* remove job from pending_list */
list_del_init(&job->list);
+ /* account for the next fence in the queue */
+ next = list_first_entry_or_null(&sched->pending_list,
+ struct drm_sched_job, list);
+ if (next) {
+ next->s_fence->scheduled.timestamp =
+ job->s_fence->finished.timestamp;
+ }
} else {
job = NULL;
/* queue timeout for next job */
--
2.31.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: Add show_fdinfo() interface
2021-04-06 9:49 [PATCH] drm/amdgpu: Add show_fdinfo() interface Roy Sun
@ 2021-04-06 10:54 ` Nirmoy
2021-04-06 11:13 ` Christian König
0 siblings, 1 reply; 4+ messages in thread
From: Nirmoy @ 2021-04-06 10:54 UTC (permalink / raw)
To: Roy Sun, amd-gfx; +Cc: Alexander.Deucher, David M Nieto
On 4/6/21 11:49 AM, Roy Sun wrote:
> Tracking devices, process info and fence info using
> /proc/pid/fdinfo
>
> Signed-off-by: David M Nieto <David.Nieto@amd.com>
> Signed-off-by: Roy Sun <Roy.Sun@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 15 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 282 ++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 58 ++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +
> drivers/gpu/drm/scheduler/sched_main.c | 11 +-
> 8 files changed, 371 insertions(+), 8 deletions(-)
> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
> index ee85e8aba636..f9de1acc65dd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/Makefile
> +++ b/drivers/gpu/drm/amd/amdgpu/Makefile
> @@ -55,7 +55,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \
> amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \
> amdgpu_gmc.o amdgpu_mmhub.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \
> amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \
> - amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \
> + amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o amdgpu_fdinfo.o\
> amdgpu_fw_attestation.o amdgpu_securedisplay.o
>
Use amdgpu-$(CONFIG_PROC_FS) instead so that you can ignore some
CONFIG_PROC_FS checks.
> amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index 616c85a01299..35843c8d133d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -107,6 +107,7 @@
> #include "amdgpu_gfxhub.h"
> #include "amdgpu_df.h"
> #include "amdgpu_smuio.h"
> +#include "amdgpu_fdinfo.h"
>
> #define MAX_GPU_INSTANCE 16
>
> @@ -477,6 +478,8 @@ struct amdgpu_fpriv {
> struct mutex bo_list_lock;
> struct idr bo_list_handles;
> struct amdgpu_ctx_mgr ctx_mgr;
> + struct drm_file *file;
> + struct amdgpu_proc *proc;
You should be able to avoid adding these extra members. See below:
> };
>
> int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index e93850f2f3b1..702fd9054883 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -1042,13 +1042,15 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,
> struct dma_fence **ef)
> {
> struct amdgpu_device *adev = get_amdgpu_device(kgd);
> + struct amdgpu_fpriv *fpriv;
> struct amdgpu_vm *new_vm;
> int ret;
>
> - new_vm = kzalloc(sizeof(*new_vm), GFP_KERNEL);
> - if (!new_vm)
> + fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL);
> + if (!fpriv)
> return -ENOMEM;
>
> + new_vm = &fpriv->vm;
> /* Initialize AMDGPU part of the VM */
> ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE, pasid);
> if (ret) {
> @@ -1063,12 +1065,14 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,
>
> *vm = (void *) new_vm;
>
> + amdgpu_fdinfo_init(adev, fpriv, pasid);
> +
> return 0;
>
> init_kfd_vm_fail:
> amdgpu_vm_fini(adev, new_vm);
> amdgpu_vm_init_fail:
> - kfree(new_vm);
> + kfree(fpriv);
> return ret;
> }
>
> @@ -1142,6 +1146,8 @@ void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)
> {
> struct amdgpu_device *adev = get_amdgpu_device(kgd);
> struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;
> + struct amdgpu_fpriv *fpriv =
> + container_of(avm, struct amdgpu_fpriv, vm);
>
> if (WARN_ON(!kgd || !vm))
> return;
> @@ -1149,8 +1155,9 @@ void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)
> pr_debug("Destroying process vm %p\n", vm);
>
> /* Release the VM context */
> + amdgpu_fdinfo_fini(adev, fpriv);
> amdgpu_vm_fini(adev, avm);
> - kfree(vm);
> + kfree(fpriv);
> }
>
> void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd, void *vm)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 4bcc03c4c6c5..07aed377dec8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -42,7 +42,7 @@
> #include "amdgpu_irq.h"
> #include "amdgpu_dma_buf.h"
> #include "amdgpu_sched.h"
> -
> +#include "amdgpu_fdinfo.h"
> #include "amdgpu_amdkfd.h"
>
> #include "amdgpu_ras.h"
> @@ -1691,6 +1691,9 @@ static const struct file_operations amdgpu_driver_kms_fops = {
> #ifdef CONFIG_COMPAT
> .compat_ioctl = amdgpu_kms_compat_ioctl,
> #endif
> +#ifdef CONFIG_PROC_FS
> + .show_fdinfo = amdgpu_show_fdinfo
> +#endif
> };
>
> int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
> new file mode 100644
> index 000000000000..5208fab6e35d
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
> @@ -0,0 +1,282 @@
> +/*
> + * Copyright 2021 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + */
> +
> +#include <linux/debugfs.h>
> +#include <linux/list.h>
> +#include <linux/module.h>
> +#include <linux/uaccess.h>
> +#include <linux/reboot.h>
> +#include <linux/syscalls.h>
> +
> +#include <drm/amdgpu_drm.h>
> +#include <drm/drm_debugfs.h>
> +
> +#include "amdgpu.h"
> +#include "amdgpu_fdinfo.h"
> +
> +
> +static const char *amdgpu_ip_name[AMDGPU_HW_IP_NUM] = {
> + [AMDGPU_HW_IP_GFX] = "gfx",
> + [AMDGPU_HW_IP_COMPUTE] = "compute",
> + [AMDGPU_HW_IP_DMA] = "dma",
> + [AMDGPU_HW_IP_UVD] = "dec",
> + [AMDGPU_HW_IP_VCE] = "enc",
> + [AMDGPU_HW_IP_UVD_ENC] = "enc_1",
> + [AMDGPU_HW_IP_VCN_DEC] = "dec",
> + [AMDGPU_HW_IP_VCN_ENC] = "enc",
> + [AMDGPU_HW_IP_VCN_JPEG] = "jpeg",
> +};
> +
> +struct amdgpu_proc {
> + struct amdgpu_device *adev;
> + struct amdgpu_fpriv *priv;
> + int pasid;
> +};
> +
Is this, struct amdgpu_proc really needed? struct amdgpu_fpriv can
provide you the pasid(fpriv->vm->pasid) and pretty sure
there is some other way to get adev from fpriv too.
> +int amdgpu_fdinfo_init(struct amdgpu_device *adev,
> + struct amdgpu_fpriv *fpriv, int pasid)
> +{
> + struct amdgpu_proc *proc;
> +
> + proc = kzalloc(sizeof(*proc), GFP_KERNEL);
> + if (!proc)
> + return -ENOMEM;
> + proc->pasid = pasid;
> + proc->adev = adev;
> + proc->priv = fpriv;
> + fpriv->proc = proc;
> +
> + return 0;
> +}
> +
> +int amdgpu_fdinfo_fini(struct amdgpu_device *adev,
> + struct amdgpu_fpriv *fpriv)
> +{
> + struct amdgpu_proc *proc = fpriv->proc;
> +
> + if (proc)
> + kfree(proc);
> +
> + fpriv->proc = NULL;
> + return 0;
> +}
> +
> +uint64_t amdgpu_get_proc_mem(struct amdgpu_fpriv *fpriv)
This can receive drm_file which gives you amdgpu_priv
so you can avoid fpriv->file.
> +{
> + int id;
> + struct drm_gem_object *gobj;
> + uint64_t total = 0;
> +
> + spin_lock(&fpriv->file->table_lock);
> + idr_for_each_entry(&fpriv->file->object_idr, gobj, id) {
> + struct amdgpu_bo *bo = gem_to_amdgpu_bo(gobj);
> + unsigned int domain = amdgpu_mem_type_to_domain(
> + bo->tbo.mem.mem_type);
> +
> + if (domain == AMDGPU_GEM_DOMAIN_VRAM)
> + total += amdgpu_bo_size(bo);
> + }
> + spin_unlock(&fpriv->file->table_lock);
> +
> + if (fpriv->vm.process_info) {
> + struct kgd_mem *mem;
> +
> + mutex_lock(&fpriv->vm.process_info->lock);
> + list_for_each_entry(mem, &fpriv->vm.process_info->kfd_bo_list,
> + validate_list.head) {
> + struct amdgpu_bo *bo = mem->bo;
> + unsigned int domain = amdgpu_mem_type_to_domain(
> + bo->tbo.mem.mem_type);
> +
> + if (domain == AMDGPU_GEM_DOMAIN_VRAM)
> + total += amdgpu_bo_size(bo);
> + }
> +
> + list_for_each_entry(mem, &fpriv->vm.process_info->userptr_valid_list,
> + validate_list.head) {
> + struct amdgpu_bo *bo = mem->bo;
> + unsigned int domain = amdgpu_mem_type_to_domain(
> + bo->tbo.mem.mem_type);
> +
> + if (domain == AMDGPU_GEM_DOMAIN_VRAM)
> + total += amdgpu_bo_size(bo);
> + }
> +
> + mutex_unlock(&fpriv->vm.process_info->lock);
> + }
> +
> + return total;
> +}
> +
> +uint64_t amdgpu_get_fence_usage(struct amdgpu_fpriv *fpriv, uint32_t hwip,
> + uint32_t idx, uint64_t *elapsed)
> +{
> + struct amdgpu_ctx_entity *centity;
> + struct idr *idp;
> + struct amdgpu_ctx *ctx;
> + uint32_t id, i;
> + uint64_t now, t1, t2;
> + uint64_t total = 0, min = 0;
> +
> +
> + if (idx >= AMDGPU_MAX_ENTITY_NUM)
> + return 0;
> +
> + idp = &fpriv->ctx_mgr.ctx_handles;
> +
> + mutex_lock(&fpriv->ctx_mgr.lock);
> + idr_for_each_entry(idp, ctx, id) {
> + if (!ctx->entities[hwip][idx])
> + continue;
> +
> + centity = ctx->entities[hwip][idx];
> +
> + for (i = 0; i < amdgpu_sched_jobs; i++) {
> + struct dma_fence *fence;
> + struct drm_sched_fence *s_fence;
> +
> + spin_lock(&ctx->ring_lock);
> + fence = dma_fence_get(centity->fences[i]);
> + spin_unlock(&ctx->ring_lock);
> + if (!fence)
> + continue;
> + s_fence = to_drm_sched_fence(fence);
> + if (!dma_fence_is_signaled(&s_fence->scheduled))
> + continue;
> + now = ktime_to_ns(ktime_get());
> + t1 = ktime_to_ns(s_fence->scheduled.timestamp);
> + t2 = !dma_fence_is_signaled(&s_fence->finished) ?
> + 0 : ktime_to_ns(s_fence->finished.timestamp);
> + dma_fence_put(fence);
> +
> + t1 = now - t1;
> + t2 = (t2 == 0) ? 0 : now - t2;
> + total += t1 - t2;
> + if (t1 > min)
> + min = t1;
> + }
> +
> + }
> +
> + mutex_unlock(&fpriv->ctx_mgr.lock);
> +
> + if (elapsed)
> + *elapsed = min;
> +
> + return total;
> +}
> +
> +uint32_t amdgpu_get_ip_count(struct amdgpu_device *adev, int id)
> +{
> + enum amd_ip_block_type type;
> + uint32_t count = 0;
> + int i;
> +
> + switch (id) {
> + case AMDGPU_HW_IP_GFX:
> + type = AMD_IP_BLOCK_TYPE_GFX;
> + break;
> + case AMDGPU_HW_IP_COMPUTE:
> + type = AMD_IP_BLOCK_TYPE_GFX;
> + break;
> + case AMDGPU_HW_IP_DMA:
> + type = AMD_IP_BLOCK_TYPE_SDMA;
> + break;
> + case AMDGPU_HW_IP_UVD:
> + type = AMD_IP_BLOCK_TYPE_UVD;
> + break;
> + case AMDGPU_HW_IP_VCE:
> + type = AMD_IP_BLOCK_TYPE_VCE;
> + break;
> + case AMDGPU_HW_IP_UVD_ENC:
> + type = AMD_IP_BLOCK_TYPE_UVD;
> + break;
> + case AMDGPU_HW_IP_VCN_DEC:
> + case AMDGPU_HW_IP_VCN_ENC:
> + type = AMD_IP_BLOCK_TYPE_VCN;
> + break;
> + case AMDGPU_HW_IP_VCN_JPEG:
> + type = (amdgpu_device_ip_get_ip_block(adev,
> + AMD_IP_BLOCK_TYPE_JPEG)) ?
> + AMD_IP_BLOCK_TYPE_JPEG : AMD_IP_BLOCK_TYPE_VCN;
> + break;
> + default:
> + return 0;
> + }
> +
> + for (i = 0; i < adev->num_ip_blocks; i++)
> + if (adev->ip_blocks[i].version->type == type &&
> + adev->ip_blocks[i].status.valid &&
> + count < AMDGPU_HW_IP_INSTANCE_MAX_COUNT)
> + count++;
> + return count;
> +
> +}
> +
> +#ifdef CONFIG_PROC_FS
> +void amdgpu_show_fdinfo(struct seq_file *m, struct file *f)
> +{
> + struct amdgpu_fpriv *fpriv;
> + struct amdgpu_device *adev;
> + uint32_t bus, dev, fn, i;
> +
> + if (amdgpu_file_to_fpriv(f, &fpriv))
> + return;
> +
> + adev = fpriv->proc->adev;
You can get adev using:
struct drm_file *file_priv = filp->private_data;
struct amdgpu_device *adev = drm_to_adev(file_priv->minor->dev);
Regards,
Nirmoy
> + bus = adev->pdev->bus->number;
> + dev = PCI_SLOT(adev->pdev->devfn);
> + fn = PCI_FUNC(adev->pdev->devfn);
> + seq_printf(m, "amdgpu_%02x:%02x.%d:pasid:\t%u\n", bus, dev, fn,
> + fpriv->proc->pasid);
> +
> + seq_printf(m, "amdgpu_%02x:%02x.%d:mem:\t%llu kB\n", bus, dev, fn,
> + amdgpu_get_proc_mem(fpriv)/1024UL);
> +
> + for (i = 0; i < AMDGPU_HW_IP_NUM; i++) {
> + uint32_t enabled = amdgpu_get_ip_count(adev, i);
> + uint32_t count = amdgpu_ctx_num_entities[i];
> + int idx = 0;
> + uint64_t total = 0, min = 0;
> + uint32_t perc, frac;
> +
> + if (enabled) {
> + for (idx = 0; idx < count; idx++) {
> + total = amdgpu_get_fence_usage(fpriv,
> + i, idx, &min);
> +
> + if ((total == 0) || (min == 0))
> + continue;
> +
> + perc = div64_u64(10000 * total, min);
> + frac = perc % 100;
> +
> + seq_printf(m, "amdgpu_%02x:%02x.%d:%s%d:\t%d.%d%%\n",
> + bus, dev, fn,
> + amdgpu_ip_name[i],
> + idx, perc/100, frac);
> + }
> + }
> + }
> +}
> +#endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
> new file mode 100644
> index 000000000000..1f776b3a5f45
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
> @@ -0,0 +1,58 @@
> +/*
> + * Copyright 2021 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + * Authors: David Nieto
> + */
> +#ifndef __AMDGPU_SMI_H__
> +#define __AMDGPU_SMI_H__
> +
> +#include <linux/idr.h>
> +#include <linux/kfifo.h>
> +#include <linux/rbtree.h>
> +#include <drm/gpu_scheduler.h>
> +#include <drm/drm_file.h>
> +#include <drm/ttm/ttm_bo_driver.h>
> +#include <linux/sched/mm.h>
> +
> +#include "amdgpu_sync.h"
> +#include "amdgpu_ring.h"
> +#include "amdgpu_ids.h"
> +
> +struct amdgpu_proc;
> +struct amdgpu_ctx;
> +uint32_t amdgpu_get_ip_count(struct amdgpu_device *adev, int id);
> +
> +uint64_t amdgpu_get_fence_usage(struct amdgpu_fpriv *fpriv, uint32_t hwip,
> + uint32_t idx, uint64_t *elapsed);
> +
> +uint64_t amdgpu_get_proc_mem(struct amdgpu_fpriv *fpriv);
> +
> +int amdgpu_fdinfo_init(struct amdgpu_device *adev,
> + struct amdgpu_fpriv *fpriv, int pasid);
> +
> +int amdgpu_fdinfo_fini(struct amdgpu_device *adev,
> + struct amdgpu_fpriv *fpriv);
> +
> +#ifdef CONFIG_PROC_FS
> +void amdgpu_show_fdinfo(struct seq_file *m, struct file *f);
> +#endif
> +
> +#endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index 39ee88d29cca..c2407c08b2ad 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -41,6 +41,7 @@
> #include "amdgpu_gem.h"
> #include "amdgpu_display.h"
> #include "amdgpu_ras.h"
> +#include "amdgpu_fdinfo.h"
>
> void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev)
> {
> @@ -1139,6 +1140,8 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
> amdgpu_ctx_mgr_init(&fpriv->ctx_mgr);
>
> file_priv->driver_priv = fpriv;
> + fpriv->file = file_priv;
> + amdgpu_fdinfo_init(adev, fpriv, pasid);
> goto out_suspend;
>
> error_vm:
> diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
> index 92d8de24d0a1..4e5d8d4af010 100644
> --- a/drivers/gpu/drm/scheduler/sched_main.c
> +++ b/drivers/gpu/drm/scheduler/sched_main.c
> @@ -515,7 +515,7 @@ void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched)
> EXPORT_SYMBOL(drm_sched_resubmit_jobs);
>
> /**
> - * drm_sched_resubmit_jobs_ext - helper to relunch certain number of jobs from mirror ring list
> + * drm_sched_resubmit_jobs_ext - helper to relunch certain number of jobs from pending list
> *
> * @sched: scheduler instance
> * @max: job numbers to relaunch
> @@ -671,7 +671,7 @@ drm_sched_select_entity(struct drm_gpu_scheduler *sched)
> static struct drm_sched_job *
> drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
> {
> - struct drm_sched_job *job;
> + struct drm_sched_job *job, *next;
>
> /*
> * Don't destroy jobs while the timeout worker is running OR thread
> @@ -690,6 +690,13 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
> if (job && dma_fence_is_signaled(&job->s_fence->finished)) {
> /* remove job from pending_list */
> list_del_init(&job->list);
> + /* account for the next fence in the queue */
> + next = list_first_entry_or_null(&sched->pending_list,
> + struct drm_sched_job, list);
> + if (next) {
> + next->s_fence->scheduled.timestamp =
> + job->s_fence->finished.timestamp;
> + }
> } else {
> job = NULL;
> /* queue timeout for next job */
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: Add show_fdinfo() interface
2021-04-06 10:54 ` Nirmoy
@ 2021-04-06 11:13 ` Christian König
2021-04-06 15:58 ` Felix Kuehling
0 siblings, 1 reply; 4+ messages in thread
From: Christian König @ 2021-04-06 11:13 UTC (permalink / raw)
To: Nirmoy, Roy Sun, amd-gfx, Kuehling, Felix
Cc: Alexander.Deucher, David M Nieto
Am 06.04.21 um 12:54 schrieb Nirmoy:
>
> On 4/6/21 11:49 AM, Roy Sun wrote:
>> Tracking devices, process info and fence info using
>> /proc/pid/fdinfo
First of all please separate the patch into the handling for the DRM
file descriptors and KFD file descriptors.
>>
>> Signed-off-by: David M Nieto <David.Nieto@amd.com>
>> Signed-off-by: Roy Sun <Roy.Sun@amd.com>
>> ---
>> drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
>> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +
>> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 15 +-
>> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +-
>> drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 282 ++++++++++++++++++
>> drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 58 ++++
>> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +
>> drivers/gpu/drm/scheduler/sched_main.c | 11 +-
>> 8 files changed, 371 insertions(+), 8 deletions(-)
>> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
>> create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile
>> b/drivers/gpu/drm/amd/amdgpu/Makefile
>> index ee85e8aba636..f9de1acc65dd 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/Makefile
>> +++ b/drivers/gpu/drm/amd/amdgpu/Makefile
>> @@ -55,7 +55,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \
>> amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \
>> amdgpu_gmc.o amdgpu_mmhub.o amdgpu_xgmi.o amdgpu_csa.o
>> amdgpu_ras.o amdgpu_vm_cpu.o \
>> amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o
>> amdgpu_nbio.o \
>> - amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \
>> + amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o
>> amdgpu_fdinfo.o\
>> amdgpu_fw_attestation.o amdgpu_securedisplay.o
>
>
> Use amdgpu-$(CONFIG_PROC_FS) instead so that you can ignore some
> CONFIG_PROC_FS checks.
>
>
>> amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>> index 616c85a01299..35843c8d133d 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>> @@ -107,6 +107,7 @@
>> #include "amdgpu_gfxhub.h"
>> #include "amdgpu_df.h"
>> #include "amdgpu_smuio.h"
>> +#include "amdgpu_fdinfo.h"
>> #define MAX_GPU_INSTANCE 16
>> @@ -477,6 +478,8 @@ struct amdgpu_fpriv {
>> struct mutex bo_list_lock;
>> struct idr bo_list_handles;
>> struct amdgpu_ctx_mgr ctx_mgr;
>> + struct drm_file *file;
>> + struct amdgpu_proc *proc;
>
>
> You should be able to avoid adding these extra members. See below:
I agree we already have the necessary information in the data structures
here.
>
>
>> };
>
>> int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv
>> **fpriv);
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
>> index e93850f2f3b1..702fd9054883 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
>> @@ -1042,13 +1042,15 @@ int
>> amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,
>> struct dma_fence **ef)
>> {
>> struct amdgpu_device *adev = get_amdgpu_device(kgd);
>> + struct amdgpu_fpriv *fpriv;
>> struct amdgpu_vm *new_vm;
>> int ret;
>> - new_vm = kzalloc(sizeof(*new_vm), GFP_KERNEL);
>> - if (!new_vm)
>> + fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL);
>> + if (!fpriv)
>> return -ENOMEM;
>> + new_vm = &fpriv->vm;
>> /* Initialize AMDGPU part of the VM */
>> ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE,
>> pasid);
>> if (ret) {
>> @@ -1063,12 +1065,14 @@ int
>> amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,
>> *vm = (void *) new_vm;
>> + amdgpu_fdinfo_init(adev, fpriv, pasid);
>> +
>> return 0;
>> init_kfd_vm_fail:
>> amdgpu_vm_fini(adev, new_vm);
>> amdgpu_vm_init_fail:
>> - kfree(new_vm);
>> + kfree(fpriv);
>> return ret;
>> }
>> @@ -1142,6 +1146,8 @@ void
>> amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)
>> {
>> struct amdgpu_device *adev = get_amdgpu_device(kgd);
>> struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;
>> + struct amdgpu_fpriv *fpriv =
>> + container_of(avm, struct amdgpu_fpriv, vm);
>> if (WARN_ON(!kgd || !vm))
>> return;
>> @@ -1149,8 +1155,9 @@ void
>> amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)
>> pr_debug("Destroying process vm %p\n", vm);
>> /* Release the VM context */
>> + amdgpu_fdinfo_fini(adev, fpriv);
>> amdgpu_vm_fini(adev, avm);
>> - kfree(vm);
>> + kfree(fpriv);
Felix needs to take a look here, but that is most likely a no-go. On the
other hand if you drop the amdgpu_proc structure that should become
unnecessary.
>> }
>> void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd,
>> void *vm)
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>> index 4bcc03c4c6c5..07aed377dec8 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>> @@ -42,7 +42,7 @@
>> #include "amdgpu_irq.h"
>> #include "amdgpu_dma_buf.h"
>> #include "amdgpu_sched.h"
>> -
>> +#include "amdgpu_fdinfo.h"
>> #include "amdgpu_amdkfd.h"
>> #include "amdgpu_ras.h"
>> @@ -1691,6 +1691,9 @@ static const struct file_operations
>> amdgpu_driver_kms_fops = {
>> #ifdef CONFIG_COMPAT
>> .compat_ioctl = amdgpu_kms_compat_ioctl,
>> #endif
>> +#ifdef CONFIG_PROC_FS
>> + .show_fdinfo = amdgpu_show_fdinfo
>> +#endif
>> };
>> int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv
>> **fpriv)
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
>> new file mode 100644
>> index 000000000000..5208fab6e35d
>> --- /dev/null
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c
>> @@ -0,0 +1,282 @@
SPDX license header is missing.
>> +/*
>> + * Copyright 2021 Advanced Micro Devices, Inc.
>> + *
>> + * Permission is hereby granted, free of charge, to any person
>> obtaining a
>> + * copy of this software and associated documentation files (the
>> "Software"),
>> + * to deal in the Software without restriction, including without
>> limitation
>> + * the rights to use, copy, modify, merge, publish, distribute,
>> sublicense,
>> + * and/or sell copies of the Software, and to permit persons to whom
>> the
>> + * Software is furnished to do so, subject to the following conditions:
>> + *
>> + * The above copyright notice and this permission notice shall be
>> included in
>> + * all copies or substantial portions of the Software.
>> + *
>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>> EXPRESS OR
>> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>> MERCHANTABILITY,
>> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
>> EVENT SHALL
>> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM,
>> DAMAGES OR
>> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
>> OTHERWISE,
>> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
>> USE OR
>> + * OTHER DEALINGS IN THE SOFTWARE.
>> + *
>> + */
>> +
>> +#include <linux/debugfs.h>
>> +#include <linux/list.h>
>> +#include <linux/module.h>
>> +#include <linux/uaccess.h>
>> +#include <linux/reboot.h>
>> +#include <linux/syscalls.h>
>> +
>> +#include <drm/amdgpu_drm.h>
>> +#include <drm/drm_debugfs.h>
>> +
>> +#include "amdgpu.h"
>> +#include "amdgpu_fdinfo.h"
>> +
>> +
>> +static const char *amdgpu_ip_name[AMDGPU_HW_IP_NUM] = {
>> + [AMDGPU_HW_IP_GFX] = "gfx",
>> + [AMDGPU_HW_IP_COMPUTE] = "compute",
>> + [AMDGPU_HW_IP_DMA] = "dma",
>> + [AMDGPU_HW_IP_UVD] = "dec",
>> + [AMDGPU_HW_IP_VCE] = "enc",
>> + [AMDGPU_HW_IP_UVD_ENC] = "enc_1",
>> + [AMDGPU_HW_IP_VCN_DEC] = "dec",
>> + [AMDGPU_HW_IP_VCN_ENC] = "enc",
>> + [AMDGPU_HW_IP_VCN_JPEG] = "jpeg",
>> +};
We should have that at some other place than here.
>> +
>> +struct amdgpu_proc {
>> + struct amdgpu_device *adev;
>> + struct amdgpu_fpriv *priv;
>> + int pasid;
>> +};
>> +
>
>
> Is this, struct amdgpu_proc really needed? struct amdgpu_fpriv can
> provide you the pasid(fpriv->vm->pasid) and pretty sure
>
> there is some other way to get adev from fpriv too.
Correct. Especially how to get adev differs from the DRM (one adev per
fd) and KFD (multiple adevs per fd).
So the whole approach taken here doesn't work in the first place.
>
>
>> +int amdgpu_fdinfo_init(struct amdgpu_device *adev,
>> + struct amdgpu_fpriv *fpriv, int pasid)
>> +{
>> + struct amdgpu_proc *proc;
>> +
>> + proc = kzalloc(sizeof(*proc), GFP_KERNEL);
>> + if (!proc)
>> + return -ENOMEM;
>> + proc->pasid = pasid;
>> + proc->adev = adev;
>> + proc->priv = fpriv;
>> + fpriv->proc = proc;
>> +
>> + return 0;
>> +}
>> +
>> +int amdgpu_fdinfo_fini(struct amdgpu_device *adev,
>> + struct amdgpu_fpriv *fpriv)
>> +{
>> + struct amdgpu_proc *proc = fpriv->proc;
>> +
>> + if (proc)
>> + kfree(proc);
>> +
>> + fpriv->proc = NULL;
>> + return 0;
>> +}
>> +
>> +uint64_t amdgpu_get_proc_mem(struct amdgpu_fpriv *fpriv)
>
>
> This can receive drm_file which gives you amdgpu_priv
>
> so you can avoid fpriv->file.
>
>
>> +{
>> + int id;
>> + struct drm_gem_object *gobj;
>> + uint64_t total = 0;
>> +
>> + spin_lock(&fpriv->file->table_lock);
>> + idr_for_each_entry(&fpriv->file->object_idr, gobj, id) {
>> + struct amdgpu_bo *bo = gem_to_amdgpu_bo(gobj);
>> + unsigned int domain = amdgpu_mem_type_to_domain(
>> + bo->tbo.mem.mem_type);
>> +
>> + if (domain == AMDGPU_GEM_DOMAIN_VRAM)
>> + total += amdgpu_bo_size(bo);
>> + }
>> + spin_unlock(&fpriv->file->table_lock);
>> +
>> + if (fpriv->vm.process_info) {
>> + struct kgd_mem *mem;
>> +
>> + mutex_lock(&fpriv->vm.process_info->lock);
>> + list_for_each_entry(mem, &fpriv->vm.process_info->kfd_bo_list,
>> + validate_list.head) {
>> + struct amdgpu_bo *bo = mem->bo;
>> + unsigned int domain = amdgpu_mem_type_to_domain(
>> + bo->tbo.mem.mem_type);
>> +
>> + if (domain == AMDGPU_GEM_DOMAIN_VRAM)
>> + total += amdgpu_bo_size(bo);
>> + }
>> +
>> + list_for_each_entry(mem,
>> &fpriv->vm.process_info->userptr_valid_list,
>> + validate_list.head) {
>> + struct amdgpu_bo *bo = mem->bo;
>> + unsigned int domain = amdgpu_mem_type_to_domain(
>> + bo->tbo.mem.mem_type);
>> +
>> + if (domain == AMDGPU_GEM_DOMAIN_VRAM)
>> + total += amdgpu_bo_size(bo);
>> + }
>> +
>> + mutex_unlock(&fpriv->vm.process_info->lock);
That stuff belongs into the VM code and not here.
>> + }
>> +
>> + return total;
>> +}
>> +
>> +uint64_t amdgpu_get_fence_usage(struct amdgpu_fpriv *fpriv, uint32_t
>> hwip,
>> + uint32_t idx, uint64_t *elapsed)
>> +{
>> + struct amdgpu_ctx_entity *centity;
>> + struct idr *idp;
>> + struct amdgpu_ctx *ctx;
>> + uint32_t id, i;
>> + uint64_t now, t1, t2;
>> + uint64_t total = 0, min = 0;
>> +
>> +
>> + if (idx >= AMDGPU_MAX_ENTITY_NUM)
>> + return 0;
>> +
>> + idp = &fpriv->ctx_mgr.ctx_handles;
>> +
>> + mutex_lock(&fpriv->ctx_mgr.lock);
>> + idr_for_each_entry(idp, ctx, id) {
>> + if (!ctx->entities[hwip][idx])
>> + continue;
>> +
>> + centity = ctx->entities[hwip][idx];
>> +
>> + for (i = 0; i < amdgpu_sched_jobs; i++) {
>> + struct dma_fence *fence;
>> + struct drm_sched_fence *s_fence;
>> +
>> + spin_lock(&ctx->ring_lock);
>> + fence = dma_fence_get(centity->fences[i]);
>> + spin_unlock(&ctx->ring_lock);
>> + if (!fence)
>> + continue;
>> + s_fence = to_drm_sched_fence(fence);
>> + if (!dma_fence_is_signaled(&s_fence->scheduled))
>> + continue;
>> + now = ktime_to_ns(ktime_get());
>> + t1 = ktime_to_ns(s_fence->scheduled.timestamp);
>> + t2 = !dma_fence_is_signaled(&s_fence->finished) ?
>> + 0 : ktime_to_ns(s_fence->finished.timestamp);
>> + dma_fence_put(fence);
>> +
>> + t1 = now - t1;
>> + t2 = (t2 == 0) ? 0 : now - t2;
>> + total += t1 - t2;
>> + if (t1 > min)
>> + min = t1;
>> + }
>> +
>> + }
>> +
>> + mutex_unlock(&fpriv->ctx_mgr.lock);
Again that stuff belong into the ctx handling.
>> +
>> + if (elapsed)
>> + *elapsed = min;
>> +
>> + return total;
>> +}
>> +
>> +uint32_t amdgpu_get_ip_count(struct amdgpu_device *adev, int id)
>> +{
>> + enum amd_ip_block_type type;
>> + uint32_t count = 0;
>> + int i;
>> +
>> + switch (id) {
>> + case AMDGPU_HW_IP_GFX:
>> + type = AMD_IP_BLOCK_TYPE_GFX;
>> + break;
>> + case AMDGPU_HW_IP_COMPUTE:
>> + type = AMD_IP_BLOCK_TYPE_GFX;
>> + break;
>> + case AMDGPU_HW_IP_DMA:
>> + type = AMD_IP_BLOCK_TYPE_SDMA;
>> + break;
>> + case AMDGPU_HW_IP_UVD:
>> + type = AMD_IP_BLOCK_TYPE_UVD;
>> + break;
>> + case AMDGPU_HW_IP_VCE:
>> + type = AMD_IP_BLOCK_TYPE_VCE;
>> + break;
>> + case AMDGPU_HW_IP_UVD_ENC:
>> + type = AMD_IP_BLOCK_TYPE_UVD;
>> + break;
>> + case AMDGPU_HW_IP_VCN_DEC:
>> + case AMDGPU_HW_IP_VCN_ENC:
>> + type = AMD_IP_BLOCK_TYPE_VCN;
>> + break;
>> + case AMDGPU_HW_IP_VCN_JPEG:
>> + type = (amdgpu_device_ip_get_ip_block(adev,
>> + AMD_IP_BLOCK_TYPE_JPEG)) ?
>> + AMD_IP_BLOCK_TYPE_JPEG : AMD_IP_BLOCK_TYPE_VCN;
>> + break;
>> + default:
>> + return 0;
>> + }
>> +
>> + for (i = 0; i < adev->num_ip_blocks; i++)
>> + if (adev->ip_blocks[i].version->type == type &&
>> + adev->ip_blocks[i].status.valid &&
>> + count < AMDGPU_HW_IP_INSTANCE_MAX_COUNT)
>> + count++;
>> + return count;
>> +
>> +}
>> +
>> +#ifdef CONFIG_PROC_FS
>> +void amdgpu_show_fdinfo(struct seq_file *m, struct file *f)
>> +{
>> + struct amdgpu_fpriv *fpriv;
>> + struct amdgpu_device *adev;
>> + uint32_t bus, dev, fn, i;
>> +
>> + if (amdgpu_file_to_fpriv(f, &fpriv))
>> + return;
>> +
>> + adev = fpriv->proc->adev;
>
>
> You can get adev using:
>
>
> struct drm_file *file_priv = filp->private_data;
>
> struct amdgpu_device *adev = drm_to_adev(file_priv->minor->dev);
>
>
> Regards,
>
> Nirmoy
>
>
>> + bus = adev->pdev->bus->number;
>> + dev = PCI_SLOT(adev->pdev->devfn);
>> + fn = PCI_FUNC(adev->pdev->devfn);
>> + seq_printf(m, "amdgpu_%02x:%02x.%d:pasid:\t%u\n", bus, dev, fn,
>> + fpriv->proc->pasid);
I think that format here is not valid for the fdinfo. You can't include
a ":" in the name AFAIK.
Additional to that the identifiers need to be fixed, but I'm not 100%
sure about that.
In other words you can't do something like amdgpu_$bus:$dev.$fn_pasid:
$value.
Instead that needs to be:
pdev:\t$bus:$dev.fn
amdgpu_pasid:\t%pasid
....
>> +
>> + seq_printf(m, "amdgpu_%02x:%02x.%d:mem:\t%llu kB\n", bus, dev, fn,
>> + amdgpu_get_proc_mem(fpriv)/1024UL);
>> +
>> + for (i = 0; i < AMDGPU_HW_IP_NUM; i++) {
>> + uint32_t enabled = amdgpu_get_ip_count(adev, i);
>> + uint32_t count = amdgpu_ctx_num_entities[i];
>> + int idx = 0;
>> + uint64_t total = 0, min = 0;
>> + uint32_t perc, frac;
>> +
>> + if (enabled) {
>> + for (idx = 0; idx < count; idx++) {
>> + total = amdgpu_get_fence_usage(fpriv,
>> + i, idx, &min);
>> +
>> + if ((total == 0) || (min == 0))
>> + continue;
>> +
>> + perc = div64_u64(10000 * total, min);
>> + frac = perc % 100;
>> +
>> + seq_printf(m, "amdgpu_%02x:%02x.%d:%s%d:\t%d.%d%%\n",
>> + bus, dev, fn,
>> + amdgpu_ip_name[i],
>> + idx, perc/100, frac);
>> + }
>> + }
>> + }
>> +}
>> +#endif
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
>> new file mode 100644
>> index 000000000000..1f776b3a5f45
>> --- /dev/null
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h
>> @@ -0,0 +1,58 @@
SPDX license is missing.
>> +/*
>> + * Copyright 2021 Advanced Micro Devices, Inc.
>> + *
>> + * Permission is hereby granted, free of charge, to any person
>> obtaining a
>> + * copy of this software and associated documentation files (the
>> "Software"),
>> + * to deal in the Software without restriction, including without
>> limitation
>> + * the rights to use, copy, modify, merge, publish, distribute,
>> sublicense,
>> + * and/or sell copies of the Software, and to permit persons to whom
>> the
>> + * Software is furnished to do so, subject to the following conditions:
>> + *
>> + * The above copyright notice and this permission notice shall be
>> included in
>> + * all copies or substantial portions of the Software.
>> + *
>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>> EXPRESS OR
>> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>> MERCHANTABILITY,
>> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
>> EVENT SHALL
>> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM,
>> DAMAGES OR
>> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
>> OTHERWISE,
>> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
>> USE OR
>> + * OTHER DEALINGS IN THE SOFTWARE.
>> + *
>> + * Authors: David Nieto
>> + */
>> +#ifndef __AMDGPU_SMI_H__
>> +#define __AMDGPU_SMI_H__
>> +
>> +#include <linux/idr.h>
>> +#include <linux/kfifo.h>
>> +#include <linux/rbtree.h>
>> +#include <drm/gpu_scheduler.h>
>> +#include <drm/drm_file.h>
>> +#include <drm/ttm/ttm_bo_driver.h>
>> +#include <linux/sched/mm.h>
>> +
>> +#include "amdgpu_sync.h"
>> +#include "amdgpu_ring.h"
>> +#include "amdgpu_ids.h"
>> +
>> +struct amdgpu_proc;
>> +struct amdgpu_ctx;
>> +uint32_t amdgpu_get_ip_count(struct amdgpu_device *adev, int id);
>> +
>> +uint64_t amdgpu_get_fence_usage(struct amdgpu_fpriv *fpriv, uint32_t
>> hwip,
>> + uint32_t idx, uint64_t *elapsed);
>> +
>> +uint64_t amdgpu_get_proc_mem(struct amdgpu_fpriv *fpriv);
>> +
>> +int amdgpu_fdinfo_init(struct amdgpu_device *adev,
>> + struct amdgpu_fpriv *fpriv, int pasid);
>> +
>> +int amdgpu_fdinfo_fini(struct amdgpu_device *adev,
>> + struct amdgpu_fpriv *fpriv);
>> +
>> +#ifdef CONFIG_PROC_FS
>> +void amdgpu_show_fdinfo(struct seq_file *m, struct file *f);
>> +#endif
>> +
>> +#endif
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>> index 39ee88d29cca..c2407c08b2ad 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>> @@ -41,6 +41,7 @@
>> #include "amdgpu_gem.h"
>> #include "amdgpu_display.h"
>> #include "amdgpu_ras.h"
>> +#include "amdgpu_fdinfo.h"
>> void amdgpu_unregister_gpu_instance(struct amdgpu_device *adev)
>> {
>> @@ -1139,6 +1140,8 @@ int amdgpu_driver_open_kms(struct drm_device
>> *dev, struct drm_file *file_priv)
>> amdgpu_ctx_mgr_init(&fpriv->ctx_mgr);
>> file_priv->driver_priv = fpriv;
>> + fpriv->file = file_priv;
>> + amdgpu_fdinfo_init(adev, fpriv, pasid);
>> goto out_suspend;
>> error_vm:
>> diff --git a/drivers/gpu/drm/scheduler/sched_main.c
>> b/drivers/gpu/drm/scheduler/sched_main.c
>> index 92d8de24d0a1..4e5d8d4af010 100644
>> --- a/drivers/gpu/drm/scheduler/sched_main.c
>> +++ b/drivers/gpu/drm/scheduler/sched_main.c
>> @@ -515,7 +515,7 @@ void drm_sched_resubmit_jobs(struct
>> drm_gpu_scheduler *sched)
>> EXPORT_SYMBOL(drm_sched_resubmit_jobs);
>> /**
>> - * drm_sched_resubmit_jobs_ext - helper to relunch certain number of
>> jobs from mirror ring list
>> + * drm_sched_resubmit_jobs_ext - helper to relunch certain number of
>> jobs from pending list
>> *
>> * @sched: scheduler instance
>> * @max: job numbers to relaunch
>> @@ -671,7 +671,7 @@ drm_sched_select_entity(struct drm_gpu_scheduler
>> *sched)
>> static struct drm_sched_job *
>> drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
>> {
>> - struct drm_sched_job *job;
>> + struct drm_sched_job *job, *next;
>> /*
>> * Don't destroy jobs while the timeout worker is running OR
>> thread
>> @@ -690,6 +690,13 @@ drm_sched_get_cleanup_job(struct
>> drm_gpu_scheduler *sched)
>> if (job && dma_fence_is_signaled(&job->s_fence->finished)) {
>> /* remove job from pending_list */
>> list_del_init(&job->list);
>> + /* account for the next fence in the queue */
>> + next = list_first_entry_or_null(&sched->pending_list,
>> + struct drm_sched_job, list);
>> + if (next) {
>> + next->s_fence->scheduled.timestamp =
>> + job->s_fence->finished.timestamp;
>> + }
That should be a separate patch for the DRM scheduler component.
Regards,
Christian.
>> } else {
>> job = NULL;
>> /* queue timeout for next job */
> _______________________________________________
> 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] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: Add show_fdinfo() interface
2021-04-06 11:13 ` Christian König
@ 2021-04-06 15:58 ` Felix Kuehling
0 siblings, 0 replies; 4+ messages in thread
From: Felix Kuehling @ 2021-04-06 15:58 UTC (permalink / raw)
To: Christian König, Nirmoy, Roy Sun, amd-gfx
Cc: Alexander.Deucher, David M Nieto
Am 2021-04-06 um 7:13 a.m. schrieb Christian König:
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
>>> @@ -1042,13 +1042,15 @@ int
>>> amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,
>>> struct dma_fence **ef)
>>> {
>>> struct amdgpu_device *adev = get_amdgpu_device(kgd);
>>> + struct amdgpu_fpriv *fpriv;
>>> struct amdgpu_vm *new_vm;
>>> int ret;
>>> - new_vm = kzalloc(sizeof(*new_vm), GFP_KERNEL);
>>> - if (!new_vm)
>>> + fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL);
>>> + if (!fpriv)
>>> return -ENOMEM;
>>> + new_vm = &fpriv->vm;
>>> /* Initialize AMDGPU part of the VM */
>>> ret = amdgpu_vm_init(adev, new_vm, AMDGPU_VM_CONTEXT_COMPUTE,
>>> pasid);
>>> if (ret) {
>>> @@ -1063,12 +1065,14 @@ int
>>> amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, u32 pasid,
>>> *vm = (void *) new_vm;
>>> + amdgpu_fdinfo_init(adev, fpriv, pasid);
>>> +
>>> return 0;
>>> init_kfd_vm_fail:
>>> amdgpu_vm_fini(adev, new_vm);
>>> amdgpu_vm_init_fail:
>>> - kfree(new_vm);
>>> + kfree(fpriv);
>>> return ret;
>>> }
>>> @@ -1142,6 +1146,8 @@ void
>>> amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)
>>> {
>>> struct amdgpu_device *adev = get_amdgpu_device(kgd);
>>> struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;
>>> + struct amdgpu_fpriv *fpriv =
>>> + container_of(avm, struct amdgpu_fpriv, vm);
>>> if (WARN_ON(!kgd || !vm))
>>> return;
>>> @@ -1149,8 +1155,9 @@ void
>>> amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm)
>>> pr_debug("Destroying process vm %p\n", vm);
>>> /* Release the VM context */
>>> + amdgpu_fdinfo_fini(adev, fpriv);
>>> amdgpu_vm_fini(adev, avm);
>>> - kfree(vm);
>>> + kfree(fpriv);
>
> Felix needs to take a look here, but that is most likely a no-go. On
> the other hand if you drop the amdgpu_proc structure that should
> become unnecessary.
This is legacy code to support really old versions of ROCm user mode
that didn't call kfd_ioctl_acquire_vm to grab the VM from a DRM device
file descriptor. This predates upstreaming of dGPU support in KFD. We
can probably get rid of amdgpu_amdkfd_gpuvm_(create/destroy)_process_vm
and the associated code paths in KFD now.
On any ROCm less than 3 years old we should be going through
amdgpu_amdkfd_gpuvm_(acquire/release)_process_vm.
Regards,
Felix
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-06 15:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-06 9:49 [PATCH] drm/amdgpu: Add show_fdinfo() interface Roy Sun
2021-04-06 10:54 ` Nirmoy
2021-04-06 11:13 ` Christian König
2021-04-06 15:58 ` Felix Kuehling
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.