From: Matthew Brost <matthew.brost@intel.com>
To: <intel-xe@lists.freedesktop.org>
Cc: Matthew Brost <matthew.brost@intel.com>, Oak Zeng <oak.zeng@intel.com>
Subject: [PATCH v3 04/13] drm/xe: Add struct xe_vma_ops abstraction
Date: Wed, 24 Apr 2024 21:55:04 -0700 [thread overview]
Message-ID: <20240425045513.1913039-5-matthew.brost@intel.com> (raw)
In-Reply-To: <20240425045513.1913039-1-matthew.brost@intel.com>
Having a structure which encapsulates a list of VMA operations will help
enable 1 job for the entire list.
v2:
- Rebase
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Oak Zeng <oak.zeng@intel.com>
---
drivers/gpu/drm/xe/xe_vm.c | 37 ++++++++++++++++++--------------
drivers/gpu/drm/xe/xe_vm_types.h | 7 ++++++
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index c0d60f29667b..7d878d1234cf 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -2236,7 +2236,7 @@ static int xe_vma_op_commit(struct xe_vm *vm, struct xe_vma_op *op)
static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q,
struct drm_gpuva_ops *ops,
struct xe_sync_entry *syncs, u32 num_syncs,
- struct list_head *ops_list, bool last)
+ struct xe_vma_ops *vops, bool last)
{
struct xe_device *xe = vm->xe;
struct xe_vma_op *last_op = NULL;
@@ -2248,11 +2248,11 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q,
drm_gpuva_for_each_op(__op, ops) {
struct xe_vma_op *op = gpuva_op_to_vma_op(__op);
struct xe_vma *vma;
- bool first = list_empty(ops_list);
+ bool first = list_empty(&vops->list);
unsigned int flags = 0;
INIT_LIST_HEAD(&op->link);
- list_add_tail(&op->link, ops_list);
+ list_add_tail(&op->link, &vops->list);
if (first) {
op->flags |= XE_VMA_OP_FIRST;
@@ -2378,7 +2378,7 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q,
}
/* FIXME: Unhandled corner case */
- XE_WARN_ON(!last_op && last && !list_empty(ops_list));
+ XE_WARN_ON(!last_op && last && !list_empty(&vops->list));
if (!last_op)
return 0;
@@ -2718,7 +2718,7 @@ static int op_lock_and_prep(struct drm_exec *exec, struct xe_vm *vm,
static int vm_bind_ioctl_ops_lock_and_prep(struct drm_exec *exec,
struct xe_vm *vm,
- struct list_head *ops_list)
+ struct xe_vma_ops *vops)
{
struct xe_vma_op *op;
int err;
@@ -2727,7 +2727,7 @@ static int vm_bind_ioctl_ops_lock_and_prep(struct drm_exec *exec,
if (err)
return err;
- list_for_each_entry(op, ops_list, link) {
+ list_for_each_entry(op, &vops->list, link) {
err = op_lock_and_prep(exec, vm, op);
if (err)
return err;
@@ -2737,13 +2737,13 @@ static int vm_bind_ioctl_ops_lock_and_prep(struct drm_exec *exec,
}
static struct dma_fence *ops_execute(struct xe_vm *vm,
- struct list_head *ops_list,
+ struct xe_vma_ops *vops,
bool cleanup)
{
struct xe_vma_op *op, *next;
struct dma_fence *fence = NULL;
- list_for_each_entry_safe(op, next, ops_list, link) {
+ list_for_each_entry_safe(op, next, &vops->list, link) {
if (!IS_ERR(fence)) {
dma_fence_put(fence);
fence = xe_vma_op_execute(vm, op);
@@ -2761,7 +2761,7 @@ static struct dma_fence *ops_execute(struct xe_vm *vm,
}
static int vm_bind_ioctl_ops_execute(struct xe_vm *vm,
- struct list_head *ops_list)
+ struct xe_vma_ops *vops)
{
struct drm_exec exec;
struct dma_fence *fence;
@@ -2772,12 +2772,12 @@ static int vm_bind_ioctl_ops_execute(struct xe_vm *vm,
drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT |
DRM_EXEC_IGNORE_DUPLICATES, 0);
drm_exec_until_all_locked(&exec) {
- err = vm_bind_ioctl_ops_lock_and_prep(&exec, vm, ops_list);
+ err = vm_bind_ioctl_ops_lock_and_prep(&exec, vm, vops);
drm_exec_retry_on_contention(&exec);
if (err)
goto unlock;
- fence = ops_execute(vm, ops_list, true);
+ fence = ops_execute(vm, vops, true);
if (IS_ERR(fence)) {
err = PTR_ERR(fence);
/* FIXME: Killing VM rather than proper error handling */
@@ -2938,6 +2938,11 @@ static int vm_bind_ioctl_signal_fences(struct xe_vm *vm,
return err;
}
+static void xe_vma_ops_init(struct xe_vma_ops *vops)
+{
+ INIT_LIST_HEAD(&vops->list);
+}
+
int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
{
struct xe_device *xe = to_xe_device(dev);
@@ -2951,7 +2956,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
u32 num_syncs, num_ufence = 0;
struct xe_sync_entry *syncs = NULL;
struct drm_xe_vm_bind_op *bind_ops;
- LIST_HEAD(ops_list);
+ struct xe_vma_ops vops;
int err;
int i;
@@ -3102,6 +3107,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
goto free_syncs;
}
+ xe_vma_ops_init(&vops);
for (i = 0; i < args->num_binds; ++i) {
u64 range = bind_ops[i].range;
u64 addr = bind_ops[i].addr;
@@ -3121,14 +3127,13 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
}
err = vm_bind_ioctl_ops_parse(vm, q, ops[i], syncs, num_syncs,
- &ops_list,
- i == args->num_binds - 1);
+ &vops, i == args->num_binds - 1);
if (err)
goto unwind_ops;
}
/* Nothing to do */
- if (list_empty(&ops_list)) {
+ if (list_empty(&vops.list)) {
err = -ENODATA;
goto unwind_ops;
}
@@ -3137,7 +3142,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
if (q)
xe_exec_queue_get(q);
- err = vm_bind_ioctl_ops_execute(vm, &ops_list);
+ err = vm_bind_ioctl_ops_execute(vm, &vops);
up_write(&vm->lock);
diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_types.h
index 72a100671e5d..26b9e05c9113 100644
--- a/drivers/gpu/drm/xe/xe_vm_types.h
+++ b/drivers/gpu/drm/xe/xe_vm_types.h
@@ -351,4 +351,11 @@ struct xe_vma_op {
struct xe_vma_op_prefetch prefetch;
};
};
+
+/** struct xe_vma_ops - VMA operations */
+struct xe_vma_ops {
+ /** @list: list of VMA operations */
+ struct list_head list;
+};
+
#endif
--
2.34.1
next prev parent reply other threads:[~2024-04-25 4:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 4:55 [PATCH v3 00/13] Prep patches for 1 job per VM bind IOCTL Matthew Brost
2024-04-25 4:55 ` [PATCH v3 01/13] drm/xe: Lock all gpuva ops during " Matthew Brost
2024-04-26 14:43 ` Zeng, Oak
2024-04-25 4:55 ` [PATCH v3 02/13] drm/xe: Add ops_execute function which returns a fence Matthew Brost
2024-04-25 4:55 ` [PATCH v3 03/13] drm/xe: Move migrate to prefetch to op_lock_and_prep function Matthew Brost
2024-04-25 4:55 ` Matthew Brost [this message]
2024-04-25 4:55 ` [PATCH v3 05/13] drm/xe: Use xe_vma_ops to implement xe_vm_rebind Matthew Brost
2024-04-25 4:55 ` [PATCH v3 06/13] drm/xe: Simplify VM bind IOCTL error handling and cleanup Matthew Brost
2024-04-25 4:55 ` [PATCH v3 07/13] drm/xe: Use xe_vma_ops to implement page fault rebinds Matthew Brost
2024-04-25 4:55 ` [PATCH v3 08/13] drm/xe: Add some members to xe_vma_ops Matthew Brost
2024-04-25 4:55 ` [PATCH v3 09/13] drm/xe: Add vm_bind_ioctl_ops_fini helper Matthew Brost
2024-04-25 4:55 ` [PATCH v3 10/13] drm/xe: Move ufence check to op_lock_and_prep Matthew Brost
2024-04-25 4:55 ` [PATCH v3 11/13] drm/xe: Move ufence add to vm_bind_ioctl_ops_fini Matthew Brost
2024-04-25 4:55 ` [PATCH v3 12/13] drm/xe: Add xe_gt_tlb_invalidation_range and convert PT layer to use this Matthew Brost
2024-04-25 4:55 ` [PATCH v3 13/13] drm/xe: Delete PT update selftest Matthew Brost
2024-04-25 5:05 ` ✓ CI.Patch_applied: success for Prep patches for 1 job per VM bind IOCTL (rev3) Patchwork
2024-04-25 5:06 ` ✗ CI.checkpatch: warning " Patchwork
2024-04-25 5:07 ` ✓ CI.KUnit: success " Patchwork
2024-04-25 5:22 ` ✓ CI.Build: " Patchwork
2024-04-25 5:26 ` ✓ CI.Hooks: " Patchwork
2024-04-25 5:27 ` ✓ CI.checksparse: " Patchwork
2024-04-25 6:10 ` ✓ CI.BAT: " Patchwork
2024-04-25 19:24 ` ✗ CI.FULL: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425045513.1913039-5-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=oak.zeng@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).