147 lines
5.6 KiB
Diff
147 lines
5.6 KiB
Diff
From 256180b78107813b8e8c292bc799f5d7c7676cd2 Mon Sep 17 00:00:00 2001
|
|
From: eperezma <eperezma@redhat.com>
|
|
Date: Mon, 11 Jan 2021 14:36:11 -0500
|
|
Subject: memory: Rename memory_region_notify_one to
|
|
memory_region_notify_iommu_one
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: eperezma <eperezma@redhat.com>
|
|
Message-id: <20210111143615.303645-2-eperezma@redhat.com>
|
|
Patchwork-id: 100570
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH 1/5] memory: Rename memory_region_notify_one to memory_region_notify_iommu_one
|
|
Bugzilla: 1845758
|
|
RH-Acked-by: Xiao Wang <jasowang@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
|
Previous name didn't reflect the iommu operation.
|
|
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
Reviewed-by: Eric Auger <eric.auger@redhat.com>
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
Message-Id: <20201116165506.31315-2-eperezma@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 3b5ebf8532afdc1518bd8b0961ed802bc3f5f07c)
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/arm/smmu-common.c | 2 +-
|
|
hw/arm/smmuv3.c | 2 +-
|
|
hw/i386/intel_iommu.c | 4 ++--
|
|
include/exec/memory.h | 6 +++---
|
|
softmmu/memory.c | 6 +++---
|
|
5 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
|
|
index 3838db1395..88d2c454f0 100644
|
|
--- a/hw/arm/smmu-common.c
|
|
+++ b/hw/arm/smmu-common.c
|
|
@@ -472,7 +472,7 @@ static void smmu_unmap_notifier_range(IOMMUNotifier *n)
|
|
entry.perm = IOMMU_NONE;
|
|
entry.addr_mask = n->end - n->start;
|
|
|
|
- memory_region_notify_one(n, &entry);
|
|
+ memory_region_notify_iommu_one(n, &entry);
|
|
}
|
|
|
|
/* Unmap all notifiers attached to @mr */
|
|
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
|
|
index 22607c3784..273f5f7dce 100644
|
|
--- a/hw/arm/smmuv3.c
|
|
+++ b/hw/arm/smmuv3.c
|
|
@@ -828,7 +828,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,
|
|
entry.addr_mask = num_pages * (1 << granule) - 1;
|
|
entry.perm = IOMMU_NONE;
|
|
|
|
- memory_region_notify_one(n, &entry);
|
|
+ memory_region_notify_iommu_one(n, &entry);
|
|
}
|
|
|
|
/* invalidate an asid/iova range tuple in all mr's */
|
|
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
|
|
index 70ac837733..067593b9e4 100644
|
|
--- a/hw/i386/intel_iommu.c
|
|
+++ b/hw/i386/intel_iommu.c
|
|
@@ -3497,7 +3497,7 @@ static void vtd_address_space_unmap(VTDAddressSpace *as, IOMMUNotifier *n)
|
|
/* This field is meaningless for unmap */
|
|
entry.translated_addr = 0;
|
|
|
|
- memory_region_notify_one(n, &entry);
|
|
+ memory_region_notify_iommu_one(n, &entry);
|
|
|
|
start += mask;
|
|
remain -= mask;
|
|
@@ -3535,7 +3535,7 @@ static void vtd_address_space_refresh_all(IntelIOMMUState *s)
|
|
|
|
static int vtd_replay_hook(IOMMUTLBEntry *entry, void *private)
|
|
{
|
|
- memory_region_notify_one((IOMMUNotifier *)private, entry);
|
|
+ memory_region_notify_iommu_one((IOMMUNotifier *)private, entry);
|
|
return 0;
|
|
}
|
|
|
|
diff --git a/include/exec/memory.h b/include/exec/memory.h
|
|
index 0f3e6bcd5e..d8456ccf52 100644
|
|
--- a/include/exec/memory.h
|
|
+++ b/include/exec/memory.h
|
|
@@ -236,7 +236,7 @@ enum IOMMUMemoryRegionAttr {
|
|
* The IOMMU implementation must use the IOMMU notifier infrastructure
|
|
* to report whenever mappings are changed, by calling
|
|
* memory_region_notify_iommu() (or, if necessary, by calling
|
|
- * memory_region_notify_one() for each registered notifier).
|
|
+ * memory_region_notify_iommu_one() for each registered notifier).
|
|
*
|
|
* Conceptually an IOMMU provides a mapping from input address
|
|
* to an output TLB entry. If the IOMMU is aware of memory transaction
|
|
@@ -1346,7 +1346,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr,
|
|
IOMMUTLBEntry entry);
|
|
|
|
/**
|
|
- * memory_region_notify_one: notify a change in an IOMMU translation
|
|
+ * memory_region_notify_iommu_one: notify a change in an IOMMU translation
|
|
* entry to a single notifier
|
|
*
|
|
* This works just like memory_region_notify_iommu(), but it only
|
|
@@ -1357,7 +1357,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr,
|
|
* replaces all old entries for the same virtual I/O address range.
|
|
* Deleted entries have .@perm == 0.
|
|
*/
|
|
-void memory_region_notify_one(IOMMUNotifier *notifier,
|
|
+void memory_region_notify_iommu_one(IOMMUNotifier *notifier,
|
|
IOMMUTLBEntry *entry);
|
|
|
|
/**
|
|
diff --git a/softmmu/memory.c b/softmmu/memory.c
|
|
index 11ca94d037..44de610c72 100644
|
|
--- a/softmmu/memory.c
|
|
+++ b/softmmu/memory.c
|
|
@@ -1942,8 +1942,8 @@ void memory_region_unregister_iommu_notifier(MemoryRegion *mr,
|
|
memory_region_update_iommu_notify_flags(iommu_mr, NULL);
|
|
}
|
|
|
|
-void memory_region_notify_one(IOMMUNotifier *notifier,
|
|
- IOMMUTLBEntry *entry)
|
|
+void memory_region_notify_iommu_one(IOMMUNotifier *notifier,
|
|
+ IOMMUTLBEntry *entry)
|
|
{
|
|
IOMMUNotifierFlag request_flags;
|
|
hwaddr entry_end = entry->iova + entry->addr_mask;
|
|
@@ -1979,7 +1979,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr,
|
|
|
|
IOMMU_NOTIFIER_FOREACH(iommu_notifier, iommu_mr) {
|
|
if (iommu_notifier->iommu_idx == iommu_idx) {
|
|
- memory_region_notify_one(iommu_notifier, &entry);
|
|
+ memory_region_notify_iommu_one(iommu_notifier, &entry);
|
|
}
|
|
}
|
|
}
|
|
--
|
|
2.18.4
|
|
|