[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v2 10/17] memory: add section range info for IOM
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH RFC v2 10/17] memory: add section range info for IOMMU notifier |
Date: |
Tue, 3 Jan 2017 15:29:47 +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>
---
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 958f4b2..cecfed1 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -84,6 +84,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 2bfc37f..e88bb54 100644
--- a/memory.c
+++ b/memory.c
@@ -1671,7 +1671,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
- [Qemu-devel] [PATCH RFC v2 00/17] VT-d: vfio enablement and misc enhances, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 01/17] IOMMU: add option to enable VTD_CAP_CM to vIOMMU capility exposoed to guest, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 02/17] memory: handle alias for iommu notifier, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 04/17] intel_iommu: allocate new key when creating new address space, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 03/17] memory: handle alias in memory_region_is_iommu(), Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 05/17] intel_iommu: simplify irq region translation, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 06/17] intel_iommu: renaming gpa to iova where proper, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 07/17] intel_iommu: fix trace for inv desc handling, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 08/17] intel_iommu: fix trace for addr translation, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 09/17] intel_iommu: vtd_slpt_level_shift check level, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 10/17] memory: add section range info for IOMMU notifier,
Peter Xu <=
- [Qemu-devel] [PATCH RFC v2 11/17] memory: provide iommu_replay_all(), Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 13/17] memory: add MemoryRegionIOMMUOps.replay() callback, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 12/17] memory: introduce memory_region_notify_one(), Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 14/17] intel_iommu: provide its own replay() callback, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 15/17] intel_iommu: do replay when context invalidate, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 16/17] intel_iommu: allow dynamic switch of IOMMU region, Peter Xu, 2017/01/03
- [Qemu-devel] [PATCH RFC v2 17/17] intel_iommu: enable vfio devices, Peter Xu, 2017/01/03
- Re: [Qemu-devel] [PATCH RFC v2 00/17] VT-d: vfio enablement and misc enhances, no-reply, 2017/01/03
- Re: [Qemu-devel] [PATCH RFC v2 00/17] VT-d: vfio enablement and misc enhances, Michael S. Tsirkin, 2017/01/12