qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: Alex Williamson <alex.williamson@redhat.com>,
	Eric Auger <eric.auger@redhat.com>,
	Zhenzhong Duan <zhenzhong.duan@intel.com>,
	"Michael S . Tsirkin" <mst@redhat.com>
Subject: [PULL 19/42] virtio-iommu: Implement set|unset]_iommu_device() callbacks
Date: Mon, 24 Jun 2024 23:24:33 +0200	[thread overview]
Message-ID: <20240624212456.350919-20-clg@redhat.com> (raw)
In-Reply-To: <20240624212456.350919-1-clg@redhat.com>

From: Eric Auger <eric.auger@redhat.com>

Implement PCIIOMMUOPs [set|unset]_iommu_device() callbacks.
In set(), the HostIOMMUDevice handle is stored in a hash
table indexed by PCI BDF. The object will allow to retrieve
information related to the physical IOMMU.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/hw/virtio/virtio-iommu.h |  2 +
 hw/virtio/virtio-iommu.c         | 82 ++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/include/hw/virtio/virtio-iommu.h b/include/hw/virtio/virtio-iommu.h
index 83a52cc446d30443b8c89170e35829047bc24866..bdb3da72d0854272b01736ccc07af0a26009d23c 100644
--- a/include/hw/virtio/virtio-iommu.h
+++ b/include/hw/virtio/virtio-iommu.h
@@ -25,6 +25,7 @@
 #include "hw/pci/pci.h"
 #include "qom/object.h"
 #include "qapi/qapi-types-virtio.h"
+#include "sysemu/host_iommu_device.h"
 
 #define TYPE_VIRTIO_IOMMU "virtio-iommu-device"
 #define TYPE_VIRTIO_IOMMU_PCI "virtio-iommu-pci"
@@ -57,6 +58,7 @@ struct VirtIOIOMMU {
     struct virtio_iommu_config config;
     uint64_t features;
     GHashTable *as_by_busptr;
+    GHashTable *host_iommu_devices;
     IOMMUPciBus *iommu_pcibus_by_bus_num[PCI_BUS_MAX];
     PCIBus *primary_bus;
     ReservedRegion *prop_resv_regions;
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 1326c6ec417c33ab5d8fdf22608dcab735f463c4..16c8ec3ca460a6d70e83b28787398f94dd16cc99 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -69,6 +69,11 @@ typedef struct VirtIOIOMMUMapping {
     uint32_t flags;
 } VirtIOIOMMUMapping;
 
+struct hiod_key {
+    PCIBus *bus;
+    uint8_t devfn;
+};
+
 static inline uint16_t virtio_iommu_get_bdf(IOMMUDevice *dev)
 {
     return PCI_BUILD_BDF(pci_bus_num(dev->bus), dev->devfn);
@@ -462,8 +467,82 @@ static AddressSpace *virtio_iommu_find_add_as(PCIBus *bus, void *opaque,
     return &sdev->as;
 }
 
+static gboolean hiod_equal(gconstpointer v1, gconstpointer v2)
+{
+    const struct hiod_key *key1 = v1;
+    const struct hiod_key *key2 = v2;
+
+    return (key1->bus == key2->bus) && (key1->devfn == key2->devfn);
+}
+
+static guint hiod_hash(gconstpointer v)
+{
+    const struct hiod_key *key = v;
+    guint value = (guint)(uintptr_t)key->bus;
+
+    return (guint)(value << 8 | key->devfn);
+}
+
+static void hiod_destroy(gpointer v)
+{
+    object_unref(v);
+}
+
+static HostIOMMUDevice *
+get_host_iommu_device(VirtIOIOMMU *viommu, PCIBus *bus, int devfn) {
+    struct hiod_key key = {
+        .bus = bus,
+        .devfn = devfn,
+    };
+
+    return g_hash_table_lookup(viommu->host_iommu_devices, &key);
+}
+
+static bool virtio_iommu_set_iommu_device(PCIBus *bus, void *opaque, int devfn,
+                                          HostIOMMUDevice *hiod, Error **errp)
+{
+    VirtIOIOMMU *viommu = opaque;
+    struct hiod_key *new_key;
+
+    assert(hiod);
+
+    if (get_host_iommu_device(viommu, bus, devfn)) {
+        error_setg(errp, "Host IOMMU device already exists");
+        return false;
+    }
+
+    new_key = g_malloc(sizeof(*new_key));
+    new_key->bus = bus;
+    new_key->devfn = devfn;
+
+    object_ref(hiod);
+    g_hash_table_insert(viommu->host_iommu_devices, new_key, hiod);
+
+    return true;
+}
+
+static void
+virtio_iommu_unset_iommu_device(PCIBus *bus, void *opaque, int devfn)
+{
+    VirtIOIOMMU *viommu = opaque;
+    HostIOMMUDevice *hiod;
+    struct hiod_key key = {
+        .bus = bus,
+        .devfn = devfn,
+    };
+
+    hiod = g_hash_table_lookup(viommu->host_iommu_devices, &key);
+    if (!hiod) {
+        return;
+    }
+
+    g_hash_table_remove(viommu->host_iommu_devices, &key);
+}
+
 static const PCIIOMMUOps virtio_iommu_ops = {
     .get_address_space = virtio_iommu_find_add_as,
+    .set_iommu_device = virtio_iommu_set_iommu_device,
+    .unset_iommu_device = virtio_iommu_unset_iommu_device,
 };
 
 static int virtio_iommu_attach(VirtIOIOMMU *s,
@@ -1357,6 +1436,9 @@ static void virtio_iommu_device_realize(DeviceState *dev, Error **errp)
 
     s->as_by_busptr = g_hash_table_new_full(NULL, NULL, NULL, g_free);
 
+    s->host_iommu_devices = g_hash_table_new_full(hiod_hash, hiod_equal,
+                                                  g_free, hiod_destroy);
+
     if (s->primary_bus) {
         pci_setup_iommu(s->primary_bus, &virtio_iommu_ops, s);
     } else {
-- 
2.45.2



  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 ` [PULL 06/42] vfio/container: Implement HostIOMMUDeviceClass::realize() handler Cédric Le Goater
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 ` Cédric Le Goater [this message]
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-20-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).