* [igt RFC 2/3] lib: Add hooks for enabling ftrace
2017-10-13 12:02 [igt RFC 1/3] lib/debugfs: Make is_mountpoint() non-fatal Chris Wilson
@ 2017-10-13 12:02 ` Chris Wilson
2017-10-13 12:23 ` Chris Wilson
2017-10-13 12:02 ` [igt RFC 3/3] lib: Enable automatic ftrace dumping for suspend failures Chris Wilson
` (3 subsequent siblings)
4 siblings, 1 reply; 7+ messages in thread
From: Chris Wilson @ 2017-10-13 12:02 UTC (permalink / raw)
To: intel-gfx
If the kernel has tracing support builtin, we can enable around
troublesome tests to obtain greater detail from the kernel that may
prove invaluable in debugging the problem.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
lib/Makefile.sources | 2 +
lib/igt_core.c | 5 ++
lib/igt_ftrace.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++
lib/igt_ftrace.h | 46 +++++++++++++
4 files changed, 234 insertions(+)
create mode 100644 lib/igt_ftrace.c
create mode 100644 lib/igt_ftrace.h
diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index 965e230e..7ae9cfb9 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -12,6 +12,8 @@ lib_source_list = \
igt_aux.c \
igt_aux.h \
igt_edid_template.h \
+ igt_ftrace.c \
+ igt_ftrace.h \
igt_gt.c \
igt_gt.h \
igt_gvt.c \
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 480d4b1e..3d928eba 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -64,6 +64,7 @@
#include "intel_io.h"
#include "igt_debugfs.h"
#include "igt_dummyload.h"
+#include "igt_ftrace.h"
#include "version.h"
#include "config.h"
@@ -565,6 +566,8 @@ static void low_mem_killer_disable(bool disable)
bool igt_exit_called;
static void common_exit_handler(int sig)
{
+ igt_ftrace_close();
+
if (!igt_only_list_subtests()) {
low_mem_killer_disable(false);
kick_fbcon(true);
@@ -859,6 +862,8 @@ out:
sync();
oom_adjust_for_doom();
low_mem_killer_disable(true);
+
+ igt_ftrace_open();
}
/* install exit handler, to ensure we clean up */
diff --git a/lib/igt_ftrace.c b/lib/igt_ftrace.c
new file mode 100644
index 00000000..5b618f11
--- /dev/null
+++ b/lib/igt_ftrace.c
@@ -0,0 +1,181 @@
+/*
+ * 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.
+ *
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "igt.h"
+#include "igt_ftrace.h"
+#include "igt_debugfs.h"
+#include "igt_sysfs.h"
+
+#define BIT(x) (1ul << (x))
+
+/* Only a single tracer in the kernel, so we can use a singleton */
+struct igt_ftrace {
+ int dir;
+
+ unsigned long flags;
+#define PID_SET BIT(0)
+#define INCLUDE_SET BIT(1)
+#define EXCLUDE_SET BIT(2)
+
+} igt_ftrace = { -1 };
+
+int igt_ftrace_open(void)
+{
+ int dir;
+ int err;
+
+ dir = open(igt_debugfs_mount(), O_RDONLY);
+ if (dir < 0)
+ return -errno;
+
+ igt_ftrace.dir = openat(dir, "tracing", O_RDONLY);
+ close(dir);
+ if (igt_ftrace.dir < 0)
+ return -errno;
+
+ err = igt_ftrace_disable();
+ if (err)
+ goto ft_close;
+
+ return 0;
+
+ft_close:
+ close(igt_ftrace.dir);
+ igt_ftrace.dir = -1;
+ return err;
+}
+
+int __igt_ftrace_enable(const char *mode,
+ const struct igt_ftrace_options *opts)
+{
+ int err;
+
+ if (igt_ftrace.dir < 0)
+ return -ENODEV;
+
+ if (!mode)
+ return -EINVAL;
+
+ err = igt_sysfs_set(igt_ftrace.dir, "current_tracer", mode);
+ if (err < 0)
+ return err;
+
+ if (opts && opts->pid) {
+ err = igt_sysfs_printf(igt_ftrace.dir,
+ "set_ftrace_pid", "%d",
+ opts->pid);
+ if (err < 0)
+ goto disable;
+
+ igt_ftrace.flags |= PID_SET;
+ }
+
+ if (opts && opts->include) {
+ err = igt_sysfs_set(igt_ftrace.dir,
+ "set_ftrace_filter",
+ opts->include);
+ if (err < 0)
+ goto disable;
+
+ igt_ftrace.flags |= INCLUDE_SET;
+ }
+
+ if (opts && opts->exclude) {
+ err = igt_sysfs_set(igt_ftrace.dir,
+ "set_ftrace_notrace",
+ opts->exclude);
+ if (err < 0)
+ goto disable;
+
+ igt_ftrace.flags |= EXCLUDE_SET;
+ }
+
+ err = igt_sysfs_set(igt_ftrace.dir, "tracer_on", "1");
+ if (err < 0)
+ return err;
+
+ return 0;
+
+disable:
+ igt_ftrace_disable();
+ return err;
+}
+
+int igt_ftrace_disable(void)
+{
+ int err;
+
+ if (igt_ftrace.dir < 0)
+ return -ENODEV;
+
+ err = igt_sysfs_set(igt_ftrace.dir, "tracer_on", "0");
+ if (err < 0)
+ return err;
+
+ if (igt_ftrace.flags & PID_SET) {
+ igt_sysfs_set(igt_ftrace.dir, "set_ftrace_pid", "");
+ igt_ftrace.flags &= ~PID_SET;
+ }
+
+ if (igt_ftrace.flags & INCLUDE_SET) {
+ igt_sysfs_set(igt_ftrace.dir, "set_ftrace_filter", "");
+ igt_ftrace.flags &= ~INCLUDE_SET;
+ }
+
+ if (igt_ftrace.flags & EXCLUDE_SET) {
+ igt_sysfs_set(igt_ftrace.dir, "set_ftrace_notrace", "");
+ igt_ftrace.flags &= ~EXCLUDE_SET;
+ }
+
+ return 0;
+}
+
+void igt_ftrace_dump(const char *header)
+{
+ char *txt;
+
+ if (igt_ftrace.dir < 0)
+ return;
+
+ txt = igt_sysfs_get(igt_ftrace.dir, "trace");
+ if (!txt)
+ return;
+
+ igt_info("%s:\n%s", header, txt);
+ free(txt);
+}
+
+void igt_ftrace_close(void)
+{
+ if (igt_ftrace.dir < 0)
+ return;
+
+ close(igt_ftrace.dir);
+ igt_ftrace.dir = -1;
+}
diff --git a/lib/igt_ftrace.h b/lib/igt_ftrace.h
new file mode 100644
index 00000000..3dd67682
--- /dev/null
+++ b/lib/igt_ftrace.h
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef IGT_FTRACE_H
+#define IGT_FTRACE_H
+
+int igt_ftrace_open(void);
+
+struct igt_ftrace_options {
+ int pid;
+ const char *include;
+ const char *exclude;
+};
+
+int __igt_ftrace_enable(const char *mode,
+ const struct igt_ftrace_options *opts);
+#define igt_ftrace_enable() __igt_ftrace_enable("function_graph", NULL)
+
+int igt_ftrace_disable(void);
+
+void igt_ftrace_dump(const char *header);
+
+void igt_ftrace_close(void);
+
+#endif /* IGT_FTRACE_H */
--
2.15.0.rc0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [igt RFC 1/3] lib/debugfs: Make is_mountpoint() non-fatal
2017-10-13 12:02 [igt RFC 1/3] lib/debugfs: Make is_mountpoint() non-fatal Chris Wilson
2017-10-13 12:02 ` [igt RFC 2/3] lib: Add hooks for enabling ftrace Chris Wilson
2017-10-13 12:02 ` [igt RFC 3/3] lib: Enable automatic ftrace dumping for suspend failures Chris Wilson
@ 2017-10-13 12:33 ` Ville Syrjälä
2017-10-13 12:47 ` ✓ Fi.CI.BAT: success for series starting with [RFC,1/3] " Patchwork
2017-10-13 15:30 ` ✓ Fi.CI.IGT: " Patchwork
4 siblings, 0 replies; 7+ messages in thread
From: Ville Syrjälä @ 2017-10-13 12:33 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Fri, Oct 13, 2017 at 01:02:57PM +0100, Chris Wilson wrote:
> is_mountpoint() asserts rather than report the error. Normally this
> isn't a problem, except for atypical selftests.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> lib/igt_debugfs.c | 33 ++++++++++++++++++++-------------
> 1 file changed, 20 insertions(+), 13 deletions(-)
>
> diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c
> index 60b29e3a..2bdcdee1 100644
> --- a/lib/igt_debugfs.c
> +++ b/lib/igt_debugfs.c
> @@ -88,18 +88,26 @@
> static bool is_mountpoint(const char *path)
> {
> char buf[strlen(path) + 4];
> - dev_t dot_dev, dotdot_dev;
> struct stat st;
> + dev_t dev;
>
> igt_assert_lt(snprintf(buf, sizeof(buf), "%s/.", path), sizeof(buf));
> - igt_assert_eq(stat(buf, &st), 0);
> - dot_dev = st.st_dev;
> + if (stat(buf, &st))
> + return false;
> +
> + if (!S_ISDIR(st.st_mode))
> + return false;
> +
> + dev = st.st_dev;
>
> igt_assert_lt(snprintf(buf, sizeof(buf), "%s/..", path), sizeof(buf));
> - igt_assert_eq(stat(buf, &st), 0);
> - dotdot_dev = st.st_dev;
> + if (stat(buf, &st))
> + return false;
> +
> + if (!S_ISDIR(st.st_mode))
> + return false;
>
> - return dot_dev != dotdot_dev;
> + return dev != st.st_dev;
> }
>
> /**
> @@ -113,16 +121,14 @@ static bool is_mountpoint(const char *path)
> */
> const char *igt_debugfs_mount(void)
> {
> - struct stat st;
> + if (is_mountpoint("/sys/kernel/debug"))
> + return "/sys/kernel/debug";
>
> - if (stat("/debug/dri", &st) == 0)
> + if (is_mountpoint("/debug"))
> return "/debug";
>
> - if (stat("/sys/kernel/debug/dri", &st) == 0)
> - return "/sys/kernel/debug";
> -
> - igt_assert(is_mountpoint("/sys/kernel/debug") ||
> - mount("debug", "/sys/kernel/debug", "debugfs", 0, 0) == 0);
> + if (mount("debug", "/sys/kernel/debug", "debugfs", 0, 0))
> + return NULL;
>
> return "/sys/kernel/debug";
> }
> @@ -155,6 +161,7 @@ char *igt_debugfs_path(int device, char *path, int pathlen)
> }
>
> debugfs_root = igt_debugfs_mount();
> + igt_assert(debugfs_root);
>
> idx = minor(st.st_rdev);
> snprintf(path, pathlen, "%s/dri/%d/name", debugfs_root, idx);
> --
> 2.15.0.rc0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread