[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/13] memory: remove the last param in memory_region
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 02/13] memory: remove the last param in memory_region_iommu_replay() |
Date: |
Mon, 29 May 2017 03:18:35 +0300 |
From: Peter Xu <address@hidden>
We were always passing in that one as "false" to assume that's an read
operation, and we also assume that IOMMU translation would always have
that read permission. A better permission would be IOMMU_NONE since the
replay is after all not a real read operation, but just a page table
rebuilding process.
CC: David Gibson <address@hidden>
CC: Paolo Bonzini <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
---
include/exec/memory.h | 5 +----
hw/vfio/common.c | 2 +-
memory.c | 8 +++-----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 97fd0c2..bfdc685 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -731,11 +731,8 @@ void memory_region_register_iommu_notifier(MemoryRegion
*mr,
*
* @mr: the memory region to observe
* @n: the notifier to which to replay iommu mappings
- * @is_write: Whether to treat the replay as a translate "write"
- * through the iommu
*/
-void memory_region_iommu_replay(MemoryRegion *mr, IOMMUNotifier *n,
- bool is_write);
+void memory_region_iommu_replay(MemoryRegion *mr, IOMMUNotifier *n);
/**
* memory_region_iommu_replay_all: replay existing IOMMU translations
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index a8f12ee..b9abe77 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -502,7 +502,7 @@ static void vfio_listener_region_add(MemoryListener
*listener,
QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next);
memory_region_register_iommu_notifier(giommu->iommu, &giommu->n);
- memory_region_iommu_replay(giommu->iommu, &giommu->n, false);
+ memory_region_iommu_replay(giommu->iommu, &giommu->n);
return;
}
diff --git a/memory.c b/memory.c
index 3f0aae8..0ddc4cc 100644
--- a/memory.c
+++ b/memory.c
@@ -1620,12 +1620,10 @@ uint64_t
memory_region_iommu_get_min_page_size(MemoryRegion *mr)
return TARGET_PAGE_SIZE;
}
-void memory_region_iommu_replay(MemoryRegion *mr, IOMMUNotifier *n,
- bool is_write)
+void memory_region_iommu_replay(MemoryRegion *mr, IOMMUNotifier *n)
{
hwaddr addr, granularity;
IOMMUTLBEntry iotlb;
- IOMMUAccessFlags flag = is_write ? IOMMU_WO : IOMMU_RO;
/* If the IOMMU has its own replay callback, override */
if (mr->iommu_ops->replay) {
@@ -1636,7 +1634,7 @@ void memory_region_iommu_replay(MemoryRegion *mr,
IOMMUNotifier *n,
granularity = memory_region_iommu_get_min_page_size(mr);
for (addr = 0; addr < memory_region_size(mr); addr += granularity) {
- iotlb = mr->iommu_ops->translate(mr, addr, flag);
+ iotlb = mr->iommu_ops->translate(mr, addr, IOMMU_NONE);
if (iotlb.perm != IOMMU_NONE) {
n->notify(n, &iotlb);
}
@@ -1654,7 +1652,7 @@ void memory_region_iommu_replay_all(MemoryRegion *mr)
IOMMUNotifier *notifier;
IOMMU_NOTIFIER_FOREACH(notifier, mr) {
- memory_region_iommu_replay(mr, notifier, false);
+ memory_region_iommu_replay(mr, notifier);
}
}
--
MST
- [Qemu-devel] [PULL 06/13] pc: add 2.10 machine type, (continued)
- [Qemu-devel] [PULL 06/13] pc: add 2.10 machine type, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 10/13] Revert "hw/pci: disable pci-bridge's shpc by default", Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 11/13] virtio: allow broken device to notify guest, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 12/13] pci: deassert intx when pci device unrealize, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 13/13] exec: abstract address_space_do_translate(), Michael S. Tsirkin, 2017/05/17
- Re: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes, no-reply, 2017/05/17
- Re: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes, Stefan Hajnoczi, 2017/05/18
- [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 01/13] memory: tune last param of iommu_ops.translate(), Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 02/13] memory: remove the last param in memory_region_iommu_replay(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 06/13] intel_iommu: use IOMMU_ACCESS_FLAG(), Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 05/13] intel_iommu: provide vtd_ce_get_type(), Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 04/13] intel_iommu: renaming context entry helpers, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 07/13] intel_iommu: allow dev-iotlb context entry conditionally, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 03/13] x86-iommu: use DeviceClass properties, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 09/13] intel_iommu: turn off pt before 2.9, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 10/13] virtio_net: Bypass backends for MTU feature negotiation, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 11/13] vhost-user: pass message as a pointer to process_message_reply(), Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 13/13] acpi-test: update expected files, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 12/13] pc: ACPI BIOS: use highest NUMA node for hotplug mem hole SRAT entry, Michael S. Tsirkin, 2017/05/28