[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RFC v5 10/22] virtio-iommu: Implement attach/detach command
From: |
Eric Auger |
Subject: |
[Qemu-arm] [RFC v5 10/22] virtio-iommu: Implement attach/detach command |
Date: |
Fri, 19 Jan 2018 14:49:03 +0000 |
This patch implements the endpoint attach/detach to/from
a domain.
Signed-off-by: Eric Auger <address@hidden>
---
hw/virtio/virtio-iommu.c | 39 +++++++++++++++++++++++++++++++++------
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index cca2614..b30d761 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -113,8 +113,8 @@ static void virtio_iommu_put_endpoint(gpointer data)
g_free(ep);
}
-viommu_domain *virtio_iommu_get_domain(VirtIOIOMMU *s, uint32_t domain_id);
-viommu_domain *virtio_iommu_get_domain(VirtIOIOMMU *s, uint32_t domain_id)
+static viommu_domain *virtio_iommu_get_domain(VirtIOIOMMU *s,
+ uint32_t domain_id)
{
viommu_domain *domain;
@@ -193,6 +193,8 @@ static int virtio_iommu_attach(VirtIOIOMMU *s,
uint32_t domain_id = le32_to_cpu(req->domain);
uint32_t ep_id = le32_to_cpu(req->endpoint);
uint32_t reserved = le32_to_cpu(req->reserved);
+ viommu_domain *domain;
+ viommu_endpoint *ep;
trace_virtio_iommu_attach(domain_id, ep_id);
@@ -200,7 +202,22 @@ static int virtio_iommu_attach(VirtIOIOMMU *s,
return VIRTIO_IOMMU_S_INVAL;
}
- return VIRTIO_IOMMU_S_UNSUPP;
+ ep = virtio_iommu_get_endpoint(s, ep_id);
+ if (ep->domain) {
+ /*
+ * the device is already attached to a domain,
+ * detach it first
+ */
+ virtio_iommu_detach_endpoint_from_domain(ep);
+ }
+
+ domain = virtio_iommu_get_domain(s, domain_id);
+ QLIST_INSERT_HEAD(&domain->endpoint_list, ep, next);
+
+ ep->domain = domain;
+ g_tree_ref(domain->mappings);
+
+ return VIRTIO_IOMMU_S_OK;
}
static int virtio_iommu_detach(VirtIOIOMMU *s,
@@ -208,14 +225,24 @@ static int virtio_iommu_detach(VirtIOIOMMU *s,
{
uint32_t ep_id = le32_to_cpu(req->endpoint);
uint32_t reserved = le32_to_cpu(req->reserved);
-
- trace_virtio_iommu_detach(ep_id);
+ viommu_endpoint *ep;
if (reserved) {
return VIRTIO_IOMMU_S_INVAL;
}
- return VIRTIO_IOMMU_S_UNSUPP;
+ ep = g_tree_lookup(s->endpoints, GUINT_TO_POINTER(ep_id));
+ if (!ep) {
+ return VIRTIO_IOMMU_S_NOENT;
+ }
+
+ if (!ep->domain) {
+ return VIRTIO_IOMMU_S_INVAL;
+ }
+
+ virtio_iommu_detach_endpoint_from_domain(ep);
+ trace_virtio_iommu_detach(ep_id);
+ return VIRTIO_IOMMU_S_OK;
}
static int virtio_iommu_map(VirtIOIOMMU *s,
--
1.9.1
- [Qemu-arm] [RFC v5 00/22] VIRTIO-IOMMU device, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 01/22] machine: Add a get_primary_pci_bus callback, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 02/22] hw/arm/virt: Implement get_primary_pci_bus, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 03/22] pc: Implement get_primary_pci_bus, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 04/22] update-linux-headers: Import virtio_iommu.h, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 05/22] linux-headers: Partial update for virtio-iommu, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 06/22] virtio-iommu: Add skeleton, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 07/22] virtio-iommu: Decode the command payload, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 08/22] virtio-iommu: Add the iommu regions, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 09/22] virtio-iommu: Register attached endpoints, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 10/22] virtio-iommu: Implement attach/detach command,
Eric Auger <=
- [Qemu-arm] [RFC v5 11/22] virtio-iommu: Implement map/unmap, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 12/22] virtio-iommu: Implement translate, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 13/22] virtio-iommu: Implement probe request, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 14/22] virtio-iommu: Add an msi_bypass property, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 15/22] virtio-iommu: Implement fault reporting, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 16/22] virtio_iommu: Handle reserved regions in translation process, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 17/22] hw/arm/virt: Add virtio-iommu to the virt board, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 18/22] hw/arm/virt-acpi-build: Add virtio-iommu node in IORT table, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 19/22] memory.h: Add set_page_size_mask IOMMUMemoryRegion callback, Eric Auger, 2018/01/19
- [Qemu-arm] [RFC v5 20/22] hw/vfio/common: Set the IOMMUMemoryRegion supported page sizes, Eric Auger, 2018/01/19