[PATCH v9 4/9] virtio-iommu: set supported page size mask
Add optional interface to set page size mask. Currently this is set global configuration and not per endpoint. Signed-off-by: Bharat Bhushan --- include/hw/virtio/virtio-iommu.h | 1 + hw/virtio/virtio-iommu.c | 9 + 2 files changed, 10 insertions(+) diff --git a/include/hw/virtio/virtio-iommu.h b/include/hw/virtio/virtio-iommu.h index 6f67f1020a..4efa09610a 100644 --- a/include/hw/virtio/virtio-iommu.h +++ b/include/hw/virtio/virtio-iommu.h @@ -35,6 +35,7 @@ typedef struct IOMMUDevice { void *viommu; PCIBus *bus; int devfn; +uint64_t page_size_mask; IOMMUMemoryRegion iommu_mr; AddressSpace as; } IOMMUDevice; diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 4cee8083bc..a28818202c 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -650,6 +650,14 @@ static gint int_cmp(gconstpointer a, gconstpointer b, gpointer user_data) return (ua > ub) - (ua < ub); } +static void virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr, +uint64_t page_size_mask) +{ +IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr); + +sdev->page_size_mask = page_size_mask; +} + static void virtio_iommu_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -865,6 +873,7 @@ static void virtio_iommu_memory_region_class_init(ObjectClass *klass, IOMMUMemoryRegionClass *imrc = IOMMU_MEMORY_REGION_CLASS(klass); imrc->translate = virtio_iommu_translate; +imrc->iommu_set_page_size_mask = virtio_iommu_set_page_size_mask; } static const TypeInfo virtio_iommu_info = { -- 2.17.1
Re: [PATCH v9 4/9] virtio-iommu: set supported page size mask
Hi Bharat, On 3/23/20 9:46 AM, Bharat Bhushan wrote: > Add optional interface to set page size mask. > Currently this is set global configuration and not > per endpoint. This allows to override the page size mask per end-point? > > Signed-off-by: Bharat Bhushan > --- > include/hw/virtio/virtio-iommu.h | 1 + > hw/virtio/virtio-iommu.c | 9 + > 2 files changed, 10 insertions(+) > > diff --git a/include/hw/virtio/virtio-iommu.h > b/include/hw/virtio/virtio-iommu.h > index 6f67f1020a..4efa09610a 100644 > --- a/include/hw/virtio/virtio-iommu.h > +++ b/include/hw/virtio/virtio-iommu.h > @@ -35,6 +35,7 @@ typedef struct IOMMUDevice { > void *viommu; > PCIBus *bus; > int devfn; > +uint64_t page_size_mask; > IOMMUMemoryRegion iommu_mr; > AddressSpace as; > } IOMMUDevice; > diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c > index 4cee8083bc..a28818202c 100644 > --- a/hw/virtio/virtio-iommu.c > +++ b/hw/virtio/virtio-iommu.c > @@ -650,6 +650,14 @@ static gint int_cmp(gconstpointer a, gconstpointer b, > gpointer user_data) > return (ua > ub) - (ua < ub); > } > > +static void virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr, > +uint64_t page_size_mask) > +{ > +IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr); > + > +sdev->page_size_mask = page_size_mask; > +} > + > static void virtio_iommu_device_realize(DeviceState *dev, Error **errp) > { > VirtIODevice *vdev = VIRTIO_DEVICE(dev); > @@ -865,6 +873,7 @@ static void > virtio_iommu_memory_region_class_init(ObjectClass *klass, > IOMMUMemoryRegionClass *imrc = IOMMU_MEMORY_REGION_CLASS(klass); > > imrc->translate = virtio_iommu_translate; > +imrc->iommu_set_page_size_mask = virtio_iommu_set_page_size_mask; > } > > static const TypeInfo virtio_iommu_info = { > Thanks Eric
RE: [EXT] Re: [PATCH v9 4/9] virtio-iommu: set supported page size mask
Hi Eric, > -Original Message- > From: Auger Eric > Sent: Thursday, March 26, 2020 9:22 PM > To: Bharat Bhushan ; peter.mayd...@linaro.org; > pet...@redhat.com; eric.auger@gmail.com; alex.william...@redhat.com; > kevin.t...@intel.com; m...@redhat.com; Tomasz Nowicki [C] > ; drjo...@redhat.com; linuc.dec...@gmail.com; qemu- > de...@nongnu.org; qemu-...@nongnu.org; bharatb.li...@gmail.com; jean- > phili...@linaro.org; yang.zh...@intel.com > Subject: [EXT] Re: [PATCH v9 4/9] virtio-iommu: set supported page size mask > > External Email > > -- > Hi Bharat, > > On 3/23/20 9:46 AM, Bharat Bhushan wrote: > > Add optional interface to set page size mask. > > Currently this is set global configuration and not per endpoint. > This allows to override the page size mask per end-point? This patch adds per endpoint page-size-mask configuration in addition to global page-size-mask. endpoint page-size-mask will override global page-size-mask configuration for that endpoint. Thanks -Bharat > > > > Signed-off-by: Bharat Bhushan > > --- > > include/hw/virtio/virtio-iommu.h | 1 + > > hw/virtio/virtio-iommu.c | 9 + > > 2 files changed, 10 insertions(+) > > > > diff --git a/include/hw/virtio/virtio-iommu.h > > b/include/hw/virtio/virtio-iommu.h > > index 6f67f1020a..4efa09610a 100644 > > --- a/include/hw/virtio/virtio-iommu.h > > +++ b/include/hw/virtio/virtio-iommu.h > > @@ -35,6 +35,7 @@ typedef struct IOMMUDevice { > > void *viommu; > > PCIBus *bus; > > int devfn; > > +uint64_t page_size_mask; > > IOMMUMemoryRegion iommu_mr; > > AddressSpace as; > > } IOMMUDevice; > > diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index > > 4cee8083bc..a28818202c 100644 > > --- a/hw/virtio/virtio-iommu.c > > +++ b/hw/virtio/virtio-iommu.c > > @@ -650,6 +650,14 @@ static gint int_cmp(gconstpointer a, gconstpointer b, > gpointer user_data) > > return (ua > ub) - (ua < ub); > > } > > > > +static void virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr, > > +uint64_t page_size_mask) > > +{ > > +IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr); > > + > > +sdev->page_size_mask = page_size_mask; } > > + > > static void virtio_iommu_device_realize(DeviceState *dev, Error > > **errp) { > > VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -865,6 +873,7 @@ > > static void virtio_iommu_memory_region_class_init(ObjectClass *klass, > > IOMMUMemoryRegionClass *imrc = > IOMMU_MEMORY_REGION_CLASS(klass); > > > > imrc->translate = virtio_iommu_translate; > > +imrc->iommu_set_page_size_mask = virtio_iommu_set_page_size_mask; > > } > > > > static const TypeInfo virtio_iommu_info = { > > > Thanks > > Eric
Re: [EXT] Re: [PATCH v9 4/9] virtio-iommu: set supported page size mask
Hi Bharat, On 3/27/20 6:13 AM, Bharat Bhushan wrote: > Hi Eric, > >> -Original Message- >> From: Auger Eric >> Sent: Thursday, March 26, 2020 9:22 PM >> To: Bharat Bhushan ; peter.mayd...@linaro.org; >> pet...@redhat.com; eric.auger@gmail.com; alex.william...@redhat.com; >> kevin.t...@intel.com; m...@redhat.com; Tomasz Nowicki [C] >> ; drjo...@redhat.com; linuc.dec...@gmail.com; qemu- >> de...@nongnu.org; qemu-...@nongnu.org; bharatb.li...@gmail.com; jean- >> phili...@linaro.org; yang.zh...@intel.com >> Subject: [EXT] Re: [PATCH v9 4/9] virtio-iommu: set supported page size mask >> >> External Email >> >> -- >> Hi Bharat, >> >> On 3/23/20 9:46 AM, Bharat Bhushan wrote: >>> Add optional interface to set page size mask. >>> Currently this is set global configuration and not per endpoint. >> This allows to override the page size mask per end-point? > > This patch adds per endpoint page-size-mask configuration in addition to > global page-size-mask. > endpoint page-size-mask will override global page-size-mask configuration for > that endpoint. Yes my comment was a suggestion for commit msg rephrasing. Sorry if it was unclear. The above text sounds clearer. thanks Eric > > Thanks > -Bharat > >>> >>> Signed-off-by: Bharat Bhushan >>> --- >>> include/hw/virtio/virtio-iommu.h | 1 + >>> hw/virtio/virtio-iommu.c | 9 + >>> 2 files changed, 10 insertions(+) >>> >>> diff --git a/include/hw/virtio/virtio-iommu.h >>> b/include/hw/virtio/virtio-iommu.h >>> index 6f67f1020a..4efa09610a 100644 >>> --- a/include/hw/virtio/virtio-iommu.h >>> +++ b/include/hw/virtio/virtio-iommu.h >>> @@ -35,6 +35,7 @@ typedef struct IOMMUDevice { >>> void *viommu; >>> PCIBus *bus; >>> int devfn; >>> +uint64_t page_size_mask; >>> IOMMUMemoryRegion iommu_mr; >>> AddressSpace as; >>> } IOMMUDevice; >>> diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index >>> 4cee8083bc..a28818202c 100644 >>> --- a/hw/virtio/virtio-iommu.c >>> +++ b/hw/virtio/virtio-iommu.c >>> @@ -650,6 +650,14 @@ static gint int_cmp(gconstpointer a, gconstpointer b, >> gpointer user_data) >>> return (ua > ub) - (ua < ub); >>> } >>> >>> +static void virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr, >>> +uint64_t page_size_mask) >>> +{ >>> +IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr); >>> + >>> +sdev->page_size_mask = page_size_mask; } >>> + >>> static void virtio_iommu_device_realize(DeviceState *dev, Error >>> **errp) { >>> VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -865,6 +873,7 @@ >>> static void virtio_iommu_memory_region_class_init(ObjectClass *klass, >>> IOMMUMemoryRegionClass *imrc = >> IOMMU_MEMORY_REGION_CLASS(klass); >>> >>> imrc->translate = virtio_iommu_translate; >>> +imrc->iommu_set_page_size_mask = virtio_iommu_set_page_size_mask; >>> } >>> >>> static const TypeInfo virtio_iommu_info = { >>> >> Thanks >> >> Eric > >