The shadow batch needs to be in the user visible ppGTT, so make sure we
are not leaking anything, if we can guess where the shadow will be
placed.
Signed-off-by: Matthew Auld <matthew.auld@xxxxxxxxx>
---
tests/i915/gen9_exec_parse.c | 86 ++++++++++++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
diff --git a/tests/i915/gen9_exec_parse.c b/tests/i915/gen9_exec_parse.c
index 087d6f35..985ae6c0 100644
--- a/tests/i915/gen9_exec_parse.c
+++ b/tests/i915/gen9_exec_parse.c
@@ -1051,6 +1051,89 @@ static void test_rejected(int i915, uint32_t handle, bool ctx_param)
}
}
+#define PAGE_SHIFT 12
+#define PAGE_SIZE (1ULL << 12)
+
+static inline uint32_t copy_shadow(uint32_t *batch, uint32_t len,
+ uint32_t src, uint32_t dst)
+{
+ unsigned int i = 0;
+
+#define COPY_BLT_CMD (2<<29|0x53<<22)
+#define BLT_WRITE_ALPHA (1<<21)
+#define BLT_WRITE_RGB (1<<20)
+ batch[i++] = COPY_BLT_CMD | BLT_WRITE_ALPHA | BLT_WRITE_RGB | 8;
+ batch[i++] = 0xcc << 16 | 1 << 25 | 1 << 24 | PAGE_SIZE;
+ batch[i++] = 0;
+ batch[i++] = len >> PAGE_SHIFT << 16 | PAGE_SIZE / 4;
+ batch[i++] = dst;
+ batch[i++] = 0;
+ batch[i++] = 0;
+ batch[i++] = PAGE_SIZE;
+ batch[i++] = src;
+ batch[i++] = 0;
+ batch[i++] = MI_BATCH_BUFFER_END;
+ batch[i++] = 0;
+
+ return i * sizeof(uint32_t);
+}
+
+static void test_shadow_peek(int fd)
+{
+ uint64_t size = PAGE_SIZE;
+ struct drm_i915_gem_exec_object2 exec[2] = {};
+ struct drm_i915_gem_execbuffer2 execbuf = {
+ .buffers_ptr = to_user_pointer(exec),
+ .buffer_count = 2,
+ };
+ uint32_t *vaddr;
+ uint32_t len;
+ int i;
+
+ exec[0].handle = gem_create(fd, size); /* scratch for shadow */
+ exec[0].flags = EXEC_OBJECT_PINNED;
+ exec[0].offset = 0;
+
+ exec[1].handle = gem_create(fd, size); /* batch */
+ exec[1].flags = EXEC_OBJECT_PINNED;
+ exec[1].offset = size;
+
+ vaddr = gem_mmap__wc(fd, exec[1].handle, 0, size, PROT_WRITE);
+
+ len = copy_shadow(vaddr,
+ size,
+ exec[1].offset + size, /* expected shadow location */
+ exec[0].offset);
+
+ munmap(vaddr, size);
+
+ execbuf.flags = I915_EXEC_BLT;
+ execbuf.batch_start_offset = 0;
+ execbuf.batch_len = len;
+
+ igt_assert_eq(__gem_execbuf(fd, &execbuf), 0);
+ gem_sync(fd, exec[1].handle);
+
+ gem_set_domain(fd, exec[0].handle,
+ I915_GEM_DOMAIN_CPU,
+ I915_GEM_DOMAIN_CPU);
+
+ vaddr = gem_mmap__cpu(fd, exec[0].handle, 0, size, PROT_READ);
+
+ /*
+ * Since batch_len is smaller than PAGE_SIZE, we should expect the extra
+ * dwords to be zeroed. Even though this doesn't affect execution, we
+ * don't want to be leaking stuff by accident.
+ */
+ for (i = len / sizeof(uint32_t); i < size / sizeof(uint32_t); i++)
+ igt_assert_eq(vaddr[i], 0);
+
+ munmap(vaddr, size);
+
+ for (i = 0; i < ARRAY_SIZE(exec); i++)
+ gem_close(fd, exec[i].handle);
+}
+
igt_main
{
uint32_t handle;
@@ -1138,6 +1221,9 @@ igt_main
igt_subtest("bb-oversize")
test_bb_oversize(i915);
+ igt_subtest("shadow-peek")
+ test_shadow_peek(i915);
+
igt_fixture {
igt_stop_hang_detector();
gem_close(i915, handle);
--
2.26.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
