[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-5.0 v11 14/20] virtio-iommu: Handle reserved regions in the t
From: |
Eric Auger |
Subject: |
[PATCH for-5.0 v11 14/20] virtio-iommu: Handle reserved regions in the translation process |
Date: |
Fri, 22 Nov 2019 19:29:37 +0100 |
When translating an address we need to check if it belongs to
a reserved virtual address range. If it does, there are 2 cases:
- it belongs to a RESERVED region: the guest should neither use
this address in a MAP not instruct the end-point to DMA on
them. We report an error
- It belongs to an MSI region: we bypass the translation.
Signed-off-by: Eric Auger <address@hidden>
---
v10 -> v11:
- directly use the reserved_regions properties array
v9 -> v10:
- in case of MSI region, we immediatly return
---
hw/virtio/virtio-iommu.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 1ce2218935..c5b202fab7 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -548,6 +548,7 @@ static IOMMUTLBEntry
virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
uint32_t sid, flags;
bool bypass_allowed;
bool found;
+ int i;
interval.low = addr;
interval.high = addr + 1;
@@ -580,6 +581,22 @@ static IOMMUTLBEntry
virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
goto unlock;
}
+ for (i = 0; i < s->nb_reserved_regions; i++) {
+ if (interval.low >= s->reserved_regions[i].low &&
+ interval.low <= s->reserved_regions[i].high) {
+ switch (s->reserved_regions[i].type) {
+ case VIRTIO_IOMMU_RESV_MEM_T_MSI:
+ entry.perm = flag;
+ goto unlock;
+ case VIRTIO_IOMMU_RESV_MEM_T_RESERVED:
+ default:
+ virtio_iommu_report_fault(s, VIRTIO_IOMMU_FAULT_R_MAPPING,
+ 0, sid, addr);
+ goto unlock;
+ }
+ }
+ }
+
if (!ep->domain) {
if (!bypass_allowed) {
qemu_log_mask(LOG_GUEST_ERROR,
--
2.20.1
- [PATCH for-5.0 v11 06/20] virtio-iommu: Implement attach/detach command, (continued)
- [PATCH for-5.0 v11 06/20] virtio-iommu: Implement attach/detach command, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 07/20] virtio-iommu: Implement map/unmap, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 08/20] virtio-iommu: Implement translate, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 09/20] virtio-iommu: Implement fault reporting, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 10/20] virtio-iommu-pci: Add virtio iommu pci support, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 11/20] hw/arm/virt: Add the virtio-iommu device tree mappings, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 12/20] qapi: Introduce DEFINE_PROP_INTERVAL, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 13/20] virtio-iommu: Implement probe request, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 14/20] virtio-iommu: Handle reserved regions in the translation process,
Eric Auger <=
- [PATCH for-5.0 v11 15/20] virtio-iommu-pci: Add array of Interval properties, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 16/20] hw/arm/virt-acpi-build: Introduce fill_iort_idmap helper, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 17/20] hw/arm/virt-acpi-build: Add virtio-iommu node in IORT table, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 18/20] virtio-iommu: Support migration, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 19/20] pc: Add support for virtio-iommu-pci, Eric Auger, 2019/11/22
- [PATCH for-5.0 v11 20/20] tests: Add virtio-iommu test, Eric Auger, 2019/11/22
- Re: [PATCH for-5.0 v11 00/20] VIRTIO-IOMMU device, no-reply, 2019/11/22