summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Kuoppala <mika.kuoppala@linux.intel.com>2013-12-04 16:39:09 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-04 16:45:28 +0100
commit6b18ef826ffdb433eff00db974589897ac1dd527 (patch)
tree11530c2338a19f8c261323595d0929988a984e3b
parentfb03ea7737dcda887e6eeca17afe7b91cf178b38 (diff)
tests/gem_reset_stats: add close-pending-fork
This triggers use after free oops on request->batch_obj when going through the rings and setting reset status on requests, after a gpu hang. v2: Streamlined the test and added comments (Daniel) Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--tests/gem_reset_stats.c62
1 files changed, 62 insertions, 0 deletions
diff --git a/tests/gem_reset_stats.c b/tests/gem_reset_stats.c
index 6c22bcee..095b14b5 100644
--- a/tests/gem_reset_stats.c
+++ b/tests/gem_reset_stats.c
@@ -25,6 +25,7 @@
*
*/
+#define _GNU_SOURCE
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
@@ -36,6 +37,7 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <time.h>
+#include <signal.h>
#include "i915_drm.h"
#include "intel_bufmgr.h"
@@ -637,6 +639,63 @@ static void test_close_pending(void)
close(fd);
}
+static void test_close_pending_fork(void)
+{
+ int pid;
+ int fd, h;
+
+ fd = drm_open_any();
+ igt_assert(fd >= 0);
+
+ assert_reset_status(fd, 0, RS_NO_ERROR);
+
+ h = inject_hang(fd, 0);
+ igt_assert(h >= 0);
+
+ sleep(1);
+
+ /* Avoid helpers as we need to kill the child
+ * without any extra signal handling on behalf of
+ * lib/drmtest.c
+ */
+ pid = fork();
+ if (pid == 0) {
+ /* Not first drm_open_any() so we need to do
+ * gem_quiescent_gpu() explicitly, as it is the
+ * key component to trigger the oops
+ */
+ const int fd2 = drm_open_any();
+ igt_assert(fd2 >= 0);
+
+ /* This adds same batch on each ring */
+ gem_quiescent_gpu(fd2);
+
+ close(fd2);
+ return;
+ } else {
+ igt_assert(pid > 0);
+ sleep(1);
+
+ /* Kill the child to reduce refcounts on
+ batch_objs */
+ kill(pid, SIGKILL);
+ }
+
+ gem_close(fd, h);
+ close(fd);
+
+ /* Then we just wait on hang to happen */
+ fd = drm_open_any();
+ igt_assert(fd >= 0);
+
+ h = exec_valid(fd, 0);
+ igt_assert(h >= 0);
+
+ gem_sync(fd, h);
+ gem_close(fd, h);
+ close(fd);
+}
+
static void drop_root(void)
{
igt_assert(getuid() == 0);
@@ -837,6 +896,9 @@ igt_main
igt_subtest("close-pending")
test_close_pending();
+ igt_subtest("close-pending-fork")
+ test_close_pending_fork();
+
igt_subtest("params")
test_params();
}