Message ID | 1486456099-7345-14-git-send-email-peterx@redhat.com |
---|---|
State | New |
Headers | show |
On Tue, Feb 07, 2017 at 04:28:15PM +0800, Peter Xu wrote: > Generalizing the notify logic in memory_region_notify_iommu() into a > single function. This can be further used in customized replay() > functions for IOMMUs. > > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > include/exec/memory.h | 15 +++++++++++++++ > memory.c | 40 ++++++++++++++++++++++++---------------- > 2 files changed, 39 insertions(+), 16 deletions(-) > > diff --git a/include/exec/memory.h b/include/exec/memory.h > index 606ce88..0767888 100644 > --- a/include/exec/memory.h > +++ b/include/exec/memory.h > @@ -682,6 +682,21 @@ void memory_region_notify_iommu(MemoryRegion *mr, > IOMMUTLBEntry entry); > > /** > + * memory_region_notify_one: notify a change in an IOMMU translation > + * entry to a single notifier > + * > + * This works just like memory_region_notify_iommu(), but it only > + * notifies a specific notifier, not all of them. > + * > + * @notifier: the notifier to be notified > + * @entry: the new entry in the IOMMU translation table. The entry > + * replaces all old entries for the same virtual I/O address range. > + * Deleted entries have .@perm == 0. > + */ > +void memory_region_notify_one(IOMMUNotifier *notifier, > + IOMMUTLBEntry *entry); > + > +/** > * memory_region_register_iommu_notifier: register a notifier for changes to > * IOMMU translation entries. > * > diff --git a/memory.c b/memory.c > index 9e1bb75..7a4f2f9 100644 > --- a/memory.c > +++ b/memory.c > @@ -1666,32 +1666,40 @@ void memory_region_unregister_iommu_notifier(MemoryRegion *mr, > memory_region_update_iommu_notify_flags(mr); > } > > -void memory_region_notify_iommu(MemoryRegion *mr, > - IOMMUTLBEntry entry) > +void memory_region_notify_one(IOMMUNotifier *notifier, > + IOMMUTLBEntry *entry) > { > - IOMMUNotifier *iommu_notifier; > IOMMUNotifierFlag request_flags; > > - assert(memory_region_is_iommu(mr)); > + /* > + * Skip the notification if the notification does not overlap > + * with registered range. > + */ > + if (notifier->start > entry->iova + entry->addr_mask + 1 || > + notifier->end < entry->iova) { > + return; > + } > > - if (entry.perm & IOMMU_RW) { > + if (entry->perm & IOMMU_RW) { > request_flags = IOMMU_NOTIFIER_MAP; > } else { > request_flags = IOMMU_NOTIFIER_UNMAP; > } > > + if (notifier->notifier_flags & request_flags) { > + notifier->notify(notifier, entry); > + } > +} > + > +void memory_region_notify_iommu(MemoryRegion *mr, > + IOMMUTLBEntry entry) > +{ > + IOMMUNotifier *iommu_notifier; > + > + assert(memory_region_is_iommu(mr)); > + > IOMMU_NOTIFIER_FOREACH(iommu_notifier, mr) { > - /* > - * Skip the notification if the notification does not overlap > - * with registered range. > - */ > - if (iommu_notifier->start > entry.iova + entry.addr_mask + 1 || > - iommu_notifier->end < entry.iova) { > - continue; > - } > - if (iommu_notifier->notifier_flags & request_flags) { > - iommu_notifier->notify(iommu_notifier, &entry); > - } > + memory_region_notify_one(iommu_notifier, &entry); > } > } >
diff --git a/include/exec/memory.h b/include/exec/memory.h index 606ce88..0767888 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -682,6 +682,21 @@ void memory_region_notify_iommu(MemoryRegion *mr, IOMMUTLBEntry entry); /** + * memory_region_notify_one: notify a change in an IOMMU translation + * entry to a single notifier + * + * This works just like memory_region_notify_iommu(), but it only + * notifies a specific notifier, not all of them. + * + * @notifier: the notifier to be notified + * @entry: the new entry in the IOMMU translation table. The entry + * replaces all old entries for the same virtual I/O address range. + * Deleted entries have .@perm == 0. + */ +void memory_region_notify_one(IOMMUNotifier *notifier, + IOMMUTLBEntry *entry); + +/** * memory_region_register_iommu_notifier: register a notifier for changes to * IOMMU translation entries. * diff --git a/memory.c b/memory.c index 9e1bb75..7a4f2f9 100644 --- a/memory.c +++ b/memory.c @@ -1666,32 +1666,40 @@ void memory_region_unregister_iommu_notifier(MemoryRegion *mr, memory_region_update_iommu_notify_flags(mr); } -void memory_region_notify_iommu(MemoryRegion *mr, - IOMMUTLBEntry entry) +void memory_region_notify_one(IOMMUNotifier *notifier, + IOMMUTLBEntry *entry) { - IOMMUNotifier *iommu_notifier; IOMMUNotifierFlag request_flags; - assert(memory_region_is_iommu(mr)); + /* + * Skip the notification if the notification does not overlap + * with registered range. + */ + if (notifier->start > entry->iova + entry->addr_mask + 1 || + notifier->end < entry->iova) { + return; + } - if (entry.perm & IOMMU_RW) { + if (entry->perm & IOMMU_RW) { request_flags = IOMMU_NOTIFIER_MAP; } else { request_flags = IOMMU_NOTIFIER_UNMAP; } + if (notifier->notifier_flags & request_flags) { + notifier->notify(notifier, entry); + } +} + +void memory_region_notify_iommu(MemoryRegion *mr, + IOMMUTLBEntry entry) +{ + IOMMUNotifier *iommu_notifier; + + assert(memory_region_is_iommu(mr)); + IOMMU_NOTIFIER_FOREACH(iommu_notifier, mr) { - /* - * Skip the notification if the notification does not overlap - * with registered range. - */ - if (iommu_notifier->start > entry.iova + entry.addr_mask + 1 || - iommu_notifier->end < entry.iova) { - continue; - } - if (iommu_notifier->notifier_flags & request_flags) { - iommu_notifier->notify(iommu_notifier, &entry); - } + memory_region_notify_one(iommu_notifier, &entry); } }
Generalizing the notify logic in memory_region_notify_iommu() into a single function. This can be further used in customized replay() functions for IOMMUs. Signed-off-by: Peter Xu <peterx@redhat.com> --- include/exec/memory.h | 15 +++++++++++++++ memory.c | 40 ++++++++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 16 deletions(-)