From: Zhenzhong Duan <zhenzhong.duan@intel.com>
To: qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com, clg@redhat.com, jgg@nvidia.com,
nicolinc@nvidia.com, eric.auger@redhat.com, peterx@redhat.com,
jasonwang@redhat.com, kevin.tian@intel.com, yi.l.liu@intel.com,
yi.y.sun@intel.com, chao.p.peng@intel.com,
Zhenzhong Duan <zhenzhong.duan@intel.com>
Subject: [RFC PATCH v4 12/24] vfio/platform: Use vfio_[attach/detach]_device
Date: Wed, 12 Jul 2023 15:25:16 +0800 [thread overview]
Message-ID: <20230712072528.275577-13-zhenzhong.duan@intel.com> (raw)
In-Reply-To: <20230712072528.275577-1-zhenzhong.duan@intel.com>
From: Eric Auger <eric.auger@redhat.com>
Let the vfio-platform device use vfio_attach_device() and
vfio_detach_device(), hence hiding the details of the used
IOMMU backend.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
---
hw/vfio/platform.c | 43 +++----------------------------------------
1 file changed, 3 insertions(+), 40 deletions(-)
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 5af73f9287..8e3d4ac458 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -529,12 +529,7 @@ static VFIODeviceOps vfio_platform_ops = {
*/
static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
{
- VFIOGroup *group;
- VFIODevice *vbasedev_iter;
- char *tmp, group_path[PATH_MAX], *group_name;
- ssize_t len;
struct stat st;
- int groupid;
int ret;
/* @sysfsdev takes precedence over @host */
@@ -557,47 +552,15 @@ static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
return -errno;
}
- tmp = g_strdup_printf("%s/iommu_group", vbasedev->sysfsdev);
- len = readlink(tmp, group_path, sizeof(group_path));
- g_free(tmp);
-
- if (len < 0 || len >= sizeof(group_path)) {
- ret = len < 0 ? -errno : -ENAMETOOLONG;
- error_setg_errno(errp, -ret, "no iommu_group found");
- return ret;
- }
-
- group_path[len] = 0;
-
- group_name = basename(group_path);
- if (sscanf(group_name, "%d", &groupid) != 1) {
- error_setg_errno(errp, errno, "failed to read %s", group_path);
- return -errno;
- }
-
- trace_vfio_platform_base_device_init(vbasedev->name, groupid);
-
- group = vfio_get_group(groupid, &address_space_memory, errp);
- if (!group) {
- return -ENOENT;
- }
-
- QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {
- if (strcmp(vbasedev_iter->name, vbasedev->name) == 0) {
- error_setg(errp, "device is already attached");
- vfio_put_group(group);
- return -EBUSY;
- }
- }
- ret = vfio_get_device(group, vbasedev->name, vbasedev, errp);
+ ret = vfio_attach_device(vbasedev->name, vbasedev,
+ &address_space_memory, errp);
if (ret) {
- vfio_put_group(group);
return ret;
}
ret = vfio_populate_device(vbasedev, errp);
if (ret) {
- vfio_put_group(group);
+ vfio_detach_device(vbasedev);
}
return ret;
--
2.34.1
next prev parent reply other threads:[~2023-07-12 7:40 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-12 7:25 [RFC PATCH v4 00/24] vfio: Adopt iommufd Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 01/24] scripts/update-linux-headers: Add iommufd.h Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 02/24] Update linux-header per VFIO device cdev v14 Zhenzhong Duan
2023-07-12 7:49 ` Cornelia Huck
2023-07-12 9:28 ` Duan, Zhenzhong
2023-07-12 9:35 ` Cornelia Huck
2023-07-12 9:50 ` Duan, Zhenzhong
2023-07-12 7:25 ` [RFC PATCH v4 03/24] vfio/common: Move IOMMU agnostic helpers to a separate file Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 04/24] vfio/common: Introduce vfio_container_add|del_section_window() Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 05/24] vfio/common: Extract out vfio_kvm_device_[add/del]_fd Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 06/24] vfio/common: Add a vfio device iterator Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 07/24] vfio/common: Refactor vfio_viommu_preset() to be group agnostic Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 08/24] vfio/common: Move legacy VFIO backend code into separate container.c Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 09/24] vfio/common: Rename into as.c Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 10/24] vfio: Add base container Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 11/24] vfio/container: Introduce vfio_[attach/detach]_device Zhenzhong Duan
2023-07-12 7:25 ` Zhenzhong Duan [this message]
2023-07-12 7:25 ` [RFC PATCH v4 13/24] vfio/ap: Use vfio_[attach/detach]_device Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 14/24] vfio/ccw: " Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 15/24] vfio/container-base: Introduce [attach/detach]_device container callbacks Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 16/24] vfio/as: Simplify vfio_viommu_preset() Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 17/24] Add iommufd configure option Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 18/24] backends/iommufd: Introduce the iommufd object Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 19/24] util/char_dev: Add open_cdev() Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 20/24] vfio/iommufd: Implement the iommufd backend Zhenzhong Duan
[not found] ` <CGME20230714092325eucas1p105978aa928776b6e008e08e793d0ac60@eucas1p1.samsung.com>
2023-07-14 9:23 ` Joel Granados
2023-07-14 9:35 ` Duan, Zhenzhong
2023-07-12 7:25 ` [RFC PATCH v4 21/24] vfio/as: Add vfio device iterator callback for iommufd Zhenzhong Duan
2023-08-17 5:48 ` Nicolin Chen
2023-08-17 6:05 ` Duan, Zhenzhong
2023-07-12 7:25 ` [RFC PATCH v4 22/24] vfio/pci: Adapt vfio pci hot reset support with iommufd BE Zhenzhong Duan
2023-08-17 5:25 ` Nicolin Chen
2023-08-17 6:11 ` Duan, Zhenzhong
2023-07-12 7:25 ` [RFC PATCH v4 23/24] vfio/as: Allow the selection of a given iommu backend Zhenzhong Duan
2023-07-12 7:25 ` [RFC PATCH v4 24/24] vfio/iommufd: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-08-01 8:28 ` [RFC PATCH v4 00/24] vfio: Adopt iommufd Duan, Zhenzhong
2023-08-02 22:44 ` Nicolin Chen
2023-08-03 1:31 ` Duan, Zhenzhong
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=20230712072528.275577-13-zhenzhong.duan@intel.com \
--to=zhenzhong.duan@intel.com \
--cc=alex.williamson@redhat.com \
--cc=chao.p.peng@intel.com \
--cc=clg@redhat.com \
--cc=eric.auger@redhat.com \
--cc=jasonwang@redhat.com \
--cc=jgg@nvidia.com \
--cc=kevin.tian@intel.com \
--cc=nicolinc@nvidia.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=yi.l.liu@intel.com \
--cc=yi.y.sun@intel.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;
as well as URLs for NNTP newsgroup(s).