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 2/8] tests/core_hotunplug: Use PCI device sysfs entry, not DRM Date: Mon, 22 Jun 2020 17:18:39 +0200 [thread overview] Message-ID: <20200622151845.4520-3-janusz.krzysztofik@linux.intel.com> (raw) In-Reply-To: <20200622151845.4520-1-janusz.krzysztofik@linux.intel.com> Future subtests may want to access PCI attributes of the device after driver unbind. Refactor prepare() helper. Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> --- tests/core_hotunplug.c | 68 +++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c index 187168009..c7213d728 100644 --- a/tests/core_hotunplug.c +++ b/tests/core_hotunplug.c @@ -54,42 +54,54 @@ struct hotunplug { igt_kmsg(KMSG_DEBUG "%s: %s: %s\n", igt_test_name(), __func__, msg); \ }) -static void prepare_for_unbind(struct hotunplug *priv, char *buf, int buflen) +static inline int prepare_common(struct hotunplug *priv) { - int len; + int fd_sysfs_drm; + + local_debug("opening device"); + priv->fd.drm = __drm_open_driver(DRIVER_ANY); + igt_assert(priv->fd.drm >= 0); + + fd_sysfs_drm = igt_sysfs_open(priv->fd.drm); + igt_assert(fd_sysfs_drm >= 0); + + return fd_sysfs_drm; +} + +static inline void prepare_for_rebind(struct hotunplug *priv, + char *buf, int buflen) +{ + int fd_sysfs_drm, len; igt_assert(buflen); - priv->fd.sysfs_drv = openat(priv->fd.sysfs_dev, "device/driver", - O_DIRECTORY); - igt_assert(priv->fd.sysfs_drv >= 0); + fd_sysfs_drm = prepare_common(priv); + + priv->fd.sysfs_drv = openat(fd_sysfs_drm, "device/driver", O_DIRECTORY); - len = readlinkat(priv->fd.sysfs_dev, "device", buf, buflen - 1); + len = readlinkat(fd_sysfs_drm, "device", buf, buflen - 1); buf[len] = '\0'; priv->dev_bus_addr = strrchr(buf, '/'); - igt_assert(priv->dev_bus_addr++); - /* sysfs_dev no longer needed */ - close(priv->fd.sysfs_dev); + close(fd_sysfs_drm); + + igt_assert(priv->fd.sysfs_drv >= 0); + igt_assert(priv->dev_bus_addr++); } -static inline void prepare(struct hotunplug *priv, char *buf, int buflen) +static inline void prepare_for_rescan(struct hotunplug *priv) { - local_debug("opening device"); - priv->fd.drm = __drm_open_driver(DRIVER_ANY); - igt_assert(priv->fd.drm >= 0); + int fd_sysfs_drm = prepare_common(priv); - priv->fd.sysfs_dev = igt_sysfs_open(priv->fd.drm); - igt_assert(priv->fd.sysfs_dev >= 0); + priv->fd.sysfs_dev = openat(fd_sysfs_drm, "device", O_DIRECTORY); - 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(priv->fd.sysfs_bus >= 0); - } + priv->fd.sysfs_bus = openat(fd_sysfs_drm, "device/subsystem", + O_DIRECTORY); + + close(fd_sysfs_drm); + + igt_assert(priv->fd.sysfs_dev >= 0); + igt_assert(priv->fd.sysfs_bus >= 0); } static const char *failure; @@ -123,7 +135,7 @@ static void device_unplug(int fd_sysfs_dev) { failure = "Device unplug timeout!"; igt_set_timeout(60, failure); - igt_sysfs_set(fd_sysfs_dev, "device/remove", "1"); + igt_sysfs_set(fd_sysfs_dev, "remove", "1"); igt_reset_timeout(); failure = NULL; @@ -183,7 +195,7 @@ static void unbind_rebind(void) struct hotunplug priv; char buf[PATH_MAX]; - prepare(&priv, buf, sizeof(buf)); + prepare_for_rebind(&priv, buf, sizeof(buf)); local_debug("closing the device"); close(priv.fd.drm); @@ -201,7 +213,7 @@ static void unplug_rescan(void) { struct hotunplug priv; - prepare(&priv, NULL, 0); + prepare_for_rescan(&priv); local_debug("closing the device"); close(priv.fd.drm); @@ -220,7 +232,7 @@ static void hotunbind_lateclose(void) struct hotunplug priv; char buf[PATH_MAX]; - prepare(&priv, buf, sizeof(buf)); + prepare_for_rebind(&priv, buf, sizeof(buf)); local_debug("hot unbinding the driver from the device"); driver_unbind(priv.fd.sysfs_drv, priv.dev_bus_addr); @@ -238,7 +250,7 @@ static void hotunplug_lateclose(void) { struct hotunplug priv; - prepare(&priv, NULL, 0); + prepare_for_rescan(&priv); local_debug("hot unplugging the device"); device_unplug(priv.fd.sysfs_dev); -- 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 2/8] tests/core_hotunplug: Use PCI device sysfs entry, not DRM Date: Mon, 22 Jun 2020 17:18:39 +0200 [thread overview] Message-ID: <20200622151845.4520-3-janusz.krzysztofik@linux.intel.com> (raw) In-Reply-To: <20200622151845.4520-1-janusz.krzysztofik@linux.intel.com> Future subtests may want to access PCI attributes of the device after driver unbind. Refactor prepare() helper. Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> --- tests/core_hotunplug.c | 68 +++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c index 187168009..c7213d728 100644 --- a/tests/core_hotunplug.c +++ b/tests/core_hotunplug.c @@ -54,42 +54,54 @@ struct hotunplug { igt_kmsg(KMSG_DEBUG "%s: %s: %s\n", igt_test_name(), __func__, msg); \ }) -static void prepare_for_unbind(struct hotunplug *priv, char *buf, int buflen) +static inline int prepare_common(struct hotunplug *priv) { - int len; + int fd_sysfs_drm; + + local_debug("opening device"); + priv->fd.drm = __drm_open_driver(DRIVER_ANY); + igt_assert(priv->fd.drm >= 0); + + fd_sysfs_drm = igt_sysfs_open(priv->fd.drm); + igt_assert(fd_sysfs_drm >= 0); + + return fd_sysfs_drm; +} + +static inline void prepare_for_rebind(struct hotunplug *priv, + char *buf, int buflen) +{ + int fd_sysfs_drm, len; igt_assert(buflen); - priv->fd.sysfs_drv = openat(priv->fd.sysfs_dev, "device/driver", - O_DIRECTORY); - igt_assert(priv->fd.sysfs_drv >= 0); + fd_sysfs_drm = prepare_common(priv); + + priv->fd.sysfs_drv = openat(fd_sysfs_drm, "device/driver", O_DIRECTORY); - len = readlinkat(priv->fd.sysfs_dev, "device", buf, buflen - 1); + len = readlinkat(fd_sysfs_drm, "device", buf, buflen - 1); buf[len] = '\0'; priv->dev_bus_addr = strrchr(buf, '/'); - igt_assert(priv->dev_bus_addr++); - /* sysfs_dev no longer needed */ - close(priv->fd.sysfs_dev); + close(fd_sysfs_drm); + + igt_assert(priv->fd.sysfs_drv >= 0); + igt_assert(priv->dev_bus_addr++); } -static inline void prepare(struct hotunplug *priv, char *buf, int buflen) +static inline void prepare_for_rescan(struct hotunplug *priv) { - local_debug("opening device"); - priv->fd.drm = __drm_open_driver(DRIVER_ANY); - igt_assert(priv->fd.drm >= 0); + int fd_sysfs_drm = prepare_common(priv); - priv->fd.sysfs_dev = igt_sysfs_open(priv->fd.drm); - igt_assert(priv->fd.sysfs_dev >= 0); + priv->fd.sysfs_dev = openat(fd_sysfs_drm, "device", O_DIRECTORY); - 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(priv->fd.sysfs_bus >= 0); - } + priv->fd.sysfs_bus = openat(fd_sysfs_drm, "device/subsystem", + O_DIRECTORY); + + close(fd_sysfs_drm); + + igt_assert(priv->fd.sysfs_dev >= 0); + igt_assert(priv->fd.sysfs_bus >= 0); } static const char *failure; @@ -123,7 +135,7 @@ static void device_unplug(int fd_sysfs_dev) { failure = "Device unplug timeout!"; igt_set_timeout(60, failure); - igt_sysfs_set(fd_sysfs_dev, "device/remove", "1"); + igt_sysfs_set(fd_sysfs_dev, "remove", "1"); igt_reset_timeout(); failure = NULL; @@ -183,7 +195,7 @@ static void unbind_rebind(void) struct hotunplug priv; char buf[PATH_MAX]; - prepare(&priv, buf, sizeof(buf)); + prepare_for_rebind(&priv, buf, sizeof(buf)); local_debug("closing the device"); close(priv.fd.drm); @@ -201,7 +213,7 @@ static void unplug_rescan(void) { struct hotunplug priv; - prepare(&priv, NULL, 0); + prepare_for_rescan(&priv); local_debug("closing the device"); close(priv.fd.drm); @@ -220,7 +232,7 @@ static void hotunbind_lateclose(void) struct hotunplug priv; char buf[PATH_MAX]; - prepare(&priv, buf, sizeof(buf)); + prepare_for_rebind(&priv, buf, sizeof(buf)); local_debug("hot unbinding the driver from the device"); driver_unbind(priv.fd.sysfs_drv, priv.dev_bus_addr); @@ -238,7 +250,7 @@ static void hotunplug_lateclose(void) { struct hotunplug priv; - prepare(&priv, NULL, 0); + prepare_for_rescan(&priv); local_debug("hot unplugging the device"); device_unplug(priv.fd.sysfs_dev); -- 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 ` Janusz Krzysztofik [this message] 2020-06-22 15:18 ` [igt-dev] [RFC PATCH i-g-t 2/8] tests/core_hotunplug: Use PCI device sysfs entry, not DRM Janusz Krzysztofik 2020-06-22 15:18 ` [Intel-gfx] [RFC PATCH i-g-t 3/8] tests/core_hotunplug: Add unbind-unplug-rescan variant Janusz Krzysztofik 2020-06-22 15:18 ` [igt-dev] " 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-3-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.