From: "José Expósito" <jose.exposito89@gmail.com>
To: igt-dev@lists.freedesktop.org
Cc: louis.chauvet@bootlin.com,
"José Expósito" <jose.exposito89@gmail.com>,
"Jim Shargo" <jshargo@chromium.org>,
"Marius Vlad" <marius.vlad@collabora.com>
Subject: [PATCH i-g-t v2 02/43] lib/igt_debugfs: Move is_mountpoint() to igt_aux
Date: Thu, 13 Mar 2025 18:32:37 +0100 [thread overview]
Message-ID: <20250313173318.5818-3-jose.exposito89@gmail.com> (raw)
In-Reply-To: <20250313173318.5818-1-jose.exposito89@gmail.com>
Rename is_mountpoint() to igt_is_mountpoint() and make it available in
igt_aux.h/c.
Refactor, no functional change.
Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
Co-developed-by: Jim Shargo <jshargo@chromium.org>
Signed-off-by: Jim Shargo <jshargo@chromium.org>
Co-developed-by: Marius Vlad <marius.vlad@collabora.com>
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
---
lib/igt_aux.c | 31 +++++++++++++++++++++++++++++++
lib/igt_aux.h | 2 ++
lib/igt_debugfs.c | 29 ++---------------------------
3 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index f5bf48da6..2905824a5 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -1374,6 +1374,37 @@ static bool get_process_ids(struct igt_process *prcs)
return prcs->tid != 0;
}
+/**
+ * igt_is_mountpoint() - Check if a path is a mounted filesystem
+ * @path: Root directory to test
+ *
+ * Returns: true if @path is the root of a mounted filesystem
+ */
+bool igt_is_mountpoint(const char *path)
+{
+ char buf[strlen(path) + 4];
+ struct stat st;
+ dev_t dev;
+
+ igt_assert_lt(snprintf(buf, sizeof(buf), "%s/.", path), sizeof(buf));
+ if (stat(buf, &st))
+ return false;
+
+ if (!S_ISDIR(st.st_mode))
+ return false;
+
+ dev = st.st_dev;
+
+ igt_assert_lt(snprintf(buf, sizeof(buf), "%s/..", path), sizeof(buf));
+ if (stat(buf, &st))
+ return false;
+
+ if (!S_ISDIR(st.st_mode))
+ return false;
+
+ return dev != st.st_dev;
+}
+
/**
* igt_is_process_running:
* @comm: Name of process in the form found in /proc/pid/comm (limited to 15
diff --git a/lib/igt_aux.h b/lib/igt_aux.h
index bfd83adca..e8a1788b2 100644
--- a/lib/igt_aux.h
+++ b/lib/igt_aux.h
@@ -314,6 +314,8 @@ double igt_stop_siglatency(struct igt_mean *result);
bool igt_allow_unlimited_files(void);
+bool igt_is_mountpoint(const char *path);
+
int igt_is_process_running(const char *comm);
int igt_terminate_process(int sig, const char *comm);
void igt_lsof(const char *dpath);
diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c
index 8ac215a76..210a9cea0 100644
--- a/lib/igt_debugfs.c
+++ b/lib/igt_debugfs.c
@@ -67,37 +67,12 @@
* General debugfs helpers
*/
-static bool is_mountpoint(const char *path)
-{
- char buf[strlen(path) + 4];
- struct stat st;
- dev_t dev;
-
- igt_assert_lt(snprintf(buf, sizeof(buf), "%s/.", path), sizeof(buf));
- if (stat(buf, &st))
- return false;
-
- if (!S_ISDIR(st.st_mode))
- return false;
-
- dev = st.st_dev;
-
- igt_assert_lt(snprintf(buf, sizeof(buf), "%s/..", path), sizeof(buf));
- if (stat(buf, &st))
- return false;
-
- if (!S_ISDIR(st.st_mode))
- return false;
-
- return dev != st.st_dev;
-}
-
static const char *__igt_debugfs_mount(void)
{
- if (is_mountpoint("/sys/kernel/debug"))
+ if (igt_is_mountpoint("/sys/kernel/debug"))
return "/sys/kernel/debug";
- if (is_mountpoint("/debug"))
+ if (igt_is_mountpoint("/debug"))
return "/debug";
if (mount("debug", "/sys/kernel/debug", "debugfs", 0, 0))
--
2.48.1
next prev parent reply other threads:[~2025-03-13 17:33 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 17:32 [PATCH i-g-t v2 00/43] VKMS configfs tests José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 01/43] lib/drmtest: Add VKMS as a known driver type José Expósito
2025-03-13 17:32 ` José Expósito [this message]
2025-03-13 17:32 ` [PATCH i-g-t v2 03/43] lib/igt_configfs: Add helper to mount configfs José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 04/43] lib/vkms: Add minimal VKMS library and test device default files José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 05/43] lib/vkms: Allow to enable/disable VKMS devices José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 06/43] tests/vkms_configfs: Test device invalid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 07/43] lib/vkms: Test plane default files José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 08/43] lib/vkms: Test plane default values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 09/43] lib/vkms: Test plane invalid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 10/43] tests/vkms_configfs: Test plane valid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 11/43] lib/vkms: Test CRTC default files José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 12/43] lib/vkms: Test CRTC default values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 13/43] lib/vkms: Test CRTC invalid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 14/43] tests/vkms_configfs: Test CRTC valid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 15/43] lib/vkms: Test encoder default files José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 16/43] lib/vkms: Test connector " José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 17/43] lib/vkms: Test connector default values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 18/43] lib/vkms: Test connector invalid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 19/43] tests/vkms_configfs: Test connector valid values José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 20/43] lib/vkms: Test attaching planes to CRTCs José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 21/43] lib/vkms: Test attaching encoders " José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 22/43] lib/vkms: Test attaching connectors to encoders José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 23/43] lib/igt_device_scan: Allow to find device by sysname José Expósito
2025-06-11 11:09 ` Kamil Konieczny
2025-07-15 10:27 ` José Expósito
2025-03-13 17:32 ` [PATCH i-g-t v2 24/43] tests/vkms_configfs: Test enablement without pipeline items José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 25/43] lib/vkms: Create VKMS device from static config José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 26/43] tests/vkms_configfs: Test adding too many planes José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 27/43] tests/vkms_configfs: Test not adding a primary plane José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 28/43] tests/vkms_configfs: Test adding multiple primary planes José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 29/43] tests/vkms_configfs: Test adding multiple cursor planes José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 30/43] tests/vkms_configfs: Test adding a plane without possible CRTCs José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 31/43] tests/vkms_configfs: Test enabling a device without CRTCs José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 32/43] tests/vkms_configfs: Test enabling a device with too many CRTCs José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 33/43] tests/vkms_configfs: Test enabling a device without encoders José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 34/43] tests/vkms_configfs: Test enabling a device with too many encoders José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 35/43] tests/vkms_configfs: Test adding an encoder without possible CRTCs José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 36/43] tests/vkms_configfs: Test adding a CRTC without encoders José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 37/43] tests/vkms_configfs: Test enabling a device without connectors José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 38/43] tests/vkms_configfs: Test enabling a device with too many connectors José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 39/43] lib/vkms: Test changing enabled device planes José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 40/43] lib/vkms: Test changing enabled device CRTCs José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 41/43] lib/vkms: Test changing enabled device encoders José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 42/43] lib/vkms: Test changing enabled device connectors José Expósito
2025-03-13 17:33 ` [PATCH i-g-t v2 43/43] tests/vkms_configfs: Test connector hot-plug José Expósito
2025-03-14 16:54 ` ✗ Xe.CI.Full: failure for VKMS configfs tests (rev4) Patchwork
2025-03-15 0:05 ` ✓ Xe.CI.BAT: success for VKMS configfs tests (rev5) Patchwork
2025-03-15 0:30 ` ✓ i915.CI.BAT: " Patchwork
2025-03-15 9:06 ` ✗ Xe.CI.Full: failure " Patchwork
2025-03-15 11:32 ` ✗ i915.CI.Full: " 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=20250313173318.5818-3-jose.exposito89@gmail.com \
--to=jose.exposito89@gmail.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=jshargo@chromium.org \
--cc=louis.chauvet@bootlin.com \
--cc=marius.vlad@collabora.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox