Move the helper function to get the VFIO cdev path to libvfio so that it
can be used in libvfio in a subsequent commit.
No functional change intended.
Signed-off-by: David Matlack <dmatl...@google.com>
---
.../selftests/vfio/lib/include/vfio_util.h | 2 +
.../selftests/vfio/lib/vfio_pci_device.c | 31 ++++++++++++++
.../selftests/vfio/vfio_iommufd_setup_test.c | 40 +++----------------
3 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/tools/testing/selftests/vfio/lib/include/vfio_util.h
b/tools/testing/selftests/vfio/lib/include/vfio_util.h
index c824c993d82e..2b2e2a163e92 100644
--- a/tools/testing/selftests/vfio/lib/include/vfio_util.h
+++ b/tools/testing/selftests/vfio/lib/include/vfio_util.h
@@ -162,6 +162,8 @@ struct vfio_pci_device {
struct vfio_pci_driver driver;
};
+const char *vfio_pci_get_cdev_path(const char *bdf);
+
struct vfio_pci_device *vfio_pci_device_init(const char *bdf, int iommu_type);
void vfio_pci_device_cleanup(struct vfio_pci_device *device);
void vfio_pci_device_reset(struct vfio_pci_device *device);
diff --git a/tools/testing/selftests/vfio/lib/vfio_pci_device.c
b/tools/testing/selftests/vfio/lib/vfio_pci_device.c
index 63f033047b4c..e8a9d46701c0 100644
--- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c
+++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
+#include <dirent.h>
#include <fcntl.h>
#include <libgen.h>
#include <stdlib.h>
@@ -328,6 +329,36 @@ static void vfio_pci_device_setup(struct vfio_pci_device
*device, const char *bd
device->msi_eventfds[i] = -1;
}
+const char *vfio_pci_get_cdev_path(const char *bdf)
+{
+ char dir_path[PATH_MAX];
+ struct dirent *entry;
+ char *cdev_path;
+ DIR *dir;
+
+ cdev_path = calloc(PATH_MAX, 1);
+ VFIO_ASSERT_NOT_NULL(cdev_path);
+
+ snprintf(dir_path, sizeof(dir_path),
"/sys/bus/pci/devices/%s/vfio-dev/", bdf);
+
+ dir = opendir(dir_path);
+ VFIO_ASSERT_NOT_NULL(dir, "Failed to open directory %s\n", dir_path);
+
+ while ((entry = readdir(dir)) != NULL) {
+ /* Find the file that starts with "vfio" */
+ if (strncmp("vfio", entry->d_name, 4))
+ continue;
+
+ snprintf(cdev_path, PATH_MAX, "/dev/vfio/devices/%s",
entry->d_name);
+ break;
+ }
+
+ VFIO_ASSERT_NE(cdev_path[0], 0, "Failed to find vfio cdev file.\n");
+ VFIO_ASSERT_EQ(closedir(dir), 0);
+
+ return cdev_path;
+}
+
struct vfio_pci_device *vfio_pci_device_init(const char *bdf, int iommu_type)
{
struct vfio_pci_device *device;
diff --git a/tools/testing/selftests/vfio/vfio_iommufd_setup_test.c
b/tools/testing/selftests/vfio/vfio_iommufd_setup_test.c
index 851032f79a31..6965785cc32f 100644
--- a/tools/testing/selftests/vfio/vfio_iommufd_setup_test.c
+++ b/tools/testing/selftests/vfio/vfio_iommufd_setup_test.c
@@ -1,8 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
-#include <assert.h>
-#include <dirent.h>
-#include <fcntl.h>
-
#include <uapi/linux/types.h>
#include <linux/limits.h>
#include <linux/sizes.h>
@@ -11,39 +7,15 @@
#include <stdint.h>
#include <stdio.h>
-#include <string.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include "../kselftest_harness.h"
-static const char iommu_dev_path[] = "/dev/iommu";
-char cdev_path[PATH_MAX] = { '\0' };
-
-static void set_cdev_path(const char *bdf)
-{
- char dir_path[PATH_MAX];
- DIR *dir;
- struct dirent *entry;
-
- snprintf(dir_path, sizeof(dir_path),
"/sys/bus/pci/devices/%s/vfio-dev/", bdf);
-
- dir = opendir(dir_path);
- assert(dir);
-
- /* Find the file named "vfio<number>" */
- while ((entry = readdir(dir)) != NULL) {
- if (!strncmp("vfio", entry->d_name, 4)) {
- snprintf(cdev_path, sizeof(cdev_path),
"/dev/vfio/devices/%s",
- entry->d_name);
- break;
- }
- }
-
- assert(strlen(cdev_path) > 0);
+#include <vfio_util.h>
- closedir(dir);
-}
+static const char *iommu_dev_path = "/dev/iommu";
+static const char *cdev_path;
static int vfio_device_bind_iommufd_ioctl(int cdev_fd, int iommufd)
{
@@ -148,15 +120,13 @@ TEST_F(vfio_cdev, attach_invalid_pt_fails)
int main(int argc, char *argv[])
{
- char *bdf;
-
if (argc != 2) {
printf("Usage: %s bus:device:function\n", argv[0]);
return 1;
}
- bdf = argv[1];
- set_cdev_path(bdf);
+ cdev_path = vfio_pci_get_cdev_path(argv[1]);
+
printf("Using cdev device %s\n", cdev_path);
return test_harness_run(1, argv);
--
2.49.0.1151.ga128411c76-goog
