diff options
| author | Gavin Shan <gwshan@linux.vnet.ibm.com> | 2014-07-14 22:09:43 +1000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-07-15 16:11:59 +0200 |
| commit | 27e27782f78212cbd97170b0854c35a0738cfd34 (patch) | |
| tree | b89877a5020186b5f4fcd49a2cfebdd5389c433d | |
| parent | f92f5da108225fc7dcc5f357fdc473083890fe3f (diff) | |
| download | qemu-27e27782f78212cbd97170b0854c35a0738cfd34.tar.gz | |
sPAPR/IOMMU: Fix TCE entry permission
The permission of TCE entry should exclude physical base address.
Otherwise, unmapping TCE entry can be interpreted to mapping TCE
entry wrongly for VFIO devices.
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/misc/vfio.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr_iommu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index aef4c9ce9d..0b9eba0c84 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2489,7 +2489,7 @@ static void vfio_iommu_map_notify(Notifier *n, void *data) return; } - if (iotlb->perm != IOMMU_NONE) { + if ((iotlb->perm & IOMMU_RW) != IOMMU_NONE) { vaddr = memory_region_get_ram_ptr(mr) + xlat; ret = vfio_dma_map(container, iotlb->iova, diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 698ae60953..f6e32a48af 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -81,7 +81,7 @@ static IOMMUTLBEntry spapr_tce_translate_iommu(MemoryRegion *iommu, hwaddr addr) ret.iova = addr & page_mask; ret.translated_addr = tce & page_mask; ret.addr_mask = ~page_mask; - ret.perm = tce; + ret.perm = tce & IOMMU_RW; } trace_spapr_iommu_xlate(tcet->liobn, addr, ret.iova, ret.perm, ret.addr_mask); @@ -223,7 +223,7 @@ static target_ulong put_tce_emu(sPAPRTCETable *tcet, target_ulong ioba, entry.iova = ioba & page_mask; entry.translated_addr = tce & page_mask; entry.addr_mask = ~page_mask; - entry.perm = tce; + entry.perm = tce & IOMMU_RW; memory_region_notify_iommu(&tcet->iommu, entry); return H_SUCCESS; |