tests/core_hotunplug: Fixes and enhancements
v2 cover tests/core_hotunplug: Fixes and enhancements
Clean up the test code and unblock unbind variants.
@Michał: Since most v2 updates are trivial, I've preserved your
Reviewd-by: except for patch 11/16 "Follow failed subtests with health checks" - please have a look and confirm if you are still OK with it.
Thanks,
Janusz
Janusz Krzysztofik (16):
tests/core_hotunplug: Use igt_assert_fd() tests/core_hotunplug: Constify dev_bus_addr string tests/core_hotunplug: Consolidate duplicated debug messages tests/core_hotunplug: Assert successful device filter application tests/core_hotunplug: Fix missing newline tests/core_hotunplug: Maintain a single data structure instance tests/core_hotunplug: Pass errors via a data structure field tests/core_hotunplug: Handle device close errors tests/core_hotunplug: Prepare invariant data once per test run tests/core_hotunplug: Skip selectively on sysfs close errors tests/core_hotunplug: Follow failed subtests with health checks tests/core_hotunplug: Fail subtests on device close errors tests/core_hotunplug: Process return values of sysfs operations tests/core_hotunplug: Assert expected device presence/absence tests/core_hotunplug: Explicitly ignore unused return values tests/core_hotunplug: Un-blocklist *unbind* subtests
tests/core_hotunplug.c | 334 +++++++++++++++++++++-------------- tests/intel-ci/blacklist.txt | 2 +- 2 files changed, 204 insertions(+), 132 deletions(-)
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 1/16 tests/core_hotunplug: Use igt_assert_fd()
There is a new library helper that asserts validity of open file descriptors. Use it instead of open coding.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tests/core_hotunplug.c +5 -5
@@ -57,7 +57,7 @@ static void prepare_for_unbind(struct hotunplug *priv, char *buf, int buflen) priv->fd.sysfs_drv =openat (priv->fd.sysfs_dev,"device/driver" ,O_DIRECTORY ); -igt_assert (priv->fd.sysfs_drv >=0 ); +igt_assert_fd (priv->fd.sysfs_drv); len =readlinkat (priv->fd.sysfs_dev,"device" , buf, buflen -1 ); buf[len] ='\0' ;
@@ -72,10 +72,10 @@ static void prepare(struct hotunplug *priv, char *buf, int buflen) {igt_debug ("opening device\n" ); priv->fd.drm =__drm_open_driver (DRIVER_ANY ); -igt_assert (priv->fd.drm >=0 ); +igt_assert_fd (priv->fd.drm); priv->fd.sysfs_dev =igt_sysfs_open (priv->fd.drm); -igt_assert (priv->fd.sysfs_dev >=0 ); +igt_assert_fd (priv->fd.sysfs_dev);if (buf) {prepare_for_unbind (priv, buf, buflen);
@@ -83,7 +83,7 @@ static void prepare(struct hotunplug *priv, char *buf, int buflen)/* prepare for bus rescan */ priv->fd.sysfs_bus =openat (priv->fd.sysfs_dev,"device/subsystem" ,O_DIRECTORY ); -igt_assert (priv->fd.sysfs_bus >=0 ); +igt_assert_fd (priv->fd.sysfs_bus); } }
@@ -261,7 +261,7 @@ igt_main* a device file descriptor open for exit handler use. */ fd_drm =__drm_open_driver (DRIVER_ANY ); -igt_assert (fd_drm >=0 ); +igt_assert_fd (fd_drm);if (is_i915_device (fd_drm))igt_require_gem (fd_drm);
Signature · 6 lines
2.21.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/16 tests/core_hotunplug: Constify dev_bus_addr string
In reply to Janusz KrzysztofikDevice bus address structure field is always initialized with a pointer to a substring of the device sysfs path and never used for its modification. Declare it as a constant string.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/core_hotunplug.c +1 -1
@@ -44,7 +44,7 @@ struct hotunplug {int sysfs_bus;int sysfs_drv; } fd; -char *dev_bus_addr; +const char *dev_bus_addr; };/* Helpers */
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 3/16 tests/core_hotunplug: Consolidate duplicated debug messages
In reply to Janusz KrzysztofikSome debug messages which designate specific test operations, or their greater parts at least, sound always the same, no matter which subtest they are called from. Emit them, possibly updated with subtest specified modifiers, from inside respective helpers instead of duplicating them in subtest bodies.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
tests/core_hotunplug.c +15 -14
@@ -90,8 +90,11 @@ static void prepare(struct hotunplug *priv, char *buf, int buflen)static const char *failure;/* Unbind the driver from the device */ -static void driver_unbind (int fd_sysfs_drv,const char *dev_bus_addr) +static void driver_unbind (int fd_sysfs_drv,const char *dev_bus_addr, +const char *prefix) { +igt_debug ("%sunbinding the driver from the device\n" , prefix); + failure ="Driver unbind timeout!" ;igt_set_timeout (60 , failure);igt_sysfs_set (fd_sysfs_drv,"unbind" , dev_bus_addr);
@@ -104,6 +107,8 @@ static void driver_unbind(int fd_sysfs_drv, const char *dev_bus_addr)/* Re-bind the driver to the device */ static void driver_bind (int fd_sysfs_drv,const char *dev_bus_addr) { +igt_debug ("rebinding the driver to the device\n" ); + failure ="Driver re-bind timeout!" ;igt_set_timeout (60 , failure);igt_sysfs_set (fd_sysfs_drv,"bind" , dev_bus_addr);
@@ -114,8 +119,10 @@ static void driver_bind(int fd_sysfs_drv, const char *dev_bus_addr) }/* Remove (virtually unplug) the device from its bus */ -static void device_unplug (int fd_sysfs_dev) +static void device_unplug (int fd_sysfs_dev,const char *prefix) { +igt_debug ("%sunplugging the device\n" , prefix); + failure ="Device unplug timeout!" ;igt_set_timeout (60 , failure);igt_sysfs_set (fd_sysfs_dev,"device/remove" ,"1" );
@@ -128,6 +135,8 @@ static void device_unplug(int fd_sysfs_dev)/* Re-discover the device by rescanning its bus */ static void bus_rescan (int fd_sysfs_bus) { +igt_debug ("recovering the device\n" ); + failure ="Bus rescan timeout!" ;igt_set_timeout (60 , failure);igt_sysfs_set (fd_sysfs_bus,"rescan" ,"1" );
@@ -184,10 +193,8 @@ static void unbind_rebind(void)igt_debug ("closing the device\n" );close (priv.fd.drm); -igt_debug ("unbinding the driver from the device\n" ); -driver_unbind (priv.fd.sysfs_drv, priv.dev_bus_addr); +driver_unbind (priv.fd.sysfs_drv, priv.dev_bus_addr,"" ); -igt_debug ("rebinding the driver to the device\n" );driver_bind (priv.fd.sysfs_drv, priv.dev_bus_addr);healthcheck ();
@@ -202,10 +209,8 @@ static void unplug_rescan(void)igt_debug ("closing the device\n" );close (priv.fd.drm); -igt_debug ("unplugging the device\n" ); -device_unplug (priv.fd.sysfs_dev); +device_unplug (priv.fd.sysfs_dev,"" ); -igt_debug ("recovering the device\n" );bus_rescan (priv.fd.sysfs_bus);healthcheck ();
@@ -218,10 +223,8 @@ static void hotunbind_lateclose(void)prepare (&priv, buf,sizeof (buf)); -igt_debug ("hot unbinding the driver from the device\n" ); -driver_unbind (priv.fd.sysfs_drv, priv.dev_bus_addr); +driver_unbind (priv.fd.sysfs_drv, priv.dev_bus_addr,"hot " ); -igt_debug ("rebinding the driver to the device\n" );driver_bind (priv.fd.sysfs_drv, priv.dev_bus_addr);igt_debug ("late closing the unbound device instance\n" );
@@ -236,10 +239,8 @@ static void hotunplug_lateclose(void)prepare (&priv,NULL ,0 ); -igt_debug ("hot unplugging the device\n" ); -device_unplug (priv.fd.sysfs_dev); +device_unplug (priv.fd.sysfs_dev,"hot " ); -igt_debug ("recovering the device\n" );bus_rescan (priv.fd.sysfs_bus);igt_debug ("late closing the removed device instance\n" );
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 4/16 tests/core_hotunplug: Assert successful device filter application
In reply to Janusz KrzysztofikReturn value of igt_device_filter_add() representing a number of successfully installed device filters is now ignored. Fail if not 1.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/core_hotunplug.c +1 -1
@@ -178,7 +178,7 @@ static void set_filter_from_device(int fd)igt_assert (realpath (path, dst));igt_device_filter_free_all (); -igt_device_filter_add (filter); +igt_assert_eq (igt_device_filter_add (filter),1 ); }/* Subtests */
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 5/16 tests/core_hotunplug: Fix missing newline
In reply to Janusz KrzysztofikA trailing newline is missing from one of fatal error messages, fix it.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/core_hotunplug.c +1 -1
@@ -155,7 +155,7 @@ static void healthcheck(void)igt_debug ("reopening the device\n" ); fd_drm =__drm_open_driver (DRIVER_ANY ); -igt_abort_on_f (fd_drm <0 ,"Device reopen failure" ); +igt_abort_on_f (fd_drm <0 ,"Device reopen failure\n" );if (is_i915_device (fd_drm)) { failure ="GEM failure" ;
Signature · 6 lines
2.21.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/16 tests/core_hotunplug: Maintain a single data structure instance
In reply to Janusz KrzysztofikThe following changes to the test are planned:
- avoid global variables,
- skip subtest after device close errors,
- prepare invariant data only once per test run,
- move device health checks to igt_fixture sections,
- try to recover from subtest failures instead of aborting. For that to be possible, maintain a single instance of hotunplug structure at igt_main level and pass it down to subtests.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 56 ++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 30 deletions(-)
tests/core_hotunplug.c +26 -30
@@ -183,68 +183,62 @@ static void set_filter_from_device(int fd)/* Subtests */ -static void unbind_rebind (void ) +static void unbind_rebind (struct hotunplug *priv) { -struct hotunplug priv;char buf[PATH_MAX ]; -prepare (&priv, buf,sizeof (buf)); +prepare (priv, buf,sizeof (buf));igt_debug ("closing the device\n" ); -close (priv.fd.drm); +close (priv->fd.drm); -driver_unbind (priv.fd.sysfs_drv, priv.dev_bus_addr,"" ); +driver_unbind (priv->fd.sysfs_drv, priv->dev_bus_addr,"" ); -driver_bind (priv.fd.sysfs_drv, priv.dev_bus_addr); +driver_bind (priv->fd.sysfs_drv, priv->dev_bus_addr);healthcheck (); } -static void unplug_rescan (void ) +static void unplug_rescan (struct hotunplug *priv) { -struct hotunplug priv; - -prepare (&priv,NULL ,0 ); +prepare (priv,NULL ,0 );igt_debug ("closing the device\n" ); -close (priv.fd.drm); +close (priv->fd.drm); -device_unplug (priv.fd.sysfs_dev,"" ); +device_unplug (priv->fd.sysfs_dev,"" ); -bus_rescan (priv.fd.sysfs_bus); +bus_rescan (priv->fd.sysfs_bus);healthcheck (); } -static void hotunbind_lateclose (void ) +static void hotunbind_lateclose (struct hotunplug *priv) { -struct hotunplug priv;char buf[PATH_MAX ]; -prepare (&priv, buf,sizeof (buf)); +prepare (priv, buf,sizeof (buf)); -driver_unbind (priv.fd.sysfs_drv, priv.dev_bus_addr,"hot " ); +driver_unbind (priv->fd.sysfs_drv, priv->dev_bus_addr,"hot " ); -driver_bind (priv.fd.sysfs_drv, priv.dev_bus_addr); +driver_bind (priv->fd.sysfs_drv, priv->dev_bus_addr);igt_debug ("late closing the unbound device instance\n" ); -close (priv.fd.drm); +close (priv->fd.drm);healthcheck (); } -static void hotunplug_lateclose (void ) +static void hotunplug_lateclose (struct hotunplug *priv) { -struct hotunplug priv; - -prepare (&priv,NULL ,0 ); +prepare (priv,NULL ,0 ); -device_unplug (priv.fd.sysfs_dev,"hot " ); +device_unplug (priv->fd.sysfs_dev,"hot " ); -bus_rescan (priv.fd.sysfs_bus); +bus_rescan (priv->fd.sysfs_bus);igt_debug ("late closing the removed device instance\n" ); -close (priv.fd.drm); +close (priv->fd.drm);healthcheck (); }
@@ -253,6 +247,8 @@ static void hotunplug_lateclose(void) igt_main { +struct hotunplug priv; + igt_fixture {int fd_drm;
@@ -275,28 +271,28 @@ igt_mainigt_describe ("Check if the driver can be cleanly unbound from a device believed to be closed" ); igt_subtest("unbind-rebind") -unbind_rebind (); +unbind_rebind (&priv);igt_fixture igt_abort_on_f(failure, "%s\n", failure);igt_describe ("Check if a device believed to be closed can be cleanly unplugged" ); igt_subtest("unplug-rescan") -unplug_rescan (); +unplug_rescan (&priv);igt_fixture igt_abort_on_f(failure, "%s\n", failure);igt_describe ("Check if the driver can be cleanly unbound from a still open device, then released" ); igt_subtest("hotunbind-lateclose") -hotunbind_lateclose (); +hotunbind_lateclose (&priv);igt_fixture igt_abort_on_f(failure, "%s\n", failure);igt_describe ("Check if a still open device can be cleanly unplugged, then released" ); igt_subtest("hotunplug-lateclose") -hotunplug_lateclose (); +hotunplug_lateclose (&priv);igt_fixture igt_abort_on_f(failure, "%s\n", failure);
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 7/16 tests/core_hotunplug: Pass errors via a data structure field
In reply to Janusz KrzysztofikA pointer to fatal error messages can be passed around via hotunplug structure, no need to declare it as global.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 92 +++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 47 deletions(-)
tests/core_hotunplug.c +45 -47
@@ -45,6 +45,7 @@ struct hotunplug {int sysfs_drv; } fd;const char *dev_bus_addr; +const char *failure; };/* Helpers */
@@ -87,66 +88,63 @@ static void prepare(struct hotunplug *priv, char *buf, int buflen) } } -static const char *failure; -/* Unbind the driver from the device */ -static void driver_unbind (int fd_sysfs_drv,const char *dev_bus_addr, -const char *prefix) +static void driver_unbind (struct hotunplug *priv,const char *prefix) {igt_debug ("%sunbinding the driver from the device\n" , prefix); - failure ="Driver unbind timeout!" ; -igt_set_timeout (60 , failure); -igt_sysfs_set (fd_sysfs_drv,"unbind" , dev_bus_addr); + priv->failure ="Driver unbind timeout!" ; +igt_set_timeout (60 , priv->failure); +igt_sysfs_set (priv->fd.sysfs_drv,"unbind" , priv->dev_bus_addr);igt_reset_timeout (); - failure =NULL ; + priv->failure =NULL ; -/* don't close fd_sysfs_drv, it will be used for driver rebinding */ +/* don't close fd.sysfs_drv, it will be used for driver rebinding */ }/* Re-bind the driver to the device */ -static void driver_bind (int fd_sysfs_drv,const char *dev_bus_addr) +static void driver_bind (struct hotunplug *priv) {igt_debug ("rebinding the driver to the device\n" ); - failure ="Driver re-bind timeout!" ; -igt_set_timeout (60 , failure); -igt_sysfs_set (fd_sysfs_drv,"bind" , dev_bus_addr); + priv->failure ="Driver re-bind timeout!" ; +igt_set_timeout (60 , priv->failure); +igt_sysfs_set (priv->fd.sysfs_drv,"bind" , priv->dev_bus_addr);igt_reset_timeout (); - failure =NULL ; + priv->failure =NULL ; -close (fd_sysfs_drv); +close (priv->fd.sysfs_drv); }/* Remove (virtually unplug) the device from its bus */ -static void device_unplug (int fd_sysfs_dev,const char *prefix) +static void device_unplug (struct hotunplug *priv,const char *prefix) {igt_debug ("%sunplugging the device\n" , prefix); - failure ="Device unplug timeout!" ; -igt_set_timeout (60 , failure); -igt_sysfs_set (fd_sysfs_dev,"device/remove" ,"1" ); + priv->failure ="Device unplug timeout!" ; +igt_set_timeout (60 , priv->failure); +igt_sysfs_set (priv->fd.sysfs_dev,"device/remove" ,"1" );igt_reset_timeout (); - failure =NULL ; + priv->failure =NULL ; -close (fd_sysfs_dev); +close (priv->fd.sysfs_dev); }/* Re-discover the device by rescanning its bus */ -static void bus_rescan (int fd_sysfs_bus) +static void bus_rescan (struct hotunplug *priv) {igt_debug ("recovering the device\n" ); - failure ="Bus rescan timeout!" ; -igt_set_timeout (60 , failure); -igt_sysfs_set (fd_sysfs_bus,"rescan" ,"1" ); + priv->failure ="Bus rescan timeout!" ; +igt_set_timeout (60 , priv->failure); +igt_sysfs_set (priv->fd.sysfs_bus,"rescan" ,"1" );igt_reset_timeout (); - failure =NULL ; + priv->failure =NULL ; -close (fd_sysfs_bus); +close (priv->fd.sysfs_bus); } -static void healthcheck (void ) +static void healthcheck (struct hotunplug *priv) {int fd_drm;
@@ -158,9 +156,9 @@ static void healthcheck(void)igt_abort_on_f (fd_drm <0 ,"Device reopen failure\n" );if (is_i915_device (fd_drm)) { - failure ="GEM failure" ; + priv->failure ="GEM failure" ;igt_require_gem (fd_drm); - failure =NULL ; + priv->failure =NULL ; }close (fd_drm);
@@ -192,11 +190,11 @@ static void unbind_rebind(struct hotunplug *priv)igt_debug ("closing the device\n" );close (priv->fd.drm); -driver_unbind (priv->fd.sysfs_drv, priv->dev_bus_addr,"" ); +driver_unbind (priv,"" ); -driver_bind (priv->fd.sysfs_drv, priv->dev_bus_addr); +driver_bind (priv); -healthcheck (); +healthcheck (priv); }static void unplug_rescan (struct hotunplug *priv)
@@ -206,11 +204,11 @@ static void unplug_rescan(struct hotunplug *priv)igt_debug ("closing the device\n" );close (priv->fd.drm); -device_unplug (priv->fd.sysfs_dev,"" ); +device_unplug (priv,"" ); -bus_rescan (priv->fd.sysfs_bus); +bus_rescan (priv); -healthcheck (); +healthcheck (priv); }static void hotunbind_lateclose (struct hotunplug *priv)
@@ -219,35 +217,35 @@ static void hotunbind_lateclose(struct hotunplug *priv)prepare (priv, buf,sizeof (buf)); -driver_unbind (priv->fd.sysfs_drv, priv->dev_bus_addr,"hot " ); +driver_unbind (priv,"hot " ); -driver_bind (priv->fd.sysfs_drv, priv->dev_bus_addr); +driver_bind (priv);igt_debug ("late closing the unbound device instance\n" );close (priv->fd.drm); -healthcheck (); +healthcheck (priv); }static void hotunplug_lateclose (struct hotunplug *priv) {prepare (priv,NULL ,0 ); -device_unplug (priv->fd.sysfs_dev,"hot " ); +device_unplug (priv,"hot " ); -bus_rescan (priv->fd.sysfs_bus); +bus_rescan (priv);igt_debug ("late closing the removed device instance\n" );close (priv->fd.drm); -healthcheck (); +healthcheck (priv); }/* Main */ igt_main { -struct hotunplug priv; +struct hotunplug priv = { .failure =NULL , }; igt_fixture {int fd_drm;
@@ -274,26 +272,26 @@ igt_mainunbind_rebind (&priv);igt_fixture - igt_abort_on_f(failure, "%s\n", failure); + igt_abort_on_f(priv.failure, "%s\n", priv.failure);igt_describe ("Check if a device believed to be closed can be cleanly unplugged" ); igt_subtest("unplug-rescan")unplug_rescan (&priv);igt_fixture - igt_abort_on_f(failure, "%s\n", failure); + igt_abort_on_f(priv.failure, "%s\n", priv.failure);igt_describe ("Check if the driver can be cleanly unbound from a still open device, then released" ); igt_subtest("hotunbind-lateclose")hotunbind_lateclose (&priv);igt_fixture - igt_abort_on_f(failure, "%s\n", failure); + igt_abort_on_f(priv.failure, "%s\n", priv.failure);igt_describe ("Check if a still open device can be cleanly unplugged, then released" ); igt_subtest("hotunplug-lateclose")hotunplug_lateclose (&priv);igt_fixture - igt_abort_on_f(failure, "%s\n", failure); + igt_abort_on_f(priv.failure, "%s\n", priv.failure); }
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 8/16 tests/core_hotunplug: Handle device close errors
In reply to Janusz KrzysztofikThe test now ignores device close errors. Those errors are believed to have no influence on device health so there is no need to process them the same way as we mostly do on errors, i.e., notify CI about a problem via igt_abort. However, those errors may indicate issues with the test itself. Moreover, impact of those errors on operations performed by subtests, like driver unbind or device remove, should be perceived as undefined. Then, we should fail as soon as a device or device sysfs node close error occurs and also skip subsequent subtests. However, once a driver unbind or device unplug operation has been attempted by a subtest, we can't just fail without checking the device health.
When in a subtest, store results of device close operations for future reference. Reuse file descriptor fields of the hotunplug structure for that. Unless in between of a driver remove or device unplug operation and a successful device health check, fail current test section right after a device close error occurs, warn otherwise. If still running, examine device file descriptor fields in subsequent igt_fixture sections and skip on errors.
v2: Fix a typo in post_healthcheck function name,
- rebase on current upstream master.
--- tests/core_hotunplug.c | 61 ++++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 14 deletions(-)
tests/core_hotunplug.c +47 -14
@@ -43,13 +43,22 @@ struct hotunplug {int sysfs_dev;int sysfs_bus;int sysfs_drv; - } fd; + } fd;/* >= 0: valid fd, == -1: closed, < -1: close failed */ const char *dev_bus_addr;const char *failure; };/* Helpers */ +static int local_close (int fd) +{ + errno =0 ; +if (close (fd))/* close failure - return -errno (never -1) */ +return -errno; + +return -1 ;/* success - return 'closed' */ +} +static void prepare_for_unbind (struct hotunplug *priv,char *buf,int buflen) {int len;
@@ -66,7 +75,9 @@ static void prepare_for_unbind(struct hotunplug *priv, char *buf, int buflen)igt_assert (priv->dev_bus_addr++);/* sysfs_dev no longer needed */ -close (priv->fd.sysfs_dev); + priv->fd.sysfs_dev =local_close (priv->fd.sysfs_dev); +igt_assert_f (priv->fd.sysfs_dev ==-1 , +"Device sysfs node close failed\n" ); }static void prepare (struct hotunplug *priv,char *buf,int buflen)
@@ -127,7 +138,9 @@ static void device_unplug(struct hotunplug *priv, const char *prefix)igt_reset_timeout (); priv->failure =NULL ; -close (priv->fd.sysfs_dev); + priv->fd.sysfs_dev =local_close (priv->fd.sysfs_dev); +igt_warn_on_f (priv->fd.sysfs_dev !=-1 , +"Device sysfs node close failed\n" ); }/* Re-discover the device by rescanning its bus */
@@ -146,6 +159,7 @@ static void bus_rescan(struct hotunplug *priv)static void healthcheck (struct hotunplug *priv) { +/* preserve error code potentially stored before in priv->fd.drm */ int fd_drm;/* device name may have changed, rebuild IGT device list */
@@ -161,7 +175,19 @@ static void healthcheck(struct hotunplug *priv) priv->failure =NULL ; } -close (fd_drm); + fd_drm =local_close (fd_drm); +if (priv->fd.drm ==-1 ) + priv->fd.drm = fd_drm; +igt_assert_f (fd_drm ==-1 ,"Device close failed\n" ); +} + +static void post_healthcheck (struct hotunplug *priv) +{ +igt_abort_on_f (priv->failure,"%s\n" , priv->failure); + +igt_require_f (priv->fd.drm ==-1 ,"Device not closed properly\n" ); +igt_require_f (priv->fd.sysfs_dev ==-1 , +"Device sysfs node not closed properly\n" ); }static void set_filter_from_device (int fd)
@@ -188,7 +214,8 @@ static void unbind_rebind(struct hotunplug *priv)prepare (priv, buf,sizeof (buf));igt_debug ("closing the device\n" ); -close (priv->fd.drm); + priv->fd.drm =local_close (priv->fd.drm); +igt_assert_f (priv->fd.drm ==-1 ,"Device close failed\n" );driver_unbind (priv,"" );
@@ -202,7 +229,8 @@ static void unplug_rescan(struct hotunplug *priv)prepare (priv,NULL ,0 );igt_debug ("closing the device\n" ); -close (priv->fd.drm); + priv->fd.drm =local_close (priv->fd.drm); +igt_assert_f (priv->fd.drm ==-1 ,"Device close failed\n" );device_unplug (priv,"" );
@@ -222,7 +250,8 @@ static void hotunbind_lateclose(struct hotunplug *priv)driver_bind (priv);igt_debug ("late closing the unbound device instance\n" ); -close (priv->fd.drm); + priv->fd.drm =local_close (priv->fd.drm); +igt_warn_on_f (priv->fd.drm !=-1 ,"Device close failed\n" );healthcheck (priv); }
@@ -236,7 +265,8 @@ static void hotunplug_lateclose(struct hotunplug *priv)bus_rescan (priv);igt_debug ("late closing the removed device instance\n" ); -close (priv->fd.drm); + priv->fd.drm =local_close (priv->fd.drm); +igt_warn_on_f (priv->fd.drm !=-1 ,"Device close failed\n" );healthcheck (priv); }
@@ -245,7 +275,10 @@ static void hotunplug_lateclose(struct hotunplug *priv) igt_main { -struct hotunplug priv = { .failure =NULL , }; +struct hotunplug priv = { + .fd = { .drm =-1 , .sysfs_dev =-1 , }, + .failure =NULL , + }; igt_fixture {int fd_drm;
@@ -264,7 +297,7 @@ igt_main/* Make sure subtests always reopen the same device */ set_filter_from_device (fd_drm); -close (fd_drm); +igt_fail_on_f (close (fd_drm),"Device close failed\n" ); }igt_describe ("Check if the driver can be cleanly unbound from a device believed to be closed" );
@@ -272,26 +305,26 @@ igt_mainunbind_rebind (&priv);igt_fixture - igt_abort_on_f(priv.failure, "%s\n", priv.failure); + post_healthcheck(&priv);igt_describe ("Check if a device believed to be closed can be cleanly unplugged" ); igt_subtest("unplug-rescan")unplug_rescan (&priv);igt_fixture - igt_abort_on_f(priv.failure, "%s\n", priv.failure); + post_healthcheck(&priv);igt_describe ("Check if the driver can be cleanly unbound from a still open device, then released" ); igt_subtest("hotunbind-lateclose")hotunbind_lateclose (&priv);igt_fixture - igt_abort_on_f(priv.failure, "%s\n", priv.failure); + post_healthcheck(&priv);igt_describe ("Check if a still open device can be cleanly unplugged, then released" ); igt_subtest("hotunplug-lateclose")hotunplug_lateclose (&priv);igt_fixture - igt_abort_on_f(priv.failure, "%s\n", priv.failure); + post_healthcheck(&priv); }
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 9/16 tests/core_hotunplug: Prepare invariant data once per test run
In reply to Janusz KrzysztofikEach subtest now calls a prepare() helper which opens a couple of files required by that subtest. Those files are then closed after use, either directly from the subtest body, or indirectly from inside one of helper functions called during the subtest execution. That approach not only makes lifecycle of individual file descriptors difficult to follow but also prevents us from re-running health checks on subtest failures from follow up igt_fixture sections since we may need to retry bus rescan or driver rebind operations.
Two of those files - device bus and driver sysfs nodes - are not affected nor interfere with driver unbind / device unplug operations performed by subtests. Then, there is not much sense in closing and reopening those nodes. Open them once at the beginning of a test run, then close them as late as on test completion.
The prepare() helper also populates a device bus address string used by driver unbind / rebind operations. Since the bus address of an exercised device never changes, also prepare that string only once at the beginning of a test run. Note that it is the same as the last component of a device filter string which is already resolved and installed from an initial igt_fixture section of the test. Then, initialize the device bus address field of a hotunplug structure instance with a pointer to the respective substring of that filter rather than resolving it again from the device sysfs node pathname.
There is one more sysfs node - a DRM device node - now opened by the prepare() helper for subtests which perform device remove operations. That node can't be opened only once at the beginning of a test run because its open file descriptor is no longer usable as soon as a driver unbind operation is performed. On the other hand, it can't be opened easily from inside a device_remove() helper since some subtests just don't open the device so its file descriptor used by igt_sysfs_open() may just not be available. However, note that only a PCI sysfs node of the device, not necessarily the DRM one, is actually required for a successful device remove operation, and that node can be opened easily from a bus file descriptor using a device bus address string, both already available. Then, change the semantics of a .fd.sysfs_dev field of the hotunplug structure from DRM to PCI device sysfs file descriptor, then let the device_remove() helper open the device PCI node by itself and store its file descriptor in that field. Also, for still more easy access to the device PCI node, use a 'subsystem/devices' subnode of the PCI device as its bus sysfs location instead of just 'subsystem', then adjust a relative path to the bus 'rescan' function accordingly.
A side benefit of using the PCI device sysfs node, not the DRM one, while removing the device is that a future subtest may now easily perform both driver unbind and device remove operations in a row.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 91 ++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 56 deletions(-)
tests/core_hotunplug.c +35 -56
@@ -59,46 +59,33 @@ static int local_close(int fd)return -1 ;/* success - return 'closed' */ } -static void prepare_for_unbind (struct hotunplug *priv,char *buf,int buflen) +static void prepare (struct hotunplug *priv) { -int len; +const char *filter =igt_device_filter_get (0 ), *sysfs_path; -igt_assert (buflen); +igt_assert (filter); - priv->fd.sysfs_drv =openat (priv->fd.sysfs_dev,"device/driver" , -O_DIRECTORY ); + priv->dev_bus_addr =strrchr (filter,'/' ); +igt_assert (priv->dev_bus_addr++); + + sysfs_path =strchr (filter,':' ); +igt_assert (sysfs_path++); + + priv->fd.sysfs_dev =open (sysfs_path,O_DIRECTORY ); +igt_assert_fd (priv->fd.sysfs_dev); + + priv->fd.sysfs_drv =openat (priv->fd.sysfs_dev,"driver" ,O_DIRECTORY );igt_assert_fd (priv->fd.sysfs_drv); - len =readlinkat (priv->fd.sysfs_dev,"device" , buf, buflen -1 ); - buf[len] ='\0' ; - priv->dev_bus_addr =strrchr (buf,'/' ); -igt_assert (priv->dev_bus_addr++); + priv->fd.sysfs_bus =openat (priv->fd.sysfs_dev,"subsystem/devices" , +O_DIRECTORY ); +igt_assert_fd (priv->fd.sysfs_bus); -/* sysfs_dev no longer needed */ priv->fd.sysfs_dev =local_close (priv->fd.sysfs_dev);igt_assert_f (priv->fd.sysfs_dev ==-1 ,"Device sysfs node close failed\n" ); } -static void prepare (struct hotunplug *priv,char *buf,int buflen) -{ -igt_debug ("opening device\n" ); - priv->fd.drm =__drm_open_driver (DRIVER_ANY ); -igt_assert_fd (priv->fd.drm); - - priv->fd.sysfs_dev =igt_sysfs_open (priv->fd.drm); -igt_assert_fd (priv->fd.sysfs_dev); - -if (buf) { -prepare_for_unbind (priv, buf, buflen); - }else { -/* prepare for bus rescan */ - priv->fd.sysfs_bus =openat (priv->fd.sysfs_dev, -"device/subsystem" ,O_DIRECTORY ); -igt_assert_fd (priv->fd.sysfs_bus); - } -} -/* Unbind the driver from the device */ static void driver_unbind (struct hotunplug *priv,const char *prefix) {
@@ -109,8 +96,6 @@ static void driver_unbind(struct hotunplug *priv, const char *prefix)igt_sysfs_set (priv->fd.sysfs_drv,"unbind" , priv->dev_bus_addr);igt_reset_timeout (); priv->failure =NULL ; - -/* don't close fd.sysfs_drv, it will be used for driver rebinding */ }/* Re-bind the driver to the device */
@@ -123,18 +108,20 @@ static void driver_bind(struct hotunplug *priv)igt_sysfs_set (priv->fd.sysfs_drv,"bind" , priv->dev_bus_addr);igt_reset_timeout (); priv->failure =NULL ; - -close (priv->fd.sysfs_drv); }/* Remove (virtually unplug) the device from its bus */ static void device_unplug (struct hotunplug *priv,const char *prefix) { + priv->fd.sysfs_dev =openat (priv->fd.sysfs_bus, priv->dev_bus_addr, +O_DIRECTORY ); +igt_assert_fd (priv->fd.sysfs_dev); +igt_debug ("%sunplugging the device\n" , prefix); priv->failure ="Device unplug timeout!" ;igt_set_timeout (60 , priv->failure); -igt_sysfs_set (priv->fd.sysfs_dev,"device/remove" ,"1" ); +igt_sysfs_set (priv->fd.sysfs_dev,"remove" ,"1" );igt_reset_timeout (); priv->failure =NULL ;
@@ -150,11 +137,9 @@ static void bus_rescan(struct hotunplug *priv) priv->failure ="Bus rescan timeout!" ;igt_set_timeout (60 , priv->failure); -igt_sysfs_set (priv->fd.sysfs_bus,"rescan" ,"1" ); +igt_sysfs_set (priv->fd.sysfs_bus,"../rescan" ,"1" );igt_reset_timeout (); priv->failure =NULL ; - -close (priv->fd.sysfs_bus); }static void healthcheck (struct hotunplug *priv)
@@ -209,14 +194,6 @@ static void set_filter_from_device(int fd)static void unbind_rebind (struct hotunplug *priv) { -char buf[PATH_MAX ]; - -prepare (priv, buf,sizeof (buf)); - -igt_debug ("closing the device\n" ); - priv->fd.drm =local_close (priv->fd.drm); -igt_assert_f (priv->fd.drm ==-1 ,"Device close failed\n" ); -driver_unbind (priv,"" );driver_bind (priv);
@@ -226,12 +203,6 @@ static void unbind_rebind(struct hotunplug *priv)static void unplug_rescan (struct hotunplug *priv) { -prepare (priv,NULL ,0 ); - -igt_debug ("closing the device\n" ); - priv->fd.drm =local_close (priv->fd.drm); -igt_assert_f (priv->fd.drm ==-1 ,"Device close failed\n" ); -device_unplug (priv,"" );bus_rescan (priv);
@@ -241,9 +212,9 @@ static void unplug_rescan(struct hotunplug *priv)static void hotunbind_lateclose (struct hotunplug *priv) { -char buf[PATH_MAX ]; - -prepare (priv, buf,sizeof (buf)); +igt_debug ("opening device\n" ); + priv->fd.drm =__drm_open_driver (DRIVER_ANY ); +igt_assert_fd (priv->fd.drm);driver_unbind (priv,"hot " );
@@ -258,7 +229,9 @@ static void hotunbind_lateclose(struct hotunplug *priv)static void hotunplug_lateclose (struct hotunplug *priv) { -prepare (priv,NULL ,0 ); +igt_debug ("opening device\n" ); + priv->fd.drm =__drm_open_driver (DRIVER_ANY ); +igt_assert_fd (priv->fd.drm);device_unplug (priv,"hot " );
@@ -298,6 +271,8 @@ igt_mainset_filter_from_device (fd_drm);igt_fail_on_f (close (fd_drm),"Device close failed\n" ); + +prepare (&priv); }igt_describe ("Check if the driver can be cleanly unbound from a device believed to be closed" );
@@ -325,6 +300,10 @@ igt_main igt_subtest("hotunplug-lateclose")hotunplug_lateclose (&priv); -igt_fixture + igt_fixture {post_healthcheck (&priv); + +close (priv.fd.sysfs_bus); +close (priv.fd.sysfs_drv); + } }
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 10/16 tests/core_hotunplug: Skip selectively on sysfs close errors
In reply to Janusz KrzysztofikSince we no longer open a device DRM sysfs node, only a PCI one, driver unbind operations are no longer affected by missed or unsuccessful sysfs file close attempts. Skip only affected subtests if that happens.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tests/core_hotunplug.c +5 -4
@@ -82,8 +82,8 @@ static void prepare(struct hotunplug *priv)igt_assert_fd (priv->fd.sysfs_bus); priv->fd.sysfs_dev =local_close (priv->fd.sysfs_dev); -igt_assert_f (priv->fd.sysfs_dev ==-1 , -"Device sysfs node close failed\n" ); +igt_warn_on_f (priv->fd.sysfs_dev !=-1 , +"Device sysfs node close failed\n" ); }/* Unbind the driver from the device */
@@ -113,6 +113,9 @@ static void driver_bind(struct hotunplug *priv)/* Remove (virtually unplug) the device from its bus */ static void device_unplug (struct hotunplug *priv,const char *prefix) { +igt_require_f (priv->fd.sysfs_dev ==-1 , +"Device sysfs node not closed properly\n" ); + priv->fd.sysfs_dev =openat (priv->fd.sysfs_bus, priv->dev_bus_addr,O_DIRECTORY );igt_assert_fd (priv->fd.sysfs_dev);
@@ -171,8 +174,6 @@ static void post_healthcheck(struct hotunplug *priv)igt_abort_on_f (priv->failure,"%s\n" , priv->failure);igt_require_f (priv->fd.drm ==-1 ,"Device not closed properly\n" ); -igt_require_f (priv->fd.sysfs_dev ==-1 , -"Device sysfs node not closed properly\n" ); }static void set_filter_from_device (int fd)
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 11/16 tests/core_hotunplug: Follow failed subtests with health checks
In reply to Janusz KrzysztofikSubtests now forcibly call or request igt_abort on failures in order to avoid silently leaving an exercised device in an unusable state. However, a failure inside a subtest doesn't always mean the device is no longer working correctly and reboot is needed. On the other hand, if a subtest just fails without aborting, that doesn't mean in turn the device is healthy. We should still perform a device health check in that case before deciding on next steps.
Reuse the 'failure' structure field as a mark which is set when a subtest enters a chunk of critical steps which must be followed by a successful health check in order to avoid aborting the test execution. Then, move health checks from inside each subtest body to its individual follow-up igt_fixture section from where device file descriptors potentially left open are closed and the health check is run if theigt_subtest section has been exited with the marker set. Also, precede health check operations with a driver rebind or bus rescan attempt as needed.
v2: Start each recovery phase from unconditionally closing file
descriptors potentially left open by a subtest before it entered its critical section,
- replace igt_require() with 'if() return;' construct in recover() to reduce noise,
- replace "subtest failure" message used as a request for healthcheck with a more appropriate "need healthcheck" for clarity,
- rebase on current upstream master.
--- tests/core_hotunplug.c | 108 +++++++++++++++++++++++++++++------------ 1 file changed, 76 insertions(+), 32 deletions(-)
tests/core_hotunplug.c +76 -32
@@ -52,6 +52,9 @@ struct hotunplug {static int local_close (int fd) { +if (fd <0 )/* not open - return current status */ +return fd; + errno =0 ;if (close (fd))/* close failure - return -errno (never -1) */ return -errno;
@@ -91,11 +94,9 @@ static void driver_unbind(struct hotunplug *priv, const char *prefix) {igt_debug ("%sunbinding the driver from the device\n" , prefix); - priv->failure ="Driver unbind timeout!" ; -igt_set_timeout (60 , priv->failure); +igt_set_timeout (60 ,"Driver unbind timeout!" );igt_sysfs_set (priv->fd.sysfs_drv,"unbind" , priv->dev_bus_addr);igt_reset_timeout (); - priv->failure =NULL ; }/* Re-bind the driver to the device */
@@ -103,11 +104,9 @@ static void driver_bind(struct hotunplug *priv) {igt_debug ("rebinding the driver to the device\n" ); - priv->failure ="Driver re-bind timeout!" ; -igt_set_timeout (60 , priv->failure); +igt_set_timeout (60 ,"Driver re-bind timeout!" );igt_sysfs_set (priv->fd.sysfs_drv,"bind" , priv->dev_bus_addr);igt_reset_timeout (); - priv->failure =NULL ; }/* Remove (virtually unplug) the device from its bus */
@@ -122,11 +121,9 @@ static void device_unplug(struct hotunplug *priv, const char *prefix)igt_debug ("%sunplugging the device\n" , prefix); - priv->failure ="Device unplug timeout!" ; -igt_set_timeout (60 , priv->failure); +igt_set_timeout (60 ,"Device unplug timeout!" );igt_sysfs_set (priv->fd.sysfs_dev,"remove" ,"1" );igt_reset_timeout (); - priv->failure =NULL ; priv->fd.sysfs_dev =local_close (priv->fd.sysfs_dev); igt_warn_on_f(priv->fd.sysfs_dev != -1,
@@ -138,11 +135,15 @@ static void bus_rescan(struct hotunplug *priv) {igt_debug ("recovering the device\n" ); - priv->failure ="Bus rescan timeout!" ; -igt_set_timeout (60 , priv->failure); +igt_set_timeout (60 ,"Bus rescan timeout!" );igt_sysfs_set (priv->fd.sysfs_bus,"../rescan" ,"1" );igt_reset_timeout (); - priv->failure =NULL ; +} + +static void cleanup (struct hotunplug *priv) +{ + priv->fd.drm =local_close (priv->fd.drm); + priv->fd.sysfs_dev =local_close (priv->fd.sysfs_dev); }static void healthcheck (struct hotunplug *priv)
@@ -150,6 +151,18 @@ static void healthcheck(struct hotunplug *priv)/* preserve error code potentially stored before in priv->fd.drm */ int fd_drm; +if (faccessat (priv->fd.sysfs_bus, priv->dev_bus_addr,F_OK ,0 )) { + priv->failure ="Bus rescan failed!" ; +bus_rescan (priv); + priv->failure =NULL ; + } + +if (faccessat (priv->fd.sysfs_drv, priv->dev_bus_addr,F_OK ,0 )) { + priv->failure ="Driver re-bind failed!" ; +driver_bind (priv); + priv->failure =NULL ; + } +/* device name may have changed, rebuild IGT device list */ igt_devices_scan (true);
@@ -169,6 +182,17 @@ static void healthcheck(struct hotunplug *priv)igt_assert_f (fd_drm ==-1 ,"Device close failed\n" ); } +static void recover (struct hotunplug *priv) +{ +cleanup (priv); + +if (!priv->failure) +return ; + priv->failure =NULL ; + +healthcheck (priv); +} +static void post_healthcheck (struct hotunplug *priv) {igt_abort_on_f (priv->failure,"%s\n" , priv->failure);
@@ -195,20 +219,20 @@ static void set_filter_from_device(int fd)static void unbind_rebind (struct hotunplug *priv) { + priv->failure ="need healthcheck" ; +driver_unbind (priv,"" );driver_bind (priv); - -healthcheck (priv); }static void unplug_rescan (struct hotunplug *priv) { + priv->failure ="need healthcheck" ; +device_unplug (priv,"" );bus_rescan (priv); - -healthcheck (priv); }static void hotunbind_lateclose (struct hotunplug *priv)
@@ -217,6 +241,8 @@ static void hotunbind_lateclose(struct hotunplug *priv) priv->fd.drm =__drm_open_driver (DRIVER_ANY );igt_assert_fd (priv->fd.drm); + priv->failure ="need healthcheck" ; +driver_unbind (priv,"hot " );driver_bind (priv);
@@ -224,8 +250,6 @@ static void hotunbind_lateclose(struct hotunplug *priv)igt_debug ("late closing the unbound device instance\n" ); priv->fd.drm =local_close (priv->fd.drm);igt_warn_on_f (priv->fd.drm !=-1 ,"Device close failed\n" ); - -healthcheck (priv); }static void hotunplug_lateclose (struct hotunplug *priv)
@@ -234,6 +258,8 @@ static void hotunplug_lateclose(struct hotunplug *priv) priv->fd.drm =__drm_open_driver (DRIVER_ANY );igt_assert_fd (priv->fd.drm); + priv->failure ="need healthcheck" ; +device_unplug (priv,"hot " );bus_rescan (priv);
@@ -241,8 +267,6 @@ static void hotunplug_lateclose(struct hotunplug *priv)igt_debug ("late closing the removed device instance\n" ); priv->fd.drm =local_close (priv->fd.drm);igt_warn_on_f (priv->fd.drm !=-1 ,"Device close failed\n" ); - -healthcheck (priv); }/* Main */
@@ -276,30 +300,50 @@ igt_mainprepare (&priv); } -igt_describe ("Check if the driver can be cleanly unbound from a device believed to be closed" ); - igt_subtest("unbind-rebind") -unbind_rebind (&priv); + igt_subtest_group { +igt_describe ("Check if the driver can be cleanly unbound from a device believed to be closed" ); + igt_subtest("unbind-rebind") +unbind_rebind (&priv); + +igt_fixture + recover(&priv); + }igt_fixture post_healthcheck(&priv); -igt_describe ("Check if a device believed to be closed can be cleanly unplugged" ); - igt_subtest("unplug-rescan") -unplug_rescan (&priv); + igt_subtest_group { +igt_describe ("Check if a device believed to be closed can be cleanly unplugged" ); + igt_subtest("unplug-rescan") +unplug_rescan (&priv); + +igt_fixture + recover(&priv); + }igt_fixture post_healthcheck(&priv); -igt_describe ("Check if the driver can be cleanly unbound from a still open device, then released" ); - igt_subtest("hotunbind-lateclose") -hotunbind_lateclose (&priv); + igt_subtest_group { +igt_describe ("Check if the driver can be cleanly unbound from a still open device, then released" ); + igt_subtest("hotunbind-lateclose") +hotunbind_lateclose (&priv); + +igt_fixture + recover(&priv); + }igt_fixture post_healthcheck(&priv); -igt_describe ("Check if a still open device can be cleanly unplugged, then released" ); - igt_subtest("hotunplug-lateclose") -hotunplug_lateclose (&priv); + igt_subtest_group { +igt_describe ("Check if a still open device can be cleanly unplugged, then released" ); + igt_subtest("hotunplug-lateclose") +hotunplug_lateclose (&priv); + +igt_fixture + recover(&priv); + } igt_fixture {post_healthcheck (&priv);
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 12/16 tests/core_hotunplug: Fail subtests on device close errors
In reply to Janusz KrzysztofikSince health checks are now run from follow-up fixture sections, it is safe to fail subtests without the need to abort the test execution. Do that on device close errors instead of emitting warnings.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tests/core_hotunplug.c +4 -4
@@ -126,8 +126,8 @@ static void device_unplug(struct hotunplug *priv, const char *prefix)igt_reset_timeout (); priv->fd.sysfs_dev =local_close (priv->fd.sysfs_dev); -igt_warn_on_f (priv->fd.sysfs_dev !=-1 , -"Device sysfs node close failed\n" ); +igt_assert_f (priv->fd.sysfs_dev ==-1 , +"Device sysfs node close failed\n" ); }/* Re-discover the device by rescanning its bus */
@@ -249,7 +249,7 @@ static void hotunbind_lateclose(struct hotunplug *priv)igt_debug ("late closing the unbound device instance\n" ); priv->fd.drm =local_close (priv->fd.drm); -igt_warn_on_f (priv->fd.drm !=-1 ,"Device close failed\n" ); +igt_assert_f (priv->fd.drm ==-1 ,"Device close failed\n" ); }static void hotunplug_lateclose (struct hotunplug *priv)
@@ -266,7 +266,7 @@ static void hotunplug_lateclose(struct hotunplug *priv)igt_debug ("late closing the removed device instance\n" ); priv->fd.drm =local_close (priv->fd.drm); -igt_warn_on_f (priv->fd.drm !=-1 ,"Device close failed\n" ); +igt_assert_f (priv->fd.drm ==-1 ,"Device close failed\n" ); }/* Main */
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 13/16 tests/core_hotunplug: Process return values of sysfs operations
In reply to Janusz KrzysztofikReturn values of driver bind/unbind / device remove/recover sysfs operations are now ignored. Assert their correctness.
v2: Add trailing newlines missing from igt_assert messages,
- rebase on current upstream master.
--- tests/core_hotunplug.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
tests/core_hotunplug.c +10 -4
@@ -95,7 +95,9 @@ static void driver_unbind(struct hotunplug *priv, const char *prefix)igt_debug ("%sunbinding the driver from the device\n" , prefix);igt_set_timeout (60 ,"Driver unbind timeout!" ); -igt_sysfs_set (priv->fd.sysfs_drv,"unbind" , priv->dev_bus_addr); +igt_assert_f (igt_sysfs_set (priv->fd.sysfs_drv,"unbind" , + priv->dev_bus_addr), +"Driver unbind failure!\n" );igt_reset_timeout (); }
@@ -105,7 +107,9 @@ static void driver_bind(struct hotunplug *priv)igt_debug ("rebinding the driver to the device\n" );igt_set_timeout (60 ,"Driver re-bind timeout!" ); -igt_sysfs_set (priv->fd.sysfs_drv,"bind" , priv->dev_bus_addr); +igt_assert_f (igt_sysfs_set (priv->fd.sysfs_drv,"bind" , + priv->dev_bus_addr), +"Driver re-bind failure\n!" );igt_reset_timeout (); }
@@ -122,7 +126,8 @@ static void device_unplug(struct hotunplug *priv, const char *prefix)igt_debug ("%sunplugging the device\n" , prefix);igt_set_timeout (60 ,"Device unplug timeout!" ); -igt_sysfs_set (priv->fd.sysfs_dev,"remove" ,"1" ); +igt_assert_f (igt_sysfs_set (priv->fd.sysfs_dev,"remove" ,"1" ), +"Device unplug failure\n!" );igt_reset_timeout (); priv->fd.sysfs_dev =local_close (priv->fd.sysfs_dev);
@@ -136,7 +141,8 @@ static void bus_rescan(struct hotunplug *priv)igt_debug ("recovering the device\n" );igt_set_timeout (60 ,"Bus rescan timeout!" ); -igt_sysfs_set (priv->fd.sysfs_bus,"../rescan" ,"1" ); +igt_assert_f (igt_sysfs_set (priv->fd.sysfs_bus,"../rescan" ,"1" ), +"Bus rescan failure!\n" );igt_reset_timeout (); }
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 14/16 tests/core_hotunplug: Assert expected device presence/absence
In reply to Janusz KrzysztofikDon't rely on successful write to sysfs control files, assert existence / non-existence of a respective device sysfs node as well.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
tests/core_hotunplug.c +14 -0
@@ -99,6 +99,9 @@ static void driver_unbind(struct hotunplug *priv, const char *prefix) priv->dev_bus_addr), "Driver unbind failure!\n");igt_reset_timeout (); + +igt_assert_f (faccessat (priv->fd.sysfs_drv, priv->dev_bus_addr,F_OK ,0 ), +"Unbound device still present\n" ); }/* Re-bind the driver to the device */
@@ -111,6 +114,10 @@ static void driver_bind(struct hotunplug *priv) priv->dev_bus_addr), "Driver re-bind failure\n!");igt_reset_timeout (); + +igt_fail_on_f (faccessat (priv->fd.sysfs_drv, priv->dev_bus_addr, +F_OK ,0 ), +"Rebound device not present!\n" ); }/* Remove (virtually unplug) the device from its bus */
@@ -133,6 +140,9 @@ static void device_unplug(struct hotunplug *priv, const char *prefix) priv->fd.sysfs_dev =local_close (priv->fd.sysfs_dev);igt_assert_f (priv->fd.sysfs_dev ==-1 ,"Device sysfs node close failed\n" ); + +igt_assert_f (faccessat (priv->fd.sysfs_bus, priv->dev_bus_addr,F_OK ,0 ), +"Unplugged device still present\n" ); }/* Re-discover the device by rescanning its bus */
@@ -144,6 +154,10 @@ static void bus_rescan(struct hotunplug *priv)igt_assert_f (igt_sysfs_set (priv->fd.sysfs_bus,"../rescan" ,"1" ),"Bus rescan failure!\n" );igt_reset_timeout (); + +igt_fail_on_f (faccessat (priv->fd.sysfs_bus, priv->dev_bus_addr, +F_OK ,0 ), +"Fakely unplugged device not rediscovered!\n" ); }static void cleanup (struct hotunplug *priv)
Signature · 6 lines
2.21.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 15/16 tests/core_hotunplug: Explicitly ignore unused return values
In reply to Janusz KrzysztofikSome return values are not useful and can be ignored. Wrap those cases inside igt_ignore_warn(), not only to make sure compilers are happy but also to clearly document our decisions.
v2: Rebase on current upstream master.
--- tests/core_hotunplug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tests/core_hotunplug.c +3 -3
@@ -228,7 +228,7 @@ static void set_filter_from_device(int fd)char path[PATH_MAX +1 ];igt_assert (igt_sysfs_path (fd, path,PATH_MAX )); -strncat (path,"/device" ,PATH_MAX -strlen (path)); +igt_ignore_warn (strncat (path,"/device" ,PATH_MAX -strlen (path)));igt_assert (realpath (path, dst));igt_device_filter_free_all ();
@@ -368,7 +368,7 @@ igt_main igt_fixture {post_healthcheck (&priv); -close (priv.fd.sysfs_bus); -close (priv.fd.sysfs_drv); +igt_ignore_warn (close (priv.fd.sysfs_bus)); +igt_ignore_warn (close (priv.fd.sysfs_drv)); } }
Signature · 6 lines
2.21.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 16/16 tests/core_hotunplug: Un-blocklist *unbind* subtests
In reply to Janusz KrzysztofikSubtests which don't remove the device, only unbind the driver from it, seem relatively safe and harmless for CI. Remove them from the CI blocklist.
--- tests/intel-ci/blacklist.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/intel-ci/blacklist.txt +1 -1
@@ -120,7 +120,7 @@ igt@perf_pmu@cpu-hotplug # Currently fails and leaves the machine in a very bad state, and # causes coverage loss for other tests. -igt@core_hotunplug@.* +igt@core_hotunplug@.*plug.* # hangs several gens of hosts, and has no immediate fix igt@device_reset@reset-bound
Signature · 6 lines
2.21.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for tests/core_hotunplug: Fixes and enhancements (rev2)
In reply to Janusz Krzysztofik== Series Details ==
== Series Details ==
Series: tests/core_hotunplug: Fixes and enhancements (rev2)
URL : https://patchwork.freedesktop.org/series/79671/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8854 -> IGTPW_4867
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/index.html
Known issues
------------
Here are the changes found in IGTPW_4867 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@gt_lrc:
- fi-tgl-u2: [PASS][1] -> [DMESG-FAIL][2] ([i915#1233])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/fi-tgl-u2/igt@i915_selftest@live@gt_lrc.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/fi-tgl-u2/igt@i915_selftest@live@gt_lrc.html
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7500u: [PASS][3] -> [DMESG-WARN][4] ([i915#2203])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/fi-kbl-7500u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/fi-kbl-7500u/igt@[email protected]
#### Possible fixes ####
* igt@i915_pm_rpm@module-reload:
- fi-bsw-n3050: [DMESG-WARN][5] ([i915#1982]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/fi-bsw-n3050/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/fi-bsw-n3050/igt@[email protected]
- fi-byt-j1900: [DMESG-WARN][7] ([i915#1982]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/fi-byt-j1900/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/fi-byt-j1900/igt@[email protected]
* igt@i915_selftest@live@execlists:
- {fi-tgl-dsi}: [INCOMPLETE][9] ([i915#2268]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/fi-tgl-dsi/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/fi-tgl-dsi/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@gem_contexts:
- fi-tgl-u2: [INCOMPLETE][11] ([i915#2045]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/fi-tgl-u2/igt@i915_selftest@live@gem_contexts.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/fi-tgl-u2/igt@i915_selftest@live@gem_contexts.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-kefka: [DMESG-WARN][13] ([i915#1982]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/fi-bsw-kefka/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/fi-bsw-kefka/igt@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@c-hdmi-a2:
- fi-skl-guc: [DMESG-WARN][15] ([i915#2203]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/fi-skl-guc/igt@kms_flip@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/fi-skl-guc/igt@kms_flip@[email protected]
#### Warnings ####
* igt@kms_flip@basic-flip-vs-dpms@a-dp1:
- fi-kbl-x1275: [DMESG-WARN][17] ([i915#62] / [i915#92]) -> [DMESG-WARN][18] ([i915#62] / [i915#92] / [i915#95])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/fi-kbl-x1275/igt@kms_flip@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/fi-kbl-x1275/igt@kms_flip@[email protected]
* igt@kms_flip@basic-flip-vs-modeset@a-dp1:
- fi-kbl-x1275: [DMESG-WARN][19] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][20] ([i915#62] / [i915#92]) +4 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/fi-kbl-x1275/igt@kms_flip@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/fi-kbl-x1275/igt@kms_flip@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1233]: https://gitlab.freedesktop.org/drm/intel/issues/1233
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2045]: https://gitlab.freedesktop.org/drm/intel/issues/2045
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2268]: https://gitlab.freedesktop.org/drm/intel/issues/2268
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (45 -> 38)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5764 -> IGTPW_4867
CI-20190529: 20190529
CI_DRM_8854: 067ee09cd0a99c5ef86d0f780d7448ec416c036d @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4867: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/index.html
IGT_5764: 0f91c80b4c809cf48afff65a2ea68590389aa5ba @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✗ Fi.CI.IGT: failure for tests/core_hotunplug: Fixes and enhancements (rev2)
In reply to Janusz Krzysztofik== Series Details ==
== Series Details ==
Series: tests/core_hotunplug: Fixes and enhancements (rev2)
URL : https://patchwork.freedesktop.org/series/79671/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8854_full -> IGTPW_4867_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_4867_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in IGTPW_4867_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_4867_full:
### IGT changes ###
#### Possible regressions ####
* {igt@core_hotunplug@hotunbind-lateclose} (NEW):
- shard-hsw: NOTRUN -> [INCOMPLETE][1] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-hsw4/igt@[email protected]
* igt@gem_exec_store@dword@bcs0:
- shard-iclb: [PASS][2] -> [DMESG-WARN][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb7/igt@gem_exec_store@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb8/igt@gem_exec_store@[email protected]
* igt@gem_exec_store@dword@rcs0:
- shard-tglb: [PASS][4] -> [DMESG-FAIL][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-tglb7/igt@gem_exec_store@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-tglb5/igt@gem_exec_store@[email protected]
- shard-snb: [PASS][6] -> [FAIL][7] +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-snb5/igt@gem_exec_store@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-snb5/igt@gem_exec_store@[email protected]
- shard-iclb: [PASS][8] -> [FAIL][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb7/igt@gem_exec_store@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb8/igt@gem_exec_store@[email protected]
* igt@gen9_exec_parse@batch-invalid-length:
- shard-glk: [PASS][10] -> [FAIL][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-glk1/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-glk2/igt@[email protected]
- shard-kbl: [PASS][12] -> [FAIL][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-kbl4/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-kbl1/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- shard-hsw: [FAIL][14] ([i915#2283]) -> ([FAIL][15], [FAIL][16])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-hsw1/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-hsw2/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-hsw4/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_8854_full and IGTPW_4867_full:
### New IGT tests (2) ###
* igt@core_hotunplug@hotunbind-lateclose:
- Statuses : 1 incomplete(s) 6 pass(s)
- Exec time: [0.0, 1.64] s
* igt@core_hotunplug@unbind-rebind:
- Statuses : 1 incomplete(s) 6 pass(s)
- Exec time: [0.0, 1.60] s
Known issues
------------
Here are the changes found in IGTPW_4867_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_whisper@basic-contexts-priority-all:
- shard-glk: [PASS][17] -> [DMESG-WARN][18] ([i915#118] / [i915#95])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-glk2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-glk8/igt@[email protected]
* igt@gen9_exec_parse@batch-invalid-length:
- shard-apl: [PASS][19] -> [FAIL][20] ([i915#1635])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-apl4/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-apl7/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][21] -> [FAIL][22] ([i915#1899])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb7/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb8/igt@[email protected]
* igt@kms_big_fb@linear-64bpp-rotate-180:
- shard-glk: [PASS][23] -> [DMESG-FAIL][24] ([i915#118] / [i915#95]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-glk7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-glk8/igt@[email protected]
* igt@kms_big_fb@x-tiled-64bpp-rotate-180:
- shard-apl: [PASS][25] -> [DMESG-WARN][26] ([i915#1635] / [i915#1982])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-apl6/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-apl7/igt@[email protected]
* igt@kms_color@pipe-c-ctm-green-to-red:
- shard-hsw: [PASS][27] -> [TIMEOUT][28] ([i915#1958])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-hsw8/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-hsw4/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-256x85-sliding:
- shard-glk: [PASS][29] -> [FAIL][30] ([i915#54])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-glk3/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-glk3/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [PASS][31] -> [DMESG-WARN][32] ([i915#180]) +8 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-kbl1/igt@kms_flip@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-kbl2/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-tglb: [PASS][33] -> [DMESG-WARN][34] ([i915#1982]) +6 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-tglb7/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-tglb3/igt@[email protected]
* igt@kms_psr@no_drrs:
- shard-iclb: [PASS][35] -> [FAIL][36] ([i915#173])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb7/igt@kms_psr@no_drrs.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb1/igt@kms_psr@no_drrs.html
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][37] -> [SKIP][38] ([fdo#109441]) +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb1/igt@kms_psr@psr2_cursor_render.html
* igt@perf@blocking:
- shard-glk: [PASS][39] -> [SKIP][40] ([fdo#109271] / [i915#1354]) +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-glk4/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-glk2/igt@[email protected]
- shard-tglb: [PASS][41] -> [SKIP][42] ([i915#1354]) +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-tglb2/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-tglb5/igt@[email protected]
- shard-apl: [PASS][43] -> [SKIP][44] ([fdo#109271] / [i915#1354] / [i915#1635]) +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-apl6/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-apl7/igt@[email protected]
- shard-kbl: [PASS][45] -> [SKIP][46] ([fdo#109271] / [i915#1354]) +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-kbl1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-kbl1/igt@[email protected]
* igt@perf@invalid-oa-exponent:
- shard-iclb: [PASS][47] -> [SKIP][48] ([i915#1354]) +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb7/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb8/igt@[email protected]
* igt@perf@short-reads:
- shard-hsw: [PASS][49] -> [FAIL][50] ([i915#51])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-hsw6/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-hsw6/igt@[email protected]
* igt@prime_busy@hang-wait@bcs0:
- shard-hsw: [PASS][51] -> [FAIL][52] ([i915#2258]) +6 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-hsw6/igt@prime_busy@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-hsw1/igt@prime_busy@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@preservation-s3@vecs0:
- shard-kbl: [DMESG-WARN][53] ([i915#180]) -> [PASS][54] +3 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-kbl7/igt@gem_ctx_isolation@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-kbl1/igt@gem_ctx_isolation@[email protected]
* igt@gem_exec_whisper@basic-fds-forked-all:
- shard-glk: [DMESG-WARN][55] ([i915#118] / [i915#95]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-glk6/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-glk2/igt@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-apl: [DMESG-WARN][57] ([i915#1436] / [i915#1635] / [i915#716]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-apl7/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-apl8/igt@[email protected]
* igt@i915_pm_dc@dc5-psr:
- shard-iclb: [INCOMPLETE][59] -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb4/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb5/igt@[email protected]
* igt@i915_selftest@mock@contexts:
- shard-apl: [INCOMPLETE][61] ([i915#1635]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-apl4/igt@i915_selftest@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-apl6/igt@i915_selftest@[email protected]
* igt@kms_cursor_edge_walk@pipe-c-128x128-top-edge:
- shard-glk: [DMESG-WARN][63] ([i915#1982]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-glk7/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-glk5/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
- shard-kbl: [DMESG-WARN][65] ([i915#1982]) -> [PASS][66] +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-glk: [FAIL][67] ([i915#49]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-glk7/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-glk6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-shrfb-scaledprimary:
- shard-iclb: [DMESG-WARN][69] ([i915#1982]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb8/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb6/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-gtt:
- shard-tglb: [DMESG-WARN][71] ([i915#1982]) -> [PASS][72] +2 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-tglb5/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-tglb7/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][73] ([fdo#109642] / [fdo#111068]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb4/igt@kms_psr2_su@page_flip.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][75] ([fdo#109441]) -> [PASS][76] +1 similar issue
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb6/igt@kms_psr@psr2_primary_page_flip.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_setmode@basic:
- shard-glk: [FAIL][77] ([i915#31]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-glk5/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-glk6/igt@[email protected]
* igt@perf@blocking-parameterized:
- shard-iclb: [FAIL][79] ([i915#1542]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-iclb7/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-iclb5/igt@[email protected]
* igt@perf@polling-parameterized:
- shard-kbl: [FAIL][81] ([i915#1542]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-kbl1/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-kbl4/igt@[email protected]
* igt@prime_busy@after-wait@vcs0:
- shard-hsw: [FAIL][83] ([i915#2258]) -> [PASS][84] +1 similar issue
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-hsw2/igt@prime_busy@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-hsw6/igt@prime_busy@[email protected]
* {igt@syncobj_timeline@etime-multi-wait-all-for-submit-submitted}:
- shard-hsw: [TIMEOUT][85] ([i915#1958]) -> [PASS][86] +3 similar issues
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-hsw5/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-hsw1/igt@[email protected]
#### Warnings ####
* igt@gem_exec_reloc@basic-concurrent16:
- shard-snb: [FAIL][87] ([i915#1930]) -> [TIMEOUT][88] ([i915#1958])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-snb4/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-snb2/igt@[email protected]
* igt@i915_suspend@fence-restore-untiled:
- shard-kbl: [INCOMPLETE][89] ([i915#155]) -> [DMESG-WARN][90] ([i915#180])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-kbl4/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-kbl7/igt@[email protected]
* igt@kms_color@pipe-c-ctm-green-to-red:
- shard-snb: [SKIP][91] ([fdo#109271]) -> [TIMEOUT][92] ([i915#1958]) +1 similar issue
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-snb5/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-snb2/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-ctm-0-5:
- shard-hsw: [TIMEOUT][93] ([i915#1958]) -> [SKIP][94] ([fdo#109271] / [fdo#111827])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-hsw5/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-hsw5/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-d-64x64-bottom-edge:
- shard-hsw: [SKIP][95] ([fdo#109271]) -> [TIMEOUT][96] ([i915#1958])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8854/shard-hsw5/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/shard-hsw4/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1354]: https://gitlab.freedesktop.org/drm/intel/issues/1354
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#173]: https://gitlab.freedesktop.org/drm/intel/issues/173
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1899]: https://gitlab.freedesktop.org/drm/intel/issues/1899
[i915#1930]: https://gitlab.freedesktop.org/drm/intel/issues/1930
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2258]: https://gitlab.freedesktop.org/drm/intel/issues/2258
[i915#2283]: https://gitlab.freedesktop.org/drm/intel/issues/2283
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#51]: https://gitlab.freedesktop.org/drm/intel/issues/51
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 8)
------------------------------
Missing (3): pig-skl-6260u pig-glk-j5005 pig-icl-1065g7
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5764 -> IGTPW_4867
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_8854: 067ee09cd0a99c5ef86d0f780d7448ec416c036d @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4867: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/index.html
IGT_5764: 0f91c80b4c809cf48afff65a2ea68590389aa5ba @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4867/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoted 1 line · Janusz Krzysztofik
Clean up the test code and unblock unbind variants.
From the CI report it looks for me like driver (hot)unbind-rebind operations affect hardware and the driver doesn't handle this correctly. Moreover, the test doesn't currently detect this faulty condition and happily returns success.
On the other hand, the hardware seems not stuck permanently, it looks like it just requires engines to be reset.
Then, I'm going to extend the series with a more thorough health check and a more careful recovery. The unbind-rebind subtest shall report a failure as soon as it detects that engines require a reset, I believe, but igt_abort shall not be called unless the recovery phase fails.
Thanks,
Janusz
Quoted 26 lines
@Michał: Since most v2 updates are trivial, I've preserved your
Reviewd-by: except for patch 11/16 "Follow failed subtests with health checks" - please have a look and confirm if you are still OK with it.Thanks,
JanuszJanusz Krzysztofik (16):
tests/core_hotunplug: Useigt_assert_fd()tests/core_hotunplug: Constifydev_bus_addrstring tests/core_hotunplug: Consolidate duplicated debug messages tests/core_hotunplug: Assert successful device filter application tests/core_hotunplug: Fix missing newline tests/core_hotunplug: Maintain a single data structure instance tests/core_hotunplug: Pass errors via a data structure field tests/core_hotunplug: Handle device close errors tests/core_hotunplug: Prepare invariant data once per test run tests/core_hotunplug: Skip selectively on sysfs close errors tests/core_hotunplug: Follow failed subtests with health checks tests/core_hotunplug: Fail subtests on device close errors tests/core_hotunplug: Process return values of sysfs operations tests/core_hotunplug: Assert expected device presence/absence tests/core_hotunplug: Explicitly ignore unused return values tests/core_hotunplug: Un-blocklist *unbind* subtests
Quoted 4 lines
tests/core_hotunplug.c | 334 +++++++++++++++++++++-------------- tests/intel-ci/blacklist.txt | 2 +- 2 files changed, 204 insertions(+), 132 deletions(-)
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev