drm/amdkfd: Add queue information to sysfs

Provide compute queues information in sysfs under /sys/class/kfd/kfd/proc.
The format is /sys/class/kfd/kfd/proc/<pid>/queues/<queue id>/XX where
XX are size, type, and gpuid three files to represent queue size, queue
type, and the GPU this queue uses. <queue id> folder and files underneath
are generated when a queue is created. They are removed when the queue is
destroyed.

Signed-off-by: Amber Lin <Amber.Lin@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 6af1b5881f435e811073e996c1444d1b1c805d32..9a06eb616cbfc42b0870a2c3f4ca429d6d586b7c 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -41,6 +41,7 @@
 #include <drm/drm_drv.h>
 #include <drm/drm_device.h>
 #include <kgd_kfd_interface.h>
+#include <linux/swap.h>
 
 #include "amd_shared.h"
 
@@ -502,6 +503,9 @@ struct queue {
        struct kfd_process      *process;
        struct kfd_dev          *device;
        void *gws;
+
+       /* procfs */
+       struct kobject kobj;
 };
 
 /*
@@ -729,6 +733,7 @@ struct kfd_process {
 
        /* Kobj for our procfs */
        struct kobject *kobj;
+       struct kobject *kobj_queues;
        struct attribute attr_pasid;
 };
 
@@ -835,6 +840,8 @@ extern struct device *kfd_device;
 /* KFD's procfs */
 void kfd_procfs_init(void);
 void kfd_procfs_shutdown(void);
+int kfd_procfs_add_queue(struct queue *q);
+void kfd_procfs_del_queue(struct queue *q);
 
 /* Topology */
 int kfd_topology_init(void);

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 25b90f70aecd096b959cf87892686ff6ad95c70a..98dcbb96b2e23cfa15d6ddc4dd2a12b095d2e3f2 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -132,6 +132,88 @@ void kfd_procfs_shutdown(void)
        }
 }
 
+static ssize_t kfd_procfs_queue_show(struct kobject *kobj,
+                                    struct attribute *attr, char *buffer)
+{
+       struct queue *q = container_of(kobj, struct queue, kobj);
+
+       if (!strcmp(attr->name, "size"))
+               return snprintf(buffer, PAGE_SIZE, "%llu",
+                               q->properties.queue_size);
+       else if (!strcmp(attr->name, "type"))
+               return snprintf(buffer, PAGE_SIZE, "%d", q->properties.type);
+       else if (!strcmp(attr->name, "gpuid"))
+               return snprintf(buffer, PAGE_SIZE, "%u", q->device->id);
+       else
+               pr_err("Invalid attribute");
+
+       return 0;
+}
+
+static struct attribute attr_queue_size = {
+       .name = "size",
+       .mode = KFD_SYSFS_FILE_MODE
+};
+
+static struct attribute attr_queue_type = {
+       .name = "type",
+       .mode = KFD_SYSFS_FILE_MODE
+};
+
+static struct attribute attr_queue_gpuid = {
+       .name = "gpuid",
+       .mode = KFD_SYSFS_FILE_MODE
+};
+
+static struct attribute *procfs_queue_attrs[] = {
+       &attr_queue_size,
+       &attr_queue_type,
+       &attr_queue_gpuid,
+       NULL
+};
+
+static const struct sysfs_ops procfs_queue_ops = {
+       .show = kfd_procfs_queue_show,
+};
+
+static struct kobj_type procfs_queue_type = {
+       .sysfs_ops = &procfs_queue_ops,
+       .default_attrs = procfs_queue_attrs,
+};
+
+int kfd_procfs_add_queue(struct queue *q)
+{
+       struct kfd_process *proc;
+       int ret;
+
+       if (!q || !q->process)
+               return -EINVAL;
+       proc = q->process;
+
+       /* Create proc/<pid>/queues/<queue id> folder */
+       if (!proc->kobj_queues)
+               return -EFAULT;
+       ret = kobject_init_and_add(&q->kobj, &procfs_queue_type,
+                       proc->kobj_queues, "%u", q->properties.queue_id);
+       if (ret < 0) {
+               pr_warn("Creating proc/<pid>/queues/%u failed",
+                       q->properties.queue_id);
+               kobject_put(&q->kobj);
+               return ret;
+       }
+
+       return 0;
+}
+
+void kfd_procfs_del_queue(struct queue *q)
+{
+       if (!q)
+               return;
+
+       kobject_del(&q->kobj);
+       kobject_put(&q->kobj);
+}
+
 int kfd_process_create_wq(void)
 {
        if (!kfd_process_wq)
@@ -323,6 +405,11 @@ struct kfd_process *kfd_create_process(struct file *filep)
                if (ret)
                        pr_warn("Creating pasid for pid %d failed",
                                        (int)process->lead_thread->pid);
+
+               process->kobj_queues = kobject_create_and_add("queues",
+                                                       process->kobj);
+               if (!process->kobj_queues)
+                       pr_warn("Creating KFD proc/queues folder failed");
        }
 out:
        if (!IS_ERR(process))
@@ -457,6 +544,9 @@ static void kfd_process_wq_release(struct work_struct *work)
        /* Remove the procfs files */
        if (p->kobj) {
                sysfs_remove_file(p->kobj, &p->attr_pasid);
+               kobject_del(p->kobj_queues);
+               kobject_put(p->kobj_queues);
+               p->kobj_queues = NULL;
                kobject_del(p->kobj);
                kobject_put(p->kobj);
                p->kobj = NULL;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
index 31fcd1b51f00fa6d4457e3249bd48fd345d424cd..0fb04a2185c4ea95e1e11c15ad98befbd4de4314 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
@@ -322,6 +322,7 @@ int pqm_create_queue(struct process_queue_manager *pqm,
 
        if (q) {
                pr_debug("PQM done creating queue\n");
+               kfd_procfs_add_queue(q);
                print_queue_properties(&q->properties);
        }
 
@@ -378,6 +379,7 @@ int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid)
        }
 
        if (pqn->q) {
+               kfd_procfs_del_queue(pqn->q);
                dqm = pqn->q->device->dqm;
                retval = dqm->ops.destroy_queue(dqm, &pdd->qpd, pqn->q);
                if (retval) {