From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: Alex Williamson <alex.williamson@redhat.com>,
Zhenzhong Duan <zhenzhong.duan@intel.com>,
Eric Auger <eric.auger@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Subject: [PULL 06/42] vfio/container: Implement HostIOMMUDeviceClass::realize() handler
Date: Mon, 24 Jun 2024 23:24:20 +0200 [thread overview]
Message-ID: <20240624212456.350919-7-clg@redhat.com> (raw)
In-Reply-To: <20240624212456.350919-1-clg@redhat.com>
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
The realize function populates the capabilities. For now only the
aw_bits caps is computed for legacy backend.
Introduce a helper function vfio_device_get_aw_bits() which calls
range_get_last_bit() to get host aw_bits and package it in
HostIOMMUDeviceCaps for query with .get_cap(). This helper will
also be used by iommufd backend.
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/vfio/vfio-common.h | 1 +
hw/vfio/container.c | 19 +++++++++++++++++++
hw/vfio/helpers.c | 17 +++++++++++++++++
3 files changed, 37 insertions(+)
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 56d171721164991b408073488330bf1d79104970..105b8b7e804d3de43868d447e21eb9bedc50808f 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -289,4 +289,5 @@ bool vfio_device_get_name(VFIODevice *vbasedev, Error **errp);
void vfio_device_set_fd(VFIODevice *vbasedev, const char *str, Error **errp);
void vfio_device_init(VFIODevice *vbasedev, int type, VFIODeviceOps *ops,
DeviceState *dev, bool ram_discard);
+int vfio_device_get_aw_bits(VFIODevice *vdev);
#endif /* HW_VFIO_VFIO_COMMON_H */
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index c4fca2dfcab32781fb301181a1ef67238015a76f..2f62c13214412618b412240b61efcbe1b1c79ed5 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -1136,6 +1136,24 @@ static void vfio_iommu_legacy_class_init(ObjectClass *klass, void *data)
vioc->pci_hot_reset = vfio_legacy_pci_hot_reset;
};
+static bool hiod_legacy_vfio_realize(HostIOMMUDevice *hiod, void *opaque,
+ Error **errp)
+{
+ VFIODevice *vdev = opaque;
+
+ hiod->name = g_strdup(vdev->name);
+ hiod->caps.aw_bits = vfio_device_get_aw_bits(vdev);
+
+ return true;
+}
+
+static void hiod_legacy_vfio_class_init(ObjectClass *oc, void *data)
+{
+ HostIOMMUDeviceClass *hioc = HOST_IOMMU_DEVICE_CLASS(oc);
+
+ hioc->realize = hiod_legacy_vfio_realize;
+};
+
static const TypeInfo types[] = {
{
.name = TYPE_VFIO_IOMMU_LEGACY,
@@ -1144,6 +1162,7 @@ static const TypeInfo types[] = {
}, {
.name = TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO,
.parent = TYPE_HOST_IOMMU_DEVICE,
+ .class_init = hiod_legacy_vfio_class_init,
}
};
diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c
index 27ea26aa48f67e6518f871ac651ab8d2703cc611..b14edd46edc9069bb148359a1b419253ff4e5ef0 100644
--- a/hw/vfio/helpers.c
+++ b/hw/vfio/helpers.c
@@ -658,3 +658,20 @@ void vfio_device_init(VFIODevice *vbasedev, int type, VFIODeviceOps *ops,
vbasedev->ram_block_discard_allowed = ram_discard;
}
+
+int vfio_device_get_aw_bits(VFIODevice *vdev)
+{
+ /*
+ * iova_ranges is a sorted list. For old kernels that support
+ * VFIO but not support query of iova ranges, iova_ranges is NULL,
+ * in this case HOST_IOMMU_DEVICE_CAP_AW_BITS_MAX(64) is returned.
+ */
+ GList *l = g_list_last(vdev->bcontainer->iova_ranges);
+
+ if (l) {
+ Range *range = l->data;
+ return range_get_last_bit(range) + 1;
+ }
+
+ return HOST_IOMMU_DEVICE_CAP_AW_BITS_MAX;
+}
--
2.45.2
next prev parent reply other threads:[~2024-06-24 21:26 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-24 21:24 [PULL 00/42] vfio queue Cédric Le Goater
2024-06-24 21:24 ` [PULL 01/42] backends: Introduce HostIOMMUDevice abstract Cédric Le Goater
2024-06-24 21:24 ` [PULL 02/42] backends/host_iommu_device: Introduce HostIOMMUDeviceCaps Cédric Le Goater
2024-06-24 21:24 ` [PULL 03/42] vfio/container: Introduce TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO device Cédric Le Goater
2024-06-24 21:24 ` [PULL 04/42] backends/iommufd: Introduce TYPE_HOST_IOMMU_DEVICE_IOMMUFD[_VFIO] devices Cédric Le Goater
2024-06-24 21:24 ` [PULL 05/42] range: Introduce range_get_last_bit() Cédric Le Goater
2024-06-24 21:24 ` Cédric Le Goater [this message]
2024-06-24 21:24 ` [PULL 07/42] backends/iommufd: Introduce helper function iommufd_backend_get_device_info() Cédric Le Goater
2024-06-24 21:24 ` [PULL 08/42] vfio/iommufd: Implement HostIOMMUDeviceClass::realize() handler Cédric Le Goater
2024-06-24 21:24 ` [PULL 09/42] vfio/container: Implement HostIOMMUDeviceClass::get_cap() handler Cédric Le Goater
2024-06-24 21:24 ` [PULL 10/42] backends/iommufd: " Cédric Le Goater
2024-06-24 21:24 ` [PULL 11/42] vfio: Create host IOMMU device instance Cédric Le Goater
2024-06-24 21:24 ` [PULL 12/42] hw/pci: Introduce helper function pci_device_get_iommu_bus_devfn() Cédric Le Goater
2024-06-24 21:24 ` [PULL 13/42] hw/pci: Introduce pci_device_[set|unset]_iommu_device() Cédric Le Goater
2024-06-24 21:24 ` [PULL 14/42] vfio/pci: Pass HostIOMMUDevice to vIOMMU Cédric Le Goater
2024-06-24 21:24 ` [PULL 15/42] intel_iommu: Extract out vtd_cap_init() to initialize cap/ecap Cédric Le Goater
2024-06-24 21:24 ` [PULL 16/42] intel_iommu: Implement [set|unset]_iommu_device() callbacks Cédric Le Goater
2024-06-24 21:24 ` [PULL 17/42] intel_iommu: Check compatibility with host IOMMU capabilities Cédric Le Goater
2024-06-24 21:24 ` [PULL 18/42] HostIOMMUDevice: Store the VFIO/VDPA agent Cédric Le Goater
2024-06-24 21:24 ` [PULL 19/42] virtio-iommu: Implement set|unset]_iommu_device() callbacks Cédric Le Goater
2024-06-24 21:24 ` [PULL 20/42] HostIOMMUDevice: Introduce get_iova_ranges callback Cédric Le Goater
2024-06-24 21:24 ` [PULL 21/42] HostIOMMUDevice: Store the aliased bus and devfn Cédric Le Goater
2024-06-24 21:24 ` [PULL 22/42] virtio-iommu: Compute host reserved regions Cédric Le Goater
2024-06-24 21:24 ` [PULL 23/42] virtio-iommu: Remove the implementation of iommu_set_iova_range Cédric Le Goater
2024-06-24 21:24 ` [PULL 24/42] hw/vfio: Remove memory_region_iommu_set_iova_ranges() call Cédric Le Goater
2024-06-24 21:24 ` [PULL 25/42] memory: Remove IOMMU MR iommu_set_iova_range API Cédric Le Goater
2024-06-24 21:24 ` [PULL 26/42] vfio: Make vfio_devices_dma_logging_start() return bool Cédric Le Goater
2024-06-24 21:24 ` [PULL 27/42] vfio: Remove unused declarations from vfio-common.h Cédric Le Goater
2024-06-24 21:24 ` [PULL 28/42] vfio/common: Move dirty tracking ranges update to helper Cédric Le Goater
2024-06-24 21:24 ` [PULL 29/42] vfio/common: Extract vIOMMU code from vfio_sync_dirty_bitmap() Cédric Le Goater
2024-06-24 21:24 ` [PULL 30/42] vfio/container: Introduce vfio_address_space_insert() Cédric Le Goater
2024-06-24 21:24 ` [PULL 31/42] vfio/container: Simplify vfio_container_init() Cédric Le Goater
2024-06-24 21:24 ` [PULL 32/42] vfio/container: Modify vfio_get_iommu_type() to use a container fd Cédric Le Goater
2024-06-24 21:24 ` [PULL 33/42] vfio/container: Introduce vfio_get_iommu_class_name() Cédric Le Goater
2024-06-24 21:24 ` [PULL 34/42] vfio/container: Introduce vfio_create_container() Cédric Le Goater
2024-06-24 21:24 ` [PULL 35/42] vfio/container: Discover IOMMU type before creating the container Cédric Le Goater
2024-06-24 21:24 ` [PULL 36/42] vfio/container: Change VFIOContainerBase to use QOM Cédric Le Goater
2024-06-24 21:24 ` [PULL 37/42] vfio/container: Switch to QOM Cédric Le Goater
2024-06-24 21:24 ` [PULL 38/42] vfio/container: Introduce an instance_init() handler Cédric Le Goater
2024-06-24 21:24 ` [PULL 39/42] vfio/container: Remove VFIOContainerBase::ops Cédric Le Goater
2024-06-24 21:24 ` [PULL 40/42] vfio/container: Remove vfio_container_init() Cédric Le Goater
2024-06-24 21:24 ` [PULL 41/42] vfio/container: Introduce vfio_iommu_legacy_instance_init() Cédric Le Goater
2024-06-24 21:24 ` [PULL 42/42] vfio/container: Move vfio_container_destroy() to an instance_finalize() handler Cédric Le Goater
2024-06-25 17:25 ` [PULL 00/42] vfio queue Richard Henderson
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=20240624212456.350919-7-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=eric.auger@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhenzhong.duan@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).