| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20200116053202.GA1759@joy-OptiPlex-7040>
Date: Thu, 16 Jan 2020 00:32:02 -0500
From: Yan Zhao <yan.y.zhao@...el.com>
To: Alex Williamson <alex.williamson@...hat.com>
Cc: "Tian, Kevin" <kevin.tian@...el.com>,
"kvm@...r.kernel.org" <kvm@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"zhenyuw@...ux.intel.com" <zhenyuw@...ux.intel.com>,
"peterx@...hat.com" <peterx@...hat.com>,
"pbonzini@...hat.com" <pbonzini@...hat.com>,
"intel-gvt-dev@...ts.freedesktop.org"
<intel-gvt-dev@...ts.freedesktop.org>
Subject: Re: [PATCH v2 1/2] vfio: introduce vfio_dma_rw to read/write a range
of IOVAs
On Thu, Jan 16, 2020 at 04:06:38AM +0800, Alex Williamson wrote:
> On Tue, 14 Jan 2020 22:53:03 -0500
> Yan Zhao <yan.y.zhao@...el.com> wrote:
>
> > vfio_dma_rw will read/write a range of user space memory pointed to by
> > IOVA into/from a kernel buffer without pinning the user space memory.
> >
> > TODO: mark the IOVAs to user space memory dirty if they are written in
> > vfio_dma_rw().
> >
> > Cc: Kevin Tian <kevin.tian@...el.com>
> > Signed-off-by: Yan Zhao <yan.y.zhao@...el.com>
> > ---
> > drivers/vfio/vfio.c | 45 +++++++++++++++++++
> > drivers/vfio/vfio_iommu_type1.c | 76 +++++++++++++++++++++++++++++++++
> > include/linux/vfio.h | 5 +++
> > 3 files changed, 126 insertions(+)
> >
> > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> > index c8482624ca34..8bd52bc841cf 100644
> > --- a/drivers/vfio/vfio.c
> > +++ b/drivers/vfio/vfio.c
> > @@ -1961,6 +1961,51 @@ int vfio_unpin_pages(struct device *dev, unsigned long *user_pfn, int npage)
> > }
> > EXPORT_SYMBOL(vfio_unpin_pages);
> >
> > +/*
> > + * Read/Write a range of IOVAs pointing to user space memory into/from a kernel
> > + * buffer without pinning the user space memory
> > + * @dev [in] : device
> > + * @iova [in] : base IOVA of a user space buffer
> > + * @data [in] : pointer to kernel buffer
> > + * @len [in] : kernel buffer length
> > + * @write : indicate read or write
> > + * Return error code on failure or 0 on success.
> > + */
> > +int vfio_dma_rw(struct device *dev, dma_addr_t iova, void *data,
> > + size_t len, bool write)
> > +{
> > + struct vfio_container *container;
> > + struct vfio_group *group;
> > + struct vfio_iommu_driver *driver;
> > + int ret = 0;
> > +
> > + if (!dev || !data || len <= 0)
> > + return -EINVAL;
> > +
> > + group = vfio_group_get_from_dev(dev);
> > + if (!group)
> > + return -ENODEV;
> > +
> > + ret = vfio_group_add_container_user(group);
> > + if (ret)
> > + goto out;
> > +
> > + container = group->container;
> > + driver = container->iommu_driver;
> > +
> > + if (likely(driver && driver->ops->dma_rw))
> > + ret = driver->ops->dma_rw(container->iommu_data,
> > + iova, data, len, write);
> > + else
> > + ret = -ENOTTY;
> > +
> > + vfio_group_try_dissolve_container(group);
> > +out:
> > + vfio_group_put(group);
> > + return ret;
> > +}
> > +EXPORT_SYMBOL(vfio_dma_rw);
> > +
> > static int vfio_register_iommu_notifier(struct vfio_group *group,
> > unsigned long *events,
> > struct notifier_block *nb)
> > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
> > index 2ada8e6cdb88..a2d850b97ae6 100644
> > --- a/drivers/vfio/vfio_iommu_type1.c
> > +++ b/drivers/vfio/vfio_iommu_type1.c
> > @@ -27,6 +27,7 @@
> > #include <linux/iommu.h>
> > #include <linux/module.h>
> > #include <linux/mm.h>
> > +#include <linux/mmu_context.h>
> > #include <linux/rbtree.h>
> > #include <linux/sched/signal.h>
> > #include <linux/sched/mm.h>
> > @@ -2326,6 +2327,80 @@ static int vfio_iommu_type1_unregister_notifier(void *iommu_data,
> > return blocking_notifier_chain_unregister(&iommu->notifier, nb);
> > }
> >
> > +static size_t vfio_iommu_type1_rw_dma_nopin(struct vfio_iommu *iommu,
> > + dma_addr_t iova, void *data,
> > + size_t count, bool write)
>
> "_nopin"? It might be pinned, but that's irrelevant to this interface.
> Maybe "_chunk" as we're only trying to operate on the chunk of the whole
> that fits within the next vfio_dma? Also swapping rw_dma vs dma_rw,
> pick one.
>
got it!
> > +{
> > + struct mm_struct *mm;
> > + unsigned long vaddr;
> > + struct vfio_dma *dma;
> > + bool kthread = current->mm == NULL;
> > + size_t done = 0;
> > + size_t offset;
> > +
> > + dma = vfio_find_dma(iommu, iova, 1);
> > + if (!dma)
> > + return 0;
> > +
> > + if (write && !(dma->prot & IOMMU_WRITE))
> > + return 0;
>
> Good catch, but users can also designate a mapping without read
> permissions, in which case this interface should not allow read either.
> Thanks,
>
yes, will add it too. thanks :)
Yan
> > +
> > + mm = get_task_mm(dma->task);
> > +
> > + if (!mm)
> > + return 0;
> > +
> > + if (kthread)
> > + use_mm(mm);
> > + else if (current->mm != mm)
> > + goto out;
> > +
> > + offset = iova - dma->iova;
> > +
> > + if (count > dma->size - offset)
> > + count = dma->size - offset;
> > +
> > + vaddr = dma->vaddr + offset;
> > +
> > + if (write)
> > + done = __copy_to_user((void __user *)vaddr, data, count) ?
> > + 0 : count;
> > + else
> > + done = __copy_from_user(data, (void __user *)vaddr, count) ?
> > + 0 : count;
> > +
> > + if (kthread)
> > + unuse_mm(mm);
> > +out:
> > + mmput(mm);
> > + return done;
> > +}
> > +
> > +static int vfio_iommu_type1_dma_rw(void *iommu_data, dma_addr_t iova,
> > + void *data, size_t count, bool write)
> > +{
> > + struct vfio_iommu *iommu = iommu_data;
> > + int ret = 0;
> > + size_t done = 0;
> > +
> > + mutex_lock(&iommu->lock);
> > + while (count > 0) {
> > + done = vfio_iommu_type1_rw_dma_nopin(iommu, iova, data,
> > + count, write);
> > + if (!done) {
> > + ret = -EFAULT;
> > + break;
> > + }
> > +
> > + count -= done;
> > + data += done;
> > + iova += done;
> > + }
> > +
> > + mutex_unlock(&iommu->lock);
> > + return ret;
> > +}
> > +
> > static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
> > .name = "vfio-iommu-type1",
> > .owner = THIS_MODULE,
> > @@ -2338,6 +2413,7 @@ static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
> > .unpin_pages = vfio_iommu_type1_unpin_pages,
> > .register_notifier = vfio_iommu_type1_register_notifier,
> > .unregister_notifier = vfio_iommu_type1_unregister_notifier,
> > + .dma_rw = vfio_iommu_type1_dma_rw,
> > };
> >
> > static int __init vfio_iommu_type1_init(void)
> > diff --git a/include/linux/vfio.h b/include/linux/vfio.h
> > index e42a711a2800..962f76a2d668 100644
> > --- a/include/linux/vfio.h
> > +++ b/include/linux/vfio.h
> > @@ -82,6 +82,8 @@ struct vfio_iommu_driver_ops {
> > struct notifier_block *nb);
> > int (*unregister_notifier)(void *iommu_data,
> > struct notifier_block *nb);
> > + int (*dma_rw)(void *iommu_data, dma_addr_t iova,
> > + void *data, size_t count, bool write);
> > };
> >
> > extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);
> > @@ -107,6 +109,9 @@ extern int vfio_pin_pages(struct device *dev, unsigned long *user_pfn,
> > extern int vfio_unpin_pages(struct device *dev, unsigned long *user_pfn,
> > int npage);
> >
> > +extern int vfio_dma_rw(struct device *dev, dma_addr_t iova, void *data,
> > + size_t len, bool write);
> > +
> > /* each type has independent events */
> > enum vfio_notify_type {
> > VFIO_IOMMU_NOTIFY = 0,
>
> _______________________________________________
> intel-gvt-dev mailing list
> intel-gvt-dev@...ts.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
Powered by blists - more mailing lists