summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2019-02-14 16:57:11 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2019-02-17 20:54:44 +0000
commit6727e17c00b2ad0a801f96fc8a2afe404b95ec88 (patch)
tree7f4d965e2cddf3a5f33fc7b3871f6dee466c6ee3
parent7802324e86ddf947cba847e910f75b1a8affe8d7 (diff)
i915/gem_create: Verify that all new objects are clear
The kernel must not return stale information back to userspace when they create a new object. For that purpose, we always clear objects on creation, so verify that this is so. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/i915/gem_create.c71
2 files changed, 73 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 24ee8514..c5dd210c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -95,6 +95,8 @@ AM_LDFLAGS = -Wl,--as-needed
drm_import_export_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
drm_import_export_LDADD = $(LDADD) -lpthread
+gem_create_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
+gem_create_LDADD = $(LDADD) -lpthread
gem_close_race_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
gem_close_race_LDADD = $(LDADD) -lpthread
gem_ctx_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
diff --git a/tests/i915/gem_create.c b/tests/i915/gem_create.c
index 25c5e808..605b7f9d 100644
--- a/tests/i915/gem_create.c
+++ b/tests/i915/gem_create.c
@@ -44,6 +44,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <getopt.h>
+#include <pthread.h>
#include <drm.h>
@@ -141,6 +142,73 @@ static void invalid_nonaligned_size(int fd)
gem_close(fd, handle);
}
+static uint64_t get_npages(uint64_t *global, uint64_t npages)
+{
+ uint64_t try, old, max;
+
+ max = *global;
+ do {
+ old = max;
+ try = npages % (max / 2);
+ max -= try;
+ } while ((max = __sync_val_compare_and_swap(global, old, max)) != old);
+
+ return try;
+}
+
+struct thread_clear {
+ uint64_t max;
+ int timeout;
+ int i915;
+};
+
+static void *thread_clear(void *data)
+{
+ struct thread_clear *arg = data;
+ int i915 = arg->i915;
+
+ igt_until_timeout(arg->timeout) {
+ uint32_t handle;
+ uint64_t npages;
+
+ npages = random();
+ npages <<= 32;
+ npages |= random();
+ npages = get_npages(&arg->max, npages);
+
+ handle = gem_create(i915, npages << 12);
+ for (uint64_t page = 0; page < npages; page++) {
+ uint64_t x;
+
+ gem_read(i915, handle,
+ page * 4096 + (page % (4096 - sizeof(x))),
+ &x, sizeof(x));
+ igt_assert_eq_u64(x, 0);
+ }
+ gem_close(i915, handle);
+
+ __sync_add_and_fetch(&arg->max, npages);
+ }
+
+ return NULL;
+}
+
+static void always_clear(int i915, int timeout)
+{
+ struct thread_clear arg = {
+ .i915 = i915,
+ .timeout = timeout,
+ .max = intel_get_avail_ram_mb() << (20 - 12), /* in pages */
+ };
+ const int ncpus = sysconf(_SC_NPROCESSORS_ONLN);
+ pthread_t thread[ncpus];
+
+ for (int i = 0; i < ncpus; i++)
+ pthread_create(&thread[i], NULL, thread_clear, &arg);
+ for (int i = 0; i < ncpus; i++)
+ pthread_join(thread[i], NULL);
+}
+
igt_main
{
int fd = -1;
@@ -162,4 +230,7 @@ igt_main
igt_subtest("create-invalid-nonaligned")
invalid_nonaligned_size(fd);
+
+ igt_subtest("create-clear")
+ always_clear(fd, 30);
}