On Wed, Jul 12, 2023 at 03:25:24PM +0800, Zhenzhong Duan wrote:
> From: Yi Liu <yi.l....@intel.com>
>
> Add the iommufd backend. The IOMMUFD container class is implemented
> based on the new /dev/iommu user API. This backend obviously depends
> on CONFIG_IOMMUFD.
>
> So far, the iommufd backend doesn't support live migration yet due
> to missing support in the host kernel.
>
> Co-authored-by: Eric Auger <eric.au...@redhat.com>
> Signed-off-by: Eric Auger <eric.au...@redhat.com>
> Signed-off-by: Yi Liu <yi.l....@intel.com>
> Signed-off-by: Zhenzhong Duan <zhenzhong.d...@intel.com>
> ---
> hw/vfio/as.c | 12 +-
> hw/vfio/iommufd.c | 511 ++++++++++++++++++++++++++
> hw/vfio/meson.build | 3 +
> hw/vfio/trace-events | 11 +
> include/hw/vfio/vfio-common.h | 24 ++
> include/hw/vfio/vfio-container-base.h | 3 +
> 6 files changed, 562 insertions(+), 2 deletions(-)
> create mode 100644 hw/vfio/iommufd.c
>
> diff --git a/hw/vfio/as.c b/hw/vfio/as.c
> index a7179403b7..2e7ecd4e96 100644
> --- a/hw/vfio/as.c
> +++ b/hw/vfio/as.c
> @@ -45,7 +45,7 @@
> #include "migration/qemu-file.h"
> #include "sysemu/tpm.h"
>
> -static QLIST_HEAD(, VFIOAddressSpace) vfio_address_spaces =
> +VFIOAddressSpaceList vfio_address_spaces =
> QLIST_HEAD_INITIALIZER(vfio_address_spaces);
>
> #ifdef CONFIG_KVM
> @@ -1516,8 +1516,16 @@ int vfio_attach_device(char *name, VFIODevice
> *vbasedev,
> {
> const VFIOIOMMUBackendOpsClass *ops;
>
> - ops = VFIO_IOMMU_BACKEND_OPS_CLASS(
> +#ifdef CONFIG_IOMMUFD
> + if (vbasedev->iommufd) {
> + ops = VFIO_IOMMU_BACKEND_OPS_CLASS(
> + object_class_by_name(TYPE_VFIO_IOMMU_BACKEND_IOMMUFD_OPS));
> + } else
> +#endif
> + {
> + ops = VFIO_IOMMU_BACKEND_OPS_CLASS(
> object_class_by_name(TYPE_VFIO_IOMMU_BACKEND_LEGACY_OPS));
> + }
> if (!ops) {
> error_setg(errp, "VFIO IOMMU Backend not found!");
> return -ENODEV;
> diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
> new file mode 100644
> index 0000000000..286ad0b766
> --- /dev/null
> +++ b/hw/vfio/iommufd.c
> @@ -0,0 +1,511 @@
> +/*
> + * iommufd container backend
> + *
> + * Copyright (C) 2023 Intel Corporation.
> + * Copyright Red Hat, Inc. 2023
> + *
> + * Authors: Yi Liu <yi.l....@intel.com>
> + * Eric Auger <eric.au...@redhat.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> +
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> +
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include "qemu/osdep.h"
> +#include <sys/ioctl.h>
> +#include <linux/vfio.h>
> +#include <linux/iommufd.h>
> +
> +#include "hw/vfio/vfio-common.h"
> +#include "qemu/error-report.h"
> +#include "trace.h"
> +#include "qapi/error.h"
> +#include "sysemu/iommufd.h"
> +#include "hw/qdev-core.h"
> +#include "sysemu/reset.h"
> +#include "qemu/cutils.h"
> +#include "qemu/char_dev.h"
> +
> +static int iommufd_map(VFIOContainer *bcontainer, hwaddr iova,
> + ram_addr_t size, void *vaddr, bool readonly)
> +{
> + VFIOIOMMUFDContainer *container =
> + container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer);
> +
> + return iommufd_backend_map_dma(container->be,
> + container->ioas_id,
> + iova, size, vaddr, readonly);
> +}
> +
> +static int iommufd_unmap(VFIOContainer *bcontainer,
> + hwaddr iova, ram_addr_t size,
> + IOMMUTLBEntry *iotlb)
> +{
> + VFIOIOMMUFDContainer *container =
> + container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer);
> +
> + /* TODO: Handle dma_unmap_bitmap with iotlb args (migration) */
> + return iommufd_backend_unmap_dma(container->be,
> + container->ioas_id, iova, size);
> +}
> +
> +static int vfio_get_devicefd(const char *sysfs_path, Error **errp)
> +{
> + long int ret = -ENOTTY;
> + char *path, *vfio_dev_path = NULL, *vfio_path = NULL;
> + DIR *dir = NULL;
> + struct dirent *dent;
> + gchar *contents;
> + struct stat st;
> + gsize length;
> + int major, minor;
> + dev_t vfio_devt;
> +
> + path = g_strdup_printf("%s/vfio-dev", sysfs_path);
> + if (stat(path, &st) < 0) {
> + error_setg_errno(errp, errno, "no such host device");
> + goto out_free_path;
> + }
> +
> + dir = opendir(path);
> + if (!dir) {
> + error_setg_errno(errp, errno, "couldn't open dirrectory %s", path);
> + goto out_free_path;
> + }
> +
> + while ((dent = readdir(dir))) {
> + if (!strncmp(dent->d_name, "vfio", 4)) {
> + vfio_dev_path = g_strdup_printf("%s/%s/dev", path, dent->d_name);
> + break;
> + }
> + }
> +
> + if (!vfio_dev_path) {
> + error_setg(errp, "failed to find vfio-dev/vfioX/dev");
> + goto out_free_path;
> + }
> +
> + if (!g_file_get_contents(vfio_dev_path, &contents, &length, NULL)) {
> + error_setg(errp, "failed to load \"%s\"", vfio_dev_path);
> + goto out_free_dev_path;
> + }
> +
> + if (sscanf(contents, "%d:%d", &major, &minor) != 2) {
> + error_setg(errp, "failed to get major:mino for \"%s\"",
> vfio_dev_path);
Very small nit: Should be "minor" here.
> + goto out_free_dev_path;
> + }
> + g_free(contents);
> + vfio_devt = makedev(major, minor);
> +
> + vfio_path = g_strdup_printf("/dev/vfio/devices/%s", dent->d_name);
> + ret = open_cdev(vfio_path, vfio_devt);
> + if (ret < 0) {
> + error_setg(errp, "Failed to open %s", vfio_path);
> + }
> +
> + trace_vfio_iommufd_get_devicefd(vfio_path, ret);
> + g_free(vfio_path);
> +
> +out_free_dev_path:
> + g_free(vfio_dev_path);
> + closedir(dir);
> +out_free_path:
> + if (*errp) {
> + error_prepend(errp, VFIO_MSG_PREFIX, path);
> + }
> + g_free(path);
> +
> + return ret;
> +}
> +
> +static VFIOIOASHwpt *vfio_container_get_hwpt(VFIOIOMMUFDContainer *container,
> + uint32_t hwpt_id)
> +{
> + VFIOIOASHwpt *hwpt;
> +
> + QLIST_FOREACH(hwpt, &container->hwpt_list, next) {
> + if (hwpt->hwpt_id == hwpt_id) {
> + return hwpt;
> + }
> + }
> +
> + hwpt = g_malloc0(sizeof(*hwpt));
> +
> + hwpt->hwpt_id = hwpt_id;
> + QLIST_INIT(&hwpt->device_list);
> + QLIST_INSERT_HEAD(&container->hwpt_list, hwpt, next);
> +
> + return hwpt;
> +}
> +
> +static void vfio_container_put_hwpt(VFIOIOASHwpt *hwpt)
> +{
> + if (!QLIST_EMPTY(&hwpt->device_list)) {
> + g_assert_not_reached();
> + }
> + QLIST_REMOVE(hwpt, next);
> + g_free(hwpt);
> +}
> +
> +static VFIOIOASHwpt *vfio_find_hwpt_for_dev(VFIOIOMMUFDContainer *container,
> + VFIODevice *vbasedev)
> +{
> + VFIOIOASHwpt *hwpt;
> + VFIODevice *vbasedev_iter;
> +
> + QLIST_FOREACH(hwpt, &container->hwpt_list, next) {
> + QLIST_FOREACH(vbasedev_iter, &hwpt->device_list, next) {
> + if (vbasedev_iter == vbasedev) {
> + return hwpt;
> + }
> + }
> + }
> + return NULL;
> +}
> +
> +static void vfio_kvm_device_add_device(VFIODevice *vbasedev)
> +{
> + if (vfio_kvm_device_add_fd(vbasedev->fd)) {
> + error_report("Failed to add device %s to KVM VFIO device",
> + vbasedev->name);
> + }
> +}
> +
> +static void vfio_kvm_device_del_device(VFIODevice *vbasedev)
> +{
> + if (vfio_kvm_device_del_fd(vbasedev->fd)) {
> + error_report("Failed to del device %s from KVM VFIO device",
> + vbasedev->name);
> + }
> +}
> +
> +static void
> +__vfio_device_detach_container(VFIODevice *vbasedev,
> + VFIOIOMMUFDContainer *container, Error **errp)
> +{
> + struct vfio_device_attach_iommufd_pt detach_data = {
> + .argsz = sizeof(detach_data),
> + .flags = 0,
> + };
> +
> + if (ioctl(vbasedev->fd, VFIO_DEVICE_DETACH_IOMMUFD_PT, &detach_data)) {
> + error_setg_errno(errp, errno, "detach %s from ioas id=%d failed",
> + vbasedev->name, container->ioas_id);
> + }
> + trace_vfio_iommufd_detach_device(container->be->fd, vbasedev->name,
> + container->ioas_id);
> + vfio_kvm_device_del_device(vbasedev);
> +
> + /* iommufd unbind is done per device fd close */
> +}
> +
> +static void vfio_device_detach_container(VFIODevice *vbasedev,
> + VFIOIOMMUFDContainer *container,
> + Error **errp)
> +{
> + VFIOIOASHwpt *hwpt;
> +
> + hwpt = vfio_find_hwpt_for_dev(container, vbasedev);
> + if (hwpt) {
> + QLIST_REMOVE(vbasedev, next);
> + if (QLIST_EMPTY(&hwpt->device_list)) {
> + vfio_container_put_hwpt(hwpt);
> + }
> + }
> +
> + __vfio_device_detach_container(vbasedev, container, errp);
> +}
> +
> +static int vfio_device_attach_container(VFIODevice *vbasedev,
> + VFIOIOMMUFDContainer *container,
> + Error **errp)
> +{
> + struct vfio_device_bind_iommufd bind = {
> + .argsz = sizeof(bind),
> + .flags = 0,
> + .iommufd = container->be->fd,
> + };
> + struct vfio_device_attach_iommufd_pt attach_data = {
> + .argsz = sizeof(attach_data),
> + .flags = 0,
> + .pt_id = container->ioas_id,
> + };
> + VFIOIOASHwpt *hwpt;
> + int ret;
> +
> + /*
> + * Add device to kvm-vfio to be prepared for the tracking
> + * in KVM. Especially for some emulated devices, it requires
> + * to have kvm information in the device open.
> + */
> + vfio_kvm_device_add_device(vbasedev);
> +
> + /* Bind device to iommufd */
> + ret = ioctl(vbasedev->fd, VFIO_DEVICE_BIND_IOMMUFD, &bind);
> + if (ret) {
> + vfio_kvm_device_del_device(vbasedev);
> + error_setg_errno(errp, errno, "error bind device fd=%d to
> iommufd=%d",
> + vbasedev->fd, bind.iommufd);
> + return ret;
> + }
> +
> + vbasedev->devid = bind.out_devid;
> + trace_vfio_iommufd_bind_device(bind.iommufd, vbasedev->name,
> + vbasedev->fd, vbasedev->devid);
> +
> + /* Attach device to an ioas within iommufd */
> + ret = ioctl(vbasedev->fd, VFIO_DEVICE_ATTACH_IOMMUFD_PT, &attach_data);
> + if (ret) {
> + vfio_kvm_device_del_device(vbasedev);
> + error_setg_errno(errp, errno,
> + "[iommufd=%d] error attach %s (%d) to ioasid=%d",
> + container->be->fd, vbasedev->name, vbasedev->fd,
> + attach_data.pt_id);
> + return ret;
> +
> + }
> + trace_vfio_iommufd_attach_device(bind.iommufd, vbasedev->name,
> + vbasedev->fd, container->ioas_id,
> + attach_data.pt_id);
> +
> + hwpt = vfio_container_get_hwpt(container, attach_data.pt_id);
> +
> + QLIST_INSERT_HEAD(&hwpt->device_list, vbasedev, next);
> + return 0;
> +}
> +
> +static void vfio_iommufd_container_destroy(VFIOIOMMUFDContainer *container)
> +{
> + vfio_container_destroy(&container->bcontainer);
> + g_free(container);
> +}
> +
> +static int vfio_ram_block_discard_disable(bool state)
> +{
> + /*
> + * We support coordinated discarding of RAM via the RamDiscardManager.
> + */
> + return ram_block_uncoordinated_discard_disable(state);
> +}
> +
> +static void iommufd_detach_device(VFIODevice *vbasedev);
> +
> +static int iommufd_attach_device(char *name, VFIODevice *vbasedev,
> + AddressSpace *as, Error **errp)
> +{
> + VFIOIOMMUBackendOpsClass *ops = VFIO_IOMMU_BACKEND_OPS_CLASS(
> + object_class_by_name(TYPE_VFIO_IOMMU_BACKEND_IOMMUFD_OPS));
> + VFIOContainer *bcontainer;
> + VFIOIOMMUFDContainer *container;
> + VFIOAddressSpace *space;
> + struct vfio_device_info dev_info = { .argsz = sizeof(dev_info) };
> + int ret, devfd;
> + uint32_t ioas_id;
> + Error *err = NULL;
> +
> + devfd = vfio_get_devicefd(vbasedev->sysfsdev, errp);
> + if (devfd < 0) {
> + return devfd;
> + }
> + vbasedev->fd = devfd;
> +
> + space = vfio_get_address_space(as);
> +
> + /* try to attach to an existing container in this space */
> + QLIST_FOREACH(bcontainer, &space->containers, next) {
> + if (bcontainer->ops != ops) {
> + continue;
> + }
> + container = container_of(bcontainer, VFIOIOMMUFDContainer,
> bcontainer);
> + if (vfio_device_attach_container(vbasedev, container, &err)) {
> + const char *msg = error_get_pretty(err);
> +
> + trace_vfio_iommufd_fail_attach_existing_container(msg);
> + error_free(err);
> + err = NULL;
> + } else {
> + ret = vfio_ram_block_discard_disable(true);
> + if (ret) {
> + vfio_device_detach_container(vbasedev, container, &err);
> + error_propagate(errp, err);
> + vfio_put_address_space(space);
> + close(vbasedev->fd);
> + error_prepend(errp,
> + "Cannot set discarding of RAM broken (%d)",
> ret);
> + return ret;
> + }
> + goto out;
> + }
> + }
> +
> + /* Need to allocate a new dedicated container */
> + ret = iommufd_backend_get_ioas(vbasedev->iommufd, &ioas_id);
> + if (ret < 0) {
> + vfio_put_address_space(space);
> + close(vbasedev->fd);
> + error_report("Failed to alloc ioas (%s)", strerror(errno));
> + return ret;
> + }
> +
> + trace_vfio_iommufd_alloc_ioas(vbasedev->iommufd->fd, ioas_id);
> +
> + container = g_malloc0(sizeof(*container));
> + container->be = vbasedev->iommufd;
> + container->ioas_id = ioas_id;
> + QLIST_INIT(&container->hwpt_list);
> +
> + bcontainer = &container->bcontainer;
> + vfio_container_init(bcontainer, space, ops);
> +
> + ret = vfio_device_attach_container(vbasedev, container, &err);
> + if (ret) {
> + /* todo check if any other thing to do */
> + error_propagate(errp, err);
> + vfio_iommufd_container_destroy(container);
> + iommufd_backend_put_ioas(vbasedev->iommufd, ioas_id);
> + vfio_put_address_space(space);
> + close(vbasedev->fd);
> + return ret;
> + }
> +
> + ret = vfio_ram_block_discard_disable(true);
> + if (ret) {
> + goto error;
> + }
> +
> + /*
> + * TODO: for now iommufd BE is on par with vfio iommu type1, so it's
> + * fine to add the whole range as window. For SPAPR, below code
> + * should be updated.
> + */
> + vfio_host_win_add(bcontainer, 0, (hwaddr)-1, 4096);
> + bcontainer->pgsizes = 4096;
> +
> + QLIST_INSERT_HEAD(&space->containers, bcontainer, next);
> +
> + bcontainer->listener = vfio_memory_listener;
> +
> + memory_listener_register(&bcontainer->listener, bcontainer->space->as);
> +
> + bcontainer->initialized = true;
> +
> +out:
> + vbasedev->container = bcontainer;
> +
> + /*
> + * TODO: examine RAM_BLOCK_DISCARD stuff, should we do group level
> + * for discarding incompatibility check as well?
> + */
> + if (vbasedev->ram_block_discard_allowed) {
> + vfio_ram_block_discard_disable(false);
> + }
> +
> + ret = ioctl(devfd, VFIO_DEVICE_GET_INFO, &dev_info);
> + if (ret) {
> + error_setg_errno(errp, errno, "error getting device info");
> + memory_listener_unregister(&bcontainer->listener);
> + QLIST_SAFE_REMOVE(bcontainer, next);
> + goto error;
> + }
> +
> + vbasedev->group = 0;
> + vbasedev->num_irqs = dev_info.num_irqs;
> + vbasedev->num_regions = dev_info.num_regions;
> + vbasedev->flags = dev_info.flags;
> + vbasedev->reset_works = !!(dev_info.flags & VFIO_DEVICE_FLAGS_RESET);
> +
> + trace_vfio_iommufd_device_info(vbasedev->name, devfd, vbasedev->num_irqs,
> + vbasedev->num_regions, vbasedev->flags);
> + return 0;
> +error:
> + vfio_device_detach_container(vbasedev, container, &err);
> + error_propagate(errp, err);
> + vfio_iommufd_container_destroy(container);
> + iommufd_backend_put_ioas(vbasedev->iommufd, ioas_id);
> + vfio_put_address_space(space);
> + close(vbasedev->fd);
> + return ret;
> +}
> +
> +static void iommufd_detach_device(VFIODevice *vbasedev)
> +{
> + VFIOContainer *bcontainer = vbasedev->container;
> + VFIOIOMMUFDContainer *container;
> + VFIODevice *vbasedev_iter;
> + VFIOIOASHwpt *hwpt;
> + Error *err = NULL;
> +
> + if (!bcontainer) {
> + goto out;
> + }
> +
> + if (!vbasedev->ram_block_discard_allowed) {
> + vfio_ram_block_discard_disable(false);
> + }
> +
> + container = container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer);
> + QLIST_FOREACH(hwpt, &container->hwpt_list, next) {
> + QLIST_FOREACH(vbasedev_iter, &hwpt->device_list, next) {
> + if (vbasedev_iter == vbasedev) {
> + goto found;
> + }
> + }
> + }
> + g_assert_not_reached();
> +found:
> + QLIST_REMOVE(vbasedev, next);
> + if (QLIST_EMPTY(&hwpt->device_list)) {
> + vfio_container_put_hwpt(hwpt);
> + }
> +
> + __vfio_device_detach_container(vbasedev, container, &err);
> + if (err) {
> + error_report_err(err);
> + }
> + if (QLIST_EMPTY(&container->hwpt_list)) {
> + VFIOAddressSpace *space = bcontainer->space;
> +
> + memory_listener_unregister(&bcontainer->listener);
> + iommufd_backend_put_ioas(container->be, container->ioas_id);
> + vfio_iommufd_container_destroy(container);
> + vfio_put_address_space(space);
> + }
> + vbasedev->container = NULL;
> +out:
> + close(vbasedev->fd);
> + g_free(vbasedev->name);
> +}
> +
> +static void vfio_iommu_backend_iommufd_ops_class_init(ObjectClass *oc,
> + void *data) {
> + VFIOIOMMUBackendOpsClass *ops = VFIO_IOMMU_BACKEND_OPS_CLASS(oc);
> +
> + ops->dma_map = iommufd_map;
> + ops->dma_unmap = iommufd_unmap;
> + ops->attach_device = iommufd_attach_device;
> + ops->detach_device = iommufd_detach_device;
> +}
> +
> +static const TypeInfo vfio_iommu_backend_iommufd_ops_type = {
> + .name = TYPE_VFIO_IOMMU_BACKEND_IOMMUFD_OPS,
> +
> + .parent = TYPE_VFIO_IOMMU_BACKEND_OPS,
> + .class_init = vfio_iommu_backend_iommufd_ops_class_init,
> + .abstract = true,
> +};
> +static void vfio_iommu_backend_iommufd_ops_register_types(void)
> +{
> + type_register_static(&vfio_iommu_backend_iommufd_ops_type);
> +}
> +type_init(vfio_iommu_backend_iommufd_ops_register_types);
> +
> diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build
> index fd0dfd198a..326ff35749 100644
> --- a/hw/vfio/meson.build
> +++ b/hw/vfio/meson.build
> @@ -7,6 +7,9 @@ vfio_ss.add(files(
> 'spapr.c',
> 'migration.c',
> ))
> +if have_iommufd
> + vfio_ss.add(files('iommufd.c'))
> +endif
> vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files(
> 'display.c',
> 'pci-quirks.c',
> diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
> index 3f1a7e1c3e..4412c510e4 100644
> --- a/hw/vfio/trace-events
> +++ b/hw/vfio/trace-events
> @@ -167,3 +167,14 @@ vfio_save_setup(const char *name, uint64_t
> data_buffer_size) " (%s) data buffer
> vfio_state_pending_estimate(const char *name, uint64_t precopy, uint64_t
> postcopy, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s)
> precopy 0x%"PRIx64" postcopy 0x%"PRIx64" precopy initial size 0x%"PRIx64"
> precopy dirty size 0x%"PRIx64
> vfio_state_pending_exact(const char *name, uint64_t precopy, uint64_t
> postcopy, uint64_t stopcopy_size, uint64_t precopy_init_size, uint64_t
> precopy_dirty_size) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64" stopcopy
> size 0x%"PRIx64" precopy initial size 0x%"PRIx64" precopy dirty size
> 0x%"PRIx64
> vfio_vmstate_change(const char *name, int running, const char *reason, const
> char *dev_state) " (%s) running %d reason %s device state %s"
> +
> +#iommufd.c
> +
> +vfio_iommufd_get_devicefd(const char *dev, int devfd) " %s (fd=%d)"
> +vfio_iommufd_bind_device(int iommufd, const char *name, int devfd, int
> devid) " [iommufd=%d] Succesfully bound device %s (fd=%d): output devid=%d"
> +vfio_iommufd_attach_device(int iommufd, const char *name, int devfd, int
> ioasid, int hwptid) " [iommufd=%d] Succesfully attached device %s (%d) to
> ioasid=%d: output hwptd=%d"
> +vfio_iommufd_detach_device(int iommufd, const char *name, int ioasid) "
> [iommufd=%d] Detached %s from ioasid=%d"
> +vfio_iommufd_alloc_ioas(int iommufd, int ioas_id) " [iommufd=%d] new IOMMUFD
> container with ioasid=%d"
> +vfio_iommufd_device_info(char *name, int devfd, int num_irqs, int
> num_regions, int flags) " %s (%d) num_irqs=%d num_regions=%d flags=%d"
> +vfio_iommufd_fail_attach_existing_container(const char *msg) " %s"
> +vfio_iommufd_container_reset(char *name) " Successfully reset %s"
> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
> index 81a87d88b6..6434a442fd 100644
> --- a/include/hw/vfio/vfio-common.h
> +++ b/include/hw/vfio/vfio-common.h
> @@ -85,6 +85,26 @@ typedef struct VFIOLegacyContainer {
> QLIST_HEAD(, VFIOGroup) group_list;
> } VFIOLegacyContainer;
>
> +#ifdef CONFIG_IOMMUFD
> +typedef struct VFIOIOASHwpt {
> + uint32_t hwpt_id;
> + QLIST_HEAD(, VFIODevice) device_list;
> + QLIST_ENTRY(VFIOIOASHwpt) next;
> +} VFIOIOASHwpt;
> +
> +typedef struct IOMMUFDBackend IOMMUFDBackend;
> +
> +typedef struct VFIOIOMMUFDContainer {
> + VFIOContainer bcontainer;
> + IOMMUFDBackend *be;
> + uint32_t ioas_id;
> + QLIST_HEAD(, VFIOIOASHwpt) hwpt_list;
> +} VFIOIOMMUFDContainer;
> +#endif
> +
> +typedef QLIST_HEAD(VFIOAddressSpaceList, VFIOAddressSpace)
> VFIOAddressSpaceList;
> +extern VFIOAddressSpaceList vfio_address_spaces;
> +
> typedef struct VFIODeviceOps VFIODeviceOps;
>
> typedef struct VFIODevice {
> @@ -110,6 +130,10 @@ typedef struct VFIODevice {
> OnOffAuto pre_copy_dirty_page_tracking;
> bool dirty_pages_supported;
> bool dirty_tracking;
> +#ifdef CONFIG_IOMMUFD
> + int devid;
> + IOMMUFDBackend *iommufd;
> +#endif
> } VFIODevice;
>
> struct VFIODeviceOps {
> diff --git a/include/hw/vfio/vfio-container-base.h
> b/include/hw/vfio/vfio-container-base.h
> index b18fa92146..51aff4af05 100644
> --- a/include/hw/vfio/vfio-container-base.h
> +++ b/include/hw/vfio/vfio-container-base.h
> @@ -117,6 +117,9 @@ void vfio_container_init(VFIOContainer *container,
> void vfio_container_destroy(VFIOContainer *container);
>
> #define TYPE_VFIO_IOMMU_BACKEND_LEGACY_OPS "vfio-iommu-backend-legacy-ops"
> +#ifdef CONFIG_IOMMUFD
> +#define TYPE_VFIO_IOMMU_BACKEND_IOMMUFD_OPS "vfio-iommu-backend-iommufd-ops"
> +#endif
> #define TYPE_VFIO_IOMMU_BACKEND_OPS "vfio-iommu-backend-ops"
>
> DECLARE_CLASS_CHECKERS(VFIOIOMMUBackendOpsClass,
> --
> 2.34.1
>
>
--
Joel Granados
signature.asc
Description: PGP signature
