From: "Zbigniew Kempczyński" <zbigniew.kempczynski@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t v3 09/17] lib/xe_util: Add vm bind/unbind helper for Xe
Date: Tue, 11 Jul 2023 13:20:01 +0200 [thread overview]
Message-ID: <20230711112009.122482-10-zbigniew.kempczynski@intel.com> (raw)
In-Reply-To: <20230711112009.122482-1-zbigniew.kempczynski@intel.com>
Before calling exec we need to prepare vm to contain valid entries.
Bind/unbind in xe expects single bind_op or vector of bind_ops what
makes preparation of it a little bit inconvinient. Add function
which iterates over list of xe_object (auxiliary structure which
describes bind information for object) and performs the bind/unbind
in one step. It also supports passing syncobj in/out to work in
pipelined executions.
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
--
v3: - Drop priv field in the structure
---
lib/xe/xe_util.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++
lib/xe/xe_util.h | 17 +++++++
2 files changed, 142 insertions(+)
diff --git a/lib/xe/xe_util.c b/lib/xe/xe_util.c
index 5f0f69a8c6..7d78065a13 100644
--- a/lib/xe/xe_util.c
+++ b/lib/xe/xe_util.c
@@ -102,3 +102,128 @@ char *xe_memregion_dynamic_subtest_name(int xe, struct igt_collection *set)
return name;
}
+#ifdef XEBINDDBG
+#define bind_info igt_info
+#define bind_debug igt_debug
+#else
+#define bind_info(...) {}
+#define bind_debug(...) {}
+#endif
+
+static struct drm_xe_vm_bind_op *xe_alloc_bind_ops(struct igt_list_head *obj_list,
+ uint32_t *num_ops)
+{
+ struct drm_xe_vm_bind_op *bind_ops, *ops;
+ struct xe_object *obj;
+ uint32_t num_objects = 0, i = 0, op;
+
+ igt_list_for_each_entry(obj, obj_list, link)
+ num_objects++;
+
+ *num_ops = num_objects;
+ if (!num_objects) {
+ bind_info(" [nothing to bind]\n");
+ return NULL;
+ }
+
+ bind_ops = calloc(num_objects, sizeof(*bind_ops));
+ igt_assert(bind_ops);
+
+ igt_list_for_each_entry(obj, obj_list, link) {
+ ops = &bind_ops[i];
+
+ if (obj->bind_op == XE_OBJECT_BIND) {
+ op = XE_VM_BIND_OP_MAP | XE_VM_BIND_FLAG_ASYNC;
+ ops->obj = obj->handle;
+ } else {
+ op = XE_VM_BIND_OP_UNMAP | XE_VM_BIND_FLAG_ASYNC;
+ }
+
+ ops->op = op;
+ ops->obj_offset = 0;
+ ops->addr = obj->offset;
+ ops->range = obj->size;
+ ops->region = 0;
+
+ bind_info(" [%d]: [%6s] handle: %u, offset: %llx, size: %llx\n",
+ i, obj->bind_op == XE_OBJECT_BIND ? "BIND" : "UNBIND",
+ ops->obj, (long long)ops->addr, (long long)ops->range);
+ i++;
+ }
+
+ return bind_ops;
+}
+
+/**
+ * xe_bind_unbind_async:
+ * @xe: drm fd of Xe device
+ * @vm: vm to bind/unbind objects to/from
+ * @bind_engine: bind engine, 0 if default
+ * @obj_list: list of xe_object
+ * @sync_in: sync object (fence-in), 0 if there's no input dependency
+ * @sync_out: sync object (fence-out) to signal on bind/unbind completion,
+ * if 0 wait for bind/unbind completion.
+ *
+ * Function iterates over xe_object @obj_list, prepares binding operation
+ * and does bind/unbind in one step. Providing sync_in / sync_out allows
+ * working in pipelined mode. With sync_in and sync_out set to 0 function
+ * waits until binding operation is complete.
+ */
+void xe_bind_unbind_async(int xe, uint32_t vm, uint32_t bind_engine,
+ struct igt_list_head *obj_list,
+ uint32_t sync_in, uint32_t sync_out)
+{
+ struct drm_xe_vm_bind_op *bind_ops;
+ struct drm_xe_sync tabsyncs[2] = {
+ { .flags = DRM_XE_SYNC_SYNCOBJ, .handle = sync_in },
+ { .flags = DRM_XE_SYNC_SYNCOBJ | DRM_XE_SYNC_SIGNAL, .handle = sync_out },
+ };
+ struct drm_xe_sync *syncs;
+ uint32_t num_binds = 0;
+ int num_syncs;
+
+ bind_info("[Binding to vm: %u]\n", vm);
+ bind_ops = xe_alloc_bind_ops(obj_list, &num_binds);
+
+ if (!num_binds) {
+ if (sync_out)
+ syncobj_signal(xe, &sync_out, 1);
+ return;
+ }
+
+ if (sync_in) {
+ syncs = tabsyncs;
+ num_syncs = 2;
+ } else {
+ syncs = &tabsyncs[1];
+ num_syncs = 1;
+ }
+
+ /* User didn't pass sync out, create it and wait for completion */
+ if (!sync_out)
+ tabsyncs[1].handle = syncobj_create(xe, 0);
+
+ bind_info("[Binding syncobjs: (in: %u, out: %u)]\n",
+ tabsyncs[0].handle, tabsyncs[1].handle);
+
+ if (num_binds == 1) {
+ if ((bind_ops[0].op & 0xffff) == XE_VM_BIND_OP_MAP)
+ xe_vm_bind_async(xe, vm, bind_engine, bind_ops[0].obj, 0,
+ bind_ops[0].addr, bind_ops[0].range,
+ syncs, num_syncs);
+ else
+ xe_vm_unbind_async(xe, vm, bind_engine, 0,
+ bind_ops[0].addr, bind_ops[0].range,
+ syncs, num_syncs);
+ } else {
+ xe_vm_bind_array(xe, vm, bind_engine, bind_ops,
+ num_binds, syncs, num_syncs);
+ }
+
+ if (!sync_out) {
+ igt_assert_eq(syncobj_wait_err(xe, &tabsyncs[1].handle, 1, INT64_MAX, 0), 0);
+ syncobj_destroy(xe, tabsyncs[1].handle);
+ }
+
+ free(bind_ops);
+}
diff --git a/lib/xe/xe_util.h b/lib/xe/xe_util.h
index 9f56fa9898..61511dd97f 100644
--- a/lib/xe/xe_util.h
+++ b/lib/xe/xe_util.h
@@ -27,4 +27,21 @@ __xe_get_memory_region_set(int xe, uint32_t *mem_regions_type, int num_regions);
char *xe_memregion_dynamic_subtest_name(int xe, struct igt_collection *set);
+enum xe_bind_op {
+ XE_OBJECT_BIND,
+ XE_OBJECT_UNBIND,
+};
+
+struct xe_object {
+ uint32_t handle;
+ uint64_t offset;
+ uint64_t size;
+ enum xe_bind_op bind_op;
+ struct igt_list_head link;
+};
+
+void xe_bind_unbind_async(int fd, uint32_t vm, uint32_t bind_engine,
+ struct igt_list_head *obj_list,
+ uint32_t sync_in, uint32_t sync_out);
+
#endif /* XE_UTIL_H */
--
2.34.1
next prev parent reply other threads:[~2023-07-11 11:20 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 11:19 [igt-dev] [PATCH i-g-t v3 00/17] Extend intel_blt to work on Xe Zbigniew Kempczyński
2023-07-11 11:19 ` [igt-dev] [PATCH i-g-t v3 01/17] tests/api_intel_allocator: Don't use allocator ahnd aliasing api Zbigniew Kempczyński
2023-07-11 11:19 ` [igt-dev] [PATCH i-g-t v3 02/17] lib/intel_allocator: Drop aliasing allocator handle api Zbigniew Kempczyński
2023-07-12 7:27 ` Karolina Stolarek
2023-07-11 11:19 ` [igt-dev] [PATCH i-g-t v3 03/17] lib/intel_allocator: Remove extensive debugging Zbigniew Kempczyński
2023-07-11 11:19 ` [igt-dev] [PATCH i-g-t v3 04/17] lib/xe_ioctl: Export non-assert xe_exec function Zbigniew Kempczyński
2023-07-12 7:33 ` Karolina Stolarek
2023-07-11 11:19 ` [igt-dev] [PATCH i-g-t v3 05/17] lib/xe_query: Use vramN when returning string region name Zbigniew Kempczyński
2023-07-11 11:19 ` [igt-dev] [PATCH i-g-t v3 06/17] lib/xe_query: Add xe_region_class() helper Zbigniew Kempczyński
2023-07-11 11:19 ` [igt-dev] [PATCH i-g-t v3 07/17] lib/drmtest: Add get_intel_driver() helper Zbigniew Kempczyński
2023-07-11 11:20 ` [igt-dev] [PATCH i-g-t v3 08/17] lib/xe_util: Return dynamic subtest name for Xe Zbigniew Kempczyński
2023-07-11 11:20 ` Zbigniew Kempczyński [this message]
2023-07-12 8:00 ` [igt-dev] [PATCH i-g-t v3 09/17] lib/xe_util: Add vm bind/unbind helper " Karolina Stolarek
2023-07-11 11:20 ` [igt-dev] [PATCH i-g-t v3 10/17] lib/intel_allocator: Add intel_allocator_bind() Zbigniew Kempczyński
2023-07-12 9:13 ` Karolina Stolarek
2023-07-12 9:33 ` Zbigniew Kempczyński
2023-07-12 10:39 ` Karolina Stolarek
2023-07-12 17:03 ` Zbigniew Kempczyński
2023-07-11 11:20 ` [igt-dev] [PATCH i-g-t v3 11/17] lib/intel_ctx: Add xe context information Zbigniew Kempczyński
2023-07-12 9:14 ` Karolina Stolarek
2023-07-11 11:20 ` [igt-dev] [PATCH i-g-t v3 12/17] lib/intel_blt: Introduce blt_copy_init() helper to cache driver Zbigniew Kempczyński
2023-07-11 11:20 ` [igt-dev] [PATCH i-g-t v3 13/17] lib/intel_blt: Extend blitter library to support xe driver Zbigniew Kempczyński
2023-07-12 9:22 ` Karolina Stolarek
2023-07-12 9:43 ` Zbigniew Kempczyński
2023-07-12 10:22 ` Karolina Stolarek
2023-07-11 11:20 ` [igt-dev] [PATCH i-g-t v3 14/17] tests/xe_ccs: Check if flatccs is working with block-copy for Xe Zbigniew Kempczyński
2023-07-12 10:02 ` Karolina Stolarek
2023-07-11 11:20 ` [igt-dev] [PATCH i-g-t v3 15/17] tests/xe_exercise_blt: Check blitter library fast-copy " Zbigniew Kempczyński
2023-07-12 10:18 ` Karolina Stolarek
2023-07-12 17:05 ` Zbigniew Kempczyński
2023-07-11 11:20 ` [igt-dev] [PATCH i-g-t v3 16/17] tests/api-intel-allocator: Adopt to exercise allocator to Xe Zbigniew Kempczyński
2023-07-11 11:20 ` [igt-dev] [PATCH i-g-t v3 17/17] tests/gem_ccs: Avoid writing png twice Zbigniew Kempczyński
2023-07-12 9:24 ` Karolina Stolarek
2023-07-11 11:40 ` [igt-dev] ✗ GitLab.Pipeline: warning for Extend intel_blt to work on Xe (rev3) Patchwork
2023-07-11 12:09 ` [igt-dev] ○ CI.xeBAT: info " Patchwork
2023-07-11 12:10 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2023-07-11 14:52 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2023-07-12 8:14 ` Zbigniew Kempczyński
2023-07-14 4:56 ` Yedireswarapu, SaiX Nandan
2023-07-14 4:48 ` [igt-dev] ✓ Fi.CI.IGT: success " 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=20230711112009.122482-10-zbigniew.kempczynski@intel.com \
--to=zbigniew.kempczynski@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/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