Dave found a bug where creating and closing an fd twice from the syncobj
would lead to a crash. In addition to explicitly testing for a previous
bug, include a stress test that covers a few more permutations of the
create/close pattern to see if can uncover a race in future.
Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxxxx>
---
tests/syncobj_basic.c | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/tests/syncobj_basic.c b/tests/syncobj_basic.c
index acc4a6418..0a155a3e2 100644
--- a/tests/syncobj_basic.c
+++ b/tests/syncobj_basic.c
@@ -177,6 +177,43 @@ test_valid_cycle(int fd)
syncobj_destroy(fd, second_handle);
}
+static void
+stress_close_race(int fd, int timeout_ms)
+{
+ const unsigned int ncpus = sysconf(_SC_NPROCESSORS_ONLN);
+ uint32_t handle;
+ int *done;
+
+ handle = syncobj_create(fd, 0);
+ done = mmap(NULL, 4096, PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
+
+ igt_fork(child, 2*ncpus + 1) {
+ const unsigned int sz = 5*child + 1;
+ int syncobj[sz];
+
+ for (unsigned int i = 0; i < sz; i++)
+ syncobj[i] = syncobj_handle_to_fd(fd, handle, 0);
+
+ do {
+ igt_permute_array(syncobj, sz, igt_exchange_int);
+ for (unsigned int i = 0; i < sz; i++) {
+ close(syncobj[i]);
+ syncobj[i] =
+ syncobj_handle_to_fd(fd, handle, 0);
+ }
+ } while (!*done);
+
+ for (unsigned int i = 0; i < sz; i++)
+ close(syncobj[i]);
+ }
+ usleep(timeout_ms * 1000);
+ *done = 1;
+ igt_waitchildren();
+
+ munmap(done, 4096);
+ syncobj_destroy(fd, handle);
+}
+
static bool has_syncobj(int fd)
{
uint64_t value;
@@ -231,4 +268,6 @@ igt_main
igt_subtest("test-valid-cycle")
test_valid_cycle(fd);
+ igt_subtest("stress-close-race")
+ stress_close_race(fd, 1000);
}
--
2.15.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
