From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH] tests/gem_reset_stats: add close-pending-fork
Date: Wed, 4 Dec 2013 16:39:09 +0200 [thread overview]
Message-ID: <1386167949-10162-1-git-send-email-mika.kuoppala@intel.com> (raw)
In-Reply-To: <20131203170343.GM27344@phenom.ffwll.local>
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
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>
---
tests/gem_reset_stats.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/tests/gem_reset_stats.c b/tests/gem_reset_stats.c
index 6c22bce..095b14b 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();
}
--
1.7.9.5
next prev parent reply other threads:[~2013-12-04 14:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-02 14:47 [PATCH] tests/gem_reset_stats: add close-pending-fork Mika Kuoppala
2013-12-02 15:03 ` Chris Wilson
2013-12-02 16:32 ` Mika Kuoppala
2013-12-03 17:03 ` Daniel Vetter
2013-12-04 14:39 ` Mika Kuoppala [this message]
2013-12-04 15:48 ` Daniel Vetter
2013-12-02 15:31 ` [RFC] drm/i915: reference count batch object on requests Mika Kuoppala
2013-12-03 17:10 ` Daniel Vetter
2013-12-04 11:24 ` Chris Wilson
2013-12-04 12:08 ` Daniel Vetter
2013-12-04 12:11 ` Chris Wilson
2013-12-04 13:28 ` Mika Kuoppala
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386167949-10162-1-git-send-email-mika.kuoppala@intel.com \
--to=mika.kuoppala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox