* [PATCH i-g-t 1/4 v5] lib/{igt_sysfs, igt_aux}: Make available to other users kick_fbcon() (unbind_fbcon()), and added helpers to lib/igt_aux, lib/igt_kmod.
2016-11-03 16:28 [PATCH i-g-t 0/4 v5] Convert sh scripts to C variants Marius Vlad
@ 2016-11-03 16:28 ` Marius Vlad
2016-11-03 16:28 ` [PATCH i-g-t 2/4 v5] lib/igt_gvt: Make use of libkmod helpers and fix reading gvt parameter Marius Vlad
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Marius Vlad @ 2016-11-03 16:28 UTC (permalink / raw)
To: intel-gfx
lib/igt_aux: Added igt_pkill helper.
lib/igt_kmod: Added load/unload kmod helpers.
v5:
- added igt_i915_driver_{load/unload}.
- added kick_snd_hda_intel() to match current tests/drv_module_reload_basic and
integrated into igt_i915_driver_load/unload.
- added gtk-doc section for lib/igt_kmod
v4:
- decided to split libkmod helpers into their own file as there's
another user lib/igt_gvt or tests/gvt_basic.
- fixed some gtk-doc documentation.
v3:
- return -errno (igt_pkill()) in case of failure (Cris Wilson)
- return bool for igt_kmod_is_loaded(), replaced strncasecmp with strncmp
(Chris Wilson)
- use igt_debug() instead of igt_info() for igt_kmod_load()/
igt_kmod_unload() and return -err directly from libkmod (Chris Wilson)
v2:
- Renamed libkmod helpers (Chris Wilson)
- Removed SIGTERM/SIGKILL case where we repeatedly tried to terminate the
process: just call kill(2) once (Chris Wilson)
- Removed redundant check in igt_kmod_unload(), igt_module_in_use() (Chris
Wilson)
- Pass flags to igt_kmod_unload() from the caller (Chris Wilson)
- Removed useless function igt_kill() which acts just as kill(2) (Chris
Wilson)
Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
configure.ac | 2 +
.../intel-gpu-tools/intel-gpu-tools-docs.xml | 1 +
lib/Makefile.am | 2 +
lib/Makefile.sources | 2 +
lib/igt_aux.c | 40 ++++
lib/igt_aux.h | 2 +
lib/igt_gvt.c | 43 +---
lib/igt_kmod.c | 260 +++++++++++++++++++++
lib/igt_kmod.h | 38 +++
lib/igt_sysfs.c | 106 +++++++++
lib/igt_sysfs.h | 3 +
11 files changed, 458 insertions(+), 41 deletions(-)
create mode 100644 lib/igt_kmod.c
create mode 100644 lib/igt_kmod.h
diff --git a/configure.ac b/configure.ac
index 735cfd5..2c6e49d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,6 +121,8 @@ AC_SUBST(ASSEMBLER_WARN_CFLAGS)
PKG_CHECK_MODULES(DRM, [libdrm])
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
+PKG_CHECK_MODULES(KMOD, [libkmod])
+PKG_CHECK_MODULES(PROCPS, [libprocps])
case "$target_cpu" in
x86*|i?86)
diff --git a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml
index c862f2a..39061a8 100644
--- a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml
+++ b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml
@@ -22,6 +22,7 @@
<xi:include href="xml/igt_sysfs.xml"/>
<xi:include href="xml/igt_draw.xml"/>
<xi:include href="xml/igt_kms.xml"/>
+ <xi:include href="xml/igt_kmod.xml"/>
<xi:include href="xml/igt_fb.xml"/>
<xi:include href="xml/igt_aux.xml"/>
<xi:include href="xml/igt_gt.xml"/>
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4c0893d..e1737bd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -34,6 +34,8 @@ AM_CFLAGS += $(CAIRO_CFLAGS)
libintel_tools_la_LIBADD = \
$(DRM_LIBS) \
$(PCIACCESS_LIBS) \
+ $(PROCPS_LIBS) \
+ $(KMOD_LIBS) \
$(CAIRO_LIBS) \
$(LIBUDEV_LIBS) \
$(LIBUNWIND_LIBS) \
diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index e8e277b..2205c86 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -77,6 +77,8 @@ lib_source_list = \
igt_pm.h \
uwildmat/uwildmat.h \
uwildmat/uwildmat.c \
+ igt_kmod.c \
+ igt_kmod.h \
$(NULL)
.PHONY: version.h.tmp
diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index 421f6d4..a8c5662 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -51,6 +51,8 @@
#include <termios.h>
#include <assert.h>
+#include <proc/readproc.h>
+
#include "drmtest.h"
#include "i915_drm.h"
#include "intel_chipset.h"
@@ -1193,6 +1195,44 @@ void igt_set_module_param_int(const char *name, int val)
igt_set_module_param(name, str);
}
+/**
+ * igt_pkill:
+ * @sig: Signal to send
+ * @comm: Name of process in the form found in /proc/pid/comm (limited to 15
+ * chars)
+ *
+ * Returns: 0 in case the process is not found running or the signal has been
+ * sent successfully or -errno otherwise.
+ *
+ * This function sends the signal @sig for a process found in process table
+ * with name @comm.
+ */
+int
+igt_pkill(int sig, const char *comm)
+{
+ PROCTAB *proc;
+ proc_t *proc_info;
+ int err = 0;
+
+ proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG);
+ igt_assert(proc != NULL);
+
+ while ((proc_info = readproc(proc, NULL))) {
+ if (!strncasecmp(proc_info->cmd, comm, sizeof(proc_info->cmd))) {
+
+ if (kill(proc_info->tid, sig) < 0)
+ err = -errno;
+
+ freeproc(proc_info);
+ break;
+ }
+ freeproc(proc_info);
+ }
+
+ closeproc(proc);
+ return err;
+}
+
static struct igt_siglatency {
timer_t timer;
struct timespec target;
diff --git a/lib/igt_aux.h b/lib/igt_aux.h
index d30196b..b425ed8 100644
--- a/lib/igt_aux.h
+++ b/lib/igt_aux.h
@@ -264,4 +264,6 @@ double igt_stop_siglatency(struct igt_mean *result);
void igt_set_module_param(const char *name, const char *val);
void igt_set_module_param_int(const char *name, int val);
+int igt_pkill(int sig, const char *comm);
+
#endif /* IGT_AUX_H */
diff --git a/lib/igt_gvt.c b/lib/igt_gvt.c
index 0f332d1..8bbf9bd 100644
--- a/lib/igt_gvt.c
+++ b/lib/igt_gvt.c
@@ -23,6 +23,7 @@
#include "igt.h"
#include "igt_gvt.h"
+#include "igt_sysfs.h"
#include <dirent.h>
#include <unistd.h>
@@ -46,49 +47,9 @@ static bool is_gvt_enabled(void)
return enabled;
}
-static void unbind_fbcon(void)
-{
- char buf[128];
- const char *path = "/sys/class/vtconsole";
- DIR *dir;
- struct dirent *vtcon;
-
- dir = opendir(path);
- if (!dir)
- return;
-
- while ((vtcon = readdir(dir))) {
- int fd, len;
-
- if (strncmp(vtcon->d_name, "vtcon", 5))
- continue;
-
- sprintf(buf, "%s/%s/name", path, vtcon->d_name);
- fd = open(buf, O_RDONLY);
- if (fd < 0)
- continue;
-
- len = read(fd, buf, sizeof(buf) - 1);
- close(fd);
- if (len >= 0)
- buf[len] = '\0';
-
- if (strstr(buf, "frame buffer device")) {
- sprintf(buf, "%s/%s/bind", path, vtcon->d_name);
- fd = open(buf, O_WRONLY);
- if (fd != -1) {
- igt_ignore_warn(write(fd, "1\n", 2));
- close(fd);
- }
- break;
- }
- }
- closedir(dir);
-}
-
static void unload_i915(void)
{
- unbind_fbcon();
+ kick_fbcon(false);
/* pkill alsact */
igt_ignore_warn(system("/sbin/modprobe -s -r i915"));
diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
new file mode 100644
index 0000000..b98d3be
--- /dev/null
+++ b/lib/igt_kmod.c
@@ -0,0 +1,260 @@
+/*
+ * Copyright © 2016 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 "igt.h"
+#include "igt_sysfs.h"
+#include "igt_kmod.h"
+
+#include <signal.h>
+
+/**
+ * SECTION:igt_kmod
+ * @short_description: Wrappers around libkmod for module loading/unloading
+ * @title: kmod
+ * @include: igt.h
+ *
+ * This library provides helpers to load/unload module driver.
+ */
+
+
+/**
+ * igt_kmod_is_loaded:
+ * @mod_name: The name of the module.
+ *
+ * Returns: True in case the module has been found or false otherwise.
+ *
+ * Function to check the existance of module @mod_name in list of loaded kernel
+ * modules.
+ *
+ */
+bool
+igt_kmod_is_loaded(const char *mod_name)
+{
+ struct kmod_list *mod, *list;
+ struct kmod_ctx *ctx;
+ bool ret = false;
+
+ ctx = kmod_new(NULL, NULL);
+ igt_assert(ctx != NULL);
+
+ if (kmod_module_new_from_loaded(ctx, &list) < 0) {
+ goto out;
+ }
+
+ kmod_list_foreach(mod, list) {
+ struct kmod_module *kmod = kmod_module_get_module(mod);
+ const char *kmod_name = kmod_module_get_name(kmod);
+
+ if (!strncmp(kmod_name, mod_name, strlen(kmod_name))) {
+ kmod_module_unref(kmod);
+ ret = true;
+ break;
+ }
+ kmod_module_unref(kmod);
+ }
+ kmod_module_unref_list(list);
+out:
+ kmod_unref(ctx);
+
+ return ret;
+}
+
+/**
+ * igt_kmod_load:
+ * @mod_name: The name of the module
+ * @opts: Parameters for the module. NULL in case no parameters
+ * are to be passed, or a '\0' terminated string otherwise.
+ *
+ * Returns: 0 in case of success or -errno in case the module could not
+ * be loaded.
+ *
+ * This function loads a kernel module using the name specified in @mod_name.
+ *
+ * @Note: This functions doesn't automatically resolve other module
+ * dependencies so make make sure you load the dependencies module(s) before
+ * this one.
+ */
+int
+igt_kmod_load(const char *mod_name, const char *opts)
+{
+ struct kmod_ctx *ctx;
+ struct kmod_module *kmod;
+ int err = 0;
+
+ ctx = kmod_new(NULL, NULL);
+ igt_assert(ctx != NULL);
+
+ err = kmod_module_new_from_name(ctx, mod_name, &kmod);
+ if (err < 0) {
+ goto out;
+ }
+
+ err = kmod_module_insert_module(kmod, 0, opts);
+ if (err < 0) {
+ switch (err) {
+ case -EEXIST:
+ igt_debug("Module %s already inserted\n",
+ kmod_module_get_name(kmod));
+ break;
+ case -ENOENT:
+ igt_debug("Unknown symbol in module %s or "
+ "unknown parameter\n",
+ kmod_module_get_name(kmod));
+ break;
+ default:
+ igt_debug("Could not insert %s (%s)\n",
+ kmod_module_get_name(kmod), strerror(-err));
+ break;
+ }
+ }
+out:
+ kmod_module_unref(kmod);
+ kmod_unref(ctx);
+
+ return -err ? err < 0 : err;
+}
+
+
+/**
+ * igt_kmod_unload:
+ * @mod_name: Module name.
+ * @flags: flags are passed directly to libkmod and can be:
+ * KMOD_REMOVE_FORCE or KMOD_REMOVE_NOWAIT.
+ *
+ * Returns: 0 in case of success or -errno otherwise.
+ *
+ * Removes the module @mod_name.
+ *
+ */
+int
+igt_kmod_unload(const char *mod_name, unsigned int flags)
+{
+ struct kmod_ctx *ctx;
+ struct kmod_module *kmod;
+ int err = 0;
+
+ ctx = kmod_new(NULL, NULL);
+ igt_assert(ctx != NULL);
+
+ err = kmod_module_new_from_name(ctx, mod_name, &kmod);
+ if (err < 0) {
+ igt_debug("Could not use module %s (%s)\n", mod_name,
+ strerror(-err));
+ goto out;
+ }
+
+ err = kmod_module_remove_module(kmod, flags);
+ if (err < 0) {
+ igt_debug("Could not remove module %s (%s)\n", mod_name,
+ strerror(-err));
+ }
+
+out:
+ kmod_module_unref(kmod);
+ kmod_unref(ctx);
+
+ return -err ? err < 0 : err;
+}
+
+/**
+ * igt_i915_driver_load:
+ * @opts: options to pass to i915 driver
+ *
+ * Loads the i915 driver and its dependencies.
+ *
+ */
+int
+igt_i915_driver_load(const char *opts)
+{
+ if (opts)
+ igt_info("Reloading i915 with %s\n\n", opts);
+
+ /* we do not have automatic loading of dependencies */
+ igt_kmod_load("drm", NULL);
+ igt_kmod_load("drm_kms_helper", NULL);
+
+ if (igt_kmod_load("i915", opts)) {
+ igt_info("Could not load i915\n");
+ return IGT_EXIT_FAILURE;
+ }
+
+ kick_fbcon(true);
+ igt_kmod_load("snd_hda_intel", NULL);
+
+ return IGT_EXIT_SUCCESS;
+}
+
+/**
+ * igt_i915_driver_unload:
+ *
+ * Unloads the i915 driver and its dependencies.
+ *
+ */
+int
+igt_i915_driver_unload(void)
+{
+ /* unbind vt */
+ kick_fbcon(false);
+
+ if (igt_kmod_is_loaded("snd_hda_intel")) {
+ igt_pkill(SIGTERM, "alsactl");
+
+ /* unbind snd_hda_intel */
+ kick_snd_hda_intel();
+
+ if (igt_kmod_unload("snd_hda_intel", 0)) {
+ igt_info("Could not unload snd_hda_intel\n");
+ return IGT_EXIT_FAILURE;
+ }
+ }
+
+ /* gen5 */
+ if (igt_kmod_is_loaded("intel_ips")) {
+ igt_kmod_unload("intel_ips", 0);
+ }
+
+ if (igt_kmod_is_loaded("i915")) {
+ if (igt_kmod_unload("i915", 0)) {
+ igt_info("Could not unload i915\n");
+ return IGT_EXIT_SKIP;
+ } else {
+ igt_info("i915.ko has been unloaded!\n");
+ }
+ }
+
+ if (igt_kmod_is_loaded("intel-gtt")) {
+ igt_kmod_unload("intel-gtt", 0);
+ }
+
+ igt_kmod_unload("drm_kms_helper", 0);
+ igt_kmod_unload("drm", 0);
+
+ if (igt_kmod_is_loaded("i915")) {
+ igt_info("WARNING: i915.ko still loaded!\n");
+ return IGT_EXIT_FAILURE;
+ } else {
+ igt_info("module successfully unloaded\n");
+ }
+
+ return IGT_EXIT_SUCCESS;
+}
diff --git a/lib/igt_kmod.h b/lib/igt_kmod.h
new file mode 100644
index 0000000..c4322ba
--- /dev/null
+++ b/lib/igt_kmod.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2016 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_KMOD_H
+#define IGT_KMOD_H
+
+#include <libkmod.h>
+
+bool igt_kmod_is_loaded(const char *mod_name);
+
+int igt_kmod_load(const char *mod_name, const char *opts);
+int igt_kmod_unload(const char *mod_name, unsigned int flags);
+
+int igt_i915_driver_load(const char *opts);
+int igt_i915_driver_unload(void);
+
+
+#endif /* IGT_KMOD_H */
diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c
index c19821d..570329d 100644
--- a/lib/igt_sysfs.c
+++ b/lib/igt_sysfs.c
@@ -34,7 +34,11 @@
#include <fcntl.h>
#include <unistd.h>
#include <i915_drm.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include "igt_core.h"
#include "igt_sysfs.h"
/**
@@ -392,3 +396,105 @@ bool igt_sysfs_set_boolean(int dir, const char *attr, bool value)
{
return igt_sysfs_printf(dir, attr, "%d", value) == 1;
}
+
+/**
+ * kick_fbcon:
+ * @enable: boolean value
+ *
+ * This functions enables/disables the text console running on top of the
+ * framebuffer device.
+ */
+void kick_fbcon(bool enable)
+{
+ char buf[128];
+ const char *path = "/sys/class/vtconsole";
+ DIR *dir;
+ struct dirent *vtcon;
+
+ dir = opendir(path);
+ if (!dir)
+ return;
+
+ while ((vtcon = readdir(dir))) {
+ int fd, len;
+
+ if (strncmp(vtcon->d_name, "vtcon", 5))
+ continue;
+
+ sprintf(buf, "%s/%s/name", path, vtcon->d_name);
+ fd = open(buf, O_RDONLY);
+ if (fd < 0)
+ continue;
+
+ len = read(fd, buf, sizeof(buf) - 1);
+ close(fd);
+ if (len >= 0)
+ buf[len] = '\0';
+
+ if (strstr(buf, "frame buffer device")) {
+ sprintf(buf, "%s/%s/bind", path, vtcon->d_name);
+ fd = open(buf, O_WRONLY);
+ if (fd != -1) {
+ if (enable)
+ igt_ignore_warn(write(fd, "1\n", 2));
+ else
+ igt_ignore_warn(write(fd, "0\n", 2));
+ close(fd);
+ }
+ break;
+ }
+ }
+ closedir(dir);
+}
+
+/**
+ * kick_snd_hda_intel:
+ *
+ * This functions unbinds the snd_hda_intel driver so the module cand be
+ * unloaded.
+ *
+ */
+void kick_snd_hda_intel(void)
+{
+ DIR *dir;
+ struct dirent *snd_hda;
+ int fd; size_t len;
+
+ const char *dpath = "/sys/bus/pci/drivers/snd_hda_intel";
+ const char *path = "/sys/bus/pci/drivers/snd_hda_intel/unbind";
+ const char *devid = "0000:";
+
+ fd = open(path, O_WRONLY);
+ if (fd < 0) {
+ return;
+ }
+
+ dir = opendir(dpath);
+ if (!dir)
+ goto out;
+
+ len = strlen(devid);
+ while ((snd_hda = readdir(dir))) {
+ struct stat st;
+ char fpath[PATH_MAX];
+
+ if (*snd_hda->d_name == '.')
+ continue;
+
+ snprintf(fpath, sizeof(fpath), "%s/%s", dpath, snd_hda->d_name);
+ if (lstat(fpath, &st))
+ continue;
+
+ if (!S_ISLNK(st.st_mode))
+ continue;
+
+ if (!strncmp(devid, snd_hda->d_name, len)) {
+ igt_ignore_warn(write(fd, snd_hda->d_name,
+ strlen(snd_hda->d_name)));
+ }
+ }
+
+ closedir(dir);
+out:
+ close(fd);
+}
diff --git a/lib/igt_sysfs.h b/lib/igt_sysfs.h
index 4820066..69b2e5e 100644
--- a/lib/igt_sysfs.h
+++ b/lib/igt_sysfs.h
@@ -43,4 +43,7 @@ bool igt_sysfs_set_u32(int dir, const char *attr, uint32_t value);
bool igt_sysfs_get_boolean(int dir, const char *attr);
bool igt_sysfs_set_boolean(int dir, const char *attr, bool value);
+void kick_fbcon(bool enable);
+void kick_snd_hda_intel(void);
+
#endif /* __IGT_SYSFS_H__ */
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH i-g-t 2/4 v5] lib/igt_gvt: Make use of libkmod helpers and fix reading gvt parameter.
2016-11-03 16:28 [PATCH i-g-t 0/4 v5] Convert sh scripts to C variants Marius Vlad
2016-11-03 16:28 ` [PATCH i-g-t 1/4 v5] lib/{igt_sysfs, igt_aux}: Make available to other users kick_fbcon() (unbind_fbcon()), and added helpers to lib/igt_aux, lib/igt_kmod Marius Vlad
@ 2016-11-03 16:28 ` Marius Vlad
2016-11-10 2:30 ` Zhenyu Wang
2016-11-03 16:28 ` [PATCH i-g-t 3/4 v5] tests/drv_module_reload: Convert sh script to C version Marius Vlad
2016-11-03 16:28 ` [PATCH i-g-t 4/4 v5] tests/kms_sysfs_edid_timing: Convert sh " Marius Vlad
3 siblings, 1 reply; 9+ messages in thread
From: Marius Vlad @ 2016-11-03 16:28 UTC (permalink / raw)
To: intel-gfx
v2:
- use igt_sysfs_get_boolean() to get gvt status (Chris Wilson)
- do not hard-fail when i915 module could not be loaded/unloaded (Chris
Wilson)
Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
lib/igt_gvt.c | 37 ++++++++++++++++++-------------------
tests/gvt_basic.c | 2 +-
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/lib/igt_gvt.c b/lib/igt_gvt.c
index 8bbf9bd..4ab7433 100644
--- a/lib/igt_gvt.c
+++ b/lib/igt_gvt.c
@@ -24,35 +24,30 @@
#include "igt.h"
#include "igt_gvt.h"
#include "igt_sysfs.h"
+#include "igt_kmod.h"
+#include <signal.h>
#include <dirent.h>
#include <unistd.h>
#include <fcntl.h>
static bool is_gvt_enabled(void)
{
- FILE *file;
- int value;
bool enabled = false;
+ int dir, fd;
- file = fopen("/sys/module/i915/parameters/enable_gvt", "r");
- if (!file)
+ fd = __drm_open_driver(DRIVER_INTEL);
+ dir = igt_sysfs_open_parameters(fd);
+ if (dir < 0)
return false;
- if (fscanf(file, "%d", &value) == 1)
- enabled = value;
- fclose(file);
+ enabled = igt_sysfs_get_boolean(dir, "enable_gvt");
- errno = 0;
- return enabled;
-}
+ close(dir);
+ close(fd);
-static void unload_i915(void)
-{
- kick_fbcon(false);
- /* pkill alsact */
+ return enabled;
- igt_ignore_warn(system("/sbin/modprobe -s -r i915"));
}
bool igt_gvt_load_module(void)
@@ -60,8 +55,11 @@ bool igt_gvt_load_module(void)
if (is_gvt_enabled())
return true;
- unload_i915();
- igt_ignore_warn(system("/sbin/modprobe -s i915 enable_gvt=1"));
+ if (igt_i915_driver_unload())
+ return false;
+
+ if (igt_i915_driver_load("enable_gvt=1"))
+ return false;
return is_gvt_enabled();
}
@@ -71,8 +69,9 @@ void igt_gvt_unload_module(void)
if (!is_gvt_enabled())
return;
- unload_i915();
- igt_ignore_warn(system("/sbin/modprobe -s i915 enable_gvt=0"));
+ igt_i915_driver_unload();
+
+ igt_i915_driver_load(NULL);
igt_assert(!is_gvt_enabled());
}
diff --git a/tests/gvt_basic.c b/tests/gvt_basic.c
index 48b853a..4e909a5 100644
--- a/tests/gvt_basic.c
+++ b/tests/gvt_basic.c
@@ -32,7 +32,7 @@ igt_main
igt_fixture {
igt_require(igt_gvt_load_module());
- fd = drm_open_driver(DRIVER_INTEL);
+ fd = __drm_open_driver(DRIVER_INTEL);
}
igt_subtest_f("invalid-placeholder-test");
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH i-g-t 2/4 v5] lib/igt_gvt: Make use of libkmod helpers and fix reading gvt parameter.
2016-11-03 16:28 ` [PATCH i-g-t 2/4 v5] lib/igt_gvt: Make use of libkmod helpers and fix reading gvt parameter Marius Vlad
@ 2016-11-10 2:30 ` Zhenyu Wang
0 siblings, 0 replies; 9+ messages in thread
From: Zhenyu Wang @ 2016-11-10 2:30 UTC (permalink / raw)
To: Marius Vlad; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 2987 bytes --]
On 2016.11.03 18:28:11 +0200, Marius Vlad wrote:
> v2:
> - use igt_sysfs_get_boolean() to get gvt status (Chris Wilson)
> - do not hard-fail when i915 module could not be loaded/unloaded (Chris
> Wilson)
>
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
Looks fine to me.
Acked-by: Zhenyu Wang <zhenyuw@linux.intel.com>
> ---
> lib/igt_gvt.c | 37 ++++++++++++++++++-------------------
> tests/gvt_basic.c | 2 +-
> 2 files changed, 19 insertions(+), 20 deletions(-)
>
> diff --git a/lib/igt_gvt.c b/lib/igt_gvt.c
> index 8bbf9bd..4ab7433 100644
> --- a/lib/igt_gvt.c
> +++ b/lib/igt_gvt.c
> @@ -24,35 +24,30 @@
> #include "igt.h"
> #include "igt_gvt.h"
> #include "igt_sysfs.h"
> +#include "igt_kmod.h"
>
> +#include <signal.h>
> #include <dirent.h>
> #include <unistd.h>
> #include <fcntl.h>
>
> static bool is_gvt_enabled(void)
> {
> - FILE *file;
> - int value;
> bool enabled = false;
> + int dir, fd;
>
> - file = fopen("/sys/module/i915/parameters/enable_gvt", "r");
> - if (!file)
> + fd = __drm_open_driver(DRIVER_INTEL);
> + dir = igt_sysfs_open_parameters(fd);
> + if (dir < 0)
> return false;
>
> - if (fscanf(file, "%d", &value) == 1)
> - enabled = value;
> - fclose(file);
> + enabled = igt_sysfs_get_boolean(dir, "enable_gvt");
>
> - errno = 0;
> - return enabled;
> -}
> + close(dir);
> + close(fd);
>
> -static void unload_i915(void)
> -{
> - kick_fbcon(false);
> - /* pkill alsact */
> + return enabled;
>
> - igt_ignore_warn(system("/sbin/modprobe -s -r i915"));
> }
>
> bool igt_gvt_load_module(void)
> @@ -60,8 +55,11 @@ bool igt_gvt_load_module(void)
> if (is_gvt_enabled())
> return true;
>
> - unload_i915();
> - igt_ignore_warn(system("/sbin/modprobe -s i915 enable_gvt=1"));
> + if (igt_i915_driver_unload())
> + return false;
> +
> + if (igt_i915_driver_load("enable_gvt=1"))
> + return false;
>
> return is_gvt_enabled();
> }
> @@ -71,8 +69,9 @@ void igt_gvt_unload_module(void)
> if (!is_gvt_enabled())
> return;
>
> - unload_i915();
> - igt_ignore_warn(system("/sbin/modprobe -s i915 enable_gvt=0"));
> + igt_i915_driver_unload();
> +
> + igt_i915_driver_load(NULL);
>
> igt_assert(!is_gvt_enabled());
> }
> diff --git a/tests/gvt_basic.c b/tests/gvt_basic.c
> index 48b853a..4e909a5 100644
> --- a/tests/gvt_basic.c
> +++ b/tests/gvt_basic.c
> @@ -32,7 +32,7 @@ igt_main
>
> igt_fixture {
> igt_require(igt_gvt_load_module());
> - fd = drm_open_driver(DRIVER_INTEL);
> + fd = __drm_open_driver(DRIVER_INTEL);
> }
>
> igt_subtest_f("invalid-placeholder-test");
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Open Source Technology Center, Intel ltd.
$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 163 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH i-g-t 3/4 v5] tests/drv_module_reload: Convert sh script to C version.
2016-11-03 16:28 [PATCH i-g-t 0/4 v5] Convert sh scripts to C variants Marius Vlad
2016-11-03 16:28 ` [PATCH i-g-t 1/4 v5] lib/{igt_sysfs, igt_aux}: Make available to other users kick_fbcon() (unbind_fbcon()), and added helpers to lib/igt_aux, lib/igt_kmod Marius Vlad
2016-11-03 16:28 ` [PATCH i-g-t 2/4 v5] lib/igt_gvt: Make use of libkmod helpers and fix reading gvt parameter Marius Vlad
@ 2016-11-03 16:28 ` Marius Vlad
2016-11-03 16:36 ` Jani Nikula
2016-11-03 16:28 ` [PATCH i-g-t 4/4 v5] tests/kms_sysfs_edid_timing: Convert sh " Marius Vlad
3 siblings, 1 reply; 9+ messages in thread
From: Marius Vlad @ 2016-11-03 16:28 UTC (permalink / raw)
To: intel-gfx
v5:
- reworked gem_info to gem_sanitychecks (Chris Wilson)
- remove subgroups/subtests for gem_exec_store and gem_sanitycheck
(Chris Wilson)
v4:
- adjust test to make use of lib/igt_kmod
- replaced SW_FINISH with SET_CACHEING (Chris Wilson)
v3:
- fix passing boolean value as flags to igt_kmod_unload().
v2:
- embedded gem_alive and gem_exec_store into test (Chris Wilson)
- int main() to igt_main (Chris Wilson)
- moved tests/gem_alive -> tools/gem_info (Chris Wilson)
- added to intel-ci/fast-feedback.testlist (Petri Latvala)
- added hda_dynamic_debug() (Petri Latvala)
- renamed from tests/drv_module_reload_basic to tests/drv_module_reload
(all subtests are basic and have been added to fast-feedback.testlist)
Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
tests/Makefile.am | 1 -
tests/Makefile.sources | 2 +-
tests/drv_module_reload.c | 332 ++++++++++++++++++++++++++++++++++
tests/drv_module_reload_basic | 111 ------------
tests/gem_alive.c | 35 ----
tests/intel-ci/fast-feedback.testlist | 4 +-
tools/Makefile.sources | 1 +
tools/intel_gem_info.c | 35 ++++
8 files changed, 372 insertions(+), 149 deletions(-)
create mode 100644 tests/drv_module_reload.c
delete mode 100755 tests/drv_module_reload_basic
delete mode 100644 tests/gem_alive.c
create mode 100644 tools/intel_gem_info.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a408126..14a41ae 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,6 @@ noinst_PROGRAMS = \
$(NULL)
pkglibexec_PROGRAMS = \
- gem_alive \
gem_stress \
$(TESTS_progs) \
$(TESTS_progs_M) \
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 6d081c3..b1511c6 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -211,6 +211,7 @@ TESTS_progs = \
kms_pwrite_crc \
kms_sink_crc_basic \
prime_udl \
+ drv_module_reload \
$(NULL)
# IMPORTANT: The ZZ_ tests need to be run last!
@@ -221,7 +222,6 @@ TESTS_scripts_M = \
TESTS_scripts = \
debugfs_emon_crash \
drv_debugfs_reader \
- drv_module_reload_basic \
kms_sysfs_edid_timing \
sysfs_l3_parity \
test_rte_check \
diff --git a/tests/drv_module_reload.c b/tests/drv_module_reload.c
new file mode 100644
index 0000000..31ec2ec
--- /dev/null
+++ b/tests/drv_module_reload.c
@@ -0,0 +1,332 @@
+/*
+ * Copyright © 2016 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 "igt.h"
+#include "igt_debugfs.h"
+#include "igt_aux.h"
+#include "igt_kmod.h"
+#include "igt_sysfs.h"
+#include "igt_core.h"
+
+#include <dirent.h>
+#include <sys/utsname.h>
+#include <linux/limits.h>
+#include <signal.h>
+#include <libgen.h>
+#include <signal.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+
+
+#define LOCAL_I915_EXEC_BSD_SHIFT (13)
+#define LOCAL_I915_EXEC_BSD_MASK (3 << LOCAL_I915_EXEC_BSD_SHIFT)
+
+#define ENGINE_MASK (I915_EXEC_RING_MASK | LOCAL_I915_EXEC_BSD_MASK)
+
+static void store_dword(int fd, unsigned ring)
+{
+ const int gen = intel_gen(intel_get_drm_devid(fd));
+ struct drm_i915_gem_exec_object2 obj[2];
+ struct drm_i915_gem_relocation_entry reloc;
+ struct drm_i915_gem_execbuffer2 execbuf;
+ uint32_t batch[16];
+ int i;
+
+ if (!gem_has_ring(fd, ring))
+ return;
+
+ if (gen == 6 && (ring & ~(3<<13)) == I915_EXEC_BSD)
+ return;
+
+ intel_detect_and_clear_missed_interrupts(fd);
+ memset(&execbuf, 0, sizeof(execbuf));
+ execbuf.buffers_ptr = (uintptr_t)obj;
+ execbuf.buffer_count = 2;
+ execbuf.flags = ring;
+ if (gen < 6)
+ execbuf.flags |= I915_EXEC_SECURE;
+
+ memset(obj, 0, sizeof(obj));
+ obj[0].handle = gem_create(fd, 4096);
+ obj[1].handle = gem_create(fd, 4096);
+
+ memset(&reloc, 0, sizeof(reloc));
+ reloc.target_handle = obj[0].handle;
+ reloc.presumed_offset = 0;
+ reloc.offset = sizeof(uint32_t);
+ reloc.delta = 0;
+ reloc.read_domains = I915_GEM_DOMAIN_INSTRUCTION;
+ reloc.write_domain = I915_GEM_DOMAIN_INSTRUCTION;
+ obj[1].relocs_ptr = (uintptr_t)&reloc;
+ obj[1].relocation_count = 1;
+
+ i = 0;
+ batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0);
+ if (gen >= 8) {
+ batch[++i] = 0;
+ batch[++i] = 0;
+ } else if (gen >= 4) {
+ batch[++i] = 0;
+ batch[++i] = 0;
+ reloc.offset += sizeof(uint32_t);
+ } else {
+ batch[i]--;
+ batch[++i] = 0;
+ }
+ batch[++i] = 0xc0ffee;
+ batch[++i] = MI_BATCH_BUFFER_END;
+ gem_write(fd, obj[1].handle, 0, batch, sizeof(batch));
+ gem_execbuf(fd, &execbuf);
+ gem_close(fd, obj[1].handle);
+
+ gem_read(fd, obj[0].handle, 0, batch, sizeof(batch));
+ gem_close(fd, obj[0].handle);
+ igt_assert_eq(*batch, 0xc0ffee);
+ igt_assert_eq(intel_detect_and_clear_missed_interrupts(fd), 0);
+}
+
+static void store_all(int fd)
+{
+ const int gen = intel_gen(intel_get_drm_devid(fd));
+ struct drm_i915_gem_exec_object2 obj[2];
+ struct drm_i915_gem_relocation_entry reloc[32];
+ struct drm_i915_gem_execbuffer2 execbuf;
+ unsigned engines[16], permuted[16];
+ uint32_t batch[16];
+ uint64_t offset;
+ unsigned engine, nengine;
+ int value;
+ int i, j;
+
+ memset(&execbuf, 0, sizeof(execbuf));
+ execbuf.buffers_ptr = (uintptr_t)obj;
+ execbuf.buffer_count = 2;
+ if (gen < 6)
+ execbuf.flags |= I915_EXEC_SECURE;
+
+ memset(reloc, 0, sizeof(reloc));
+ memset(obj, 0, sizeof(obj));
+ obj[0].handle = gem_create(fd, 4096);
+ obj[1].handle = gem_create(fd, 4096);
+ obj[1].relocation_count = 1;
+
+ offset = sizeof(uint32_t);
+ i = 0;
+ batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0);
+ if (gen >= 8) {
+ batch[++i] = 0;
+ batch[++i] = 0;
+ } else if (gen >= 4) {
+ batch[++i] = 0;
+ batch[++i] = 0;
+ offset += sizeof(uint32_t);
+ } else {
+ batch[i]--;
+ batch[++i] = 0;
+ }
+ batch[value = ++i] = 0xc0ffee;
+ batch[++i] = MI_BATCH_BUFFER_END;
+
+ nengine = 0;
+ intel_detect_and_clear_missed_interrupts(fd);
+ for_each_engine(fd, engine) {
+ if (gen == 6 && (engine & ~(3<<13)) == I915_EXEC_BSD)
+ continue;
+
+ igt_assert(2*(nengine+1)*sizeof(batch) <= 4096);
+
+ execbuf.flags &= ~ENGINE_MASK;
+ execbuf.flags |= engine;
+
+ j = 2*nengine;
+ reloc[j].target_handle = obj[0].handle;
+ reloc[j].presumed_offset = ~0;
+ reloc[j].offset = j*sizeof(batch) + offset;
+ reloc[j].delta = nengine*sizeof(uint32_t);
+ reloc[j].read_domains = I915_GEM_DOMAIN_INSTRUCTION;
+ reloc[j].write_domain = I915_GEM_DOMAIN_INSTRUCTION;
+ obj[1].relocs_ptr = (uintptr_t)&reloc[j];
+
+ batch[value] = 0xdeadbeef;
+ gem_write(fd, obj[1].handle, j*sizeof(batch),
+ batch, sizeof(batch));
+ execbuf.batch_start_offset = j*sizeof(batch);
+ gem_execbuf(fd, &execbuf);
+
+ j = 2*nengine + 1;
+ reloc[j].target_handle = obj[0].handle;
+ reloc[j].presumed_offset = ~0;
+ reloc[j].offset = j*sizeof(batch) + offset;
+ reloc[j].delta = nengine*sizeof(uint32_t);
+ reloc[j].read_domains = I915_GEM_DOMAIN_INSTRUCTION;
+ reloc[j].write_domain = I915_GEM_DOMAIN_INSTRUCTION;
+ obj[1].relocs_ptr = (uintptr_t)&reloc[j];
+
+ batch[value] = nengine;
+ gem_write(fd, obj[1].handle, j*sizeof(batch),
+ batch, sizeof(batch));
+ execbuf.batch_start_offset = j*sizeof(batch);
+ gem_execbuf(fd, &execbuf);
+
+ engines[nengine++] = engine;
+ }
+ gem_sync(fd, obj[1].handle);
+
+ for (i = 0; i < nengine; i++) {
+ obj[1].relocs_ptr = (uintptr_t)&reloc[2*i];
+ execbuf.batch_start_offset = 2*i*sizeof(batch);
+ memcpy(permuted, engines, nengine*sizeof(engines[0]));
+ igt_permute_array(permuted, nengine, igt_exchange_int);
+ for (j = 0; j < nengine; j++) {
+ execbuf.flags &= ~ENGINE_MASK;
+ execbuf.flags |= permuted[j];
+ gem_execbuf(fd, &execbuf);
+ }
+ obj[1].relocs_ptr = (uintptr_t)&reloc[2*i+1];
+ execbuf.batch_start_offset = (2*i+1)*sizeof(batch);
+ execbuf.flags &= ~ENGINE_MASK;
+ execbuf.flags |= engines[i];
+ gem_execbuf(fd, &execbuf);
+ }
+ gem_close(fd, obj[1].handle);
+
+ gem_read(fd, obj[0].handle, 0, engines, sizeof(engines));
+ gem_close(fd, obj[0].handle);
+
+ for (i = 0; i < nengine; i++)
+ igt_assert_eq_u32(engines[i], i);
+ igt_assert_eq(intel_detect_and_clear_missed_interrupts(fd), 0);
+}
+
+static int
+reload(const char *opts_i915)
+{
+ int err = IGT_EXIT_SUCCESS;
+
+ if ((err = igt_i915_driver_unload()))
+ return err;
+
+ if ((err = igt_i915_driver_load(opts_i915)))
+ return err;
+
+ return err;
+}
+
+static void
+gem_sanitycheck(void)
+{
+ int err = 0;
+ int fd;
+ struct drm_i915_gem_caching args = {};
+
+
+ fd = __drm_open_driver(DRIVER_INTEL);
+ igt_set_timeout(1, "Module reload timeout!");
+
+ if (ioctl(fd, DRM_IOCTL_I915_GEM_SET_CACHING, &args) < 0)
+ err = -errno;
+
+ igt_set_timeout(0, NULL);
+ close(fd);
+
+ igt_assert_eq(err, -ENOENT);
+}
+
+static void
+gem_exec_store(void)
+{
+ int fd;
+ const struct intel_execution_engine *e;
+
+ fd = __drm_open_driver(DRIVER_INTEL);
+ igt_fork_hang_detector(fd);
+
+ for (e = intel_execution_engines; e->name; e++) {
+ store_dword(fd, e->exec_id | e->flags);
+ }
+
+ store_all(fd);
+
+ igt_stop_hang_detector();
+ close(fd);
+}
+
+static void
+hda_dynamic_debug(bool enable)
+{
+ FILE *fp;
+ const char snd_hda_intel_on[] = "module snd_hda_intel +pf";
+ const char snd_hda_core_on[] = "module snd_hda_core +pf";
+
+ const char snd_hda_intel_off[] = "module snd_hda_core =_";
+ const char snd_hda_core_off[] = "module snd_hda_intel =_";
+
+ fp = fopen("/sys/kernel/debug/dynamic_debug/control", "w");
+ igt_assert(fp != NULL);
+
+ if (enable) {
+ fwrite(snd_hda_intel_on, 1, sizeof(snd_hda_intel_on), fp);
+ fwrite(snd_hda_core_on, 1, sizeof(snd_hda_core_on), fp);
+ } else {
+ fwrite(snd_hda_intel_off, 1, sizeof(snd_hda_intel_off), fp);
+ fwrite(snd_hda_core_off, 1, sizeof(snd_hda_core_off), fp);
+ }
+
+ fclose(fp);
+}
+
+igt_main
+{
+ int i, err;
+ char buf[64];
+
+ igt_fixture
+ hda_dynamic_debug(true);
+
+ igt_subtest("basic-reload") {
+
+ if ((err = reload(NULL)))
+ igt_fail(err);
+
+ gem_sanitycheck();
+ gem_exec_store();
+ }
+
+ igt_subtest("basic-reload-inject") {
+ for (i = 0; i < 4; i++) {
+ memset(buf, 0, sizeof(buf));
+ snprintf(buf, sizeof(buf), "inject_load_failure=%d", i);
+ reload(buf);
+ }
+ }
+
+ igt_subtest("basic-reload-final") {
+ if ((err = reload(NULL)))
+ igt_fail(err);
+
+ gem_sanitycheck();
+ gem_exec_store();
+ }
+
+ igt_fixture
+ hda_dynamic_debug(false);
+}
diff --git a/tests/drv_module_reload_basic b/tests/drv_module_reload_basic
deleted file mode 100755
index 98f3694..0000000
--- a/tests/drv_module_reload_basic
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-#
-# Testcase: Reload the drm module
-#
-# ... we've broken this way too often :(
-#
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-# no other drm service should be running, so we can just unbind
-
-# return 0 if module by name $1 is loaded according to lsmod
-function mod_loaded()
-{
- lsmod | grep -w "^$1" &> /dev/null
-}
-
-function reload() {
- local snd_hda_intel_unloaded
-
- echo Reloading i915.ko with $*
-
- # we must kick away fbcon (but only fbcon)
- for vtcon in /sys/class/vtconsole/vtcon*/ ; do
- if grep "frame buffer device" $vtcon/name > /dev/null ; then
- echo unbinding $vtcon: `cat $vtcon/name`
- echo 0 > $vtcon/bind
- fi
- done
-
- # The sound driver uses our power well
- pkill alsactl
- snd_hda_intel_unloaded=0
- if mod_loaded snd_hda_intel; then
- # unbind sound cards
- for card in $(find /sys/bus/pci/drivers/snd_hda_intel -name "0000:*" -printf "%f\n"); do
- echo $card > /sys/bus/pci/drivers/snd_hda_intel/unbind
- done
-
- if rmmod snd_hda_intel; then
- snd_hda_intel_unloaded=1
- else
- lsmod >&2
- lsof /dev/snd/* >&2
- fi
- fi
-
- # gen5 only
- if mod_loaded intel_ips; then
- rmmod intel_ips
- fi
-
- if ! rmmod i915; then
- lsmod >&2
- return $IGT_EXIT_SKIP
- fi
- #ignore errors in intel-gtt, often built-in
- rmmod intel-gtt &> /dev/null
- # drm may be used by other devices (nouveau, radeon, udl, etc)
- rmmod drm_kms_helper &> /dev/null
- rmmod drm &> /dev/null
-
- if mod_loaded i915; then
- echo WARNING: i915.ko still loaded!
- return $IGT_EXIT_FAILURE
- else
- echo module successfully unloaded
- fi
-
- modprobe i915 $*
-
- if [ -f /sys/class/vtconsole/vtcon1/bind ]; then
- echo 1 > /sys/class/vtconsole/vtcon1/bind
- fi
-
- modprobe -q snd_hda_intel || return $snd_hda_intel_unloaded
-}
-
-function finish_load() {
- # does the device exist?
- if $SOURCE_DIR/gem_alive > /dev/null ; then
- echo "module successfully loaded again"
- else
- echo "failed to reload module successfully"
- return $IGT_EXIT_FAILURE
- fi
-
- # then try to run something
- if ! $SOURCE_DIR/gem_exec_store > /dev/null ; then
- echo "failed to execute a simple batch after reload"
- return $IGT_EXIT_FAILURE
- fi
-
- return $IGT_EXIT_SUCCESS
-}
-
-hda_dynamic_debug_enable
-
-reload || exit $?
-finish_load || exit $?
-
-# Repeat the module reload trying to to generate faults
-for i in $(seq 1 4); do
- reload inject_load_failure=$i
-done
-
-reload || exit $?
-finish_load
-
-exit $?
diff --git a/tests/gem_alive.c b/tests/gem_alive.c
deleted file mode 100644
index 7544443..0000000
--- a/tests/gem_alive.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "igt.h"
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <i915_drm.h>
-
-
-int main(void)
-{
- struct drm_i915_gem_sw_finish arg = { 0 };
- int fd;
-
- signal(SIGALRM, SIG_IGN);
-
- fd = __drm_open_driver(DRIVER_INTEL);
- if (fd < 0)
- return IGT_EXIT_SKIP;
-
- alarm(1);
- if (ioctl(fd, DRM_IOCTL_I915_GEM_SW_FINISH, &arg) == 0)
- return IGT_EXIT_SKIP;
-
- switch (errno) {
- case ENOENT:
- return 0;
- case EIO:
- return 1;
- case EINTR:
- return 2;
- default:
- return 3;
- }
-}
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index b8fce59..4a553a2 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -3,7 +3,9 @@ igt@core_prop_blob@basic
igt@drv_getparams_basic@basic-eu-total
igt@drv_getparams_basic@basic-subslice-total
igt@drv_hangman@error-state-basic
-igt@drv_module_reload_basic
+igt@drv_module_reload@basic-reload
+igt@drv_module_reload@basic-reload-inject
+igt@drv_module_reload@basic-reload-final
igt@gem_basic@bad-close
igt@gem_basic@create-close
igt@gem_basic@create-fd-close
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index be58871..e2451ea 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -29,6 +29,7 @@ tools_prog_lists = \
intel_residency \
intel_stepping \
intel_watermark \
+ intel_gem_info \
$(NULL)
dist_bin_SCRIPTS = intel_gpu_abrt
diff --git a/tools/intel_gem_info.c b/tools/intel_gem_info.c
new file mode 100644
index 0000000..7544443
--- /dev/null
+++ b/tools/intel_gem_info.c
@@ -0,0 +1,35 @@
+#include "igt.h"
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <signal.h>
+#include <i915_drm.h>
+
+
+int main(void)
+{
+ struct drm_i915_gem_sw_finish arg = { 0 };
+ int fd;
+
+ signal(SIGALRM, SIG_IGN);
+
+ fd = __drm_open_driver(DRIVER_INTEL);
+ if (fd < 0)
+ return IGT_EXIT_SKIP;
+
+ alarm(1);
+ if (ioctl(fd, DRM_IOCTL_I915_GEM_SW_FINISH, &arg) == 0)
+ return IGT_EXIT_SKIP;
+
+ switch (errno) {
+ case ENOENT:
+ return 0;
+ case EIO:
+ return 1;
+ case EINTR:
+ return 2;
+ default:
+ return 3;
+ }
+}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH i-g-t 3/4 v5] tests/drv_module_reload: Convert sh script to C version.
2016-11-03 16:28 ` [PATCH i-g-t 3/4 v5] tests/drv_module_reload: Convert sh script to C version Marius Vlad
@ 2016-11-03 16:36 ` Jani Nikula
2016-11-04 7:02 ` Saarinen, Jani
2016-11-16 10:28 ` Petri Latvala
0 siblings, 2 replies; 9+ messages in thread
From: Jani Nikula @ 2016-11-03 16:36 UTC (permalink / raw)
To: Marius Vlad, intel-gfx
On Thu, 03 Nov 2016, Marius Vlad <marius.c.vlad@intel.com> wrote:
> v5:
> - reworked gem_info to gem_sanitychecks (Chris Wilson)
> - remove subgroups/subtests for gem_exec_store and gem_sanitycheck
> (Chris Wilson)
>
> v4:
> - adjust test to make use of lib/igt_kmod
> - replaced SW_FINISH with SET_CACHEING (Chris Wilson)
>
> v3:
> - fix passing boolean value as flags to igt_kmod_unload().
>
> v2:
> - embedded gem_alive and gem_exec_store into test (Chris Wilson)
> - int main() to igt_main (Chris Wilson)
> - moved tests/gem_alive -> tools/gem_info (Chris Wilson)
> - added to intel-ci/fast-feedback.testlist (Petri Latvala)
> - added hda_dynamic_debug() (Petri Latvala)
> - renamed from tests/drv_module_reload_basic to tests/drv_module_reload
> (all subtests are basic and have been added to fast-feedback.testlist)
>
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
I'd like the merging of this patch be postponed until we have confidence
that the snd_hda_intel module reload works in CI. It has been failing
sporadically, so seeing just a couple of passing rounds after the latest
fixes is not enough.
BR,
Jani.
> ---
> tests/Makefile.am | 1 -
> tests/Makefile.sources | 2 +-
> tests/drv_module_reload.c | 332 ++++++++++++++++++++++++++++++++++
> tests/drv_module_reload_basic | 111 ------------
> tests/gem_alive.c | 35 ----
> tests/intel-ci/fast-feedback.testlist | 4 +-
> tools/Makefile.sources | 1 +
> tools/intel_gem_info.c | 35 ++++
> 8 files changed, 372 insertions(+), 149 deletions(-)
> create mode 100644 tests/drv_module_reload.c
> delete mode 100755 tests/drv_module_reload_basic
> delete mode 100644 tests/gem_alive.c
> create mode 100644 tools/intel_gem_info.c
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index a408126..14a41ae 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -26,7 +26,6 @@ noinst_PROGRAMS = \
> $(NULL)
>
> pkglibexec_PROGRAMS = \
> - gem_alive \
> gem_stress \
> $(TESTS_progs) \
> $(TESTS_progs_M) \
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 6d081c3..b1511c6 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -211,6 +211,7 @@ TESTS_progs = \
> kms_pwrite_crc \
> kms_sink_crc_basic \
> prime_udl \
> + drv_module_reload \
> $(NULL)
>
> # IMPORTANT: The ZZ_ tests need to be run last!
> @@ -221,7 +222,6 @@ TESTS_scripts_M = \
> TESTS_scripts = \
> debugfs_emon_crash \
> drv_debugfs_reader \
> - drv_module_reload_basic \
> kms_sysfs_edid_timing \
> sysfs_l3_parity \
> test_rte_check \
> diff --git a/tests/drv_module_reload.c b/tests/drv_module_reload.c
> new file mode 100644
> index 0000000..31ec2ec
> --- /dev/null
> +++ b/tests/drv_module_reload.c
> @@ -0,0 +1,332 @@
> +/*
> + * Copyright © 2016 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 "igt.h"
> +#include "igt_debugfs.h"
> +#include "igt_aux.h"
> +#include "igt_kmod.h"
> +#include "igt_sysfs.h"
> +#include "igt_core.h"
> +
> +#include <dirent.h>
> +#include <sys/utsname.h>
> +#include <linux/limits.h>
> +#include <signal.h>
> +#include <libgen.h>
> +#include <signal.h>
> +#include <sys/ioctl.h>
> +#include <fcntl.h>
> +
> +
> +#define LOCAL_I915_EXEC_BSD_SHIFT (13)
> +#define LOCAL_I915_EXEC_BSD_MASK (3 << LOCAL_I915_EXEC_BSD_SHIFT)
> +
> +#define ENGINE_MASK (I915_EXEC_RING_MASK | LOCAL_I915_EXEC_BSD_MASK)
> +
> +static void store_dword(int fd, unsigned ring)
> +{
> + const int gen = intel_gen(intel_get_drm_devid(fd));
> + struct drm_i915_gem_exec_object2 obj[2];
> + struct drm_i915_gem_relocation_entry reloc;
> + struct drm_i915_gem_execbuffer2 execbuf;
> + uint32_t batch[16];
> + int i;
> +
> + if (!gem_has_ring(fd, ring))
> + return;
> +
> + if (gen == 6 && (ring & ~(3<<13)) == I915_EXEC_BSD)
> + return;
> +
> + intel_detect_and_clear_missed_interrupts(fd);
> + memset(&execbuf, 0, sizeof(execbuf));
> + execbuf.buffers_ptr = (uintptr_t)obj;
> + execbuf.buffer_count = 2;
> + execbuf.flags = ring;
> + if (gen < 6)
> + execbuf.flags |= I915_EXEC_SECURE;
> +
> + memset(obj, 0, sizeof(obj));
> + obj[0].handle = gem_create(fd, 4096);
> + obj[1].handle = gem_create(fd, 4096);
> +
> + memset(&reloc, 0, sizeof(reloc));
> + reloc.target_handle = obj[0].handle;
> + reloc.presumed_offset = 0;
> + reloc.offset = sizeof(uint32_t);
> + reloc.delta = 0;
> + reloc.read_domains = I915_GEM_DOMAIN_INSTRUCTION;
> + reloc.write_domain = I915_GEM_DOMAIN_INSTRUCTION;
> + obj[1].relocs_ptr = (uintptr_t)&reloc;
> + obj[1].relocation_count = 1;
> +
> + i = 0;
> + batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0);
> + if (gen >= 8) {
> + batch[++i] = 0;
> + batch[++i] = 0;
> + } else if (gen >= 4) {
> + batch[++i] = 0;
> + batch[++i] = 0;
> + reloc.offset += sizeof(uint32_t);
> + } else {
> + batch[i]--;
> + batch[++i] = 0;
> + }
> + batch[++i] = 0xc0ffee;
> + batch[++i] = MI_BATCH_BUFFER_END;
> + gem_write(fd, obj[1].handle, 0, batch, sizeof(batch));
> + gem_execbuf(fd, &execbuf);
> + gem_close(fd, obj[1].handle);
> +
> + gem_read(fd, obj[0].handle, 0, batch, sizeof(batch));
> + gem_close(fd, obj[0].handle);
> + igt_assert_eq(*batch, 0xc0ffee);
> + igt_assert_eq(intel_detect_and_clear_missed_interrupts(fd), 0);
> +}
> +
> +static void store_all(int fd)
> +{
> + const int gen = intel_gen(intel_get_drm_devid(fd));
> + struct drm_i915_gem_exec_object2 obj[2];
> + struct drm_i915_gem_relocation_entry reloc[32];
> + struct drm_i915_gem_execbuffer2 execbuf;
> + unsigned engines[16], permuted[16];
> + uint32_t batch[16];
> + uint64_t offset;
> + unsigned engine, nengine;
> + int value;
> + int i, j;
> +
> + memset(&execbuf, 0, sizeof(execbuf));
> + execbuf.buffers_ptr = (uintptr_t)obj;
> + execbuf.buffer_count = 2;
> + if (gen < 6)
> + execbuf.flags |= I915_EXEC_SECURE;
> +
> + memset(reloc, 0, sizeof(reloc));
> + memset(obj, 0, sizeof(obj));
> + obj[0].handle = gem_create(fd, 4096);
> + obj[1].handle = gem_create(fd, 4096);
> + obj[1].relocation_count = 1;
> +
> + offset = sizeof(uint32_t);
> + i = 0;
> + batch[i] = MI_STORE_DWORD_IMM | (gen < 6 ? 1 << 22 : 0);
> + if (gen >= 8) {
> + batch[++i] = 0;
> + batch[++i] = 0;
> + } else if (gen >= 4) {
> + batch[++i] = 0;
> + batch[++i] = 0;
> + offset += sizeof(uint32_t);
> + } else {
> + batch[i]--;
> + batch[++i] = 0;
> + }
> + batch[value = ++i] = 0xc0ffee;
> + batch[++i] = MI_BATCH_BUFFER_END;
> +
> + nengine = 0;
> + intel_detect_and_clear_missed_interrupts(fd);
> + for_each_engine(fd, engine) {
> + if (gen == 6 && (engine & ~(3<<13)) == I915_EXEC_BSD)
> + continue;
> +
> + igt_assert(2*(nengine+1)*sizeof(batch) <= 4096);
> +
> + execbuf.flags &= ~ENGINE_MASK;
> + execbuf.flags |= engine;
> +
> + j = 2*nengine;
> + reloc[j].target_handle = obj[0].handle;
> + reloc[j].presumed_offset = ~0;
> + reloc[j].offset = j*sizeof(batch) + offset;
> + reloc[j].delta = nengine*sizeof(uint32_t);
> + reloc[j].read_domains = I915_GEM_DOMAIN_INSTRUCTION;
> + reloc[j].write_domain = I915_GEM_DOMAIN_INSTRUCTION;
> + obj[1].relocs_ptr = (uintptr_t)&reloc[j];
> +
> + batch[value] = 0xdeadbeef;
> + gem_write(fd, obj[1].handle, j*sizeof(batch),
> + batch, sizeof(batch));
> + execbuf.batch_start_offset = j*sizeof(batch);
> + gem_execbuf(fd, &execbuf);
> +
> + j = 2*nengine + 1;
> + reloc[j].target_handle = obj[0].handle;
> + reloc[j].presumed_offset = ~0;
> + reloc[j].offset = j*sizeof(batch) + offset;
> + reloc[j].delta = nengine*sizeof(uint32_t);
> + reloc[j].read_domains = I915_GEM_DOMAIN_INSTRUCTION;
> + reloc[j].write_domain = I915_GEM_DOMAIN_INSTRUCTION;
> + obj[1].relocs_ptr = (uintptr_t)&reloc[j];
> +
> + batch[value] = nengine;
> + gem_write(fd, obj[1].handle, j*sizeof(batch),
> + batch, sizeof(batch));
> + execbuf.batch_start_offset = j*sizeof(batch);
> + gem_execbuf(fd, &execbuf);
> +
> + engines[nengine++] = engine;
> + }
> + gem_sync(fd, obj[1].handle);
> +
> + for (i = 0; i < nengine; i++) {
> + obj[1].relocs_ptr = (uintptr_t)&reloc[2*i];
> + execbuf.batch_start_offset = 2*i*sizeof(batch);
> + memcpy(permuted, engines, nengine*sizeof(engines[0]));
> + igt_permute_array(permuted, nengine, igt_exchange_int);
> + for (j = 0; j < nengine; j++) {
> + execbuf.flags &= ~ENGINE_MASK;
> + execbuf.flags |= permuted[j];
> + gem_execbuf(fd, &execbuf);
> + }
> + obj[1].relocs_ptr = (uintptr_t)&reloc[2*i+1];
> + execbuf.batch_start_offset = (2*i+1)*sizeof(batch);
> + execbuf.flags &= ~ENGINE_MASK;
> + execbuf.flags |= engines[i];
> + gem_execbuf(fd, &execbuf);
> + }
> + gem_close(fd, obj[1].handle);
> +
> + gem_read(fd, obj[0].handle, 0, engines, sizeof(engines));
> + gem_close(fd, obj[0].handle);
> +
> + for (i = 0; i < nengine; i++)
> + igt_assert_eq_u32(engines[i], i);
> + igt_assert_eq(intel_detect_and_clear_missed_interrupts(fd), 0);
> +}
> +
> +static int
> +reload(const char *opts_i915)
> +{
> + int err = IGT_EXIT_SUCCESS;
> +
> + if ((err = igt_i915_driver_unload()))
> + return err;
> +
> + if ((err = igt_i915_driver_load(opts_i915)))
> + return err;
> +
> + return err;
> +}
> +
> +static void
> +gem_sanitycheck(void)
> +{
> + int err = 0;
> + int fd;
> + struct drm_i915_gem_caching args = {};
> +
> +
> + fd = __drm_open_driver(DRIVER_INTEL);
> + igt_set_timeout(1, "Module reload timeout!");
> +
> + if (ioctl(fd, DRM_IOCTL_I915_GEM_SET_CACHING, &args) < 0)
> + err = -errno;
> +
> + igt_set_timeout(0, NULL);
> + close(fd);
> +
> + igt_assert_eq(err, -ENOENT);
> +}
> +
> +static void
> +gem_exec_store(void)
> +{
> + int fd;
> + const struct intel_execution_engine *e;
> +
> + fd = __drm_open_driver(DRIVER_INTEL);
> + igt_fork_hang_detector(fd);
> +
> + for (e = intel_execution_engines; e->name; e++) {
> + store_dword(fd, e->exec_id | e->flags);
> + }
> +
> + store_all(fd);
> +
> + igt_stop_hang_detector();
> + close(fd);
> +}
> +
> +static void
> +hda_dynamic_debug(bool enable)
> +{
> + FILE *fp;
> + const char snd_hda_intel_on[] = "module snd_hda_intel +pf";
> + const char snd_hda_core_on[] = "module snd_hda_core +pf";
> +
> + const char snd_hda_intel_off[] = "module snd_hda_core =_";
> + const char snd_hda_core_off[] = "module snd_hda_intel =_";
> +
> + fp = fopen("/sys/kernel/debug/dynamic_debug/control", "w");
> + igt_assert(fp != NULL);
> +
> + if (enable) {
> + fwrite(snd_hda_intel_on, 1, sizeof(snd_hda_intel_on), fp);
> + fwrite(snd_hda_core_on, 1, sizeof(snd_hda_core_on), fp);
> + } else {
> + fwrite(snd_hda_intel_off, 1, sizeof(snd_hda_intel_off), fp);
> + fwrite(snd_hda_core_off, 1, sizeof(snd_hda_core_off), fp);
> + }
> +
> + fclose(fp);
> +}
> +
> +igt_main
> +{
> + int i, err;
> + char buf[64];
> +
> + igt_fixture
> + hda_dynamic_debug(true);
> +
> + igt_subtest("basic-reload") {
> +
> + if ((err = reload(NULL)))
> + igt_fail(err);
> +
> + gem_sanitycheck();
> + gem_exec_store();
> + }
> +
> + igt_subtest("basic-reload-inject") {
> + for (i = 0; i < 4; i++) {
> + memset(buf, 0, sizeof(buf));
> + snprintf(buf, sizeof(buf), "inject_load_failure=%d", i);
> + reload(buf);
> + }
> + }
> +
> + igt_subtest("basic-reload-final") {
> + if ((err = reload(NULL)))
> + igt_fail(err);
> +
> + gem_sanitycheck();
> + gem_exec_store();
> + }
> +
> + igt_fixture
> + hda_dynamic_debug(false);
> +}
> diff --git a/tests/drv_module_reload_basic b/tests/drv_module_reload_basic
> deleted file mode 100755
> index 98f3694..0000000
> --- a/tests/drv_module_reload_basic
> +++ /dev/null
> @@ -1,111 +0,0 @@
> -#!/bin/bash
> -#
> -# Testcase: Reload the drm module
> -#
> -# ... we've broken this way too often :(
> -#
> -
> -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
> -. $SOURCE_DIR/drm_lib.sh
> -
> -# no other drm service should be running, so we can just unbind
> -
> -# return 0 if module by name $1 is loaded according to lsmod
> -function mod_loaded()
> -{
> - lsmod | grep -w "^$1" &> /dev/null
> -}
> -
> -function reload() {
> - local snd_hda_intel_unloaded
> -
> - echo Reloading i915.ko with $*
> -
> - # we must kick away fbcon (but only fbcon)
> - for vtcon in /sys/class/vtconsole/vtcon*/ ; do
> - if grep "frame buffer device" $vtcon/name > /dev/null ; then
> - echo unbinding $vtcon: `cat $vtcon/name`
> - echo 0 > $vtcon/bind
> - fi
> - done
> -
> - # The sound driver uses our power well
> - pkill alsactl
> - snd_hda_intel_unloaded=0
> - if mod_loaded snd_hda_intel; then
> - # unbind sound cards
> - for card in $(find /sys/bus/pci/drivers/snd_hda_intel -name "0000:*" -printf "%f\n"); do
> - echo $card > /sys/bus/pci/drivers/snd_hda_intel/unbind
> - done
> -
> - if rmmod snd_hda_intel; then
> - snd_hda_intel_unloaded=1
> - else
> - lsmod >&2
> - lsof /dev/snd/* >&2
> - fi
> - fi
> -
> - # gen5 only
> - if mod_loaded intel_ips; then
> - rmmod intel_ips
> - fi
> -
> - if ! rmmod i915; then
> - lsmod >&2
> - return $IGT_EXIT_SKIP
> - fi
> - #ignore errors in intel-gtt, often built-in
> - rmmod intel-gtt &> /dev/null
> - # drm may be used by other devices (nouveau, radeon, udl, etc)
> - rmmod drm_kms_helper &> /dev/null
> - rmmod drm &> /dev/null
> -
> - if mod_loaded i915; then
> - echo WARNING: i915.ko still loaded!
> - return $IGT_EXIT_FAILURE
> - else
> - echo module successfully unloaded
> - fi
> -
> - modprobe i915 $*
> -
> - if [ -f /sys/class/vtconsole/vtcon1/bind ]; then
> - echo 1 > /sys/class/vtconsole/vtcon1/bind
> - fi
> -
> - modprobe -q snd_hda_intel || return $snd_hda_intel_unloaded
> -}
> -
> -function finish_load() {
> - # does the device exist?
> - if $SOURCE_DIR/gem_alive > /dev/null ; then
> - echo "module successfully loaded again"
> - else
> - echo "failed to reload module successfully"
> - return $IGT_EXIT_FAILURE
> - fi
> -
> - # then try to run something
> - if ! $SOURCE_DIR/gem_exec_store > /dev/null ; then
> - echo "failed to execute a simple batch after reload"
> - return $IGT_EXIT_FAILURE
> - fi
> -
> - return $IGT_EXIT_SUCCESS
> -}
> -
> -hda_dynamic_debug_enable
> -
> -reload || exit $?
> -finish_load || exit $?
> -
> -# Repeat the module reload trying to to generate faults
> -for i in $(seq 1 4); do
> - reload inject_load_failure=$i
> -done
> -
> -reload || exit $?
> -finish_load
> -
> -exit $?
> diff --git a/tests/gem_alive.c b/tests/gem_alive.c
> deleted file mode 100644
> index 7544443..0000000
> --- a/tests/gem_alive.c
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -#include "igt.h"
> -#include <sys/ioctl.h>
> -#include <fcntl.h>
> -#include <errno.h>
> -#include <string.h>
> -#include <signal.h>
> -#include <i915_drm.h>
> -
> -
> -int main(void)
> -{
> - struct drm_i915_gem_sw_finish arg = { 0 };
> - int fd;
> -
> - signal(SIGALRM, SIG_IGN);
> -
> - fd = __drm_open_driver(DRIVER_INTEL);
> - if (fd < 0)
> - return IGT_EXIT_SKIP;
> -
> - alarm(1);
> - if (ioctl(fd, DRM_IOCTL_I915_GEM_SW_FINISH, &arg) == 0)
> - return IGT_EXIT_SKIP;
> -
> - switch (errno) {
> - case ENOENT:
> - return 0;
> - case EIO:
> - return 1;
> - case EINTR:
> - return 2;
> - default:
> - return 3;
> - }
> -}
> diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
> index b8fce59..4a553a2 100644
> --- a/tests/intel-ci/fast-feedback.testlist
> +++ b/tests/intel-ci/fast-feedback.testlist
> @@ -3,7 +3,9 @@ igt@core_prop_blob@basic
> igt@drv_getparams_basic@basic-eu-total
> igt@drv_getparams_basic@basic-subslice-total
> igt@drv_hangman@error-state-basic
> -igt@drv_module_reload_basic
> +igt@drv_module_reload@basic-reload
> +igt@drv_module_reload@basic-reload-inject
> +igt@drv_module_reload@basic-reload-final
> igt@gem_basic@bad-close
> igt@gem_basic@create-close
> igt@gem_basic@create-fd-close
> diff --git a/tools/Makefile.sources b/tools/Makefile.sources
> index be58871..e2451ea 100644
> --- a/tools/Makefile.sources
> +++ b/tools/Makefile.sources
> @@ -29,6 +29,7 @@ tools_prog_lists = \
> intel_residency \
> intel_stepping \
> intel_watermark \
> + intel_gem_info \
> $(NULL)
>
> dist_bin_SCRIPTS = intel_gpu_abrt
> diff --git a/tools/intel_gem_info.c b/tools/intel_gem_info.c
> new file mode 100644
> index 0000000..7544443
> --- /dev/null
> +++ b/tools/intel_gem_info.c
> @@ -0,0 +1,35 @@
> +#include "igt.h"
> +#include <sys/ioctl.h>
> +#include <fcntl.h>
> +#include <errno.h>
> +#include <string.h>
> +#include <signal.h>
> +#include <i915_drm.h>
> +
> +
> +int main(void)
> +{
> + struct drm_i915_gem_sw_finish arg = { 0 };
> + int fd;
> +
> + signal(SIGALRM, SIG_IGN);
> +
> + fd = __drm_open_driver(DRIVER_INTEL);
> + if (fd < 0)
> + return IGT_EXIT_SKIP;
> +
> + alarm(1);
> + if (ioctl(fd, DRM_IOCTL_I915_GEM_SW_FINISH, &arg) == 0)
> + return IGT_EXIT_SKIP;
> +
> + switch (errno) {
> + case ENOENT:
> + return 0;
> + case EIO:
> + return 1;
> + case EINTR:
> + return 2;
> + default:
> + return 3;
> + }
> +}
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH i-g-t 3/4 v5] tests/drv_module_reload: Convert sh script to C version.
2016-11-03 16:36 ` Jani Nikula
@ 2016-11-04 7:02 ` Saarinen, Jani
2016-11-16 10:28 ` Petri Latvala
1 sibling, 0 replies; 9+ messages in thread
From: Saarinen, Jani @ 2016-11-04 7:02 UTC (permalink / raw)
To: Jani Nikula, Vlad, Marius C, intel-gfx@lists.freedesktop.org
> -----Original Message-----
> From: Jani Nikula [mailto:jani.nikula@linux.intel.com]
> Sent: Thursday, November 3, 2016 6:37 PM
> To: Vlad, Marius C <marius.c.vlad@intel.com>; intel-gfx@lists.freedesktop.org
> Cc: Latvala, Petri <petri.latvala@intel.com>; chris@chris-wilson.co.uk; Saarinen,
> Jani <jani.saarinen@intel.com>
> Subject: Re: [PATCH i-g-t 3/4 v5] tests/drv_module_reload: Convert sh script to
> C version.
>
> On Thu, 03 Nov 2016, Marius Vlad <marius.c.vlad@intel.com> wrote:
> > v5:
> > - reworked gem_info to gem_sanitychecks (Chris Wilson)
> > - remove subgroups/subtests for gem_exec_store and gem_sanitycheck
> > (Chris Wilson)
> >
> > v4:
> > - adjust test to make use of lib/igt_kmod
> > - replaced SW_FINISH with SET_CACHEING (Chris Wilson)
> >
> > v3:
> > - fix passing boolean value as flags to igt_kmod_unload().
> >
> > v2:
> > - embedded gem_alive and gem_exec_store into test (Chris Wilson)
> > - int main() to igt_main (Chris Wilson)
> > - moved tests/gem_alive -> tools/gem_info (Chris Wilson)
> > - added to intel-ci/fast-feedback.testlist (Petri Latvala)
> > - added hda_dynamic_debug() (Petri Latvala)
> > - renamed from tests/drv_module_reload_basic to
> > tests/drv_module_reload (all subtests are basic and have been added to
> > fast-feedback.testlist)
> >
> > Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
>
> I'd like the merging of this patch be postponed until we have confidence that the
> snd_hda_intel module reload works in CI. It has been failing sporadically, so
> seeing just a couple of passing rounds after the latest fixes is not enough.
Ack, agree.
>
> BR,
> Jani.
Jani Saarinen
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH i-g-t 3/4 v5] tests/drv_module_reload: Convert sh script to C version.
2016-11-03 16:36 ` Jani Nikula
2016-11-04 7:02 ` Saarinen, Jani
@ 2016-11-16 10:28 ` Petri Latvala
1 sibling, 0 replies; 9+ messages in thread
From: Petri Latvala @ 2016-11-16 10:28 UTC (permalink / raw)
To: Marius Vlad; +Cc: intel-gfx
On Thu, Nov 03, 2016 at 06:36:45PM +0200, Jani Nikula wrote:
> On Thu, 03 Nov 2016, Marius Vlad <marius.c.vlad@intel.com> wrote:
> > v5:
> > - reworked gem_info to gem_sanitychecks (Chris Wilson)
> > - remove subgroups/subtests for gem_exec_store and gem_sanitycheck
> > (Chris Wilson)
> >
> > v4:
> > - adjust test to make use of lib/igt_kmod
> > - replaced SW_FINISH with SET_CACHEING (Chris Wilson)
> >
> > v3:
> > - fix passing boolean value as flags to igt_kmod_unload().
> >
> > v2:
> > - embedded gem_alive and gem_exec_store into test (Chris Wilson)
> > - int main() to igt_main (Chris Wilson)
> > - moved tests/gem_alive -> tools/gem_info (Chris Wilson)
> > - added to intel-ci/fast-feedback.testlist (Petri Latvala)
> > - added hda_dynamic_debug() (Petri Latvala)
> > - renamed from tests/drv_module_reload_basic to tests/drv_module_reload
> > (all subtests are basic and have been added to fast-feedback.testlist)
> >
> > Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
>
> I'd like the merging of this patch be postponed until we have confidence
> that the snd_hda_intel module reload works in CI. It has been failing
> sporadically, so seeing just a couple of passing rounds after the latest
> fixes is not enough.
The module reloading has worked fine in CI lately. From that POV this
can go in now. However, the C version is missing the latest fixes to
the script version:
> > - # unbind sound cards
> > - for card in $(find /sys/bus/pci/drivers/snd_hda_intel -name "0000:*" -printf "%f\n"); do
> > - echo $card > /sys/bus/pci/drivers/snd_hda_intel/unbind
> > - done
This bit here, from fb957183105b08f058af331efe9f41ffc4128c6f, and some
debug output (lsmods, lsofs) from
b85e5a90862197b478d4f60cb0778fea71820de2 and
bd429cdc082748f1284ad987a867b502e5c8009f.
--
Petri Latvala
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH i-g-t 4/4 v5] tests/kms_sysfs_edid_timing: Convert sh to C version.
2016-11-03 16:28 [PATCH i-g-t 0/4 v5] Convert sh scripts to C variants Marius Vlad
` (2 preceding siblings ...)
2016-11-03 16:28 ` [PATCH i-g-t 3/4 v5] tests/drv_module_reload: Convert sh script to C version Marius Vlad
@ 2016-11-03 16:28 ` Marius Vlad
3 siblings, 0 replies; 9+ messages in thread
From: Marius Vlad @ 2016-11-03 16:28 UTC (permalink / raw)
To: intel-gfx
v3:
- use igt_mean for accounting (Chris Wilson)
- make it Intel-agnostic when searching for connectors (Chris Wilson)
v2:
- don't read cached values (Chris Wilson)
- warn on per connector, and fail per mean (Chris Wilson)
These are synthetic: 10ms per connector, and 50ms for all.
Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
tests/Makefile.sources | 2 +-
tests/kms_sysfs_edid_timing | 25 -----------
tests/kms_sysfs_edid_timing.c | 96 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 97 insertions(+), 26 deletions(-)
delete mode 100755 tests/kms_sysfs_edid_timing
create mode 100644 tests/kms_sysfs_edid_timing.c
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index b1511c6..8af455a 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -212,6 +212,7 @@ TESTS_progs = \
kms_sink_crc_basic \
prime_udl \
drv_module_reload \
+ kms_sysfs_edid_timing \
$(NULL)
# IMPORTANT: The ZZ_ tests need to be run last!
@@ -222,7 +223,6 @@ TESTS_scripts_M = \
TESTS_scripts = \
debugfs_emon_crash \
drv_debugfs_reader \
- kms_sysfs_edid_timing \
sysfs_l3_parity \
test_rte_check \
tools_test \
diff --git a/tests/kms_sysfs_edid_timing b/tests/kms_sysfs_edid_timing
deleted file mode 100755
index 46ea540..0000000
--- a/tests/kms_sysfs_edid_timing
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# This check the time we take to read the content of all the possible connectors.
-# Without the edid -ENXIO patch (http://permalink.gmane.org/gmane.comp.video.dri.devel/62083),
-# we sometimes take a *really* long time. So let's just check for some reasonable timing here
-#
-
-DRM_LIB_ALLOW_NO_MASTER=1
-
-SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
-. $SOURCE_DIR/drm_lib.sh
-
-TIME1=$(date +%s%N)
-cat $(find /sys/devices/|grep drm | grep /status) > /dev/null
-TIME2=$(date +%s%N)
-
-# time in ms
-RES=$(((TIME2 - TIME1) / 1000000))
-
-if [ $RES -gt 600 ]; then
- echo "Talking to outputs took ${RES}ms, something is wrong"
- exit $IGT_EXIT_FAILURE
-fi
-
-exit $IGT_EXIT_SUCCESS
diff --git a/tests/kms_sysfs_edid_timing.c b/tests/kms_sysfs_edid_timing.c
new file mode 100644
index 0000000..b56a147
--- /dev/null
+++ b/tests/kms_sysfs_edid_timing.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2016 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 "igt.h"
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#define THRESHOLD_PER_CONNECTOR 10
+#define THRESHOLD_TOTAL 50
+#define CHECK_TIMES 15
+
+IGT_TEST_DESCRIPTION("This check the time we take to read the content of all "
+ "the possible connectors. Without the edid -ENXIO patch "
+ "(http://permalink.gmane.org/gmane.comp.video.dri.devel/62083), "
+ "we sometimes take a *really* long time. "
+ "So let's just check for some reasonable timing here");
+
+
+igt_simple_main
+{
+ DIR *dirp;
+ struct dirent *de;
+
+ dirp = opendir("/sys/class/drm");
+ igt_assert(dirp != NULL);
+
+ while ((de = readdir(dirp))) {
+ struct igt_mean mean = {};
+ struct stat st;
+ char path[PATH_MAX];
+ int i;
+
+ if (*de->d_name == '.')
+ continue;;
+
+ snprintf(path, sizeof(path), "/sys/class/drm/%s/status",
+ de->d_name);
+
+ if (stat(path, &st))
+ continue;
+
+ igt_mean_init(&mean);
+ for (i = 0; i < CHECK_TIMES; i++) {
+ struct timespec ts = {};
+ int fd;
+
+ igt_nsec_elapsed(&ts);
+ fd = open(path, O_WRONLY);
+ igt_ignore_warn(write(fd, "detect\n", 7));
+
+ igt_mean_add(&mean, igt_nsec_elapsed(&ts));
+
+ close(fd);
+ }
+
+ igt_debug("%s: mean.max %.2fns, %.2fus, %.2fms, "
+ "mean.avg %.2fns, %.2fus, %.2fms\n",
+ de->d_name,
+ mean.max, mean.max / 1e3, mean.max / 1e6,
+ mean.mean, mean.mean / 1e3, mean.mean / 1e6);
+
+ if (mean.max > (THRESHOLD_PER_CONNECTOR * 1e6)) {
+ igt_warn("%s: probe time exceed 10ms, "
+ "max=%.2fms, avg=%.2fms\n", de->d_name,
+ mean.max / 1e6, mean.mean / 1e6);
+ }
+ igt_assert_f(mean.mean < (THRESHOLD_TOTAL * 1e6),
+ "%s: average probe time exceeded 50ms, "
+ "max=%.2fms, avg=%.2fms\n", de->d_name,
+ mean.max / 1e6, mean.mean / 1e6);
+
+ }
+ closedir(dirp);
+
+}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread