Message ID | 1491462524-1617-6-git-send-email-peterx@redhat.com |
---|---|
State | New |
Headers | show |
Hi Peter, On 06/04/2017 09:08, Peter Xu wrote: > Originally we have one memory_region_iommu_replay() function, which is > the default behavior to replay the translations of the whole IOMMU > region. However, on some platform like x86, we may want our own replay > logic for IOMMU regions. This patch add one more hook for IOMMUOps for s/add/adds > the callback, and it'll override the default if set. > > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > --- > include/exec/memory.h | 2 ++ > memory.c | 6 ++++++ > 2 files changed, 8 insertions(+) > > diff --git a/include/exec/memory.h b/include/exec/memory.h > index 055b3a8..c0280b7 100644 > --- a/include/exec/memory.h > +++ b/include/exec/memory.h > @@ -191,6 +191,8 @@ struct MemoryRegionIOMMUOps { > void (*notify_flag_changed)(MemoryRegion *iommu, > IOMMUNotifierFlag old_flags, > IOMMUNotifierFlag new_flags); > + /* Set this up to provide customized IOMMU replay function */ > + void (*replay)(MemoryRegion *iommu, IOMMUNotifier *notifier); > }; > > typedef struct CoalescedMemoryRange CoalescedMemoryRange; > diff --git a/memory.c b/memory.c > index ded4bf1..b782d5b 100644 > --- a/memory.c > +++ b/memory.c > @@ -1626,6 +1626,12 @@ void memory_region_iommu_replay(MemoryRegion *mr, IOMMUNotifier *n, > hwaddr addr, granularity; > IOMMUTLBEntry iotlb; > > + /* If the IOMMU has its own replay callback, override */ > + if (mr->iommu_ops->replay) { > + mr->iommu_ops->replay(mr, n); > + return; > + } > + > granularity = memory_region_iommu_get_min_page_size(mr); > > for (addr = 0; addr < memory_region_size(mr); addr += granularity) { >
On Thu, Apr 06, 2017 at 03:08:40PM +0800, Peter Xu wrote: > Originally we have one memory_region_iommu_replay() function, which is > the default behavior to replay the translations of the whole IOMMU > region. However, on some platform like x86, we may want our own replay > logic for IOMMU regions. This patch add one more hook for IOMMUOps for > the callback, and it'll override the default if set. > > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > --- > include/exec/memory.h | 2 ++ > memory.c | 6 ++++++ > 2 files changed, 8 insertions(+) > > diff --git a/include/exec/memory.h b/include/exec/memory.h > index 055b3a8..c0280b7 100644 > --- a/include/exec/memory.h > +++ b/include/exec/memory.h > @@ -191,6 +191,8 @@ struct MemoryRegionIOMMUOps { > void (*notify_flag_changed)(MemoryRegion *iommu, > IOMMUNotifierFlag old_flags, > IOMMUNotifierFlag new_flags); > + /* Set this up to provide customized IOMMU replay function */ > + void (*replay)(MemoryRegion *iommu, IOMMUNotifier *notifier); > }; > > typedef struct CoalescedMemoryRange CoalescedMemoryRange; > diff --git a/memory.c b/memory.c > index ded4bf1..b782d5b 100644 > --- a/memory.c > +++ b/memory.c > @@ -1626,6 +1626,12 @@ void memory_region_iommu_replay(MemoryRegion *mr, IOMMUNotifier *n, > hwaddr addr, granularity; > IOMMUTLBEntry iotlb; > > + /* If the IOMMU has its own replay callback, override */ > + if (mr->iommu_ops->replay) { > + mr->iommu_ops->replay(mr, n); > + return; > + } > + > granularity = memory_region_iommu_get_min_page_size(mr); > > for (addr = 0; addr < memory_region_size(mr); addr += granularity) { > -- > 2.7.4
diff --git a/include/exec/memory.h b/include/exec/memory.h index 055b3a8..c0280b7 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -191,6 +191,8 @@ struct MemoryRegionIOMMUOps { void (*notify_flag_changed)(MemoryRegion *iommu, IOMMUNotifierFlag old_flags, IOMMUNotifierFlag new_flags); + /* Set this up to provide customized IOMMU replay function */ + void (*replay)(MemoryRegion *iommu, IOMMUNotifier *notifier); }; typedef struct CoalescedMemoryRange CoalescedMemoryRange; diff --git a/memory.c b/memory.c index ded4bf1..b782d5b 100644 --- a/memory.c +++ b/memory.c @@ -1626,6 +1626,12 @@ void memory_region_iommu_replay(MemoryRegion *mr, IOMMUNotifier *n, hwaddr addr, granularity; IOMMUTLBEntry iotlb; + /* If the IOMMU has its own replay callback, override */ + if (mr->iommu_ops->replay) { + mr->iommu_ops->replay(mr, n); + return; + } + granularity = memory_region_iommu_get_min_page_size(mr); for (addr = 0; addr < memory_region_size(mr); addr += granularity) {