From: Lukasz Laguna <lukasz.laguna@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 2/8] lib/igt_sriov_device: add helper for opening VF device
Date: Fri, 24 Nov 2023 09:52:53 +0100 [thread overview]
Message-ID: <20231124085259.1777-3-lukasz.laguna@intel.com> (raw)
In-Reply-To: <20231124085259.1777-1-lukasz.laguna@intel.com>
From: Katarzyna Dec <katarzyna.dec@intel.com>
Helper opens DRM device node and returns its file descriptor.
v2:
- s/drm_open_device/__drm_open_device (Kamil)
- combine string with one go (Kamil)
Cc: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Katarzyna Dec <katarzyna.dec@intel.com>
Signed-off-by: Lukasz Laguna <lukasz.laguna@intel.com>
---
lib/drmtest.c | 17 ++++++++++++----
lib/drmtest.h | 1 +
lib/igt_sriov_device.c | 46 ++++++++++++++++++++++++++++++++++++++++++
lib/igt_sriov_device.h | 1 +
4 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/lib/drmtest.c b/lib/drmtest.c
index f0b97e362..8aa510695 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -245,7 +245,16 @@ static void log_opened_device_path(const char *device_path)
igt_info("Opened device: %s\n", item->path);
}
-static int open_device(const char *name, unsigned int chipset)
+/**
+ * __drm_open_device:
+ * @name: DRM node name
+ * @chipset: OR'd flags for each chipset to search, eg. #DRIVER_INTEL
+ *
+ * Open a drm legacy device node.
+ *
+ * Returns: DRM file descriptor or -1 on error
+ */
+int __drm_open_device(const char *name, unsigned int chipset)
{
const char *forced;
char dev_name[16] = "";
@@ -350,7 +359,7 @@ static int __search_and_open(const char *base, int offset, unsigned int chipset,
if (_is_already_opened(name, as_idx))
continue;
- fd = open_device(name, chipset);
+ fd = __drm_open_device(name, chipset);
if (fd != -1)
return fd;
}
@@ -392,13 +401,13 @@ static int __open_driver_exact(const char *name, unsigned int chipset)
{
int fd;
- fd = open_device(name, chipset);
+ fd = __drm_open_device(name, chipset);
if (fd != -1)
return fd;
drm_load_module(chipset);
- return open_device(name, chipset);
+ return __drm_open_device(name, chipset);
}
/*
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 909a0c12c..271a93e8b 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -98,6 +98,7 @@ void __set_forced_driver(const char *name);
*/
#define ALIGN_DOWN(x, a) ALIGN((x) - ((a) - 1), (a))
+int __drm_open_device(const char *name, unsigned int chipset);
void drm_load_module(unsigned int chipset);
int drm_open_driver(int chipset);
int drm_open_driver_master(int chipset);
diff --git a/lib/igt_sriov_device.c b/lib/igt_sriov_device.c
index c5c594c2c..8e4d30b91 100644
--- a/lib/igt_sriov_device.c
+++ b/lib/igt_sriov_device.c
@@ -3,8 +3,10 @@
* Copyright(c) 2023 Intel Corporation. All rights reserved.
*/
+#include <dirent.h>
#include <errno.h>
+#include "drmtest.h"
#include "igt_core.h"
#include "igt_sriov_device.h"
#include "igt_sysfs.h"
@@ -211,3 +213,47 @@ void igt_sriov_disable_driver_autoprobe(int pf)
{
pf_attr_set_u32(pf, "device/sriov_drivers_autoprobe", false);
}
+
+/**
+ * igt_sriov_open_vf_drm_device - Open VF DRM device node
+ * @pf: PF device file descriptor
+ * @vf_num: VF number (1-based to identify single VF)
+ *
+ * Open DRM device node for given VF.
+ *
+ * Return:
+ * VF file descriptor or -1 on error.
+ */
+int igt_sriov_open_vf_drm_device(int pf, unsigned int vf_num)
+{
+ char dir_path[PATH_MAX], path[256], dev_name[16];
+ DIR *dir;
+ struct dirent *de;
+ bool found = false;
+
+ igt_assert(vf_num > 0);
+
+ if (!igt_sysfs_path(pf, path, sizeof(path)))
+ return -1;
+ /* vf_num is 1-based, but virtfn is 0-based */
+ snprintf(dir_path, sizeof(dir_path), "%s/device/virtfn%u/drm", path, vf_num - 1);
+
+ dir = opendir(dir_path);
+ if (!dir)
+ return -1;
+ while ((de = readdir(dir))) {
+ unsigned int card_num;
+
+ if (sscanf(de->d_name, "card%d", &card_num) == 1) {
+ snprintf(dev_name, sizeof(dev_name), "/dev/dri/card%u", card_num);
+ found = true;
+ break;
+ }
+ }
+ closedir(dir);
+
+ if (!found)
+ return -1;
+
+ return __drm_open_device(dev_name, DRIVER_ANY);
+}
diff --git a/lib/igt_sriov_device.h b/lib/igt_sriov_device.h
index 337fdf84b..4e57f0dcb 100644
--- a/lib/igt_sriov_device.h
+++ b/lib/igt_sriov_device.h
@@ -25,5 +25,6 @@ void igt_sriov_disable_vfs(int pf);
bool igt_sriov_is_driver_autoprobe_enabled(int pf);
void igt_sriov_enable_driver_autoprobe(int pf);
void igt_sriov_disable_driver_autoprobe(int pf);
+int igt_sriov_open_vf_drm_device(int pf, unsigned int vf_num);
#endif /* __IGT_SRIOV_DEVICE_H__ */
--
2.40.0
next prev parent reply other threads:[~2023-11-24 8:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-24 8:52 [igt-dev] [PATCH i-g-t 0/8] Initial SR-IOV validation Lukasz Laguna
2023-11-24 8:52 ` [igt-dev] [PATCH i-g-t 1/8] lib/igt_sriov_device: add core SR-IOV helpers Lukasz Laguna
2023-11-24 8:52 ` Lukasz Laguna [this message]
2023-11-24 8:52 ` [igt-dev] [PATCH i-g-t 3/8] lib/igt_sriov_device: add helper for checking if VF DRM driver is probed Lukasz Laguna
2023-11-24 8:52 ` [igt-dev] [PATCH i-g-t 4/8] lib/igt_sriov_device: add helpers for operations in different VFs scenarios Lukasz Laguna
2023-11-24 8:52 ` [igt-dev] [PATCH i-g-t 5/8] tests/sriov_basic: add basic tests for enabling SR-IOV VFs Lukasz Laguna
2023-11-24 8:52 ` [igt-dev] [PATCH i-g-t 6/8] lib/igt_sriov_device: add helpers for VF DRM driver bind and unbind Lukasz Laguna
2023-11-24 8:52 ` [igt-dev] [PATCH i-g-t 7/8] tests/sriov_basic: validate driver binding to VFs Lukasz Laguna
2023-11-24 8:52 ` [igt-dev] [PATCH i-g-t 8/8] tests/sriov_basic: add more tests for VF driver binding Lukasz Laguna
2023-11-24 11:10 ` [igt-dev] ✓ Fi.CI.BAT: success for Initial SR-IOV validation (rev5) Patchwork
2023-11-24 12:16 ` [igt-dev] ✓ CI.xeBAT: " Patchwork
2023-11-25 14:06 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-11-30 12:48 [igt-dev] [PATCH i-g-t 0/8] Initial SR-IOV validation Lukasz Laguna
2023-11-30 12:48 ` [igt-dev] [PATCH i-g-t 2/8] lib/igt_sriov_device: add helper for opening VF device Lukasz Laguna
2023-12-01 15:33 ` Kamil Konieczny
2023-11-20 14:14 [igt-dev] [PATCH i-g-t 0/8] Initial SR-IOV validation Lukasz Laguna
2023-11-20 14:14 ` [igt-dev] [PATCH i-g-t 2/8] lib/igt_sriov_device: add helper for opening VF device Lukasz Laguna
2023-11-23 9:21 ` Kamil Konieczny
2023-11-24 8:58 ` Laguna, Lukasz
2023-11-09 6:51 [igt-dev] [PATCH i-g-t 0/8] Initial SR-IOV validation Lukasz Laguna
2023-11-09 6:51 ` [igt-dev] [PATCH i-g-t 2/8] lib/igt_sriov_device: add helper for opening VF device Lukasz Laguna
2023-11-06 19:59 [igt-dev] [PATCH i-g-t 0/8] Initial SR-IOV validation Lukasz Laguna
2023-11-06 19:59 ` [igt-dev] [PATCH i-g-t 2/8] lib/igt_sriov_device: add helper for opening VF device Lukasz Laguna
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=20231124085259.1777-3-lukasz.laguna@intel.com \
--to=lukasz.laguna@intel.com \
--cc=igt-dev@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: 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