[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 5/5] sPAPR/IOMMU: Fix TCE entry permission
From: |
Alexander Graf |
Subject: |
[Qemu-ppc] [PULL 5/5] sPAPR/IOMMU: Fix TCE entry permission |
Date: |
Tue, 15 Jul 2014 16:15:21 +0200 |
From: Gavin Shan <address@hidden>
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 <address@hidden>
Acked-by: Alex Williamson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/misc/vfio.c | 2 +-
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 aef4c9c..0b9eba0 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 698ae60..f6e32a4 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;
--
1.8.1.4
- [Qemu-ppc] [PULL 2.1 0/5] ppc patch queue 2014-07-15, Alexander Graf, 2014/07/15
- [Qemu-ppc] [PULL 4/5] spapr: Enable use of huge pages, Alexander Graf, 2014/07/15
- [Qemu-ppc] [PULL 3/5] spapr: Move RMA memory region registration code, Alexander Graf, 2014/07/15
- [Qemu-ppc] [PULL 5/5] sPAPR/IOMMU: Fix TCE entry permission,
Alexander Graf <=
- [Qemu-ppc] [PULL 1/5] target-ppc: Fix number of threads per core limit, Alexander Graf, 2014/07/15
- [Qemu-ppc] [PULL 2/5] ppc: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory, Alexander Graf, 2014/07/15
- Re: [Qemu-ppc] [PULL 2.1 0/5] ppc patch queue 2014-07-15, Peter Maydell, 2014/07/15