This function has an assumption that we will definitely call translate()
once (or say, the addr will be located inside one IOMMU memory region),
otherwise an empty IOTLB will be returned. Nevertheless, this is not
what we want. When there is no IOMMU memory region, we should build up a
static mapping for the caller, instead of an invalid IOTLB.
We won't trigger this path before VT-d passthrough mode. When
passthrough mode for a vhost device is setup, VT-d is possible to
disable the IOMMU region for that device. Without current patch, we'll
get a vhost boot failure, and it'll be failed over to virtio userspace
mode.
CC: Paolo Bonzini <pbonz...@redhat.com>
CC: Jason Wang <jasow...@redhat.com>
CC: Michael S. Tsirkin <m...@redhat.com>
Signed-off-by: Peter Xu <pet...@redhat.com>
---
exec.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/exec.c b/exec.c
index 072de5d..5cfdacd 100644
--- a/exec.c
+++ b/exec.c
@@ -463,12 +463,13 @@ address_space_translate_internal(AddressSpaceDispatch *d,
hwaddr addr, hwaddr *x
}
/* Called from RCU critical section */
-IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr,
+IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr iova,
bool is_write)
{
IOMMUTLBEntry iotlb = {0};
MemoryRegionSection *section;
MemoryRegion *mr;
+ hwaddr addr = iova, psize;
for (;;) {
AddressSpaceDispatch *d = atomic_rcu_read(&as->dispatch);
@@ -478,6 +479,23 @@ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace
*as, hwaddr addr,
mr = section->mr;
if (!mr->iommu_ops) {
+ /*
+ * We didn't translate() but reached here. It possibly
+ * means it's a static mapping. If so (it should be RAM),
+ * we set the IOTLB up.
+ */
+ if (!iotlb.target_as && memory_region_is_ram(mr) &&
+ !memory_region_is_rom(mr)) {
+ psize = mr->ram_block->page_size;
+ iova &= ~(psize - 1);
+ iotlb = (IOMMUTLBEntry) {
+ .target_as = &address_space_memory,
+ .iova = iova,
+ .translated_addr = iova,
+ .addr_mask = psize - 1,
+ .perm = IOMMU_RW,
+ };
+ }
break;
}
--
2.7.4
