[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 07/13] memory: add section range info for IOMMU
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC PATCH 07/13] memory: add section range info for IOMMU notifier |
Date: |
Tue, 6 Dec 2016 18:36:22 +0800 |
In this patch, IOMMUNotifier.{start|end} are introduced to store section
information for a specific notifier. When notification occurs, we not
only check the notification type (MAP|UNMAP), but also check whether the
notified iova is in the range of specific IOMMU notifier, and skip those
notifiers if not in the listened range.
When removing an region, we need to make sure we removed the correct
VFIOGuestIOMMU by checking the IOMMUNotifier.start address as well.
Suggested-by: David Gibson <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
v2:
- replace offset_within_address_space with offset_within_region since
IOTLB iova is relative to region [David]
---
hw/vfio/common.c | 7 ++++++-
include/exec/memory.h | 3 +++
memory.c | 4 +++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 801578b..6f648da 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -455,6 +455,10 @@ static void vfio_listener_region_add(MemoryListener
*listener,
giommu->container = container;
giommu->n.notify = vfio_iommu_map_notify;
giommu->n.notifier_flags = IOMMU_NOTIFIER_ALL;
+ giommu->n.start = section->offset_within_region;
+ llend = int128_add(int128_make64(giommu->n.start), section->size);
+ llend = int128_sub(llend, int128_one());
+ giommu->n.end = int128_get64(llend);
QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next);
memory_region_register_iommu_notifier(giommu->iommu, &giommu->n);
@@ -525,7 +529,8 @@ static void vfio_listener_region_del(MemoryListener
*listener,
VFIOGuestIOMMU *giommu;
QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) {
- if (giommu->iommu == section->mr) {
+ if (giommu->iommu == section->mr &&
+ giommu->n.start == section->offset_within_region) {
memory_region_unregister_iommu_notifier(giommu->iommu,
&giommu->n);
QLIST_REMOVE(giommu, giommu_next);
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 2d7ee54..cb2d432 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -85,6 +85,9 @@ typedef enum {
struct IOMMUNotifier {
void (*notify)(struct IOMMUNotifier *notifier, IOMMUTLBEntry *data);
IOMMUNotifierFlag notifier_flags;
+ /* Notify for address space range start <= addr <= end */
+ hwaddr start;
+ hwaddr end;
QLIST_ENTRY(IOMMUNotifier) node;
};
typedef struct IOMMUNotifier IOMMUNotifier;
diff --git a/memory.c b/memory.c
index 9b88638..f73c897 100644
--- a/memory.c
+++ b/memory.c
@@ -1663,7 +1663,9 @@ void memory_region_notify_iommu(MemoryRegion *mr,
}
QLIST_FOREACH(iommu_notifier, &mr->iommu_notify, node) {
- if (iommu_notifier->notifier_flags & request_flags) {
+ if (iommu_notifier->notifier_flags & request_flags &&
+ iommu_notifier->start <= entry.iova &&
+ iommu_notifier->end >= entry.iova) {
iommu_notifier->notify(iommu_notifier, &entry);
}
}
--
2.7.4
- Re: [Qemu-devel] [RFC PATCH 01/13] intel_iommu: allocate new key when creating new address space, (continued)
[Qemu-devel] [RFC PATCH 02/13] intel_iommu: simplify irq region translation, Peter Xu, 2016/12/06
[Qemu-devel] [RFC PATCH 03/13] intel_iommu: renaming gpa to iova where proper, Peter Xu, 2016/12/06
[Qemu-devel] [RFC PATCH 05/13] intel_iommu: fix trace for addr translation, Peter Xu, 2016/12/06
[Qemu-devel] [RFC PATCH 04/13] intel_iommu: fix trace for inv desc handling, Peter Xu, 2016/12/06
[Qemu-devel] [RFC PATCH 06/13] intel_iommu: vtd_slpt_level_shift check level, Peter Xu, 2016/12/06
[Qemu-devel] [RFC PATCH 07/13] memory: add section range info for IOMMU notifier,
Peter Xu <=
[Qemu-devel] [RFC PATCH 08/13] memory: provide iommu_replay_all(), Peter Xu, 2016/12/06
[Qemu-devel] [RFC PATCH 09/13] memory: introduce memory_region_notify_one(), Peter Xu, 2016/12/06
[Qemu-devel] [RFC PATCH 10/13] memory: add MemoryRegionIOMMUOps.replay() callback, Peter Xu, 2016/12/06
[Qemu-devel] [RFC PATCH 11/13] intel_iommu: provide its own replay() callback, Peter Xu, 2016/12/06
[Qemu-devel] [RFC PATCH 12/13] intel_iommu: do replay when context invalidate, Peter Xu, 2016/12/06
[Qemu-devel] [RFC PATCH 13/13] intel_iommu: use page_walk for iotlb inv notify, Peter Xu, 2016/12/06
Re: [Qemu-devel] [RFC PATCH 00/13] VT-d replay and misc cleanup, Peter Xu, 2016/12/06
Re: [Qemu-devel] [RFC PATCH 00/13] VT-d replay and misc cleanup, Peter Xu, 2016/12/13