From: Robin Murphy <robin.murphy@arm.com> To: Jean-Philippe Brucker <jean-philippe@linaro.org>, iommu@lists.linux-foundation.org Cc: bbhushan2@marvell.com, virtualization@lists.linux-foundation.org, jasowang@redhat.com, mst@redhat.com Subject: Re: [PATCH v2 3/3] iommu/virtio: Reject IOMMU page granule larger than PAGE_SIZE Date: Thu, 26 Mar 2020 12:13:21 +0000 [thread overview] Message-ID: <66e665bc-bc33-8bda-331d-270b43cbe36d@arm.com> (raw) In-Reply-To: <20200326093558.2641019-4-jean-philippe@linaro.org> On 2020-03-26 9:35 am, Jean-Philippe Brucker wrote: > We don't currently support IOMMUs with a page granule larger than the > system page size. The IOVA allocator has a BUG_ON() in this case, and > VFIO has a WARN_ON(). > > Removing these obstacles ranges doesn't seem possible without major > changes to the DMA API and VFIO. Some callers of iommu_map(), for > example, want to map multiple page-aligned regions adjacent to each > others for scatter-gather purposes. Even in simple DMA API uses, a call > to dma_map_page() would let the endpoint access neighbouring memory. And > VFIO users cannot ensure that their virtual address buffer is physically > contiguous at the IOMMU granule. > > Rather than triggering the IOVA BUG_ON() on mismatched page sizes, abort > the vdomain finalise() with an error message. We could simply abort the > viommu probe(), but an upcoming extension to virtio-iommu will allow > setting different page masks for each endpoint. Reviewed-by: Robin Murphy <robin.murphy@arm.com> > Reported-by: Bharat Bhushan <bbhushan2@marvell.com> > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> > --- > v1->v2: Move to vdomain_finalise(), improve commit message > --- > drivers/iommu/virtio-iommu.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c > index 5eed75cd121f..750f69c49b95 100644 > --- a/drivers/iommu/virtio-iommu.c > +++ b/drivers/iommu/virtio-iommu.c > @@ -607,12 +607,22 @@ static struct iommu_domain *viommu_domain_alloc(unsigned type) > return &vdomain->domain; > } > > -static int viommu_domain_finalise(struct viommu_dev *viommu, > +static int viommu_domain_finalise(struct viommu_endpoint *vdev, > struct iommu_domain *domain) > { > int ret; > + unsigned long viommu_page_size; > + struct viommu_dev *viommu = vdev->viommu; > struct viommu_domain *vdomain = to_viommu_domain(domain); > > + viommu_page_size = 1UL << __ffs(viommu->pgsize_bitmap); > + if (viommu_page_size > PAGE_SIZE) { > + dev_err(vdev->dev, > + "granule 0x%lx larger than system page size 0x%lx\n", > + viommu_page_size, PAGE_SIZE); > + return -EINVAL; > + } > + > ret = ida_alloc_range(&viommu->domain_ids, viommu->first_domain, > viommu->last_domain, GFP_KERNEL); > if (ret < 0) > @@ -659,7 +669,7 @@ static int viommu_attach_dev(struct iommu_domain *domain, struct device *dev) > * Properly initialize the domain now that we know which viommu > * owns it. > */ > - ret = viommu_domain_finalise(vdev->viommu, domain); > + ret = viommu_domain_finalise(vdev, domain); > } else if (vdomain->viommu != vdev->viommu) { > dev_err(dev, "cannot attach to foreign vIOMMU\n"); > ret = -EXDEV; > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Robin Murphy <robin.murphy@arm.com> To: Jean-Philippe Brucker <jean-philippe@linaro.org>, iommu@lists.linux-foundation.org Cc: bbhushan2@marvell.com, virtualization@lists.linux-foundation.org, mst@redhat.com Subject: Re: [PATCH v2 3/3] iommu/virtio: Reject IOMMU page granule larger than PAGE_SIZE Date: Thu, 26 Mar 2020 12:13:21 +0000 [thread overview] Message-ID: <66e665bc-bc33-8bda-331d-270b43cbe36d@arm.com> (raw) In-Reply-To: <20200326093558.2641019-4-jean-philippe@linaro.org> On 2020-03-26 9:35 am, Jean-Philippe Brucker wrote: > We don't currently support IOMMUs with a page granule larger than the > system page size. The IOVA allocator has a BUG_ON() in this case, and > VFIO has a WARN_ON(). > > Removing these obstacles ranges doesn't seem possible without major > changes to the DMA API and VFIO. Some callers of iommu_map(), for > example, want to map multiple page-aligned regions adjacent to each > others for scatter-gather purposes. Even in simple DMA API uses, a call > to dma_map_page() would let the endpoint access neighbouring memory. And > VFIO users cannot ensure that their virtual address buffer is physically > contiguous at the IOMMU granule. > > Rather than triggering the IOVA BUG_ON() on mismatched page sizes, abort > the vdomain finalise() with an error message. We could simply abort the > viommu probe(), but an upcoming extension to virtio-iommu will allow > setting different page masks for each endpoint. Reviewed-by: Robin Murphy <robin.murphy@arm.com> > Reported-by: Bharat Bhushan <bbhushan2@marvell.com> > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> > --- > v1->v2: Move to vdomain_finalise(), improve commit message > --- > drivers/iommu/virtio-iommu.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c > index 5eed75cd121f..750f69c49b95 100644 > --- a/drivers/iommu/virtio-iommu.c > +++ b/drivers/iommu/virtio-iommu.c > @@ -607,12 +607,22 @@ static struct iommu_domain *viommu_domain_alloc(unsigned type) > return &vdomain->domain; > } > > -static int viommu_domain_finalise(struct viommu_dev *viommu, > +static int viommu_domain_finalise(struct viommu_endpoint *vdev, > struct iommu_domain *domain) > { > int ret; > + unsigned long viommu_page_size; > + struct viommu_dev *viommu = vdev->viommu; > struct viommu_domain *vdomain = to_viommu_domain(domain); > > + viommu_page_size = 1UL << __ffs(viommu->pgsize_bitmap); > + if (viommu_page_size > PAGE_SIZE) { > + dev_err(vdev->dev, > + "granule 0x%lx larger than system page size 0x%lx\n", > + viommu_page_size, PAGE_SIZE); > + return -EINVAL; > + } > + > ret = ida_alloc_range(&viommu->domain_ids, viommu->first_domain, > viommu->last_domain, GFP_KERNEL); > if (ret < 0) > @@ -659,7 +669,7 @@ static int viommu_attach_dev(struct iommu_domain *domain, struct device *dev) > * Properly initialize the domain now that we know which viommu > * owns it. > */ > - ret = viommu_domain_finalise(vdev->viommu, domain); > + ret = viommu_domain_finalise(vdev, domain); > } else if (vdomain->viommu != vdev->viommu) { > dev_err(dev, "cannot attach to foreign vIOMMU\n"); > ret = -EXDEV; >
next prev parent reply other threads:[~2020-03-26 12:13 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-26 9:35 [PATCH v2 0/3] iommu/virtio: Misc fixes Jean-Philippe Brucker 2020-03-26 9:35 ` Jean-Philippe Brucker 2020-03-26 9:35 ` [PATCH v2 1/3] iommu/virtio: Fix sparse warning Jean-Philippe Brucker 2020-03-26 9:35 ` Jean-Philippe Brucker 2020-03-26 9:35 ` [PATCH v2 2/3] iommu/virtio: Fix freeing of incomplete domains Jean-Philippe Brucker 2020-03-26 9:35 ` Jean-Philippe Brucker 2020-03-26 12:09 ` Robin Murphy 2020-03-26 12:09 ` Robin Murphy 2020-03-26 9:35 ` [PATCH v2 3/3] iommu/virtio: Reject IOMMU page granule larger than PAGE_SIZE Jean-Philippe Brucker 2020-03-26 9:35 ` Jean-Philippe Brucker 2020-03-26 12:13 ` Robin Murphy [this message] 2020-03-26 12:13 ` Robin Murphy 2020-03-26 17:41 ` Auger Eric 2020-03-26 17:41 ` Auger Eric 2020-03-27 5:48 ` [EXT] " Bharat Bhushan 2020-03-27 5:48 ` Bharat Bhushan 2020-03-27 10:11 ` [PATCH v2 0/3] iommu/virtio: Misc fixes Joerg Roedel 2020-03-27 10:11 ` Joerg Roedel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=66e665bc-bc33-8bda-331d-270b43cbe36d@arm.com \ --to=robin.murphy@arm.com \ --cc=bbhushan2@marvell.com \ --cc=iommu@lists.linux-foundation.org \ --cc=jasowang@redhat.com \ --cc=jean-philippe@linaro.org \ --cc=mst@redhat.com \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.