drm/amdkfd: add events IOCTL set definitions

- AMDKFD_IOC_CREATE_EVENT:
	Creates a new event of a specified type

- AMDKFD_IOC_DESTROY_EVENT:
	Destroys an existing event

- AMDKFD_IOC_SET_EVENT:
	Signal an existing event

- AMDKFD_IOC_RESET_EVENT:
	Reset an existing event

- AMDKFD_IOC_WAIT_EVENTS:
	Wait on event(s) until they are signaled

v2:

- Move the limit of the signal events to kfd_ioctl.h so it
  can be used by userspace

v3:
- Change all bool fields in struct kfd_memory_exception_failure
to uint32_t

Signed-off-by: Andrew Lewycky <Andrew.Lewycky@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 19a4fba46e4e26ea4e31044b597e0f50f45fb9fd..9933b2efe5dd9eaa5a5a73f040341e5b9d96c7ef 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -514,6 +514,36 @@ static int kfd_ioctl_get_process_apertures(struct file *filp,
        return 0;
 }
 
+static int kfd_ioctl_create_event(struct file *filp, struct kfd_process *p,
+                                       void *data)
+{
+       return -ENODEV;
+}
+
+static int kfd_ioctl_destroy_event(struct file *filp, struct kfd_process *p,
+                                       void *data)
+{
+       return -ENODEV;
+}
+
+static int kfd_ioctl_set_event(struct file *filp, struct kfd_process *p,
+                               void *data)
+{
+       return -ENODEV;
+}
+
+static int kfd_ioctl_reset_event(struct file *filp, struct kfd_process *p,
+                               void *data)
+{
+       return -ENODEV;
+}
+
+static int kfd_ioctl_wait_events(struct file *filp, struct kfd_process *p,
+                               void *data)
+{
+       return -ENODEV;
+}
+
 #define AMDKFD_IOCTL_DEF(ioctl, _func, _flags) \
        [_IOC_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags, .cmd_drv = 0, .name = #ioctl}
 
@@ -539,6 +569,21 @@ static const struct amdkfd_ioctl_desc amdkfd_ioctls[] = {
 
        AMDKFD_IOCTL_DEF(AMDKFD_IOC_UPDATE_QUEUE,
                        kfd_ioctl_update_queue, 0),
+
+       AMDKFD_IOCTL_DEF(AMDKFD_IOC_CREATE_EVENT,
+                       kfd_ioctl_create_event, 0),
+
+       AMDKFD_IOCTL_DEF(AMDKFD_IOC_DESTROY_EVENT,
+                       kfd_ioctl_destroy_event, 0),
+
+       AMDKFD_IOCTL_DEF(AMDKFD_IOC_SET_EVENT,
+                       kfd_ioctl_set_event, 0),
+
+       AMDKFD_IOCTL_DEF(AMDKFD_IOC_RESET_EVENT,
+                       kfd_ioctl_reset_event, 0),
+
+       AMDKFD_IOCTL_DEF(AMDKFD_IOC_WAIT_EVENTS,
+                       kfd_ioctl_wait_events, 0),
 };
 
 #define AMDKFD_CORE_IOCTL_COUNT        ARRAY_SIZE(amdkfd_ioctls)

diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index af94f31e33ac9d8ccb5f68312feff34ea4eb6aa1..4ca35a8f9891dae2638207c13903c0f9b55bfa61 100644 (file)
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -27,7 +27,7 @@
 #include <linux/ioctl.h>
 
 #define KFD_IOCTL_MAJOR_VERSION 1
-#define KFD_IOCTL_MINOR_VERSION 0
+#define KFD_IOCTL_MINOR_VERSION 1
 
 struct kfd_ioctl_get_version_args {
        uint32_t major_version; /* from KFD */
@@ -128,6 +128,83 @@ struct kfd_ioctl_get_process_apertures_args {
        uint32_t pad;
 };
 
+/* Matching HSA_EVENTTYPE */
+#define KFD_IOC_EVENT_SIGNAL                   0
+#define KFD_IOC_EVENT_NODECHANGE               1
+#define KFD_IOC_EVENT_DEVICESTATECHANGE                2
+#define KFD_IOC_EVENT_HW_EXCEPTION             3
+#define KFD_IOC_EVENT_SYSTEM_EVENT             4
+#define KFD_IOC_EVENT_DEBUG_EVENT              5
+#define KFD_IOC_EVENT_PROFILE_EVENT            6
+#define KFD_IOC_EVENT_QUEUE_EVENT              7
+#define KFD_IOC_EVENT_MEMORY                   8
+
+#define KFD_IOC_WAIT_RESULT_COMPLETE           0
+#define KFD_IOC_WAIT_RESULT_TIMEOUT            1
+#define KFD_IOC_WAIT_RESULT_FAIL               2
+
+#define KFD_SIGNAL_EVENT_LIMIT                 256
+
+struct kfd_ioctl_create_event_args {
+       uint64_t event_page_offset;     /* from KFD */
+       uint32_t event_trigger_data;    /* from KFD - signal events only */
+       uint32_t event_type;            /* to KFD */
+       uint32_t auto_reset;            /* to KFD */
+       uint32_t node_id;               /* to KFD - only valid for certain
+                                                       event types */
+       uint32_t event_id;              /* from KFD */
+       uint32_t event_slot_index;      /* from KFD */
+};
+
+struct kfd_ioctl_destroy_event_args {
+       uint32_t event_id;              /* to KFD */
+       uint32_t pad;
+};
+
+struct kfd_ioctl_set_event_args {
+       uint32_t event_id;              /* to KFD */
+       uint32_t pad;
+};
+
+struct kfd_ioctl_reset_event_args {
+       uint32_t event_id;              /* to KFD */
+       uint32_t pad;
+};
+
+struct kfd_memory_exception_failure {
+       uint32_t NotPresent;    /* Page not present or supervisor privilege */
+       uint32_t ReadOnly;      /* Write access to a read-only page */
+       uint32_t NoExecute;     /* Execute access to a page marked NX */
+       uint32_t pad;
+};
+
+/* memory exception data*/
+struct kfd_hsa_memory_exception_data {
+       struct kfd_memory_exception_failure failure;
+       uint64_t va;
+       uint32_t gpu_id;
+       uint32_t pad;
+};
+
+/* Event data*/
+struct kfd_event_data {
+       union {
+               struct kfd_hsa_memory_exception_data memory_exception_data;
+       };                              /* From KFD */
+       uint64_t kfd_event_data_ext;    /* pointer to an extension structure
+                                          for future exception types */
+       uint32_t event_id;              /* to KFD */
+       uint32_t pad;
+};
+
+struct kfd_ioctl_wait_events_args {
+       uint64_t events_ptr;            /* to KFD */
+       uint32_t num_events;            /* to KFD */
+       uint32_t wait_for_all;          /* to KFD */
+       uint32_t timeout;               /* to KFD */
+       uint32_t wait_result;           /* from KFD */
+};
+
 #define AMDKFD_IOCTL_BASE 'K'
 #define AMDKFD_IO(nr)                  _IO(AMDKFD_IOCTL_BASE, nr)
 #define AMDKFD_IOR(nr, type)           _IOR(AMDKFD_IOCTL_BASE, nr, type)
@@ -155,7 +232,22 @@ struct kfd_ioctl_get_process_apertures_args {
 #define AMDKFD_IOC_UPDATE_QUEUE                        \
                AMDKFD_IOW(0x07, struct kfd_ioctl_update_queue_args)
 
+#define AMDKFD_IOC_CREATE_EVENT                        \
+               AMDKFD_IOWR(0x08, struct kfd_ioctl_create_event_args)
+
+#define AMDKFD_IOC_DESTROY_EVENT               \
+               AMDKFD_IOW(0x09, struct kfd_ioctl_destroy_event_args)
+
+#define AMDKFD_IOC_SET_EVENT                   \
+               AMDKFD_IOW(0x0A, struct kfd_ioctl_set_event_args)
+
+#define AMDKFD_IOC_RESET_EVENT                 \
+               AMDKFD_IOW(0x0B, struct kfd_ioctl_reset_event_args)
+
+#define AMDKFD_IOC_WAIT_EVENTS                 \
+               AMDKFD_IOWR(0x0C, struct kfd_ioctl_wait_events_args)
+
 #define AMDKFD_COMMAND_START           0x01
-#define AMDKFD_COMMAND_END             0x08
+#define AMDKFD_COMMAND_END             0x0D
 
 #endif