[Intel-xe] [PATCH 12/21] drm/xe/uapi: "Perf" layer to support multiple perf counter stream types
Ashutosh Dixit
ashutosh.dixit at intel.com
Tue Sep 19 16:10:40 UTC 2023
In XE, the plan is to support multiple types of perf counter streams (OA is
only one type of these streams). This requires addition of a PERF layer to
multiplex these different stream types through a single set of PERF
ioctl's.
Signed-off-by: Ashutosh Dixit <ashutosh.dixit at intel.com>
---
drivers/gpu/drm/xe/Makefile | 1 +
drivers/gpu/drm/xe/xe_device.c | 8 +++---
drivers/gpu/drm/xe/xe_oa.c | 43 +++++++++++++++++-----------
drivers/gpu/drm/xe/xe_perf.c | 52 ++++++++++++++++++++++++++++++++++
drivers/gpu/drm/xe/xe_perf.h | 18 ++++++++++++
include/uapi/drm/xe_drm.h | 44 +++++++++++++++++++---------
6 files changed, 133 insertions(+), 33 deletions(-)
create mode 100644 drivers/gpu/drm/xe/xe_perf.c
create mode 100644 drivers/gpu/drm/xe/xe_perf.h
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index a40c4827b9c85..294874681cc6c 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -88,6 +88,7 @@ xe-y += xe_bb.o \
xe_pat.o \
xe_pci.o \
xe_pcode.o \
+ xe_perf.o \
xe_pm.o \
xe_preempt_fence.o \
xe_pt.o \
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 7a179c4515633..770b9fe6e65df 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -25,8 +25,8 @@
#include "xe_irq.h"
#include "xe_mmio.h"
#include "xe_module.h"
-#include "xe_oa.h"
#include "xe_pcode.h"
+#include "xe_perf.h"
#include "xe_pm.h"
#include "xe_query.h"
#include "xe_tile.h"
@@ -115,9 +115,9 @@ static const struct drm_ioctl_desc xe_ioctls[] = {
DRM_RENDER_ALLOW),
DRM_IOCTL_DEF_DRV(XE_VM_MADVISE, xe_vm_madvise_ioctl, DRM_RENDER_ALLOW),
- DRM_IOCTL_DEF_DRV(XE_OA_OPEN, xe_oa_stream_open_ioctl, DRM_RENDER_ALLOW),
- DRM_IOCTL_DEF_DRV(XE_OA_ADD_CONFIG, xe_oa_add_config_ioctl, DRM_RENDER_ALLOW),
- DRM_IOCTL_DEF_DRV(XE_OA_REMOVE_CONFIG, xe_oa_remove_config_ioctl, DRM_RENDER_ALLOW),
+ DRM_IOCTL_DEF_DRV(XE_PERF_OPEN, xe_perf_open_ioctl, DRM_RENDER_ALLOW),
+ DRM_IOCTL_DEF_DRV(XE_PERF_ADD_CONFIG, xe_perf_add_config_ioctl, DRM_RENDER_ALLOW),
+ DRM_IOCTL_DEF_DRV(XE_PERF_REMOVE_CONFIG, xe_perf_remove_config_ioctl, DRM_RENDER_ALLOW),
};
diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
index 506dd056805b2..63db0969a86b2 100644
--- a/drivers/gpu/drm/xe/xe_oa.c
+++ b/drivers/gpu/drm/xe/xe_oa.c
@@ -1173,13 +1173,13 @@ static long xe_oa_ioctl_locked(struct xe_oa_stream *stream,
unsigned long arg)
{
switch (cmd) {
- case XE_OA_IOCTL_ENABLE:
+ case XE_PERF_IOCTL_ENABLE:
xe_oa_enable_locked(stream);
return 0;
- case XE_OA_IOCTL_DISABLE:
+ case XE_PERF_IOCTL_DISABLE:
xe_oa_disable_locked(stream);
return 0;
- case XE_OA_IOCTL_CONFIG:
+ case XE_PERF_IOCTL_CONFIG:
return xe_oa_config_locked(stream, arg);
}
@@ -1692,12 +1692,11 @@ static int xe_oa_read_properties_unlocked(struct xe_oa *oa, u64 __user *uprops,
return 0;
}
-int xe_oa_stream_open_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file)
+int xe_oa_stream_open_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
{
struct xe_oa *oa = &to_xe_device(dev)->oa;
- struct drm_xe_oa_open_param *param = data;
struct xe_oa_open_properties props = {};
+ struct drm_xe_oa_open_param param;
u32 known_open_flags;
struct xe_gt *gt;
int ret;
@@ -1707,14 +1706,18 @@ int xe_oa_stream_open_ioctl(struct drm_device *dev, void *data,
return -ENODEV;
}
+ ret = __copy_from_user(¶m, data, sizeof(param));
+ if (XE_IOCTL_DBG(oa->xe, ret))
+ return -EFAULT;
+
known_open_flags = XE_OA_FLAG_FD_CLOEXEC | XE_OA_FLAG_FD_NONBLOCK | XE_OA_FLAG_DISABLED;
- if (param->flags & ~known_open_flags) {
+ if (param.flags & ~known_open_flags) {
drm_dbg(&oa->xe->drm, "Unknown drm_xe_oa_open_param flag\n");
return -EINVAL;
}
- ret = xe_oa_read_properties_unlocked(oa, u64_to_user_ptr(param->properties_ptr),
- param->num_properties,
+ ret = xe_oa_read_properties_unlocked(oa, u64_to_user_ptr(param.properties_ptr),
+ param.num_properties,
&props);
if (ret)
return ret;
@@ -1722,7 +1725,7 @@ int xe_oa_stream_open_ioctl(struct drm_device *dev, void *data,
gt = props.hwe->gt;
mutex_lock(>->oa.lock);
- ret = xe_oa_stream_open_ioctl_locked(oa, param, &props, file);
+ ret = xe_oa_stream_open_ioctl_locked(oa, ¶m, &props, file);
mutex_unlock(>->oa.lock);
return ret;
@@ -1918,7 +1921,8 @@ int xe_oa_add_config_ioctl(struct drm_device *dev, void *data,
struct drm_file *file)
{
struct xe_oa *oa = &to_xe_device(dev)->oa;
- struct drm_xe_oa_config *arg = data;
+ struct drm_xe_oa_config param;
+ struct drm_xe_oa_config *arg = ¶m;
struct xe_oa_config *oa_config, *tmp;
struct xe_oa_reg *regs;
int err, id;
@@ -1933,6 +1937,10 @@ int xe_oa_add_config_ioctl(struct drm_device *dev, void *data,
return -EACCES;
}
+ err = __copy_from_user(¶m, data, sizeof(param));
+ if (XE_IOCTL_DBG(oa->xe, err))
+ return -EFAULT;
+
if ((!arg->mux_regs_ptr || !arg->n_mux_regs) &&
(!arg->boolean_regs_ptr || !arg->n_boolean_regs) &&
(!arg->flex_regs_ptr || !arg->n_flex_regs)) {
@@ -2035,7 +2043,7 @@ int xe_oa_remove_config_ioctl(struct drm_device *dev, void *data,
{
struct xe_oa *oa = &to_xe_device(dev)->oa;
struct xe_oa_config *oa_config;
- u64 *arg = data;
+ u64 arg, *ptr = data;
int ret;
if (!oa->xe) {
@@ -2048,22 +2056,25 @@ int xe_oa_remove_config_ioctl(struct drm_device *dev, void *data,
return -EACCES;
}
+ ret = get_user(arg, ptr);
+ if (XE_IOCTL_DBG(oa->xe, ret))
+ return ret;
+
ret = mutex_lock_interruptible(&oa->metrics_lock);
if (ret)
return ret;
- oa_config = idr_find(&oa->metrics_idr, *arg);
+ oa_config = idr_find(&oa->metrics_idr, arg);
if (!oa_config) {
drm_dbg(&oa->xe->drm, "Failed to remove unknown OA config\n");
ret = -ENOENT;
goto err_unlock;
}
- WARN_ON(*arg != oa_config->id);
+ WARN_ON(arg != oa_config->id);
sysfs_remove_group(oa->metrics_kobj, &oa_config->sysfs_metric);
-
- idr_remove(&oa->metrics_idr, *arg);
+ idr_remove(&oa->metrics_idr, arg);
mutex_unlock(&oa->metrics_lock);
diff --git a/drivers/gpu/drm/xe/xe_perf.c b/drivers/gpu/drm/xe/xe_perf.c
new file mode 100644
index 0000000000000..0f747af59f245
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_perf.c
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#include "xe_oa.h"
+#include "xe_perf.h"
+
+int xe_perf_open_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ struct drm_xe_perf_param *arg = data;
+
+ if (arg->extensions)
+ return -EINVAL;
+
+ switch (arg->perf_type) {
+ case XE_PERF_TYPE_OA:
+ return xe_oa_stream_open_ioctl(dev, (void *)arg->param, file);
+ default:
+ return -EINVAL;
+ }
+}
+
+int xe_perf_add_config_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ struct drm_xe_perf_param *arg = data;
+
+ if (arg->extensions)
+ return -EINVAL;
+
+ switch (arg->perf_type) {
+ case XE_PERF_TYPE_OA:
+ return xe_oa_add_config_ioctl(dev, (void *)arg->param, file);
+ default:
+ return -EINVAL;
+ }
+}
+
+int xe_perf_remove_config_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
+{
+ struct drm_xe_perf_param *arg = data;
+
+ if (arg->extensions)
+ return -EINVAL;
+
+ switch (arg->perf_type) {
+ case XE_PERF_TYPE_OA:
+ return xe_oa_remove_config_ioctl(dev, (void *)arg->param, file);
+ default:
+ return -EINVAL;
+ }
+}
diff --git a/drivers/gpu/drm/xe/xe_perf.h b/drivers/gpu/drm/xe/xe_perf.h
new file mode 100644
index 0000000000000..7ee90491132a0
--- /dev/null
+++ b/drivers/gpu/drm/xe/xe_perf.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef _XE_PERF_H_
+#define _XE_PERF_H_
+
+#include <drm/xe_drm.h>
+
+struct drm_device;
+struct drm_file;
+
+int xe_perf_open_ioctl(struct drm_device *dev, void *data, struct drm_file *file);
+int xe_perf_add_config_ioctl(struct drm_device *dev, void *data, struct drm_file *file);
+int xe_perf_remove_config_ioctl(struct drm_device *dev, void *data, struct drm_file *file);
+
+#endif
diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 3a64f904858d8..265a52d0162be 100644
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -111,9 +111,9 @@ struct xe_user_extension {
#define DRM_XE_WAIT_USER_FENCE 0x0b
#define DRM_XE_VM_MADVISE 0x0c
#define DRM_XE_EXEC_QUEUE_GET_PROPERTY 0x0d
-#define DRM_XE_OA_OPEN 0x16
-#define DRM_XE_OA_ADD_CONFIG 0x17
-#define DRM_XE_OA_REMOVE_CONFIG 0x18
+#define DRM_XE_PERF_OPEN 0x16
+#define DRM_XE_PERF_ADD_CONFIG 0x17
+#define DRM_XE_PERF_REMOVE_CONFIG 0x18
/* Must be kept compact -- no holes */
#define DRM_IOCTL_XE_DEVICE_QUERY DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_DEVICE_QUERY, struct drm_xe_device_query)
@@ -130,9 +130,9 @@ struct xe_user_extension {
#define DRM_IOCTL_XE_EXEC_QUEUE_SET_PROPERTY DRM_IOW(DRM_COMMAND_BASE + DRM_XE_EXEC_QUEUE_SET_PROPERTY, struct drm_xe_exec_queue_set_property)
#define DRM_IOCTL_XE_WAIT_USER_FENCE DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_WAIT_USER_FENCE, struct drm_xe_wait_user_fence)
#define DRM_IOCTL_XE_VM_MADVISE DRM_IOW(DRM_COMMAND_BASE + DRM_XE_VM_MADVISE, struct drm_xe_vm_madvise)
-#define DRM_IOCTL_XE_OA_OPEN DRM_IOW(DRM_COMMAND_BASE + DRM_XE_OA_OPEN, struct drm_xe_oa_open_param)
-#define DRM_IOCTL_XE_OA_ADD_CONFIG DRM_IOW(DRM_COMMAND_BASE + DRM_XE_OA_ADD_CONFIG, struct drm_xe_oa_config)
-#define DRM_IOCTL_XE_OA_REMOVE_CONFIG DRM_IOW(DRM_COMMAND_BASE + DRM_XE_OA_REMOVE_CONFIG, __u64)
+#define DRM_IOCTL_XE_PERF_OPEN DRM_IOW(DRM_COMMAND_BASE + DRM_XE_PERF_OPEN, struct drm_xe_perf_param)
+#define DRM_IOCTL_XE_PERF_ADD_CONFIG DRM_IOW(DRM_COMMAND_BASE + DRM_XE_PERF_ADD_CONFIG, struct drm_xe_perf_param)
+#define DRM_IOCTL_XE_PERF_REMOVE_CONFIG DRM_IOW(DRM_COMMAND_BASE + DRM_XE_PERF_REMOVE_CONFIG, struct drm_xe_perf_param)
/**
* enum drm_xe_memory_class - Supported memory classes.
@@ -1100,6 +1100,26 @@ struct drm_xe_vm_madvise {
#define XE_PMU_MEDIA_GROUP_BUSY(gt) ___XE_PMU_OTHER(gt, 3)
#define XE_PMU_ANY_ENGINE_GROUP_BUSY(gt) ___XE_PMU_OTHER(gt, 4)
+enum drm_xe_perf_type {
+ XE_PERF_TYPE_OA,
+};
+
+/**
+ * struct drm_xe_perf_param - XE perf layer param
+ *
+ * The perf layer enables multiplexing perf counter streams of multiple
+ * types. The actual params for a particular stream operation are supplied
+ * via the @param pointer (use __copy_from_user to get these params).
+ */
+struct drm_xe_perf_param {
+ /** @extensions: Pointer to the first extension struct, if any */
+ __u64 extensions;
+ /** @perf_type: Type, of enum drm_xe_perf_type, of perf stream */
+ __u64 perf_type;
+ /** @param: Pointer to actual stream params */
+ __u64 param;
+};
+
enum drm_xe_oa_format {
XE_OA_FORMAT_C4_B8 = 7,
@@ -1326,21 +1346,19 @@ struct drm_xe_oa_config {
*
* It's undefined whether any pending data for the stream will be lost.
*/
-#define XE_OA_IOCTL_ENABLE _IO('i', 0x0)
+#define XE_PERF_IOCTL_ENABLE _IO('i', 0x0)
/*
- * Disable data capture for a stream.
+ * Disable data capture for a stream
*
* It is an error to try and read a stream that is disabled.
*/
-#define XE_OA_IOCTL_DISABLE _IO('i', 0x1)
+#define XE_PERF_IOCTL_DISABLE _IO('i', 0x1)
/*
- * Change metrics_set captured by a stream.
- *
- * Returns the previously bound metrics set id, or a negative error code.
+ * Change stream configuration
*/
-#define XE_OA_IOCTL_CONFIG _IO('i', 0x2)
+#define XE_PERF_IOCTL_CONFIG _IO('i', 0x2)
#if defined(__cplusplus)
}
--
2.41.0
More information about the Intel-xe
mailing list