[PATCH i-g-t v6 20/21] tests/core_hotunplug: Duplicate debug messages in dmesg
Janusz Krzysztofik
janusz.krzysztofik at linux.intel.com
Mon Sep 7 12:55:08 UTC 2020
The purpose of debug messages displayed by the test is to make
identification of a subtest phase that fails more easy. Since issues
exhibited by the test are mostly reported to dmesg, print those debug
messages to /dev/kmsg as well.
v2: Rebase on upstream.
v3: Refresh.
v4: Refresh.
v5: Refresh.
Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik at linux.intel.com>
---
tests/core_hotunplug.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c
index 6231335a8..e5bf7d805 100644
--- a/tests/core_hotunplug.c
+++ b/tests/core_hotunplug.c
@@ -52,6 +52,12 @@ struct hotunplug {
/* Helpers */
+#define local_debug(fmt, msg...) \
+({ \
+ igt_debug(fmt, msg); \
+ igt_kmsg(KMSG_DEBUG "%s: " fmt, igt_test_name(), msg); \
+})
+
/**
* Subtests must be able to close examined devices completely. Don't
* use drm_open_driver() since in case of an i915 device it opens it
@@ -62,8 +68,8 @@ static int local_drm_open_driver(bool render, const char *prefix,
{
int fd_drm;
- igt_debug("%sopening %s device%s\n", prefix, render ? "render" : "DRM",
- suffix);
+ local_debug("%sopening %s device%s\n", prefix,
+ render ? "render" : "DRM", suffix);
fd_drm = render ? __drm_open_driver_render(DRIVER_ANY) :
__drm_open_driver(DRIVER_ANY);
@@ -124,7 +130,7 @@ static void prepare(struct hotunplug *priv)
static void driver_unbind(struct hotunplug *priv, const char *prefix,
int timeout)
{
- igt_debug("%sunbinding the driver from the device\n", prefix);
+ local_debug("%sunbinding the driver from the device\n", prefix);
priv->failure = "Driver unbind failure!";
igt_set_timeout(timeout, "Driver unbind timeout!");
@@ -140,7 +146,7 @@ static void driver_unbind(struct hotunplug *priv, const char *prefix,
/* Re-bind the driver to the device */
static void driver_bind(struct hotunplug *priv, int timeout)
{
- igt_debug("rebinding the driver to the device\n");
+ local_debug("%s\n", "rebinding the driver to the device");
priv->failure = "Driver re-bind failure!";
igt_set_timeout(timeout, "Driver re-bind timeout!");
@@ -164,7 +170,7 @@ static void device_unplug(struct hotunplug *priv, const char *prefix,
O_DIRECTORY);
igt_assert_fd(priv->fd.sysfs_dev);
- igt_debug("%sunplugging the device\n", prefix);
+ local_debug("%sunplugging the device\n", prefix);
priv->failure = "Device unplug failure!";
igt_set_timeout(timeout, "Device unplug timeout!");
@@ -182,7 +188,7 @@ static void device_unplug(struct hotunplug *priv, const char *prefix,
/* Re-discover the device by rescanning its bus */
static void bus_rescan(struct hotunplug *priv, int timeout)
{
- igt_debug("rediscovering the device\n");
+ local_debug("%s\n", "rediscovering the device");
priv->failure = "Bus rescan failure!";
igt_set_timeout(timeout, "Bus rescan timeout!");
@@ -235,7 +241,7 @@ static int local_i915_healthcheck(int i915, const char *prefix)
if (hang_detected)
return -EIO;
- igt_debug("%srunning i915 GPU healthcheck\n", prefix);
+ local_debug("%s%s\n", prefix, "running i915 GPU healthcheck");
if (local_i915_is_wedged(i915))
return -EIO;
@@ -270,7 +276,7 @@ static int local_i915_recover(int i915)
if (!local_i915_healthcheck(i915, "re-"))
return 0;
- igt_debug("forcing i915 GPU reset\n");
+ local_debug("%s\n", "forcing i915 GPU reset");
igt_force_gpu_reset(i915);
hang_detected = false;
@@ -404,7 +410,7 @@ static void hotunbind_rebind(struct hotunplug *priv)
driver_unbind(priv, "hot ", 0);
- igt_debug("late closing the unbound device instance\n");
+ local_debug("%s\n", "late closing the unbound device instance");
priv->fd.drm = close_device(priv->fd.drm);
igt_assert_eq(priv->fd.drm, -1);
@@ -420,7 +426,7 @@ static void hotunplug_rescan(struct hotunplug *priv)
device_unplug(priv, "hot ", 0);
- igt_debug("late closing the removed device instance\n");
+ local_debug("%s\n", "late closing the removed device instance");
priv->fd.drm = close_device(priv->fd.drm);
igt_assert_eq(priv->fd.drm, -1);
@@ -439,7 +445,7 @@ static void hotrebind_lateclose(struct hotunplug *priv)
healthcheck(priv, false);
- igt_debug("late closing the unbound device instance\n");
+ local_debug("%s\n", "late closing the unbound device instance");
priv->fd.drm = close_device(priv->fd.drm);
igt_assert_eq(priv->fd.drm, -1);
@@ -456,7 +462,7 @@ static void hotreplug_lateclose(struct hotunplug *priv)
healthcheck(priv, false);
- igt_debug("late closing the removed device instance\n");
+ local_debug("%s\n", "late closing the removed device instance");
priv->fd.drm = close_device(priv->fd.drm);
igt_assert_eq(priv->fd.drm, -1);
--
2.21.1
More information about the Intel-gfx-trybot
mailing list