[Intel-xe] [PATCH V4 2/6] drm/xe: Add sysfs for default engine scheduler properties
Tejas Upadhyay
tejas.upadhyay at intel.com
Thu Jul 20 12:15:47 UTC 2023
For each HW engine under GT we are adding defaults sysfs
entry to list all engine scheduler properties and its
default values. So that it will be easier for user to
fetch default values of these properties anytime to go
back to default.
For example,
DUT# cat /sys/class/drm/card1/device/tileN/gtN/engines/bcs/.defaults/
job_timeout_ms preempt_timeout_us timeslice_duration_us
where,
@job_timeout_ms: The time after which a job is removed from the scheduler.
@preempt_timeout_us: How long to wait (in microseconds) for a preemption
event to occur when submitting a new context.
@timeslice_duration_us: Each context is scheduled for execution for the
timeslice duration, before switching to the next
context.
V3 :
- Rearrange code in its own file
- Rebase
- Update commit message to reflect tile addition
V2 :
- Use sysfs_create_files in this patch - Niranjana
- Handle prototype error for xe_add_engine_defaults - CI hooks
- Remove unused member sysfs_hwe - Niranjana
Signed-off-by: Tejas Upadhyay <tejas.upadhyay at intel.com>
---
drivers/gpu/drm/xe/xe_engine.c | 4 +-
drivers/gpu/drm/xe/xe_engine_class_sysfs.c | 94 ++++++++++++++++++++--
drivers/gpu/drm/xe/xe_engine_class_sysfs.h | 20 +++++
drivers/gpu/drm/xe/xe_guc_submit.c | 5 +-
drivers/gpu/drm/xe/xe_hw_engine.c | 5 ++
drivers/gpu/drm/xe/xe_hw_engine_types.h | 12 +++
6 files changed, 131 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_engine.c b/drivers/gpu/drm/xe/xe_engine.c
index 59e0a9e085ba..aa2d49efb9bb 100644
--- a/drivers/gpu/drm/xe/xe_engine.c
+++ b/drivers/gpu/drm/xe/xe_engine.c
@@ -54,8 +54,8 @@ static struct xe_engine *__xe_engine_create(struct xe_device *xe,
INIT_LIST_HEAD(&e->multi_gt_link);
/* FIXME: Wire up to configurable default value */
- e->sched_props.timeslice_us = 1 * 1000;
- e->sched_props.preempt_timeout_us = 640 * 1000;
+ e->sched_props.timeslice_us = hwe->sched_props.timeslice_us;
+ e->sched_props.preempt_timeout_us = hwe->sched_props.preempt_timeout_us;
if (xe_engine_is_parallel(e)) {
e->parallel.composite_fence_ctx = dma_fence_context_alloc(1);
diff --git a/drivers/gpu/drm/xe/xe_engine_class_sysfs.c b/drivers/gpu/drm/xe/xe_engine_class_sysfs.c
index 9959b0362d71..7804cc27bd05 100644
--- a/drivers/gpu/drm/xe/xe_engine_class_sysfs.c
+++ b/drivers/gpu/drm/xe/xe_engine_class_sysfs.c
@@ -9,6 +9,8 @@
#include "xe_engine_class_sysfs.h"
+static int xe_add_engine_class_defaults(struct kobject *parent);
+
static void kobj_xe_engine_release(struct kobject *kobj)
{
kfree(kobj);
@@ -19,22 +21,91 @@ static const struct kobj_type kobj_xe_engine_type = {
.sysfs_ops = &kobj_sysfs_ops
};
-static struct kobject *
+static struct kobj_hwe *
kobj_xe_engine(struct kobject *parent, char *name)
+{
+ struct kobj_hwe *khwe;
+
+ khwe = kzalloc(sizeof(*khwe), GFP_KERNEL);
+ if (!khwe)
+ return NULL;
+
+ kobject_init(&khwe->base, &kobj_xe_engine_type);
+ if (kobject_add(&khwe->base, parent, "%s", name)) {
+ kobject_put(&khwe->base);
+ return NULL;
+ }
+
+ return khwe;
+}
+
+static ssize_t job_timeout_default(struct kobject *kobj,
+ struct kobj_attribute *attr, char *buf)
+{
+ struct xe_hw_engine *hwe = kobj_to_hwe(kobj->parent);
+
+ return sprintf(buf, "%u\n", hwe->defaults.job_timeout_ms);
+}
+
+static struct kobj_attribute job_timeout_def =
+__ATTR(job_timeout_ms, 0444, job_timeout_default, NULL);
+
+static ssize_t timeslice_default(struct kobject *kobj,
+ struct kobj_attribute *attr, char *buf)
+{
+ struct xe_hw_engine *hwe = kobj_to_hwe(kobj->parent);
+
+ return sprintf(buf, "%u\n", hwe->defaults.timeslice_us);
+}
+
+static struct kobj_attribute timeslice_duration_def =
+__ATTR(timeslice_duration_us, 0444, timeslice_default, NULL);
+
+static ssize_t preempt_timeout_default(struct kobject *kobj,
+ struct kobj_attribute *attr,
+ char *buf)
+{
+ struct xe_hw_engine *hwe = kobj_to_hwe(kobj->parent);
+
+ return sprintf(buf, "%u\n", hwe->defaults.preempt_timeout_us);
+}
+
+static struct kobj_attribute preempt_timeout_def =
+__ATTR(preempt_timeout_us, 0444, preempt_timeout_default, NULL);
+
+static const struct attribute *defaults[] = {
+ &job_timeout_def.attr,
+ ×lice_duration_def.attr,
+ &preempt_timeout_def.attr,
+ NULL
+};
+
+static int xe_add_engine_class_defaults(struct kobject *parent)
{
struct kobject *kobj;
+ int err = 0;
kobj = kzalloc(sizeof(*kobj), GFP_KERNEL);
if (!kobj)
- return NULL;
+ return -ENOMEM;
kobject_init(kobj, &kobj_xe_engine_type);
- if (kobject_add(kobj, parent, "%s", name)) {
+
+ err = kobject_add(kobj, parent, "%s", ".defaults");
+ if (err)
+ goto err_object;
+
+ err = sysfs_create_files(kobj, defaults);
+ if (err)
+ goto err_object;
+
+ if (0) {
+err_object:
kobject_put(kobj);
- return NULL;
+ return err;
}
- return kobj;
+ return err;
}
static void xe_engine_sysfs_kobj_release(struct kobject *kobj)
@@ -69,7 +140,7 @@ int xe_engine_class_sysfs_init(struct xe_gt *gt)
for_each_hw_engine(hwe, gt, id) {
char name[MAX_ENGINE_CLASS_NAME_LEN];
- struct kobject *khwe;
+ struct kobj_hwe *khwe;
if (hwe->class == XE_ENGINE_CLASS_OTHER ||
hwe->class == XE_ENGINE_CLASS_MAX)
@@ -106,6 +177,17 @@ int xe_engine_class_sysfs_init(struct xe_gt *gt)
kobject_put(kobj);
return -EINVAL;
}
+
+ khwe->hwe = hwe;
+ err = xe_add_engine_class_defaults(&khwe->base);
+ if (err) {
+ kobject_put(kobj);
+ drm_warn(>_to_xe(gt)->drm,
+ "Warning: adding .defaults to engines failed!, err: %d\n",
+ err);
+ return err;
+ }
+
}
return err;
}
diff --git a/drivers/gpu/drm/xe/xe_engine_class_sysfs.h b/drivers/gpu/drm/xe/xe_engine_class_sysfs.h
index f195dacc1ec6..492a84a22c30 100644
--- a/drivers/gpu/drm/xe/xe_engine_class_sysfs.h
+++ b/drivers/gpu/drm/xe/xe_engine_class_sysfs.h
@@ -10,4 +10,24 @@
#define MAX_ENGINE_CLASS_NAME_LEN 16
int xe_engine_class_sysfs_init(struct xe_gt *gt);
+
+/**
+ * struct kobj_hwe - A hwe's kobject struct that connects the kobject and the
+ * hwe.
+ *
+ * When dealing with multiple hwe, this struct helps to understand which hwe
+ * needs to be addressed on a given sysfs call.
+ */
+struct kobj_hwe {
+ /** @base: The actual kobject */
+ struct kobject base;
+ /** @hwe: A pointer to the hwe itself */
+ struct xe_hw_engine *hwe;
+};
+
+static inline struct xe_hw_engine *kobj_to_hwe(struct kobject *kobj)
+{
+ return container_of(kobj, struct kobj_hwe, base)->hwe;
+}
+
#endif
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index 911d4965c27c..08e1b05206cc 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -1128,7 +1128,8 @@ static int guc_engine_init(struct xe_engine *e)
ge->engine = e;
init_waitqueue_head(&ge->suspend_wait);
- timeout = xe_vm_no_dma_fences(e->vm) ? MAX_SCHEDULE_TIMEOUT : HZ * 5;
+ timeout = xe_vm_no_dma_fences(e->vm) ? MAX_SCHEDULE_TIMEOUT :
+ e->hwe->sched_props.job_timeout_ms;
err = drm_sched_init(&ge->sched, &drm_sched_ops, NULL,
e->lrc[0].ring.size / MAX_JOB_SIZE_BYTES,
64, timeout, guc_to_gt(guc)->ordered_wq, NULL,
@@ -1136,6 +1137,8 @@ static int guc_engine_init(struct xe_engine *e)
gt_to_xe(e->gt)->drm.dev);
if (err)
goto err_free;
+ /* Record timeout value, in order to show current set timeout */
+ e->hwe->sched_props.job_timeout_ms = timeout;
sched = &ge->sched;
err = drm_sched_entity_init(&ge->entity, DRM_SCHED_PRIORITY_NORMAL,
diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c
index 1af5cccd1142..0a254a59735d 100644
--- a/drivers/gpu/drm/xe/xe_hw_engine.c
+++ b/drivers/gpu/drm/xe/xe_hw_engine.c
@@ -361,6 +361,11 @@ static void hw_engine_init_early(struct xe_gt *gt, struct xe_hw_engine *hwe,
hwe->name = info->name;
hwe->fence_irq = >->fence_irq[info->class];
hwe->engine_id = id;
+ /* FIXME: Wire up to configurable default value */
+ hwe->sched_props.job_timeout_ms = HZ * 5;
+ hwe->sched_props.timeslice_us = 1 * 1000;
+ hwe->sched_props.preempt_timeout_us = 640 * 1000;
+ hwe->defaults = hwe->sched_props; /* Record default props */
xe_reg_sr_init(&hwe->reg_sr, hwe->name, gt_to_xe(gt));
xe_wa_process_engine(hwe);
diff --git a/drivers/gpu/drm/xe/xe_hw_engine_types.h b/drivers/gpu/drm/xe/xe_hw_engine_types.h
index d788e67312b9..6635c36f38d0 100644
--- a/drivers/gpu/drm/xe/xe_hw_engine_types.h
+++ b/drivers/gpu/drm/xe/xe_hw_engine_types.h
@@ -107,6 +107,18 @@ struct xe_hw_engine {
void (*irq_handler)(struct xe_hw_engine *, u16);
/** @engine_id: id for this hw engine */
enum xe_hw_engine_id engine_id;
+ /**
+ * @sched_props: scheduling properties
+ * @defaults: default scheduling properties
+ */
+ struct {
+ /** @set_job_timeout: Set job timeout in ms for engine */
+ u32 job_timeout_ms;
+ /** @timeslice_us: timeslice period in micro-seconds */
+ u32 timeslice_us;
+ /** @preempt_timeout_us: preemption timeout in micro-seconds */
+ u32 preempt_timeout_us;
+ } sched_props, defaults;
};
/**
--
2.25.1
More information about the Intel-xe
mailing list