drm/amdkfd: Add new VI-specific queue properties

This patch adds new fields to the queue_properties structure. The new fields
are relevant only for queues running on AMD GPU VI architecture.

The eop_ring_buffer_address and eop_ring_buffer_size describe an
end-of-pipe queue which is assigned to the MQD. In CI, the EOP queue was per
pipeline and in VI it is per queue.

The ctx_save_restore_area_address and ctx_save_restore_area_size describe a
memory area that is designated to allow the CP to do context save/restore in
mid-wave state.

This patch also modifies the set_queue_properties_from_user() (called from
kfd_ioctl_create_queue()) to check and copy those new parameters.

Signed-off-by: Ben Goz <ben.goz@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 4c0b1e42e405c67d3a30c40a8b955a6700d05d17..b008fd67ace9ea4db06a74a384f5d483cf9cfa8b 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -145,6 +145,8 @@ static long kfd_ioctl_get_version(struct file *filep, struct kfd_process *p,
 static int set_queue_properties_from_user(struct queue_properties *q_properties,
                                struct kfd_ioctl_create_queue_args *args)
 {
+       void *tmp;
+
        if (args->queue_percentage > KFD_MAX_QUEUE_PERCENTAGE) {
                pr_err("kfd: queue percentage must be between 0 to KFD_MAX_QUEUE_PERCENTAGE\n");
                return -EINVAL;
@@ -182,6 +184,20 @@ static int set_queue_properties_from_user(struct queue_properties *q_properties,
                return -EFAULT;
        }
 
+       tmp = (void *)(uintptr_t)args->eop_buffer_address;
+       if (tmp != NULL &&
+               !access_ok(VERIFY_WRITE, tmp, sizeof(uint32_t))) {
+               pr_debug("kfd: can't access eop buffer");
+               return -EFAULT;
+       }
+
+       tmp = (void *)(uintptr_t)args->ctx_save_restore_address;
+       if (tmp != NULL &&
+               !access_ok(VERIFY_WRITE, tmp, sizeof(uint32_t))) {
+               pr_debug("kfd: can't access ctx save restore buffer");
+               return -EFAULT;
+       }
+
        q_properties->is_interop = false;
        q_properties->queue_percent = args->queue_percentage;
        q_properties->priority = args->queue_priority;
@@ -189,6 +205,11 @@ static int set_queue_properties_from_user(struct queue_properties *q_properties,
        q_properties->queue_size = args->ring_size;
        q_properties->read_ptr = (uint32_t *) args->read_pointer_address;
        q_properties->write_ptr = (uint32_t *) args->write_pointer_address;
+       q_properties->eop_ring_buffer_address = args->eop_buffer_address;
+       q_properties->eop_ring_buffer_size = args->eop_buffer_size;
+       q_properties->ctx_save_restore_area_address =
+                       args->ctx_save_restore_address;
+       q_properties->ctx_save_restore_area_size = args->ctx_save_restore_size;
        if (args->queue_type == KFD_IOC_QUEUE_TYPE_COMPUTE ||
                args->queue_type == KFD_IOC_QUEUE_TYPE_COMPUTE_AQL)
                q_properties->type = KFD_QUEUE_TYPE_COMPUTE;
@@ -220,6 +241,11 @@ static int set_queue_properties_from_user(struct queue_properties *q_properties,
 
        pr_debug("Queue Format (%d)\n", q_properties->format);
 
+       pr_debug("Queue EOP (0x%llX)\n", q_properties->eop_ring_buffer_address);
+
+       pr_debug("Queue CTX save arex (0x%llX)\n",
+                       q_properties->ctx_save_restore_area_address);
+
        return 0;
 }
 
@@ -244,9 +270,12 @@ static long kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p,
        if (err)
                return err;
 
+       pr_debug("kfd: looking for gpu id 0x%x\n", args.gpu_id);
        dev = kfd_device_by_id(args.gpu_id);
-       if (dev == NULL)
+       if (dev == NULL) {
+               pr_debug("kfd: gpu id 0x%x was not found\n", args.gpu_id);
                return -EINVAL;
+       }
 
        mutex_lock(&p->mutex);
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index a79c21781d3b5b63d133d5e4785f269a0d7aedc4..3ba34b7bb122ca99d7bb5328046bf659ac3f2d82 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -299,6 +299,11 @@ struct queue_properties {
        uint32_t sdma_engine_id;
        uint32_t sdma_queue_id;
        uint32_t sdma_vm_addr;
+       /* Relevant only for VI */
+       uint64_t eop_ring_buffer_address;
+       uint32_t eop_ring_buffer_size;
+       uint64_t ctx_save_restore_area_address;
+       uint32_t ctx_save_restore_area_size;
 };
 
 /**