[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/39] virtio-iommu: Handle non power of 2 range invalidations
From: |
Peter Maydell |
Subject: |
[PULL 05/39] virtio-iommu: Handle non power of 2 range invalidations |
Date: |
Fri, 12 Mar 2021 13:51:06 +0000 |
From: Eric Auger <eric.auger@redhat.com>
Unmap notifiers work with an address mask assuming an
invalidation range of a power of 2. Nothing mandates this
in the VIRTIO-IOMMU spec.
So in case the range is not a power of 2, split it into
several invalidations.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-id: 20210309102742.30442-4-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/virtio/virtio-iommu.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index c2883a2f6c8..1b23e8e18c7 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -155,6 +155,7 @@ static void virtio_iommu_notify_unmap(IOMMUMemoryRegion
*mr, hwaddr virt_start,
hwaddr virt_end)
{
IOMMUTLBEvent event;
+ uint64_t delta = virt_end - virt_start;
if (!(mr->iommu_notify_flags & IOMMU_NOTIFIER_UNMAP)) {
return;
@@ -164,12 +165,24 @@ static void virtio_iommu_notify_unmap(IOMMUMemoryRegion
*mr, hwaddr virt_start,
event.type = IOMMU_NOTIFIER_UNMAP;
event.entry.target_as = &address_space_memory;
- event.entry.addr_mask = virt_end - virt_start;
- event.entry.iova = virt_start;
event.entry.perm = IOMMU_NONE;
event.entry.translated_addr = 0;
+ event.entry.addr_mask = delta;
+ event.entry.iova = virt_start;
- memory_region_notify_iommu(mr, 0, event);
+ if (delta == UINT64_MAX) {
+ memory_region_notify_iommu(mr, 0, event);
+ }
+
+
+ while (virt_start != virt_end + 1) {
+ uint64_t mask = dma_aligned_pow2_mask(virt_start, virt_end, 64);
+
+ event.entry.addr_mask = mask;
+ event.entry.iova = virt_start;
+ memory_region_notify_iommu(mr, 0, event);
+ virt_start += mask + 1;
+ }
}
static gboolean virtio_iommu_notify_unmap_cb(gpointer key, gpointer value,
--
2.20.1
- [PULL 00/39] target-arm queue, Peter Maydell, 2021/03/12
- [PULL 01/39] hw/misc: versal: Add a model of the XRAM controller, Peter Maydell, 2021/03/12
- [PULL 02/39] hw/arm: versal: Add support for the XRAMs, Peter Maydell, 2021/03/12
- [PULL 06/39] hw/arm/smmu-common: Fix smmu_iotlb_inv_iova when asid is not set, Peter Maydell, 2021/03/12
- [PULL 03/39] intel_iommu: Fix mask may be uninitialized in vtd_context_device_invalidate, Peter Maydell, 2021/03/12
- [PULL 05/39] virtio-iommu: Handle non power of 2 range invalidations,
Peter Maydell <=
- [PULL 07/39] hw/arm/smmuv3: Enforce invalidation on a power of two range, Peter Maydell, 2021/03/12
- [PULL 04/39] dma: Introduce dma_aligned_pow2_mask(), Peter Maydell, 2021/03/12
- [PULL 13/39] target/arm: Update find_last_active for PREDDESC, Peter Maydell, 2021/03/12
- [PULL 15/39] target/arm: Update CNTP for PREDDESC, Peter Maydell, 2021/03/12
- [PULL 08/39] hw/arm/smmuv3: Fix SMMU_CMD_CFGI_STE_RANGE handling, Peter Maydell, 2021/03/12
- [PULL 09/39] hw/arm/smmuv3: Uniformize sid traces, Peter Maydell, 2021/03/12
- [PULL 11/39] target/arm: Fix sve_zip_p vs odd vector lengths, Peter Maydell, 2021/03/12
- [PULL 21/39] tests/acceptance: update sunxi kernel from armbian to 5.10.16, Peter Maydell, 2021/03/12
- [PULL 14/39] target/arm: Update BRKA, BRKB, BRKN for PREDDESC, Peter Maydell, 2021/03/12
- [PULL 18/39] hw/net/allwinner-sun8i-emac: traverse transmit queue using TX_CUR_DESC register value, Peter Maydell, 2021/03/12