[Intel-gfx] [PATCH 1/2] tests/drv_hangman: Convert test from shell script to c
Mika Kuoppala
mika.kuoppala at linux.intel.com
Tue May 20 13:55:32 CEST 2014
Mixing script and standlone tests didn't mix well with the
strict i915_ring_stop flags handling. Also squash drv_missed_irq_hang
to the new test.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78322
Suggested-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com>
---
tests/Makefile.sources | 3 +-
tests/drv_hangman | 70 ---------
tests/drv_hangman.c | 357 +++++++++++++++++++++++++++++++++++++++++++++
tests/drv_missed_irq_hang | 70 ---------
4 files changed, 358 insertions(+), 142 deletions(-)
delete mode 100755 tests/drv_hangman
create mode 100644 tests/drv_hangman.c
delete mode 100755 tests/drv_missed_irq_hang
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index fbf63e9..9f5cd76 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -17,6 +17,7 @@ NOUVEAU_TESTS_M = \
TESTS_progs_M = \
core_get_client_auth \
drv_suspend \
+ drv_hangman \
gem_bad_reloc \
gem_basic \
gem_caching \
@@ -148,8 +149,6 @@ TESTS_scripts_M = \
TESTS_scripts = \
debugfs_emon_crash \
drv_debugfs_reader \
- drv_hangman \
- drv_missed_irq_hang \
drv_module_reload \
kms_sysfs_edid_timing \
sysfs_l3_parity \
diff --git a/tests/drv_hangman b/tests/drv_hangman
deleted file mode 100755
index 6b310bc..0000000
--- a/tests/drv_hangman
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#
-# Testcase: Simulate gpu hang
-#
-# This check uses the stop_rings facility to exercise the gpu hang code.
-# by reading /sys/kernel/debug/dri/0/i915_emon_status too quickly
-#
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-oldpath=`pwd`
-
-cd $i915_dfs_path
-
-if [ ! -f i915_ring_stop ] ; then
- echo "kernel doesn't support ring stopping"
- exit 77
-fi
-
-function check_iface {
- dir="$1"
- file="$2"
- mandatory="$3"
-
- [ -z "$dir" ] && return
-
- path="$dir/$file"
- echo checking ${path}
-
- if [ ! -f "$path" ] ; then
- if [ $mandatory != 0 ] ; then
- echo "'${path}' not found";
- exit 1;
- else
- echo "${path} not mandatory";
- return;
- fi
- fi
-
- if cat "$path" | grep -v "no error state collected" > /dev/null ; then
- echo "gpu hang detected"
- exit 2
- fi
-
- echo 0xf > i915_ring_stop
- echo "rings stopped"
-
- (cd $oldpath; $SOURCE_DIR/gem_exec_big) > /dev/null
-
- if cat "$path" | grep -v "no error state collected" > /dev/null ; then
- echo "gpu hang correctly detected"
- else
- echo "gpu hang not detected"
- exit 3
- fi
-
-# clear error state
- echo > "$path"
-
- if cat "$path" | grep -v "no error state collected" > /dev/null ; then
- echo "gpu hang still present"
- exit 4
- fi
-}
-
-check_iface "$i915_dfs_path" i915_error_state 1
-check_iface "$i915_sfs_path" error 0
-
-exit 0
diff --git a/tests/drv_hangman.c b/tests/drv_hangman.c
new file mode 100644
index 0000000..cf141c6
--- /dev/null
+++ b/tests/drv_hangman.c
@@ -0,0 +1,357 @@
+/*
+ * Copyright © 2014 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Mika Kuoppala <mika.kuoppala at intel.com>
+ *
+ */
+
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "drmtest.h"
+#include "igt_debugfs.h"
+#include "ioctl_wrappers.h"
+
+static int _read_sysfs(void *dst, int maxlen,
+ const char* path,
+ const char *fname)
+{
+ int fd;
+ char full[PATH_MAX];
+ int r, e;
+
+ igt_assert(snprintf(full, PATH_MAX, "%s/%s", path, fname) < PATH_MAX);
+
+ fd = open(full, O_RDONLY);
+ if (fd == -1)
+ return -errno;
+
+ r = read(fd, dst, maxlen);
+ e = errno;
+ close(fd);
+
+ if (r < 0)
+ return -e;
+
+ return r;
+}
+
+static int read_sysfs(void *dst, int maxlen, const char *fname)
+{
+ char path[PATH_MAX];
+
+ igt_assert(snprintf(path, PATH_MAX, "/sys/class/drm/card%d",
+ drm_get_card()) < PATH_MAX);
+
+ return _read_sysfs(dst, maxlen, path, fname);
+}
+
+static void test_sysfs_error_exists(void)
+{
+ char tmp[1024];
+
+ igt_assert(read_sysfs(tmp, sizeof(tmp), "error") > 0);
+}
+
+static void test_debugfs_error_state_exists(void)
+{
+ int fd;
+
+ igt_assert((fd = igt_debugfs_open("i915_error_state", O_RDONLY)) >= 0);
+
+ close (fd);
+}
+
+static void test_debugfs_ring_stop_exists(void)
+{
+ int fd;
+
+ igt_assert((fd = igt_debugfs_open("i915_ring_stop", O_RDONLY)) >= 0);
+
+ close(fd);
+}
+
+static void test_debugfs_ring_irq_exists(void)
+{
+ int fd;
+
+ igt_assert((fd = igt_debugfs_open("i915_ring_missed_irq", O_RDONLY)) >= 0);
+
+ close(fd);
+
+ igt_assert((fd = igt_debugfs_open("i915_ring_test_irq", O_RDONLY)) >= 0);
+
+ close(fd);
+}
+
+static void read_dfs(const char *fname, char *d, int maxlen)
+{
+ int fd;
+ int l;
+
+ igt_assert((fd = igt_debugfs_open(fname, O_RDONLY)) >= 0);
+
+ igt_assert((l = read(fd, d, maxlen-1)) > 0);
+ igt_assert(l < maxlen);
+ d[l] = 0;
+ close(fd);
+
+ igt_debug("dfs entry %s read '%s'\n", fname, d);
+}
+
+static void write_dfs(const char *fname, const char *s)
+{
+ int fd;
+
+ igt_assert((fd = igt_debugfs_open(fname, O_WRONLY)) >= 0);
+
+ igt_assert(write(fd, s, strlen(s)) == strlen(s));
+ close(fd);
+
+ igt_debug("dfs entry %s write '%s'\n", fname, s);
+}
+
+static void _assert_dfs_entry(const char *fname, const char *s, bool inverse)
+{
+ char tmp[1024];
+ const int l = strlen(s) < sizeof(tmp) ?
+ strlen(s) : sizeof(tmp);
+
+ read_dfs(fname, tmp, l + 1);
+ if (!inverse) {
+ if (strncmp(tmp, s, l) != 0) {
+ fprintf(stderr, "contents of %s: '%s' (expected '%s')\n",
+ fname, tmp, s);
+ igt_fail(1);
+ }
+ } else {
+ if (strncmp(tmp, s, l) == 0) {
+ fprintf(stderr, "contents of %s: '%s' (expected not '%s'\n",
+ fname, tmp, s);
+ igt_fail(1);
+ }
+ }
+}
+
+static void assert_dfs_entry(const char *fname, const char *s)
+{
+ _assert_dfs_entry(fname, s, false);
+}
+
+static void assert_dfs_entry_not(const char *fname, const char *s)
+{
+ _assert_dfs_entry(fname, s, true);
+}
+
+static void write_and_assert_dfs_entry(const char *fname, const char *s)
+{
+ write_dfs(fname, s);
+ assert_dfs_entry(fname, s);
+}
+
+static void assert_error_state_clear(void)
+{
+ assert_dfs_entry("i915_error_state", "no error state collected");
+}
+
+static void assert_error_state_collected(void)
+{
+ assert_dfs_entry_not("i915_error_state", "no error state collected");
+}
+
+static int get_line_count(const char *s)
+{
+ int count = 0;
+
+ while (*s) {
+ if (*s == '\n')
+ count++;
+ s++;
+ }
+
+ return count;
+}
+
+static void check_other_clients(void)
+{
+ char tmp[1024];
+ char *s;
+
+ read_dfs("clients", tmp, sizeof(tmp));
+ if (get_line_count(tmp) == 2)
+ return;
+
+ if (get_line_count(tmp) == 3) {
+ int dev, pid, uid, magic;
+ s = strstr(tmp, "y");
+ igt_assert(s != NULL);
+ igt_assert(sscanf(s, "y %d %d %d %d",
+ &dev, &pid, &uid, &magic) == 4);
+
+ igt_debug("client %d %d %d %d\n", dev, pid, uid, magic);
+
+ igt_assert(pid == getpid());
+
+ igt_debug("found myself in client list\n");
+
+ return;
+ }
+
+ igt_assert_f(0, "other clients running\n");
+}
+
+static uint64_t submit_batch(int fd, unsigned ring_id, bool stop_ring)
+{
+ struct drm_i915_gem_execbuffer2 execbuf;
+ struct drm_i915_gem_exec_object2 exec;
+ const uint32_t batch[2] = { MI_BATCH_BUFFER_END, 0 };
+ uint64_t presumed_offset;
+
+ gem_require_ring(fd, ring_id);
+
+ exec.handle = gem_create(fd, 4096);
+ gem_write(fd, exec.handle, 0, batch, sizeof(batch));
+ exec.relocation_count = 0;
+ exec.relocs_ptr = 0;
+ exec.alignment = 0;
+ exec.offset = 0;
+ exec.flags = 0;
+ exec.rsvd1 = 0;
+ exec.rsvd2 = 0;
+
+ execbuf.buffers_ptr = (uintptr_t)&exec;
+ execbuf.buffer_count = 1;
+ execbuf.batch_start_offset = 0;
+ execbuf.batch_len = sizeof(batch);
+ execbuf.cliprects_ptr = 0;
+ execbuf.num_cliprects = 0;
+ execbuf.DR1 = 0;
+ execbuf.DR4 = 0;
+ execbuf.flags = ring_id;
+ i915_execbuffer2_set_context_id(execbuf, 0);
+ execbuf.rsvd2 = 0;
+
+ gem_execbuf(fd, &execbuf);
+ gem_sync(fd, exec.handle);
+ presumed_offset = exec.offset;
+
+ if (stop_ring) {
+ igt_set_stop_rings(igt_to_stop_ring_flag(ring_id));
+
+ gem_execbuf(fd, &execbuf);
+ gem_sync(fd, exec.handle);
+
+ igt_assert(igt_get_stop_rings() == STOP_RING_NONE);
+ igt_assert(presumed_offset == exec.offset);
+ }
+
+ gem_close(fd, exec.handle);
+
+ return exec.offset;
+}
+
+static void clear_error_state(void)
+{
+ int fd;
+ const char *b = "1";
+
+ igt_assert((fd = igt_debugfs_open("i915_error_state", O_WRONLY)) >= 0);
+ igt_assert(write(fd, b, 1) == 1);
+ close(fd);
+}
+
+static void test_error_state_basic(void)
+{
+ int fd;
+
+ check_other_clients();
+ clear_error_state();
+ assert_error_state_clear();
+
+ fd = drm_open_any();
+ submit_batch(fd, I915_EXEC_RENDER, true);
+ close(fd);
+
+ assert_error_state_collected();
+ clear_error_state();
+ assert_error_state_clear();
+}
+
+static void test_ring_missed_irq(void)
+{
+ int fd;
+
+ check_other_clients();
+ fd = drm_open_any();
+
+ clear_error_state();
+ assert_error_state_clear();
+ write_and_assert_dfs_entry("i915_ring_test_irq", "0x0000000f");
+ igt_debug("Interrupts masked\n");
+
+ submit_batch(fd, I915_EXEC_RENDER, false);
+ submit_batch(fd, I915_EXEC_RENDER, false);
+ submit_batch(fd, I915_EXEC_RENDER, false);
+
+ assert_dfs_entry_not("i915_ring_missed_irq", "0x00000000");
+ assert_error_state_clear();
+
+ submit_batch(fd, I915_EXEC_RENDER, false);
+
+ assert_error_state_clear();
+ write_and_assert_dfs_entry("i915_ring_test_irq", "0x00000000");
+ igt_debug("Interrupts unmasked\n");
+
+ submit_batch(fd, I915_EXEC_RENDER, false);
+
+ assert_error_state_clear();
+ write_and_assert_dfs_entry("i915_ring_missed_irq", "0x00000000");
+ igt_debug("Cleared missed interrupts\n");
+
+ close(fd);
+}
+
+igt_main
+{
+ igt_skip_on_simulation();
+
+ igt_subtest("error-state-debugfs-entry")
+ test_debugfs_error_state_exists();
+
+ igt_subtest("error-state-sysfs-entry")
+ test_sysfs_error_exists();
+
+ igt_subtest("ring-stop-sysfs-entry")
+ test_debugfs_ring_stop_exists();
+
+ igt_subtest("ring-missed-irq-sysfs-entry")
+ test_debugfs_ring_irq_exists();
+
+ igt_subtest("error-state-basic")
+ test_error_state_basic();
+
+ igt_subtest("ring-missed-irq")
+ test_ring_missed_irq();
+}
diff --git a/tests/drv_missed_irq_hang b/tests/drv_missed_irq_hang
deleted file mode 100755
index 484e151..0000000
--- a/tests/drv_missed_irq_hang
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#
-# Testcase: Simulate missed breadcrumb interrupts
-#
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-oldpath=`pwd`
-
-cd $i915_dfs_path
-
-function check_for_missed_irq {
- if test `cat i915_ring_missed_irq` = 0x00000000; then
- echo "missed interrupts undetected"
- exit 1
- fi
-}
-
-function check_for_hang {
- if cat i915_error_state | grep -v "no error state collected" > /dev/null ; then
- echo "gpu hang reported"
- exit 2
- fi
-}
-
-if [ ! -f i915_ring_missed_irq ] ; then
- echo "kernel doesn't support interrupt masking"
- exit 77
-fi
-
-# clear error state first
-echo > i915_error_state
-check_for_hang
-
-echo 0xf > i915_ring_test_irq
-echo "Interrupts masked"
-if test `cat i915_ring_test_irq` != 0x0000000f; then
- echo "Failed to set interrupt mask"
- exit 3
-fi
-
-(cd $oldpath; $SOURCE_DIR/gem_exec_blt) > /dev/null
-
-check_for_missed_irq
-check_for_hang
-
-(cd $oldpath; $SOURCE_DIR/gem_exec_blt) > /dev/null
-
-check_for_hang
-
-echo 0 > i915_ring_test_irq
-echo "Interrupts unmasked"
-if test `cat i915_ring_test_irq` != 0x00000000; then
- echo "Failed to clear interrupt mask"
- exit 3
-fi
-
-(cd $oldpath; $SOURCE_DIR/gem_exec_blt) > /dev/null
-
-check_for_hang
-
-echo 0 > i915_ring_missed_irq
-echo "Cleared missed interrupts"
-if test `cat i915_ring_missed_irq` != 0x00000000; then
- echo "Failed to clear missed interrupts"
- exit 3
-fi
-
-exit 0
--
1.7.9.5
More information about the Intel-gfx
mailing list