patches for DPDK stable branches
 help / color / mirror / Atom feed
* [PATCH] vfio: add get device info API
@ 2023-11-14 10:48 Mingjin Ye
  2023-11-15  0:12 ` Stephen Hemminger
  2023-11-24 14:09 ` Burakov, Anatoly
  0 siblings, 2 replies; 7+ messages in thread
From: Mingjin Ye @ 2023-11-14 10:48 UTC (permalink / raw)
  To: dev; +Cc: qiming.yang, Mingjin Ye, stable, Anatoly Burakov

This patch adds an API to support getting device information.

The driver can use the "rte_vfio_get_device_info" helper to get
device information from EAL.

Cc: stable@dpdk.org

Signed-off-by: Mingjin Ye <mingjinx.ye@intel.com>
---
 lib/eal/include/rte_vfio.h | 26 ++++++++++++++++++++++++++
 lib/eal/linux/eal_vfio.c   | 19 +++++++++++++++++++
 lib/eal/version.map        |  1 +
 3 files changed, 46 insertions(+)

diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 3487c4f2a2..b3f55963e3 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -212,6 +212,32 @@ int
 rte_vfio_get_group_num(const char *sysfs_base,
 		      const char *dev_addr, int *iommu_group_num);
 
+/**
+ * Get device information
+ *
+ * This function is only relevant to linux and will return
+ * an error on BSD.
+ *
+ * @param sysfs_base
+ *   sysfs path prefix.
+ *
+ * @param dev_addr
+ *   device location.
+ *
+ * @param vfio_dev_fd
+ *   VFIO fd.
+ *
+ * @param device_info
+ *   Device information.
+ *
+ * @return
+ *   0 on success.
+ *   <0 on failure.
+ */
+int
+rte_vfio_get_device_info(const char *sysfs_base, const char *dev_addr,
+			int *vfio_dev_fd, struct vfio_device_info *device_info);
+
 /**
  * Open a new VFIO container fd
  *
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index ad3c1654b2..5810d9fcd7 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -1222,6 +1222,25 @@ vfio_set_iommu_type(int vfio_container_fd)
 	return NULL;
 }
 
+int
+rte_vfio_get_device_info(const char *sysfs_base, const char *dev_addr,
+			int *vfio_dev_fd, struct vfio_device_info *device_info)
+{
+	if (!device_info || *vfio_dev_fd < 0)
+		return -1;
+
+	if (*vfio_dev_fd == 0) {
+		if (rte_vfio_setup_device(sysfs_base, dev_addr,
+				vfio_dev_fd, device_info))
+			return -1;
+	} else {
+		if (ioctl(*vfio_dev_fd, VFIO_DEVICE_GET_INFO, &device_info))
+			return -1;
+	}
+
+	return 0;
+}
+
 int
 vfio_has_supported_extensions(int vfio_container_fd)
 {
diff --git a/lib/eal/version.map b/lib/eal/version.map
index e00a844805..8b4a9c237e 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -300,6 +300,7 @@ DPDK_24 {
 	rte_vfio_noiommu_is_enabled; # WINDOWS_NO_EXPORT
 	rte_vfio_release_device; # WINDOWS_NO_EXPORT
 	rte_vfio_setup_device; # WINDOWS_NO_EXPORT
+	rte_vfio_get_device_info; # WINDOWS_NO_EXPORT
 	rte_zmalloc;
 	rte_zmalloc_socket;
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH] vfio: add get device info API
@ 2023-11-14 10:23 Mingjin Ye
  2023-11-15  6:13 ` Chenbo Xia
  0 siblings, 1 reply; 7+ messages in thread
From: Mingjin Ye @ 2023-11-14 10:23 UTC (permalink / raw)
  To: dev; +Cc: qiming.yang, Mingjin Ye, stable, Anatoly Burakov

This patch adds an API to support getting device information.

The driver can use the "rte_vfio_get_device_info" helper to get
device information from EAL.

Cc: stable@dpdk.org

Signed-off-by: Mingjin Ye <mingjinx.ye@intel.com>
---
 lib/eal/include/rte_vfio.h | 26 ++++++++++++++++++++++++++
 lib/eal/linux/eal_vfio.c   | 19 +++++++++++++++++++
 lib/eal/version.map        |  3 +++
 3 files changed, 48 insertions(+)

diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
index 3487c4f2a2..b3f55963e3 100644
--- a/lib/eal/include/rte_vfio.h
+++ b/lib/eal/include/rte_vfio.h
@@ -212,6 +212,32 @@ int
 rte_vfio_get_group_num(const char *sysfs_base,
 		      const char *dev_addr, int *iommu_group_num);
 
+/**
+ * Get device information
+ *
+ * This function is only relevant to linux and will return
+ * an error on BSD.
+ *
+ * @param sysfs_base
+ *   sysfs path prefix.
+ *
+ * @param dev_addr
+ *   device location.
+ *
+ * @param vfio_dev_fd
+ *   VFIO fd.
+ *
+ * @param device_info
+ *   Device information.
+ *
+ * @return
+ *   0 on success.
+ *   <0 on failure.
+ */
+int
+rte_vfio_get_device_info(const char *sysfs_base, const char *dev_addr,
+			int *vfio_dev_fd, struct vfio_device_info *device_info);
+
 /**
  * Open a new VFIO container fd
  *
diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index ad3c1654b2..5810d9fcd7 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -1222,6 +1222,25 @@ vfio_set_iommu_type(int vfio_container_fd)
 	return NULL;
 }
 
+int
+rte_vfio_get_device_info(const char *sysfs_base, const char *dev_addr,
+			int *vfio_dev_fd, struct vfio_device_info *device_info)
+{
+	if (!device_info || *vfio_dev_fd < 0)
+		return -1;
+
+	if (*vfio_dev_fd == 0) {
+		if (rte_vfio_setup_device(sysfs_base, dev_addr,
+				vfio_dev_fd, device_info))
+			return -1;
+	} else {
+		if (ioctl(*vfio_dev_fd, VFIO_DEVICE_GET_INFO, &device_info))
+			return -1;
+	}
+
+	return 0;
+}
+
 int
 vfio_has_supported_extensions(int vfio_container_fd)
 {
diff --git a/lib/eal/version.map b/lib/eal/version.map
index e00a844805..8a211aaefd 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -413,6 +413,9 @@ EXPERIMENTAL {
 	# added in 23.07
 	rte_memzone_max_get;
 	rte_memzone_max_set;
+
+	# added in 23.11
+	rte_vfio_get_device_info; # WINDOWS_NO_EXPORT
 };
 
 INTERNAL {
-- 
2.25.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-11-24 14:09 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-14 10:48 [PATCH] vfio: add get device info API Mingjin Ye
2023-11-15  0:12 ` Stephen Hemminger
2023-11-15  7:54   ` Ye, MingjinX
2023-11-15 15:09     ` Stephen Hemminger
2023-11-24 14:09 ` Burakov, Anatoly
  -- strict thread matches above, loose matches on Subject: below --
2023-11-14 10:23 Mingjin Ye
2023-11-15  6:13 ` Chenbo Xia

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).