This patch moves userptr definitions and helpers implementation that were
locally in gem_userptr_benchmark and gem_userptr_blits to the library, so other
tests can make use of them as well. There's no functional changes.
Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>
---
benchmarks/gem_userptr_benchmark.c | 45 +++----------------
lib/ioctl_wrappers.c | 30 +++++++++++++
lib/ioctl_wrappers.h | 13 ++++++
tests/gem_userptr_blits.c | 92 +++++++++++---------------------------
4 files changed, 73 insertions(+), 107 deletions(-)
diff --git a/benchmarks/gem_userptr_benchmark.c
b/benchmarks/gem_userptr_benchmark.c
index b804fdd..e0797dc 100644
--- a/benchmarks/gem_userptr_benchmark.c
+++ b/benchmarks/gem_userptr_benchmark.c
@@ -58,17 +58,6 @@
#define PAGE_SIZE 4096
#endif
-#define LOCAL_I915_GEM_USERPTR 0x33
-#define LOCAL_IOCTL_I915_GEM_USERPTR DRM_IOWR (DRM_COMMAND_BASE +
LOCAL_I915_GEM_USERPTR, struct local_i915_gem_userptr)
-struct local_i915_gem_userptr {
- uint64_t user_ptr;
- uint64_t user_size;
- uint32_t flags;
-#define LOCAL_I915_USERPTR_READ_ONLY (1<<0)
-#define LOCAL_I915_USERPTR_UNSYNCHRONIZED (1<<31)
- uint32_t handle;
-};
-
static uint32_t userptr_flags = LOCAL_I915_USERPTR_UNSYNCHRONIZED;
#define BO_SIZE (65536)
@@ -83,30 +72,6 @@ static void gem_userptr_test_synchronized(void)
userptr_flags = 0;
}
-static int gem_userptr(int fd, void *ptr, int size, int read_only, uint32_t
*handle)
-{
- struct local_i915_gem_userptr userptr;
- int ret;
-
- userptr.user_ptr = (uintptr_t)ptr;
- userptr.user_size = size;
- userptr.flags = userptr_flags;
- if (read_only)
- userptr.flags |= LOCAL_I915_USERPTR_READ_ONLY;
-
- ret = drmIoctl(fd, LOCAL_IOCTL_I915_GEM_USERPTR, &userptr);
- if (ret)
- ret = errno;
- igt_skip_on_f(ret == ENODEV &&
- (userptr_flags & LOCAL_I915_USERPTR_UNSYNCHRONIZED) == 0
&&
- !read_only,
- "Skipping, synchronized mappings with no kernel
CONFIG_MMU_NOTIFIER?");
- if (ret == 0)
- *handle = userptr.handle;
-
- return ret;
-}
-
static void **handle_ptr_map;
static unsigned int num_handle_ptr_map;
@@ -144,7 +109,7 @@ static uint32_t create_userptr_bo(int fd, int size)
ret = posix_memalign(&ptr, PAGE_SIZE, size);
igt_assert(ret == 0);
- ret = gem_userptr(fd, (uint32_t *)ptr, size, 0, &handle);
+ ret = gem_userptr(fd, (uint32_t *)ptr, size, 0, userptr_flags, &handle);
igt_assert(ret == 0);
add_handle_ptr(handle, ptr);
@@ -167,7 +132,7 @@ static int has_userptr(int fd)
assert(posix_memalign(&ptr, PAGE_SIZE, PAGE_SIZE) == 0);
oldflags = userptr_flags;
gem_userptr_test_unsynchronized();
- ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, &handle);
+ ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, userptr_flags, &handle);
userptr_flags = oldflags;
if (ret != 0) {
free(ptr);
@@ -379,7 +344,7 @@ static void test_impact_overlap(int fd, const char *prefix)
for (i = 0, p = block; i < nr_bos[subtest];
i++, p += PAGE_SIZE)
- ret = gem_userptr(fd, (uint32_t *)p, BO_SIZE, 0,
+ ret = gem_userptr(fd, (uint32_t *)p, BO_SIZE,
0, userptr_flags,
&handles[i]);
igt_assert(ret == 0);
}
@@ -439,7 +404,7 @@ static void test_single(int fd)
start_test(test_duration_sec);
while (run_test) {
- ret = gem_userptr(fd, bo_ptr, BO_SIZE, 0, &handle);
+ ret = gem_userptr(fd, bo_ptr, BO_SIZE, 0, userptr_flags,
&handle);
assert(ret == 0);
gem_close(fd, handle);
iter++;
@@ -480,7 +445,7 @@ static void test_multiple(int fd, unsigned int batch, int
random)
for (i = 0; i < batch; i++) {
ret = gem_userptr(fd, bo_ptr + map[i] * BO_SIZE,
BO_SIZE,
- 0, &handles[i]);
+ 0, userptr_flags, &handles[i]);
assert(ret == 0);
}
if (random)
diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 941fa66..5152647 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -742,6 +742,36 @@ void gem_context_require_ban_period(int fd)
igt_require(has_ban_period);
}
+int gem_userptr(int fd, void *ptr, int size, int read_only, uint32_t flags,
uint32_t *handle)
+{
+ struct local_i915_gem_userptr userptr;
+ int ret;
+
+ memset(&userptr, 0, sizeof(userptr));
+ userptr.user_ptr = (uintptr_t)ptr;
+ userptr.user_size = size;
+ userptr.flags = flags;
+ if (read_only)
+ userptr.flags |= LOCAL_I915_USERPTR_READ_ONLY;
+
+ ret = drmIoctl(fd, LOCAL_IOCTL_I915_GEM_USERPTR, &userptr);
+ if (ret)
+ ret = errno;
+ igt_skip_on_f(ret == ENODEV &&
+ (flags & LOCAL_I915_USERPTR_UNSYNCHRONIZED) == 0 &&
+ !read_only,
+ "Skipping, synchronized mappings with no kernel
CONFIG_MMU_NOTIFIER?");
+ if (ret == 0)
+ *handle = userptr.handle;
+
+ return ret;
+}
+
+void gem_userptr_sync(int fd, uint32_t handle)
+{
+ gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
+}
+
/**
* gem_sw_finish:
* @fd: open i915 drm file descriptor
diff --git a/lib/ioctl_wrappers.h b/lib/ioctl_wrappers.h
index bc5d4bd..030f785 100644
--- a/lib/ioctl_wrappers.h
+++ b/lib/ioctl_wrappers.h
@@ -109,6 +109,19 @@ void gem_context_require_param(int fd, uint64_t param);
void gem_context_get_param(int fd, struct local_i915_gem_context_param *p);
void gem_context_set_param(int fd, struct local_i915_gem_context_param *p);
+#define LOCAL_I915_GEM_USERPTR 0x33
+#define LOCAL_IOCTL_I915_GEM_USERPTR DRM_IOWR (DRM_COMMAND_BASE +
LOCAL_I915_GEM_USERPTR, struct local_i915_gem_userptr)
+struct local_i915_gem_userptr {
+ uint64_t user_ptr;
+ uint64_t user_size;
+ uint32_t flags;
+#define LOCAL_I915_USERPTR_READ_ONLY (1<<0)
+#define LOCAL_I915_USERPTR_UNSYNCHRONIZED (1<<31)
+ uint32_t handle;
+};
+int gem_userptr(int fd, void *ptr, int size, int read_only, uint32_t flags,
uint32_t *handle);
+void gem_userptr_sync(int fd, uint32_t handle);
+
void gem_sw_finish(int fd, uint32_t handle);
bool gem_bo_busy(int fd, uint32_t handle);
diff --git a/tests/gem_userptr_blits.c b/tests/gem_userptr_blits.c
index 1f2cc96..ecad90e 100644
--- a/tests/gem_userptr_blits.c
+++ b/tests/gem_userptr_blits.c
@@ -64,17 +64,6 @@
#define PAGE_SIZE 4096
#endif
-#define LOCAL_I915_GEM_USERPTR 0x33
-#define LOCAL_IOCTL_I915_GEM_USERPTR DRM_IOWR (DRM_COMMAND_BASE +
LOCAL_I915_GEM_USERPTR, struct local_i915_gem_userptr)
-struct local_i915_gem_userptr {
- uint64_t user_ptr;
- uint64_t user_size;
- uint32_t flags;
-#define LOCAL_I915_USERPTR_READ_ONLY (1<<0)
-#define LOCAL_I915_USERPTR_UNSYNCHRONIZED (1<<31)
- uint32_t handle;
-};
-
static uint32_t userptr_flags = LOCAL_I915_USERPTR_UNSYNCHRONIZED;
#define WIDTH 512
@@ -92,37 +81,6 @@ static void gem_userptr_test_synchronized(void)
userptr_flags = 0;
}
-static int gem_userptr(int fd, void *ptr, int size, int read_only, uint32_t
*handle)
-{
- struct local_i915_gem_userptr userptr;
- int ret;
-
- memset(&userptr, 0, sizeof(userptr));
- userptr.user_ptr = (uintptr_t)ptr;
- userptr.user_size = size;
- userptr.flags = userptr_flags;
- if (read_only)
- userptr.flags |= LOCAL_I915_USERPTR_READ_ONLY;
-
- ret = drmIoctl(fd, LOCAL_IOCTL_I915_GEM_USERPTR, &userptr);
- if (ret)
- ret = errno;
- igt_skip_on_f(ret == ENODEV &&
- (userptr_flags & LOCAL_I915_USERPTR_UNSYNCHRONIZED) == 0
&&
- !read_only,
- "Skipping, synchronized mappings with no kernel
CONFIG_MMU_NOTIFIER?");
- if (ret == 0)
- *handle = userptr.handle;
-
- return ret;
-}
-
-
-static void gem_userptr_sync(int fd, uint32_t handle)
-{
- gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
-}
-
static void
copy(int fd, uint32_t dst, uint32_t src, unsigned int error)
{
@@ -294,7 +252,7 @@ create_userptr(int fd, uint32_t val, uint32_t *ptr)
uint32_t handle;
int i, ret;
- ret = gem_userptr(fd, ptr, sizeof(linear), 0, &handle);
+ ret = gem_userptr(fd, ptr, sizeof(linear), 0, userptr_flags, &handle);
igt_assert_eq(ret, 0);
igt_assert(handle != 0);
@@ -374,7 +332,7 @@ static uint32_t create_userptr_bo(int fd, uint64_t size)
-1, 0);
igt_assert(ptr != MAP_FAILED);
- ret = gem_userptr(fd, (uint32_t *)ptr, size, 0, &handle);
+ ret = gem_userptr(fd, (uint32_t *)ptr, size, 0, userptr_flags, &handle);
igt_assert_eq(ret, 0);
add_handle_ptr(handle, ptr, size);
@@ -453,7 +411,7 @@ static int has_userptr(int fd)
igt_assert(posix_memalign(&ptr, PAGE_SIZE, PAGE_SIZE) == 0);
oldflags = userptr_flags;
gem_userptr_test_unsynchronized();
- ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, &handle);
+ ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, userptr_flags, &handle);
userptr_flags = oldflags;
if (ret != 0) {
free(ptr);
@@ -512,7 +470,7 @@ static int test_access_control(int fd)
igt_assert(posix_memalign(&ptr, PAGE_SIZE, PAGE_SIZE) == 0);
- ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, &handle);
+ ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, userptr_flags,
&handle);
if (ret == 0)
gem_close(fd, handle);
free(ptr);
@@ -530,7 +488,7 @@ static int test_invalid_null_pointer(int fd)
int ret;
/* NULL pointer. */
- ret = gem_userptr(fd, NULL, PAGE_SIZE, 0, &handle);
+ ret = gem_userptr(fd, NULL, PAGE_SIZE, 0, userptr_flags, &handle);
igt_assert_eq(ret, 0);
copy(fd, handle, handle, ~0); /* QQQ Precise errno? */
@@ -553,7 +511,7 @@ static int test_invalid_gtt_mapping(int fd)
igt_assert(((unsigned long)ptr & (PAGE_SIZE - 1)) == 0);
igt_assert((sizeof(linear) & (PAGE_SIZE - 1)) == 0);
- ret = gem_userptr(fd, ptr, sizeof(linear), 0, &handle2);
+ ret = gem_userptr(fd, ptr, sizeof(linear), 0, userptr_flags, &handle2);
igt_assert_eq(ret, 0);
copy(fd, handle2, handle2, ~0); /* QQQ Precise errno? */
gem_close(fd, handle2);
@@ -597,7 +555,7 @@ static void test_forked_access(int fd)
#ifdef MADV_DONTFORK
ret |= madvise(ptr1, sizeof(linear), MADV_DONTFORK);
#endif
- ret |= gem_userptr(fd, ptr1, sizeof(linear), 0, &handle1);
+ ret |= gem_userptr(fd, ptr1, sizeof(linear), 0, userptr_flags,
&handle1);
igt_assert_eq(ret, 0);
igt_assert(ptr1);
igt_assert(handle1);
@@ -606,7 +564,7 @@ static void test_forked_access(int fd)
#ifdef MADV_DONTFORK
ret |= madvise(ptr2, sizeof(linear), MADV_DONTFORK);
#endif
- ret |= gem_userptr(fd, ptr2, sizeof(linear), 0, &handle2);
+ ret |= gem_userptr(fd, ptr2, sizeof(linear), 0, userptr_flags,
&handle2);
igt_assert_eq(ret, 0);
igt_assert(ptr2);
igt_assert(handle2);
@@ -654,7 +612,7 @@ static int test_forbidden_ops(int fd)
igt_assert(posix_memalign(&ptr, PAGE_SIZE, PAGE_SIZE) == 0);
- ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, &handle);
+ ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, userptr_flags, &handle);
igt_assert_eq(ret, 0);
/* pread/pwrite are not always forbidden, but when they
@@ -841,19 +799,19 @@ static int test_usage_restrictions(int fd)
igt_assert(posix_memalign(&ptr, PAGE_SIZE, PAGE_SIZE * 2) == 0);
/* Address not aligned. */
- ret = gem_userptr(fd, (char *)ptr + 1, PAGE_SIZE, 0, &handle);
+ ret = gem_userptr(fd, (char *)ptr + 1, PAGE_SIZE, 0, userptr_flags,
&handle);
igt_assert_neq(ret, 0);
/* Size not rounded to page size. */
- ret = gem_userptr(fd, ptr, PAGE_SIZE - 1, 0, &handle);
+ ret = gem_userptr(fd, ptr, PAGE_SIZE - 1, 0, userptr_flags, &handle);
igt_assert_neq(ret, 0);
/* Both wrong. */
- ret = gem_userptr(fd, (char *)ptr + 1, PAGE_SIZE - 1, 0, &handle);
+ ret = gem_userptr(fd, (char *)ptr + 1, PAGE_SIZE - 1, 0, userptr_flags,
&handle);
igt_assert_neq(ret, 0);
/* Read-only not supported. */
- ret = gem_userptr(fd, (char *)ptr, PAGE_SIZE, 1, &handle);
+ ret = gem_userptr(fd, (char *)ptr, PAGE_SIZE, 1, userptr_flags,
&handle);
igt_assert_neq(ret, 0);
free(ptr);
@@ -875,7 +833,7 @@ static int test_create_destroy(int fd, int time)
for (n = 0; n < 1000; n++) {
igt_assert(posix_memalign(&ptr, PAGE_SIZE, PAGE_SIZE)
== 0);
- do_or_die(gem_userptr(fd, ptr, PAGE_SIZE, 0, &handle));
+ do_or_die(gem_userptr(fd, ptr, PAGE_SIZE, 0,
userptr_flags, &handle));
gem_close(fd, handle);
free(ptr);
@@ -1067,41 +1025,41 @@ static void test_overlap(int fd, int expected)
igt_assert(posix_memalign((void *)&ptr, PAGE_SIZE, PAGE_SIZE * 3) == 0);
- ret = gem_userptr(fd, ptr + PAGE_SIZE, PAGE_SIZE, 0, &handle);
+ ret = gem_userptr(fd, ptr + PAGE_SIZE, PAGE_SIZE, 0, userptr_flags,
&handle);
igt_assert_eq(ret, 0);
/* before, no overlap */
- ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, &handle2);
+ ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, userptr_flags, &handle2);
if (ret == 0)
gem_close(fd, handle2);
igt_assert_eq(ret, 0);
/* after, no overlap */
- ret = gem_userptr(fd, ptr + PAGE_SIZE * 2, PAGE_SIZE, 0, &handle2);
+ ret = gem_userptr(fd, ptr + PAGE_SIZE * 2, PAGE_SIZE, 0, userptr_flags,
&handle2);
if (ret == 0)
gem_close(fd, handle2);
igt_assert_eq(ret, 0);
/* exactly overlapping */
- ret = gem_userptr(fd, ptr + PAGE_SIZE, PAGE_SIZE, 0, &handle2);
+ ret = gem_userptr(fd, ptr + PAGE_SIZE, PAGE_SIZE, 0, userptr_flags,
&handle2);
if (ret == 0)
gem_close(fd, handle2);
igt_assert(ret == 0 || ret == expected);
/* start overlaps */
- ret = gem_userptr(fd, ptr, PAGE_SIZE * 2, 0, &handle2);
+ ret = gem_userptr(fd, ptr, PAGE_SIZE * 2, 0, userptr_flags, &handle2);
if (ret == 0)
gem_close(fd, handle2);
igt_assert(ret == 0 || ret == expected);
/* end overlaps */
- ret = gem_userptr(fd, ptr + PAGE_SIZE, PAGE_SIZE * 2, 0, &handle2);
+ ret = gem_userptr(fd, ptr + PAGE_SIZE, PAGE_SIZE * 2, 0, userptr_flags,
&handle2);
if (ret == 0)
gem_close(fd, handle2);
igt_assert(ret == 0 || ret == expected);
/* subsumes */
- ret = gem_userptr(fd, ptr, PAGE_SIZE * 3, 0, &handle2);
+ ret = gem_userptr(fd, ptr, PAGE_SIZE * 3, 0, userptr_flags, &handle2);
if (ret == 0)
gem_close(fd, handle2);
igt_assert(ret == 0 || ret == expected);
@@ -1126,7 +1084,7 @@ static void test_unmap(int fd, int expected)
bo_ptr = (char *)ALIGN((unsigned long)ptr, PAGE_SIZE);
for (i = 0; i < num_obj; i++, bo_ptr += sizeof(linear)) {
- ret = gem_userptr(fd, bo_ptr, sizeof(linear), 0, &bo[i]);
+ ret = gem_userptr(fd, bo_ptr, sizeof(linear), 0, userptr_flags,
&bo[i]);
igt_assert_eq(ret, 0);
}
@@ -1161,7 +1119,7 @@ static void test_unmap_after_close(int fd)
bo_ptr = (char *)ALIGN((unsigned long)ptr, PAGE_SIZE);
for (i = 0; i < num_obj; i++, bo_ptr += sizeof(linear)) {
- ret = gem_userptr(fd, bo_ptr, sizeof(linear), 0, &bo[i]);
+ ret = gem_userptr(fd, bo_ptr, sizeof(linear), 0, userptr_flags,
&bo[i]);
igt_assert_eq(ret, 0);
}
@@ -1232,7 +1190,7 @@ static void test_stress_mm(int fd)
igt_assert_eq(ret, 0);
while (loops--) {
- ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, &handle);
+ ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, userptr_flags,
&handle);
igt_assert_eq(ret, 0);
gem_close(fd, handle);
@@ -1267,7 +1225,7 @@ static void *mm_userptr_close_thread(void *data)
while (!t->stop) {
pthread_mutex_unlock(&t->mutex);
for (int i = 0; i < num_handles; i++)
- igt_assert_eq(gem_userptr(t->fd, t->ptr, PAGE_SIZE, 0,
&handle[i]),
+ igt_assert_eq(gem_userptr(t->fd, t->ptr, PAGE_SIZE, 0,
userptr_flags, &handle[i]),
0);
for (int i = 0; i < num_handles; i++)
gem_close(t->fd, handle[i]);
--
2.1.0
