[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v5 12/22] virtio-iommu: Implement translate
From: |
Eric Auger |
Subject: |
[Qemu-devel] [RFC v5 12/22] virtio-iommu: Implement translate |
Date: |
Fri, 19 Jan 2018 14:49:05 +0000 |
This patch implements the translate callback
Signed-off-by: Eric Auger <address@hidden>
---
v4 -> v5:
- check the device domain is not NULL
- s/printf/error_report
- set flags to IOMMU_NONE in case of all translation faults
---
hw/virtio/trace-events | 1 +
hw/virtio/virtio-iommu.c | 42 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index 3ce9b82..873e4fc 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -45,3 +45,4 @@ virtio_iommu_put_domain(uint32_t domain_id) "Free domain=%d"
virtio_iommu_unmap_left_interval(uint64_t low, uint64_t high, uint64_t
next_low, uint64_t next_high) "Unmap left [0x%"PRIx64",0x%"PRIx64"], new
interval=[0x%"PRIx64",0x%"PRIx64"]"
virtio_iommu_unmap_right_interval(uint64_t low, uint64_t high, uint64_t
next_low, uint64_t next_high) "Unmap right [0x%"PRIx64",0x%"PRIx64"], new
interval=[0x%"PRIx64",0x%"PRIx64"]"
virtio_iommu_unmap_inc_interval(uint64_t low, uint64_t high) "Unmap inc
[0x%"PRIx64",0x%"PRIx64"]"
+virtio_iommu_translate_out(uint64_t virt_addr, uint64_t phys_addr, uint32_t
sid) "0x%"PRIx64" -> 0x%"PRIx64 " for sid=%d"
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index f530eca..c96aacc 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -485,19 +485,59 @@ static IOMMUTLBEntry
virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
IOMMUAccessFlags flag)
{
IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr);
+ VirtIOIOMMU *s = sdev->viommu;
uint32_t sid;
+ viommu_endpoint *ep;
+ viommu_mapping *mapping;
+ viommu_interval interval;
+
+ interval.low = addr;
+ interval.high = addr + 1;
IOMMUTLBEntry entry = {
.target_as = &address_space_memory,
.iova = addr,
.translated_addr = addr,
- .addr_mask = ~(hwaddr)0,
+ .addr_mask = (1 << ctz32(s->config.page_size_mask)) - 1,
.perm = IOMMU_NONE,
};
sid = virtio_iommu_get_sid(sdev);
trace_virtio_iommu_translate(mr->parent_obj.name, sid, addr, flag);
+ qemu_mutex_lock(&s->mutex);
+
+ ep = g_tree_lookup(s->endpoints, GUINT_TO_POINTER(sid));
+ if (!ep) {
+ error_report("%s sid=%d is not known!!", __func__, sid);
+ goto unlock;
+ }
+
+ if (!ep->domain) {
+ error_report("%s %02x:%02x.%01x not attached to any domain", __func__,
+ PCI_BUS_NUM(sid), PCI_SLOT(sid), PCI_FUNC(sid));
+ goto unlock;
+ }
+
+ mapping = g_tree_lookup(ep->domain->mappings, (gpointer)(&interval));
+ if (!mapping) {
+ error_report("%s no mapping for 0x%"PRIx64" for sid=%d", __func__,
+ addr, sid);
+ goto unlock;
+ }
+
+ if (((flag & IOMMU_RO) && !(mapping->flags & VIRTIO_IOMMU_MAP_F_READ)) ||
+ ((flag & IOMMU_WO) && !(mapping->flags & VIRTIO_IOMMU_MAP_F_WRITE))) {
+ error_report("Permission error on 0x%"PRIx64"(%d): allowed=%d",
+ addr, flag, mapping->flags);
+ goto unlock;
+ }
+ entry.translated_addr = addr - mapping->virt_addr + mapping->phys_addr;
+ entry.perm = flag;
+ trace_virtio_iommu_translate_out(addr, entry.translated_addr, sid);
+
+unlock:
+ qemu_mutex_unlock(&s->mutex);
return entry;
}
--
1.9.1
- [Qemu-devel] [RFC v5 02/22] hw/arm/virt: Implement get_primary_pci_bus, (continued)
- [Qemu-devel] [RFC v5 02/22] hw/arm/virt: Implement get_primary_pci_bus, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 03/22] pc: Implement get_primary_pci_bus, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 04/22] update-linux-headers: Import virtio_iommu.h, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 05/22] linux-headers: Partial update for virtio-iommu, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 06/22] virtio-iommu: Add skeleton, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 07/22] virtio-iommu: Decode the command payload, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 08/22] virtio-iommu: Add the iommu regions, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 09/22] virtio-iommu: Register attached endpoints, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 10/22] virtio-iommu: Implement attach/detach command, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 11/22] virtio-iommu: Implement map/unmap, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 12/22] virtio-iommu: Implement translate,
Eric Auger <=
- [Qemu-devel] [RFC v5 13/22] virtio-iommu: Implement probe request, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 14/22] virtio-iommu: Add an msi_bypass property, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 15/22] virtio-iommu: Implement fault reporting, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 16/22] virtio_iommu: Handle reserved regions in translation process, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 17/22] hw/arm/virt: Add virtio-iommu to the virt board, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 18/22] hw/arm/virt-acpi-build: Add virtio-iommu node in IORT table, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 19/22] memory.h: Add set_page_size_mask IOMMUMemoryRegion callback, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 20/22] hw/vfio/common: Set the IOMMUMemoryRegion supported page sizes, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 21/22] virtio-iommu: Implement set_page_size_mask, Eric Auger, 2018/01/19
- [Qemu-devel] [RFC v5 22/22] hw/vfio/common: Do not print error when viommu translates into an mmio region, Eric Auger, 2018/01/19