Skip to contentSkip to conversation

lib/igt_core: Add igt_exec helpers

PATCH Superseded Abdiel Janulgue 2 participants 11 messages Apr 20, 2017 – May 10, 2017 Library code

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 lib/igt_core: Add igt_exec helpers

Support executing external processes with the goal of capturing its standard streams to the igt logging infrastructure in addition to its exit status.

Cc Daniel Vetter <[email protected]>
Cc Petri Latvala <[email protected]>
---
 lib/igt_core.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/igt_core.h |   3 ++
 2 files changed, 154 insertions(+)
lib/igt_core.c +151 -0
index 403b942..8a7ba0d 100644
@@ -2073,3 +2073,154 @@ FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir,
 
 	return fp;
 }
+
+struct output_pipe {
+	int output_fd;
+	int save_fd;
+	int read_fd;
+	int write_fd;
+	bool redirected;
+	enum igt_log_level log_level;
+};
+
+static bool redirect_output(struct output_pipe *p, int output_fd,
+			    enum igt_log_level level)
+{
+	int fds[2], flags;
+
+	if (pipe(fds) == -1)
+		return false;
+
+	if ((flags = fcntl(fds[0], F_GETFL) == -1))
+		return false;
+
+	flags |= O_NONBLOCK;
+	if (fcntl(fds[0], F_SETFL, flags) == -1)
+		return false;
+
+	/* save output */
+	if ((p->save_fd = dup(output_fd)) == -1)
+		return false;
+
+	/* Redirect output to our buffer */
+	if (dup2(fds[1], output_fd) == -1)
+		return false;
+
+	p->output_fd = output_fd;
+	p->read_fd = fds[0];
+	p->write_fd = fds[1];
+	p->redirected = true;
+	p->log_level = level;
+
+	return true;
+}
+
+static bool unredirect_output(struct output_pipe *p)
+{
+	close(p->write_fd);
+	if (dup2(p->save_fd, p->output_fd) == -1)
+		return false;
+	close(p->save_fd);
+
+	p->redirected = false;
+
+	return true;
+}
+
+/**
+ * igt_exec:
+ *
+ * Executes the shell command specified in @command and capture its stdout and
+ * stderr to igt_log or igt_warn respectively.
+ *
+ * Returns: The exit status of the executed process. -1 for failure.
+ */
+int igt_exec(const char *command)
+{
+#define OUT 0
+#define ERR 1
+	struct output_pipe op[2];
+	int i, sel_fd, status;
+	fd_set fds;
+	struct timeval timeout = { .tv_sec = 0, .tv_usec = 0 };
+	char buf[PIPE_BUF];
+
+	if (!redirect_output(&op[OUT], STDOUT_FILENO, IGT_LOG_INFO))
+		return -1;
+	if (!redirect_output(&op[ERR], STDERR_FILENO, IGT_LOG_WARN))
+		return -1;
+
+	if ((status = system(command)) == -1)
+		return -1;
+
+	FD_ZERO(&fds);
+	FD_SET(op[OUT].read_fd, &fds);
+	FD_SET(op[ERR].read_fd, &fds);
+
+	sel_fd = max(op[OUT].read_fd, op[ERR].read_fd);
+	if (select(sel_fd + 1, &fds, NULL, NULL, &timeout) == -1)
+		return -1;
+
+	for (i = 0; i < ARRAY_SIZE(op); i++) {
+		struct output_pipe *current = &op[i];
+
+		if (!FD_ISSET(current->read_fd, &fds)) {
+			close(current->read_fd);
+			if (!unredirect_output(current))
+				return -1;
+			continue;
+		}
+
+		memset(buf, 0, sizeof(buf));
+		while (read(current->read_fd, buf, sizeof(buf)) > 0) {
+			if (current->redirected) {
+				if (!unredirect_output(current))
+					return -1;
+			}
+			igt_log(IGT_LOG_DOMAIN, current->log_level,
+				"[cmd] %s", buf);
+			memset(buf, 0, sizeof(buf));
+		}
+		close(current->read_fd);
+	}
+
+	return WEXITSTATUS(status);
+}
+
+/**
+ * igt_exec_quiet:
+ * Similar to igt_exec(), except redirect output to /dev/null
+ *
+ * Returns: The exit status of the executed process. -1 for failure.
+ */
+int igt_exec_quiet(const char *command)
+{
+	int stderr_fd_copy, stdout_fd_copy, status, nullfd;
+
+	/* redirect */
+	if ((nullfd = open("/dev/null", O_WRONLY)) == -1)
+		return -1;
+	if ((stdout_fd_copy = dup(STDOUT_FILENO)) == -1)
+		return -1;
+	if ((stderr_fd_copy = dup(STDERR_FILENO)) == -1)
+		return -1;
+
+	if (dup2(nullfd, STDOUT_FILENO) == -1)
+		return -1;
+	if (dup2(nullfd, STDERR_FILENO) == -1)
+		return -1;
+
+	if ((status = system(command)) == -1)
+		return -1;
+
+	/* restore */
+	if (dup2(stdout_fd_copy, STDOUT_FILENO) == -1)
+		return -1;
+	if (dup2(stderr_fd_copy, STDERR_FILENO) == -1)
+		return -1;
+
+	close(stdout_fd_copy);
+	close(stderr_fd_copy);
+
+	return WEXITSTATUS(status);
+}
lib/igt_core.h +3 -0
index 51b98d8..6d4cf60 100644
@@ -918,4 +918,7 @@ FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir,
 #define igt_fopen_data(filename) \
 	__igt_fopen_data(IGT_SRCDIR, IGT_DATADIR, filename)
 
+int igt_exec(const char *command);
+int igt_exec_quiet(const char *command);
+
 #endif /* IGT_CORE_H */
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/4 igt/igt_core: Provide an option to check for the log buffer contents

---
 lib/igt_core.c | 24 ++++++++++++++++++++++++
 lib/igt_core.h |  3 +++
 2 files changed, 27 insertions(+)
lib/igt_core.c +24 -0
index 8a7ba0d..e80a32a 100644
@@ -329,6 +329,30 @@ static void _igt_log_buffer_dump(void)
 	pthread_mutex_unlock(&log_buffer_mutex);
 }
 
+/**
+ * igt_log_buffer_inspect:
+ *
+ * Provides a way to replay the internal igt log buffer for inspection.
+ * @check: A user-specified handler that gets invoked for each line of
+           the log buffer. The handler should return true to stop
+           inspecting the rest of the buffer.
+ * @data: passed as a user argument to the inspection function.
+ */
+void igt_log_buffer_inspect(igt_buffer_log_handler_t check, void *data)
+{
+	uint8_t i;
+	pthread_mutex_lock(&log_buffer_mutex);
+
+	i = log_buffer.start;
+	do {
+		if (check(log_buffer.entries[i], data))
+			break;
+		i++;
+	} while (i != log_buffer.start && i != log_buffer.end);
+
+	pthread_mutex_unlock(&log_buffer_mutex);
+}
+
 __attribute__((format(printf, 1, 2)))
 static void kmsg(const char *format, ...)
 #define KERN_EMER	"<0>"
lib/igt_core.h +3 -0
index 6d4cf60..3e0d3c3 100644
@@ -817,6 +817,9 @@ void igt_vlog(const char *domain, enum igt_log_level level, const char *format,
  */
 #define igt_critical(f...) igt_log(IGT_LOG_DOMAIN, IGT_LOG_CRITICAL, f)
 
+typedef bool (*igt_buffer_log_handler_t)(const char *line, void *data);
+void igt_log_buffer_inspect(igt_buffer_log_handler_t check, void *data);
+
 extern enum igt_log_level igt_log_level;
 
 /**
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH 3/4 lib/igt_debugfs: Add helper to return path to device.

In reply to Abdiel Janulgue
---
 lib/igt_debugfs.c | 26 ++++++++++++++++++++++++++
 lib/igt_debugfs.h |  1 +
 2 files changed, 27 insertions(+)
lib/igt_debugfs.c +26 -0
index 7584be5..b019c3b 100644
@@ -22,6 +22,9 @@
  *
  */
 
+#ifndef ANDROID
+#define _GNU_SOURCE
+#endif
 #include <inttypes.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
@@ -198,6 +201,29 @@ int igt_debugfs_dir(int device)
 	igt_debug("Opening debugfs directory '%s'\n", path);
 	return open(path, O_RDONLY);
 }
+\
+/**
+ * igt_debugfs_path:
+ * @device: fd of the device
+ *
+ * Returns:
+ * The path to the debugfs directory corresponding to device
+ */
+const char *igt_debugfs_path(int device)
+{
+	char *path = 0;
+
+	if (!path) {
+		char *linkname;
+		int debugfs;
+		igt_assert((debugfs = igt_debugfs_dir(device)) != -1);
+		igt_assert(path = calloc(PATH_MAX, sizeof(char)));
+		igt_assert(asprintf(&linkname, "/proc/self/fd/%d", debugfs) != -1);
+		igt_assert(readlink(linkname, path, PATH_MAX * sizeof(char)) != -1);
+	}
+
+	return path;
+}
 
 /**
  * igt_debugfs_open:
lib/igt_debugfs.h +1 -0
index 7b846a8..76cf409 100644
@@ -204,5 +204,6 @@ void igt_enable_prefault(void);
  */
 int igt_get_stable_obj_count(int driver);
 void igt_debugfs_dump(int device, const char *filename);
+const char *igt_debugfs_path(int device);
 
 #endif /* __IGT_DEBUGFS_H__ */
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Re: [i-g-t PATCH 3/4] lib/igt_debugfs: Add helper to return path to device.

Quoted 32 lines · Abdiel Janulgue
---
 lib/igt_debugfs.c | 26 ++++++++++++++++++++++++++
 lib/igt_debugfs.h |  1 +
 2 files changed, 27 insertions(+)
lib/igt_debugfs.c +11 -0
index 7584be5..b019c3b 100644
@@ -22,6 +22,9 @@
  *
  */
 
+#ifndef ANDROID
+#define _GNU_SOURCE
+#endif
 #include <inttypes.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
@@ -198,6 +201,29 @@ int igt_debugfs_dir(int device)
 	igt_debug("Opening debugfs directory '%s'\n", path);
 	return open(path, O_RDONLY);
 }
+\
+/**
+ * igt_debugfs_path:
+ * @device: fd of the device
+ *
+ * Returns:
+ * The path to the debugfs directory corresponding to device
+ */

lib/igt_debugfs.c int igt_debugfs_dir(int device)

Quoted 10 lines
lib/igt_debugfs.c +5 -0
+const char *igt_debugfs_path(int device)
+{
 
 
 
 
 
+	char *path = 0;
+
+	if (!path) {

??

--
Petri Latvala

Quoted 31 lines
lib/igt_debugfs.c +10 -0
+		char *linkname;
+		int debugfs;
+		igt_assert((debugfs = igt_debugfs_dir(device)) != -1);
+		igt_assert(path = calloc(PATH_MAX, sizeof(char)));
+		igt_assert(asprintf(&linkname, "/proc/self/fd/%d", debugfs) != -1);
+		igt_assert(readlink(linkname, path, PATH_MAX * sizeof(char)) != -1);
+	}
+
+	return path;
+}
 
 /**
  * igt_debugfs_open:
lib/igt_debugfs.h +1 -0
index 7b846a8..76cf409 100644
@@ -204,5 +204,6 @@ void igt_enable_prefault(void);
  */
 int igt_get_stable_obj_count(int driver);
 void igt_debugfs_dump(int device, const char *filename);
+const char *igt_debugfs_path(int device);
 
 #endif /* __IGT_DEBUGFS_H__ */
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

PATCH 4/4 Convert shell script tests to C version

In reply to Abdiel Janulgue

Converted:
- check_drm_clients (ensures no other clients are running. functionality provided by drm_open_driver_master).
- debugfs_emon_crash
- debugfs_wedged
- drv_debugfs_reader
- sysfs_l3_parity
- test_rte_check (same as check_drm_clients)
- tools_test
- ZZ_check_dmesg

Cc Daniel Vetter <[email protected]>
Cc Petri Latvala <[email protected]>
---
 tests/Makefile.sources   |   9 +---
 tests/ZZ_check_dmesg     |  11 -----
 tests/check_drm_clients  |   6 ---
 tests/debugfs.c          |  75 ++++++++++++++++++++++++++++++++
 tests/debugfs_emon_crash |  16 -------
 tests/debugfs_wedged     |  10 -----
 tests/drv_debugfs_reader |   9 ----
 tests/sysfs_l3_parity    |  22 ----------
 tests/test_rte_check     |   6 ---
 tests/tools.c            | 111 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/tools_test         |  16 -------
 11 files changed, 188 insertions(+), 103 deletions(-)
 delete mode 100755 tests/ZZ_check_dmesg
 delete mode 100755 tests/check_drm_clients
 create mode 100644 tests/debugfs.c
 delete mode 100755 tests/debugfs_emon_crash
 delete mode 100755 tests/debugfs_wedged
 delete mode 100755 tests/drv_debugfs_reader
 delete mode 100755 tests/sysfs_l3_parity
 delete mode 100755 tests/test_rte_check
 create mode 100644 tests/tools.c
 delete mode 100755 tests/tools_test
tests/Makefile.sources +2 -7
index 7fa9b8f..089428d 100644
@@ -234,6 +234,8 @@ TESTS_progs = \
 	drv_module_reload \
 	kms_sysfs_edid_timing \
 	perf \
+	debugfs \
+	tools \
 	$(NULL)
 
 # IMPORTANT: The ZZ_ tests need to be run last!
@@ -242,11 +244,6 @@ TESTS_scripts_M = \
 	$(NULL)
 
 TESTS_scripts = \
-	debugfs_emon_crash \
-	drv_debugfs_reader \
-	sysfs_l3_parity \
-	test_rte_check \
-	tools_test \
 	$(NULL)
 
 # This target contains testcases which support automagic subtest enumeration
@@ -308,9 +305,7 @@ HANG = \
 	$(NULL)
 
 scripts = \
-	check_drm_clients \
 	ddx_intel_after_fbdev \
-	debugfs_wedged \
 	drm_lib.sh \
 	drm_getopt.sh \
 	$(NULL)
tests/ZZ_check_dmesg deleted +0 -11
deleted file mode 100755
index e28ba35..0000000
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if dmesg | grep '\*ERROR\*'  > /dev/null ; then
-	echo "DRM_ERROR dirt in dmesg"
-	exit 1
-fi
-
-if dmesg | grep -- '------\[ cut here \]----' > /dev/null  ; then
-	echo "found a backtrace in dmesg"
-	exit 1
-fi
tests/check_drm_clients deleted +0 -6
deleted file mode 100755
index 2a891b8..0000000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-exit $IGT_EXIT_SUCCESS
tests/debugfs.c new file +75 -0

75 lines not on this page · raw message

tests/debugfs_emon_crash deleted +0 -16
deleted file mode 100755
index 1dbfcb2..0000000
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# This check if we can crash the kernel with segmentation-fault
-# by reading /sys/kernel/debug/dri/0/i915_emon_status too quickly
-#
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-for z in $(seq 1 1000); do
-	cat $i915_dfs_path/i915_emon_status > /dev/null 2&>1
-done
-
-# If we got here, we haven't crashed
-
-exit $IGT_EXIT_SUCCESS
tests/debugfs_wedged deleted +0 -10
deleted file mode 100755
index f15ac46..0000000
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-# Testcase: wedge the hw to check the error_state reading
-# 
-# Unfortunately wedged is permanent, so this test is not run by default
-echo 1 > ${i915_dfs_path}/i915_wedged
-cat $i915_dfs_path/i915_error_state > /dev/null 2>&1
tests/drv_debugfs_reader deleted +0 -9
deleted file mode 100755
index 6ea4e64..0000000
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-# read everything we can
-cat $i915_dfs_path/* > /dev/null 2>&1
-
-exit $IGT_EXIT_SUCCESS
tests/sysfs_l3_parity deleted +0 -22
deleted file mode 100755
index d5f3284..0000000
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -e || exit $?
-
-#Check that we can remap a row
-$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -d
-disabled=`$SOURCE_DIR/../tools/intel_l3_parity -l | grep -c 'Row 0, Bank 0, Subbank 0 is disabled'`
-if [ "$disabled" != "1" ] ; then
-	echo "Fail"
-	exit $IGT_EXIT_FAILURE
-fi
-
-$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -e
-
-#Check that we can clear remaps
-if [ `$SOURCE_DIR/../tools/intel_l3_parity -l | wc -l` != 1 ] ; then
-	echo "Fail 2"
-	exit $IGT_EXIT_FAILURE
-fi
tests/test_rte_check deleted +0 -6
deleted file mode 100755
index 2a891b8..0000000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-exit $IGT_EXIT_SUCCESS
tests/tools.c new file +111 -0

111 lines not on this page · raw message

tests/tools_test deleted +0 -16
deleted file mode 100755
index a27fb87..0000000
@@ -1,16 +0,0 @@
-#!/bin/bash
-# Test some of the most critical tools we have accidentally broken before.
-# TODO: Possibly make tests parse output
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-# ARB_MODE has existed for many gens
-PATH=$SOURCE_DIR/../tools:$PATH
-do_or_die "intel_reg read 0x4030"
-do_or_die "intel_reg dump"
-
-# TODO: Add more tests
-
-exit $IGT_EXIT_SUCCESS
-
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

PATCH 1/1 Convert ddx_intel_after_fbdev to C.

---
 tests/Makefile.sources        |   1 +
 tests/ddx_intel_after_fbdev   |  73 -------------------------
 tests/ddx_intel_after_fbdev.c | 121 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 122 insertions(+), 73 deletions(-)
 delete mode 100755 tests/ddx_intel_after_fbdev
 create mode 100644 tests/ddx_intel_after_fbdev.c
tests/Makefile.sources +1 -0
index f646050..80cb02b 100644
@@ -235,6 +235,7 @@ TESTS_progs = \
 	perf \
 	debugfs \
 	tools \
+	ddx_intel_after_fbdev \
 	$(NULL)
 
 # IMPORTANT: The ZZ_ tests need to be run last!
tests/ddx_intel_after_fbdev deleted +0 -73

73 lines not on this page · raw message

tests/ddx_intel_after_fbdev.c new file +121 -0

121 lines not on this page · raw message

Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

Re: [i-g-t PATCH 4/4] Convert shell script tests to C version

In reply to Abdiel Janulgue
Quoted 137 lines · Abdiel Janulgue

Converted:
- check_drm_clients (ensures no other clients are running. functionality provided by drm_open_driver_master).
- debugfs_emon_crash
- debugfs_wedged
- drv_debugfs_reader
- sysfs_l3_parity
- test_rte_check (same as check_drm_clients)
- tools_test
- ZZ_check_dmesg

Cc Daniel Vetter <[email protected]>
Cc Petri Latvala <[email protected]>
---
 tests/Makefile.sources   |   9 +---
 tests/ZZ_check_dmesg     |  11 -----
 tests/check_drm_clients  |   6 ---
 tests/debugfs.c          |  75 ++++++++++++++++++++++++++++++++
 tests/debugfs_emon_crash |  16 -------
 tests/debugfs_wedged     |  10 -----
 tests/drv_debugfs_reader |   9 ----
 tests/sysfs_l3_parity    |  22 ----------
 tests/test_rte_check     |   6 ---
 tests/tools.c            | 111 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/tools_test         |  16 -------
 11 files changed, 188 insertions(+), 103 deletions(-)
 delete mode 100755 tests/ZZ_check_dmesg
 delete mode 100755 tests/check_drm_clients
 create mode 100644 tests/debugfs.c
 delete mode 100755 tests/debugfs_emon_crash
 delete mode 100755 tests/debugfs_wedged
 delete mode 100755 tests/drv_debugfs_reader
 delete mode 100755 tests/sysfs_l3_parity
 delete mode 100755 tests/test_rte_check
 create mode 100644 tests/tools.c
 delete mode 100755 tests/tools_test
tests/Makefile.sources +2 -7
index 7fa9b8f..089428d 100644
@@ -234,6 +234,8 @@ TESTS_progs = \
 	drv_module_reload \
 	kms_sysfs_edid_timing \
 	perf \
+	debugfs \
+	tools \
 	$(NULL)
 
 # IMPORTANT: The ZZ_ tests need to be run last!
@@ -242,11 +244,6 @@ TESTS_scripts_M = \
 	$(NULL)
 
 TESTS_scripts = \
-	debugfs_emon_crash \
-	drv_debugfs_reader \
-	sysfs_l3_parity \
-	test_rte_check \
-	tools_test \
 	$(NULL)
 
 # This target contains testcases which support automagic subtest enumeration
@@ -308,9 +305,7 @@ HANG = \
 	$(NULL)
 
 scripts = \
-	check_drm_clients \
 	ddx_intel_after_fbdev \
-	debugfs_wedged \
 	drm_lib.sh \
 	drm_getopt.sh \
 	$(NULL)
tests/ZZ_check_dmesg deleted +0 -11
deleted file mode 100755
index e28ba35..0000000
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if dmesg | grep '\*ERROR\*'  > /dev/null ; then
-	echo "DRM_ERROR dirt in dmesg"
-	exit 1
-fi
-
-if dmesg | grep -- '------\[ cut here \]----' > /dev/null  ; then
-	echo "found a backtrace in dmesg"
-	exit 1
-fi
tests/check_drm_clients deleted +0 -6
deleted file mode 100755
index 2a891b8..0000000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-exit $IGT_EXIT_SUCCESS
tests/debugfs.c new file +29 -0
new file mode 100644
index 0000000..2e2f9bb
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2017 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.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "igt.h"
+
+igt_main
+{

tests/debugfs.c line 39

Quoted 10 lines
tests/debugfs.c new file +10 -0
+	int fd = -1;
+	igt_skip_on_simulation();
+
+	igt_fixture {
+		fd = drm_open_driver_master(DRIVER_INTEL);
+		igt_require_gem(fd);
+	}
+
+	igt_subtest_group {
+		igt_subtest("debugfs_emon_crash") {

These subtest names lead to redundant naming. This one for example becomes igt@debugfs@debugfs_emon_crash.

tests/debugfs.c line 46

Quoted 7 lines
tests/debugfs.c new file +7 -0
+			int i;
+			char *cmd;
+			igt_assert(asprintf(&cmd, "cat %s/i915_emon_status",
+					    igt_debugfs_path(fd)) != -1);
+
+			for (i = 0; i < 1000; i++)
+				igt_exec_quiet(cmd);

When converted to C, there's really no reason to keep using cat to read the file here.

tests/debugfs.c line 58

Quoted 12 lines
tests/debugfs.c new file +12 -0
+
+			free(cmd);
+		}
+
+		igt_subtest("debugfs_wedged") {
+			char *c1, *c2;
+			igt_assert(asprintf(&c1, "echo 1 > %s/i915_wedged",
+					    igt_debugfs_path(fd)) != -1);
+			igt_assert(asprintf(&c2, "cat %s/i915_error_state",
+					    igt_debugfs_path(fd)) != -1);
+			igt_exec(c1);
+			igt_exec_quiet(c2);

Same here. This could also use some documentation to explain _how_ this test behaves on a working kernel and a broken kernel. AFAICS it's the reading of i915_error_state file that explodes on a broken kernel, reported by the original script by the magic of the 'cat' of i915_error_state being the last command in the script? This C version doesn't check whether the reading of the file succeeds.

tests/debugfs.c line 67

Quoted 9 lines
tests/debugfs.c new file +9 -0
+			free(c1);
+			free(c2);
+		}
+
+		igt_subtest("drv_debugfs_reader") {
+			char *cmd;
+			igt_assert(asprintf(&cmd, "cat %s/*",
+					    igt_debugfs_path(fd)) != -1);
+			igt_exec_quiet(cmd);

Same cat comment here.

Quoted 189 lines
tests/debugfs.c new file +8 -0
+			free(cmd);
+		}
+	}
+
+	igt_fixture {
+		close(fd);
+	}
+}
tests/debugfs_emon_crash deleted +0 -16
deleted file mode 100755
index 1dbfcb2..0000000
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# This check if we can crash the kernel with segmentation-fault
-# by reading /sys/kernel/debug/dri/0/i915_emon_status too quickly
-#
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-for z in $(seq 1 1000); do
-	cat $i915_dfs_path/i915_emon_status > /dev/null 2&>1
-done
-
-# If we got here, we haven't crashed
-
-exit $IGT_EXIT_SUCCESS
tests/debugfs_wedged deleted +0 -10
deleted file mode 100755
index f15ac46..0000000
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-# Testcase: wedge the hw to check the error_state reading
-# 
-# Unfortunately wedged is permanent, so this test is not run by default
-echo 1 > ${i915_dfs_path}/i915_wedged
-cat $i915_dfs_path/i915_error_state > /dev/null 2>&1
tests/drv_debugfs_reader deleted +0 -9
deleted file mode 100755
index 6ea4e64..0000000
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-# read everything we can
-cat $i915_dfs_path/* > /dev/null 2>&1
-
-exit $IGT_EXIT_SUCCESS
tests/sysfs_l3_parity deleted +0 -22
deleted file mode 100755
index d5f3284..0000000
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -e || exit $?
-
-#Check that we can remap a row
-$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -d
-disabled=`$SOURCE_DIR/../tools/intel_l3_parity -l | grep -c 'Row 0, Bank 0, Subbank 0 is disabled'`
-if [ "$disabled" != "1" ] ; then
-	echo "Fail"
-	exit $IGT_EXIT_FAILURE
-fi
-
-$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -e
-
-#Check that we can clear remaps
-if [ `$SOURCE_DIR/../tools/intel_l3_parity -l | wc -l` != 1 ] ; then
-	echo "Fail 2"
-	exit $IGT_EXIT_FAILURE
-fi
tests/test_rte_check deleted +0 -6
deleted file mode 100755
index 2a891b8..0000000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-exit $IGT_EXIT_SUCCESS
tests/tools.c new file +82 -0
new file mode 100644
index 0000000..5fc784c
@@ -0,0 +1,111 @@
+/*
+ * Copyright © 2017 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.
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "igt.h"
+#include <stdio.h>
+
+/**
+ * Parse the r-value of a [cmd] string.
+ */
+static bool check_cmd_return_value(const char *s, void *data)
+{
+	int *val = data;
+	char *cmd, *found;
+	const char *delim = "[cmd]";
+	const int delim_len = strlen(delim);
+
+	if (!(cmd = strstr(s, delim)))
+		return false;
+
+	found = cmd + delim_len + 1;
+	igt_assert(delim_len + strlen(found) < strlen(cmd));
+
+	*val = atoi(found);
+	return true;
+}
+
+igt_main
+{
+	int fd = -1;
+	igt_skip_on_simulation();
+
+	igt_fixture {
+		/* Just make sure no other drm clients are running */
+		fd = drm_open_driver_master(DRIVER_INTEL);
+		igt_require_gem(fd);
+		close(fd);
+	}
+
+	igt_subtest_group {
+		igt_subtest("sysfs_l3_parity") {
+			char *cmd;
+			int exec_return;
+
+			igt_assert(asprintf(&cmd,
+					    "../tools/intel_l3_parity -l | "
+					    "grep -c 'Row 0, Bank 0, Subbank 0 "
+					    "is disabled'"));
+			exec_return = igt_exec(cmd);
+			free(cmd);
+			if (exec_return == IGT_EXIT_SUCCESS) {
+				int val = -1;
+				igt_log_buffer_inspect(check_cmd_return_value,
+						       &val);
+				igt_assert(val == 1);
+			} else {
+				igt_fail(IGT_EXIT_FAILURE);
+			}
+		}
+
+		igt_subtest("tools_test") {

tests/tools.c line 92

Quoted 10 lines
tests/tools.c new file +10 -0
+			char *cmd;
+
+			igt_assert(asprintf(&cmd,
+					    "../tools/intel_reg read 0x4030")
+				   != -1);
+			igt_assert(igt_exec_quiet(cmd) == IGT_EXIT_SUCCESS);
+			free(cmd);
+
+			igt_assert(asprintf(&cmd, "../tools/intel_reg dump")
+				   != -1);

intel_reg can be used without i915.ko loaded, but the fixture above requires it.

--
Petri Latvala

Quoted 44 lines
tests/tools.c new file +19 -0
+			igt_assert(igt_exec_quiet(cmd) == IGT_EXIT_SUCCESS);
+			free(cmd);
+		}
+
+		igt_subtest("ZZ_check_dmesg") {
+			char *cmd;
+			igt_assert(asprintf(&cmd, "dmesg | grep '\\*ERROR\\*'")
+				   != -1);
+			igt_assert(igt_exec_quiet(cmd) != IGT_EXIT_SUCCESS);
+			free(cmd);
+
+			igt_assert(asprintf(&cmd, "dmesg | grep "
+					    "-- '------\\[ cut here \\]----'")
+				   != -1);
+			igt_assert(igt_exec_quiet(cmd) != IGT_EXIT_SUCCESS);
+			free(cmd);
+		}
+	}
+}
tests/tools_test deleted +0 -16
deleted file mode 100755
index a27fb87..0000000
@@ -1,16 +0,0 @@
-#!/bin/bash
-# Test some of the most critical tools we have accidentally broken before.
-# TODO: Possibly make tests parse output
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-# ARB_MODE has existed for many gens
-PATH=$SOURCE_DIR/../tools:$PATH
-do_or_die "intel_reg read 0x4030"
-do_or_die "intel_reg dump"
-
-# TODO: Add more tests
-
-exit $IGT_EXIT_SUCCESS
-
Signature · 1 line
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw
In reply to Abdiel Janulgue
Quoted 27 lines · Abdiel Janulgue

Support executing external processes with the goal of capturing its standard streams to the igt logging infrastructure in addition to its exit status.

Cc Daniel Vetter <[email protected]>
Cc Petri Latvala <[email protected]>
---
 lib/igt_core.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/igt_core.h |   3 ++
 2 files changed, 154 insertions(+)
lib/igt_core.c +7 -0
index 403b942..8a7ba0d 100644
@@ -2073,3 +2073,154 @@ FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir,
 
 	return fp;
 }
+
+struct output_pipe {
+	int output_fd;
+	int save_fd;
+	int read_fd;
+	int write_fd;
+	bool redirected;

lib/igt_core.c FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir, · line 2092

Quoted 10 lines
lib/igt_core.c +10 -0
+	enum igt_log_level log_level;
+};
+
+static bool redirect_output(struct output_pipe *p, int output_fd,
+			    enum igt_log_level level)
+{
+	int fds[2], flags;
+
+	if (pipe(fds) == -1)
+		return false;

If this succeeds....

Quoted 5 lines
lib/igt_core.c +5 -0
+
+	if ((flags = fcntl(fds[0], F_GETFL) == -1))
+		return false;
+
+	flags |= O_NONBLOCK;

lib/igt_core.c FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir, · line 2107

Quoted 10 lines
lib/igt_core.c +10 -0
+	if (fcntl(fds[0], F_SETFL, flags) == -1)
+		return false;
+
+	/* save output */
+	if ((p->save_fd = dup(output_fd)) == -1)
+		return false;
+
+	/* Redirect output to our buffer */
+	if (dup2(fds[1], output_fd) == -1)
+		return false;

.... and these don't, the pipe fds are never closed.

Same for the save_fd if the dup2 fails, if the caller of this function doesn't call unredirect_output, as the return value might direct it.

Quoted 34 lines
lib/igt_core.c +34 -0
+
+	p->output_fd = output_fd;
+	p->read_fd = fds[0];
+	p->write_fd = fds[1];
+	p->redirected = true;
+	p->log_level = level;
+
+	return true;
+}
+
+static bool unredirect_output(struct output_pipe *p)
+{
+	close(p->write_fd);
+	if (dup2(p->save_fd, p->output_fd) == -1)
+		return false;
+	close(p->save_fd);
+
+	p->redirected = false;
+
+	return true;
+}
+
+/**
+ * igt_exec:
+ *
+ * Executes the shell command specified in @command and capture its stdout and
+ * stderr to igt_log or igt_warn respectively.
+ *
+ * Returns: The exit status of the executed process. -1 for failure.
+ */
+int igt_exec(const char *command)
+{
+#define OUT 0
+#define ERR 1

lib/igt_core.c FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir, · line 2151

Quoted 10 lines
lib/igt_core.c +10 -0
+	struct output_pipe op[2];
+	int i, sel_fd, status;
+	fd_set fds;
+	struct timeval timeout = { .tv_sec = 0, .tv_usec = 0 };
+	char buf[PIPE_BUF];
+
+	if (!redirect_output(&op[OUT], STDOUT_FILENO, IGT_LOG_INFO))
+		return -1;
+	if (!redirect_output(&op[ERR], STDERR_FILENO, IGT_LOG_WARN))
+		return -1;

If redirect_output for stderr returns false, unredirect_output for stdout will not get called.

Quoted 24 lines
lib/igt_core.c +24 -0
+
+	if ((status = system(command)) == -1)
+		return -1;
+
+	FD_ZERO(&fds);
+	FD_SET(op[OUT].read_fd, &fds);
+	FD_SET(op[ERR].read_fd, &fds);
+
+	sel_fd = max(op[OUT].read_fd, op[ERR].read_fd);
+	if (select(sel_fd + 1, &fds, NULL, NULL, &timeout) == -1)
+		return -1;
+
+	for (i = 0; i < ARRAY_SIZE(op); i++) {
+		struct output_pipe *current = &op[i];
+
+		if (!FD_ISSET(current->read_fd, &fds)) {
+			close(current->read_fd);
+			if (!unredirect_output(current))
+				return -1;
+			continue;
+		}
+
+		memset(buf, 0, sizeof(buf));
+		while (read(current->read_fd, buf, sizeof(buf)) > 0) {

lib/igt_core.c FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir, · line 2185

Quoted 10 lines
lib/igt_core.c +10 -0
+			if (current->redirected) {
+				if (!unredirect_output(current))
+					return -1;
+			}
+			igt_log(IGT_LOG_DOMAIN, current->log_level,
+				"[cmd] %s", buf);
+			memset(buf, 0, sizeof(buf));
+		}
+		close(current->read_fd);
+	}

Unredirect_output calls for both pipes need to be called on all exit paths.

In redirect_output you set only the read fd of the pipe() pair to O_NONBLOCK. That will make the executed command block on its writes indefinitely if it prints more than whatsitnow, 64kB?

Quoted 28 lines
lib/igt_core.c +28 -0
+
+	return WEXITSTATUS(status);
+}
+
+/**
+ * igt_exec_quiet:
+ * Similar to igt_exec(), except redirect output to /dev/null
+ *
+ * Returns: The exit status of the executed process. -1 for failure.
+ */
+int igt_exec_quiet(const char *command)
+{
+	int stderr_fd_copy, stdout_fd_copy, status, nullfd;
+
+	/* redirect */
+	if ((nullfd = open("/dev/null", O_WRONLY)) == -1)
+		return -1;
+	if ((stdout_fd_copy = dup(STDOUT_FILENO)) == -1)
+		return -1;
+	if ((stderr_fd_copy = dup(STDERR_FILENO)) == -1)
+		return -1;
+
+	if (dup2(nullfd, STDOUT_FILENO) == -1)
+		return -1;
+	if (dup2(nullfd, STDERR_FILENO) == -1)
+		return -1;
+
+	if ((status = system(command)) == -1)

lib/igt_core.c FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir, · line 2223

Quoted 10 lines
lib/igt_core.c +10 -0
+		return -1;
+
+	/* restore */
+	if (dup2(stdout_fd_copy, STDOUT_FILENO) == -1)
+		return -1;
+	if (dup2(stderr_fd_copy, STDERR_FILENO) == -1)
+		return -1;
+
+	close(stdout_fd_copy);
+	close(stderr_fd_copy);

Same fd leaks here, all exit paths should close the opened fds.

--
Petri Latvala

Quoted 18 lines
lib/igt_core.c +3 -0
+
+	return WEXITSTATUS(status);
+}
lib/igt_core.h +3 -0
index 51b98d8..6d4cf60 100644
@@ -918,4 +918,7 @@ FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir,
 #define igt_fopen_data(filename) \
 	__igt_fopen_data(IGT_SRCDIR, IGT_DATADIR, filename)
 
+int igt_exec(const char *command);
+int igt_exec_quiet(const char *command);
+
 #endif /* IGT_CORE_H */
Signature · 1 line
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

On 09.05.2017 13:18, Petri Latvala wrote:

snip 8< -----

Quoted 17 lines

lib/igt_core.c FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir, · line 2185

Quoted 12 lines
lib/igt_core.c +12 -0
+		memset(buf, 0, sizeof(buf));
+		while (read(current->read_fd, buf, sizeof(buf)) > 0) {
+			if (current->redirected) {
+				if (!unredirect_output(current))
+					return -1;
+			}
+			igt_log(IGT_LOG_DOMAIN, current->log_level,
+				"[cmd] %s", buf);
+			memset(buf, 0, sizeof(buf));
+		}
+		close(current->read_fd);
+	}

Unredirect_output calls for both pipes need to be called on all exit paths.

Quoted 4 lines

In redirect_output you set only the read fd of the pipe() pair to O_NONBLOCK. That will make the executed command block on its writes indefinitely if it prints more than whatsitnow, 64kB? the

In case the stream output is more than the pipe buf, the read loop above would just unblock the rest of the entries. From pipe(2) page:

"Data written to the write end of the pipe is buffered
by the kernel until it is read from the read end of the pipe."

Worked well when I tried it with igt_exec("../tools/intel_reg dump") which dumps a screenfull of info.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw
Quoted 2 lines · Abdiel Janulgue

In case the stream output is more than the pipe buf, the read loop above would just unblock the rest of the entries. From pipe(2) page:

But you don't reach that read loop until system() returns. Which happens after the program has terminated. Which never happens.

--
Petri Latvala
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw
Quoted 8 lines · Petri Latvala
Quoted 2 lines · Abdiel Janulgue

In case the stream output is more than the pipe buf, the read loop above would just unblock the rest of the entries. From pipe(2) page:

But you don't reach that read loop until system() returns. Which happens after the program has terminated. Which never happens.

Experimented with setting the write end of the pipe as O_NONBLOCK, I actually didn't notice any difference when dumping tons of stdout compared with just setting only the read end.
Maybe it's because we are not using write() directly? Not sure if this is expected behavior or not...

Quoted 5 lines

--
Petri Latvala

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx