[PATCH i-g-t v2 31/66] tests/xe_eudebug: Add userptr variant of basic-vm-access test

[Christoph Manszewski <christoph.manszewski@intel.com>]

From: Andrzej Hajda <andrzej.hajda@intel.com>

The variant uses DRM_XE_VM_BIND_OP_MAP_USERPTR to bind memory
from userspace.

Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Dominik Grzegorzek <dominik.grzegorzek@intel.com>
---
 tests/intel/xe_eudebug.c | 103 ++++++++++++++++++++++++++++++---------
 1 file changed, 80 insertions(+), 23 deletions(-)

diff --git a/tests/intel/xe_eudebug.c b/tests/intel/xe_eudebug.c
index c368e30e7..1e9f16765 100644
--- a/tests/intel/xe_eudebug.c
+++ b/tests/intel/xe_eudebug.c
@@ -60,6 +60,7 @@ static void test_sysfs_toggle(int fd)
 #define VM_BIND_EXTENDED (1 << 4)
 #define VM_METADATA (1 << 5)
 #define VM_BIND_METADATA (1 << 6)
+#define VM_BIND_OP_MAP_USERPTR (1 << 7)
 #define TEST_DISCOVERY (1 << 31)
 
 #define PAGE_SIZE 4096
@@ -166,54 +167,82 @@ static void basic_vm_bind_vm_destroy_client(int fd, struct xe_eudebug_client *c)
 #define BO_ITEMS 4096
 #define MIN_BO_SIZE (BO_ITEMS * sizeof(uint64_t))
 
+union buf_id {
+	uint32_t fd;
+	void *userptr;
+};
+
 struct bind_list {
 	int fd;
 	uint32_t vm;
-	uint32_t *bo;
+	union buf_id *bo;
 	struct drm_xe_vm_bind_op *bind_ops;
 	unsigned int n;
 };
 
-static void bo_prime(int fd, uint32_t bo, const uint64_t addr, const uint64_t size)
+static void *bo_get_ptr(int fd, struct drm_xe_vm_bind_op *o)
+{
+	void *ptr;
+
+	if (o->op != DRM_XE_VM_BIND_OP_MAP_USERPTR)
+		ptr = xe_bo_map(fd, o->obj, o->range);
+	else
+		ptr = (void *)(uintptr_t)o->userptr;
+
+	igt_assert(ptr);
+
+	return ptr;
+}
+
+static void bo_put_ptr(int fd, struct drm_xe_vm_bind_op *o, void *ptr)
+{
+	if (o->op != DRM_XE_VM_BIND_OP_MAP_USERPTR)
+		munmap(ptr, o->range);
+}
+
+static void bo_prime(int fd, struct drm_xe_vm_bind_op *o)
 {
 	uint64_t *d;
 	uint64_t i;
 
-	d = xe_bo_map(fd, bo, size);
-	igt_assert(d);
+	d = bo_get_ptr(fd, o);
 
-	for (i = 0; i < size/sizeof(*d); i++)
-		d[i] = addr + i;
+	for (i = 0; i < o->range / sizeof(*d); i++)
+		d[i] = o->addr + i;
 
-	munmap(d, size);
+	bo_put_ptr(fd, o, d);
 }
 
-static void bo_check(int fd, uint32_t bo, const uint64_t addr, const uint64_t size)
+static void bo_check(int fd, struct drm_xe_vm_bind_op *o)
 {
 	uint64_t *d;
 	uint64_t i;
 
-	d = xe_bo_map(fd, bo, size);
-	igt_assert(d);
+	d = bo_get_ptr(fd, o);
 
-	for (i = 0; i < size/sizeof(*d); i++)
-		igt_assert_eq(d[i], addr + i + 1);
+	for (i = 0; i < o->range / sizeof(*d); i++)
+		igt_assert_eq(d[i], o->addr + i + 1);
 
-	munmap(d, size);
+	bo_put_ptr(fd, o, d);
 }
 
-static uint32_t *vm_create_objects(int fd, uint32_t bo_placement, uint32_t vm, unsigned int size,
+static union buf_id *vm_create_objects(int fd, uint32_t bo_placement, uint32_t vm, unsigned int size,
 				   unsigned int n)
 {
-	uint32_t *bo;
+	union buf_id *bo;
 	unsigned int i;
 
 	bo = calloc(n, sizeof(*bo));
 	igt_assert(bo);
 
 	for (i = 0; i < n; i++) {
-		bo[i] = xe_bo_create(fd, vm, size, bo_placement, 0);
-		igt_assert(bo[i]);
+		if (bo_placement) {
+			bo[i].fd = xe_bo_create(fd, vm, size, bo_placement, 0);
+			igt_assert(bo[i].fd);
+		} else {
+			bo[i].userptr = aligned_alloc(PAGE_SIZE, size);
+			igt_assert(bo[i].userptr);
+		}
 	}
 
 	return bo;
@@ -223,6 +252,7 @@ static struct bind_list *create_bind_list(int fd, uint32_t bo_placement,
 					  uint32_t vm, unsigned int n)
 {
 	const unsigned int bo_size = max_t(bo_size, xe_get_default_alignment(fd), MIN_BO_SIZE);
+	bool is_userptr = !bo_placement;
 	struct bind_list *bl;
 	unsigned int i;
 
@@ -237,6 +267,16 @@ static struct bind_list *create_bind_list(int fd, uint32_t bo_placement,
 	for (i = 0; i < n; i++) {
 		struct drm_xe_vm_bind_op *o = &bl->bind_ops[i];
 
+		if (is_userptr) {
+			o->obj = 0;
+			o->userptr = (uintptr_t)bl->bo[i].userptr;
+			o->op = DRM_XE_VM_BIND_OP_MAP_USERPTR;
+		} else {
+			o->obj = bl->bo[i].fd;
+			o->obj_offset = 0;
+			o->op = DRM_XE_VM_BIND_OP_MAP;
+		}
+
 		o->range = bo_size;
 		o->addr = BO_ADDR + 2 * i * bo_size;
 		o->flags = 0;
@@ -250,7 +290,7 @@ static struct bind_list *create_bind_list(int fd, uint32_t bo_placement,
 		struct drm_xe_vm_bind_op *o = &bl->bind_ops[i];
 
 		igt_debug("bo %d: addr 0x%llx, range 0x%llx\n", i, o->addr, o->range);
-		bo_prime(fd, bl->bo[i], o->addr, o->range);
+		bo_prime(fd, o);
 	}
 
 	return bl;
@@ -277,16 +317,21 @@ static void do_bind_list(struct xe_eudebug_client *c,
 		igt_assert(syncobj_wait(bl->fd, &sync->handle, 1, INT64_MAX, 0, NULL));
 }
 
-static void check_bind_list(struct bind_list *bl)
+static void free_bind_list(struct bind_list *bl)
 {
 	unsigned int i;
 
 	for (i = 0; i < bl->n; i++) {
 		igt_debug("%d: checking 0x%llx (%lld)\n",
 			  i, bl->bind_ops[i].addr, bl->bind_ops[i].addr);
-		bo_check(bl->fd, bl->bo[i], bl->bind_ops[i].addr,
-			 bl->bind_ops[i].range);
+		bo_check(bl->fd, &bl->bind_ops[i]);
+		if (bl->bind_ops[i].op == DRM_XE_VM_BIND_OP_MAP_USERPTR)
+			free(bl->bo[i].userptr);
 	}
+
+	free(bl->bind_ops);
+	free(bl->bo);
+	free(bl);
 }
 
 static void vm_bind_client(int fd, struct xe_eudebug_client *c)
@@ -1321,6 +1366,7 @@ static void vm_access_client(struct xe_eudebug_client *c)
 	struct drm_xe_sync sync = {
 		.flags = DRM_XE_SYNC_TYPE_SYNCOBJ | DRM_XE_SYNC_FLAG_SIGNAL, };
 	struct drm_xe_engine_class_instance *hwe = c->ptr;
+	uint32_t bo_placement;
 	struct bind_list *bl;
 	uint32_t vm;
 	int fd, i;
@@ -1332,7 +1378,11 @@ static void vm_access_client(struct xe_eudebug_client *c)
 
 	vm = xe_eudebug_client_vm_create(c, fd, 0, 0);
 
-	bl = create_bind_list(fd, vram_if_possible(fd, hwe->gt_id), vm, 4);
+	if (c->flags & VM_BIND_OP_MAP_USERPTR)
+		bo_placement = 0;
+	else
+		bo_placement = vram_if_possible(fd, hwe->gt_id);
+	bl = create_bind_list(fd, bo_placement, vm, 4);
 	sync.handle = syncobj_create(bl->fd, 0);
 	do_bind_list(c, bl, &sync);
 	syncobj_destroy(bl->fd, sync.handle);
@@ -1340,7 +1390,7 @@ static void vm_access_client(struct xe_eudebug_client *c)
 	for (i = 0; i < bl->n; i++)
 		xe_eudebug_client_wait_stage(c, bl->bind_ops[i].addr);
 
-	check_bind_list(bl);
+	free_bind_list(bl);
 
 	xe_eudebug_client_vm_destroy(c, fd, vm);
 
@@ -1414,6 +1464,10 @@ static void vm_trigger(struct xe_eudebug_debugger *d,
  * SUBTEST: basic-vm-access
  * Description:
  *      Exercise XE_EUDEBG_VM_OPEN with pread and pwrite into the vm fd
+ *
+ * SUBTEST: basic-vm-access-userptr
+ * Description:
+ *      Exercise XE_EUDEBG_VM_OPEN with pread and pwrite into the vm fd, but backed by userptr
  */
 static void test_vm_access(int fd, unsigned int flags, int num_clients)
 {
@@ -1737,6 +1791,9 @@ igt_main
 	igt_subtest("basic-vm-access")
 		test_vm_access(fd, 0, 1);
 
+	igt_subtest("basic-vm-access-userptr")
+		test_vm_access(fd, VM_BIND_OP_MAP_USERPTR, 1);
+
 	igt_subtest("basic-vm-access-parameters")
 		test_vm_access_parameters(fd, 0, 1);
 
-- 
2.34.1