From: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> To: igt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [RFC PATCH i-g-t 3/8] tests/core_hotunplug: Add unbind-unplug-rescan variant Date: Mon, 22 Jun 2020 17:18:40 +0200 [thread overview] Message-ID: <20200622151845.4520-4-janusz.krzysztofik@linux.intel.com> (raw) In-Reply-To: <20200622151845.4520-1-janusz.krzysztofik@linux.intel.com> Check if this 3-step procedure exhibits any issues with device recover after unplug. Such issues may indicate insufficient device hardware re-initialization performed by the device driver, or other kernel bugs outside the driver code. Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> --- tests/core_hotunplug.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c index c7213d728..0b7c6006b 100644 --- a/tests/core_hotunplug.c +++ b/tests/core_hotunplug.c @@ -209,6 +209,35 @@ static void unbind_rebind(void) healthcheck(); } +static void unbind_unplug_rescan(void) +{ + struct hotunplug priv; + char buf[PATH_MAX]; + + /* prepare for unbind */ + prepare_for_rebind(&priv, buf, sizeof(buf)); + + /* also prepare for unplug */ + local_debug("closing the device"); + close(priv.fd.drm); + prepare_for_rescan(&priv); + + local_debug("closing the device"); + close(priv.fd.drm); + + local_debug("unbinding the driver from the device"); + driver_unbind(priv.fd.sysfs_drv, priv.dev_bus_addr); + close(priv.fd.sysfs_drv); + + local_debug("unplugging the device"); + device_unplug(priv.fd.sysfs_dev); + + local_debug("recovering the device"); + bus_rescan(priv.fd.sysfs_bus); + + healthcheck(); +} + static void unplug_rescan(void) { struct hotunplug priv; @@ -288,14 +317,21 @@ igt_main close(fd_drm); } - igt_describe("Check if the driver can be cleanly unbound from a device believed to be closed"); + igt_describe("Check if the driver can be cleanly unbound from a device believed to be closed, then rebound"); igt_subtest("unbind-rebind") unbind_rebind(); 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_describe("Check if a device with the driver unbound from it can be cleanly recovered after being unplugged\n"); + igt_subtest("unbind-unplug-rescan") + unbind_unplug_rescan(); + + igt_fixture + igt_abort_on_f(failure, "%s\n", failure); + + igt_describe("Check if a device believed to be closed can be cleanly unplugged and recovered"); igt_subtest("unplug-rescan") unplug_rescan(); -- 2.21.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> To: igt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Subject: [igt-dev] [RFC PATCH i-g-t 3/8] tests/core_hotunplug: Add unbind-unplug-rescan variant Date: Mon, 22 Jun 2020 17:18:40 +0200 [thread overview] Message-ID: <20200622151845.4520-4-janusz.krzysztofik@linux.intel.com> (raw) In-Reply-To: <20200622151845.4520-1-janusz.krzysztofik@linux.intel.com> Check if this 3-step procedure exhibits any issues with device recover after unplug. Such issues may indicate insufficient device hardware re-initialization performed by the device driver, or other kernel bugs outside the driver code. Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> --- tests/core_hotunplug.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c index c7213d728..0b7c6006b 100644 --- a/tests/core_hotunplug.c +++ b/tests/core_hotunplug.c @@ -209,6 +209,35 @@ static void unbind_rebind(void) healthcheck(); } +static void unbind_unplug_rescan(void) +{ + struct hotunplug priv; + char buf[PATH_MAX]; + + /* prepare for unbind */ + prepare_for_rebind(&priv, buf, sizeof(buf)); + + /* also prepare for unplug */ + local_debug("closing the device"); + close(priv.fd.drm); + prepare_for_rescan(&priv); + + local_debug("closing the device"); + close(priv.fd.drm); + + local_debug("unbinding the driver from the device"); + driver_unbind(priv.fd.sysfs_drv, priv.dev_bus_addr); + close(priv.fd.sysfs_drv); + + local_debug("unplugging the device"); + device_unplug(priv.fd.sysfs_dev); + + local_debug("recovering the device"); + bus_rescan(priv.fd.sysfs_bus); + + healthcheck(); +} + static void unplug_rescan(void) { struct hotunplug priv; @@ -288,14 +317,21 @@ igt_main close(fd_drm); } - igt_describe("Check if the driver can be cleanly unbound from a device believed to be closed"); + igt_describe("Check if the driver can be cleanly unbound from a device believed to be closed, then rebound"); igt_subtest("unbind-rebind") unbind_rebind(); 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_describe("Check if a device with the driver unbound from it can be cleanly recovered after being unplugged\n"); + igt_subtest("unbind-unplug-rescan") + unbind_unplug_rescan(); + + igt_fixture + igt_abort_on_f(failure, "%s\n", failure); + + igt_describe("Check if a device believed to be closed can be cleanly unplugged and recovered"); igt_subtest("unplug-rescan") unplug_rescan(); -- 2.21.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2020-06-22 15:19 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-22 15:18 [Intel-gfx] [RFC PATCH i-g-t 0/8] tests/core_hotunplug: New subtests and enhancements Janusz Krzysztofik 2020-06-22 15:18 ` [igt-dev] " Janusz Krzysztofik 2020-06-22 15:18 ` [Intel-gfx] [RFC PATCH i-g-t 1/8] tests/core_hotunplug: Duplicate debug messages in dmesg Janusz Krzysztofik 2020-06-22 15:18 ` [igt-dev] " Janusz Krzysztofik 2020-06-22 15:18 ` [Intel-gfx] [RFC PATCH i-g-t 2/8] tests/core_hotunplug: Use PCI device sysfs entry, not DRM Janusz Krzysztofik 2020-06-22 15:18 ` [igt-dev] " Janusz Krzysztofik 2020-06-22 15:18 ` Janusz Krzysztofik [this message] 2020-06-22 15:18 ` [igt-dev] [RFC PATCH i-g-t 3/8] tests/core_hotunplug: Add unbind-unplug-rescan variant Janusz Krzysztofik 2020-06-22 15:18 ` [Intel-gfx] [RFC PATCH i-g-t 4/8] tests/core_hotunplug: Add 'lateclose before recover' variants Janusz Krzysztofik 2020-06-22 15:18 ` [igt-dev] " Janusz Krzysztofik 2020-06-22 15:18 ` [Intel-gfx] [RFC PATCH i-g-t 5/8] tests/core_hotunplug: Add 'GEM address space' variant Janusz Krzysztofik 2020-06-22 15:18 ` [igt-dev] " Janusz Krzysztofik 2020-06-22 15:18 ` [Intel-gfx] [RFC PATCH i-g-t 6/8] tests/core_hotunplug: Add 'GEM object' variant Janusz Krzysztofik 2020-06-22 15:18 ` [igt-dev] " Janusz Krzysztofik 2020-06-22 15:18 ` [Intel-gfx] [RFC PATCH i-g-t 7/8] tests/core_hotunplug: Add 'PRIME handle' variant Janusz Krzysztofik 2020-06-22 15:18 ` [igt-dev] " Janusz Krzysztofik 2020-06-22 15:18 ` [Intel-gfx] [RFC PATCH i-g-t 8/8] tests/core_hotunplug: Add 'GEM batch' variant Janusz Krzysztofik 2020-06-22 15:18 ` [igt-dev] " Janusz Krzysztofik 2020-06-22 15:41 ` [igt-dev] ✗ Fi.CI.BUILD: failure for tests/core_hotunplug: New subtests and enhancements Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200622151845.4520-4-janusz.krzysztofik@linux.intel.com \ --to=janusz.krzysztofik@linux.intel.com \ --cc=igt-dev@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.