Me: Add exec queue persistance back in as default behavior
Subsystems (2)
Matthew Brost
maintainerPATCH 1/1 Me: Add exec queue persistance back in as default behavior
--- drivers/gpu/drm/xe/xe_device.c | 40 ++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_device.h | 4 +++ drivers/gpu/drm/xe/xe_device_types.h | 8 +++++ drivers/gpu/drm/xe/xe_exec_queue.c | 15 +++++++-- drivers/gpu/drm/xe/xe_exec_queue_types.h | 11 +++++++ drivers/gpu/drm/xe/xe_guc_submit.c | 2 ++ 6 files changed, 77 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_device.c +40 -0
@@ -93,6 +93,9 @@ static int xe_file_open(struct drm_device *dev, struct drm_file *file)return 0 ; } +static void device_kill_persistent_exec_queues (struct xe_device *xe, +struct xe_file *xef); +static void xe_file_close (struct drm_device *dev,struct drm_file *file) {struct xe_device *xe =to_xe_device (dev);
@@ -112,6 +115,9 @@ static void xe_file_close(struct drm_device *dev, struct drm_file *file)xe_exec_queue_put (q); }xa_destroy (&xef->exec_queue.xa); + +device_kill_persistent_exec_queues (xe, xef); +mutex_destroy (&xef->exec_queue.lock);mutex_lock (&xef->vm.lock);xa_for_each (&xef->vm.xa, idx, vm)
@@ -301,6 +307,9 @@ struct xe_device *xe_device_create(struct pci_dev *pdev,xa_erase (&xe->usm.asid_to_vm, asid); } +drmm_mutex_init (&xe->drm, &xe->persistent_engines.lock); +INIT_LIST_HEAD (&xe->persistent_engines.list); +spin_lock_init (&xe->pinned.lock);INIT_LIST_HEAD (&xe->pinned.kernel_bo_present);INIT_LIST_HEAD (&xe->pinned.external_vram);
@@ -747,6 +756,37 @@ void xe_device_shutdown(struct xe_device *xe) { } +void xe_device_add_persistent_exec_queues (struct xe_device *xe,struct xe_exec_queue *q) +{ +mutex_lock (&xe->persistent_engines.lock); +list_add_tail (&q->persistent.link, &xe->persistent_engines.list); +mutex_unlock (&xe->persistent_engines.lock); +} + +void xe_device_remove_persistent_exec_queues (struct xe_device *xe, +struct xe_exec_queue *q) +{ +mutex_lock (&xe->persistent_engines.lock); +if (!list_empty (&q->persistent.link)) +list_del (&q->persistent.link); +mutex_unlock (&xe->persistent_engines.lock); +} + +static void device_kill_persistent_exec_queues (struct xe_device *xe, +struct xe_file *xef) +{ +struct xe_exec_queue *q, *next; + +mutex_lock (&xe->persistent_engines.lock); +list_for_each_entry_safe (q, next, &xe->persistent_engines.list, + persistent.link) +if (q->persistent.xef == xef) { +xe_exec_queue_kill (q); +list_del_init (&q->persistent.link); + } +mutex_unlock (&xe->persistent_engines.lock); +} +/** * xe_device_wmb() - Device specific write memory barrier * @xe: the &xe_device
drivers/gpu/drm/xe/xe_device.h +4 -0
@@ -32,6 +32,10 @@ int xe_device_probe(struct xe_device *xe);void xe_device_remove (struct xe_device *xe);void xe_device_shutdown (struct xe_device *xe); +void xe_device_add_persistent_exec_queues (struct xe_device *xe,struct xe_exec_queue *q); +void xe_device_remove_persistent_exec_queues (struct xe_device *xe, +struct xe_exec_queue *q); +void xe_device_wmb (struct xe_device *xe);static inline struct xe_file *to_xe_file (const struct drm_file *file)
drivers/gpu/drm/xe/xe_device_types.h +8 -0
@@ -366,6 +366,14 @@ struct xe_device {struct mutex lock; } usm; +/** @persistent_engines: engines that are closed but still running */ +struct { +/** @persistent_engines.lock: protects persistent engines */ +struct mutex lock; +/** @persistent_engines.list: list of persistent engines */ +struct list_head list; + } persistent_engines; +/** @pinned: pinned BO state */ struct {/** @pinned.lock: protected pinned BO list state */
drivers/gpu/drm/xe/xe_exec_queue.c +12 -3
@@ -67,6 +67,7 @@ static struct xe_exec_queue *__xe_exec_queue_alloc(struct xe_device *xe, q->fence_irq = >->fence_irq[hwe->class]; q->ring_ops = gt->ring_ops[hwe->class]; q->ops = gt->exec_queue_ops; +INIT_LIST_HEAD (&q->persistent.link);INIT_LIST_HEAD (&q->lr.link);INIT_LIST_HEAD (&q->multi_gt_link);
@@ -574,7 +575,8 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data,/* The migration vm doesn't hold rpm ref */ xe_pm_runtime_get_noresume (xe); - flags =EXEC_QUEUE_FLAG_VM | (id ?EXEC_QUEUE_FLAG_BIND_ENGINE_CHILD :0 ); + flags =EXEC_QUEUE_FLAG_PERSISTENT |EXEC_QUEUE_FLAG_VM | + (id ?EXEC_QUEUE_FLAG_BIND_ENGINE_CHILD :0 ); migrate_vm =xe_migrate_get_vm (gt_to_tile (gt)->migrate); new = xe_exec_queue_create(xe, migrate_vm, logical_mask,
@@ -625,7 +627,9 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data, } q =xe_exec_queue_create (xe, vm, logical_mask, - args->width, hwe,0 , + args->width, hwe, +xe_vm_in_lr_mode (vm) ?0 : +EXEC_QUEUE_FLAG_PERSISTENT , args->extensions);up_read (&vm->lock);xe_vm_put (vm);
@@ -642,6 +646,8 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data, } } + q->persistent.xef = xef; +mutex_lock (&xef->exec_queue.lock); err =xa_alloc (&xef->exec_queue.xa, &id, q, xa_limit_32b,GFP_KERNEL );mutex_unlock (&xef->exec_queue.lock);
@@ -818,7 +824,10 @@ int xe_exec_queue_destroy_ioctl(struct drm_device *dev, void *data,if (XE_IOCTL_DBG (xe, !q))return -ENOENT ; -xe_exec_queue_kill (q); +if (!(q->flags &EXEC_QUEUE_FLAG_PERSISTENT )) +xe_exec_queue_kill (q); +else +xe_device_add_persistent_exec_queues (xe, q);trace_xe_exec_queue_close (q);xe_exec_queue_put (q);
drivers/gpu/drm/xe/xe_exec_queue_types.h +11 -0
@@ -80,6 +80,7 @@ struct xe_exec_queue {#define EXEC_QUEUE_FLAG_BIND_ENGINE_CHILD BIT(3)/* kernel exec_queue only, set priority to highest level */ #define EXEC_QUEUE_FLAG_HIGH_PRIORITY BIT(4) +#define EXEC_QUEUE_FLAG_PERSISTENT BIT(5)/** * @flags: flags for this exec queue, should statically setup aside from ban
@@ -101,6 +102,16 @@ struct xe_exec_queue {struct xe_guc_exec_queue *guc; }; +/** +* @persistent: persistent exec queue state +*/ +struct { +/** @persistent.xef: file which this exec queue belongs to */ +struct xe_file *xef; +/** @persisiten.link: link in list of persistent exec queues */ +struct list_head link; + } persistent; +/** @sched_props: scheduling properties */ struct {/** @sched_props.timeslice_us: timeslice period in micro-seconds */
drivers/gpu/drm/xe/xe_guc_submit.c +2 -0
@@ -1239,6 +1239,8 @@ static void __guc_exec_queue_fini_async(struct work_struct *w)if (xe_exec_queue_is_lr (q))cancel_work_sync (&ge->lr_tdr); +if (q->flags &EXEC_QUEUE_FLAG_PERSISTENT ) +xe_device_remove_persistent_exec_queues (gt_to_xe (q->gt), q);release_guc_id (guc, q);xe_sched_entity_fini (&ge->entity);xe_sched_fini (&ge->sched);
Signature · 1 line
2.34.1
Patchwork
CI✗ Fi.CI.BUILD: failure for Me: Add exec queue persistance back in as default behavior
== Series Details ==
== Series Details ==
Series: Me: Add exec queue persistance back in as default behavior
URL : https://patchwork.freedesktop.org/series/135963/
State : failure
== Summary ==
Applying: Me: Add exec queue persistance back in as default behavior Patch failed at 0001 Me: Add exec queue persistance back in as default behavior When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".