From: Jike Song <jike.song@intel.com>
To: Kirti Wankhede <kwankhede@nvidia.com>
Cc: alex.williamson@redhat.com, pbonzini@redhat.com,
kraxel@redhat.com, cjia@nvidia.com, qemu-devel@nongnu.org,
kvm@vger.kernel.org, kevin.tian@intel.com,
bjsdjshi@linux.vnet.ibm.com, linux-kernel@vger.kernel.org
Subject: Re: [Qemu-devel] [PATCH v14 11/22] vfio iommu: Add blocking notifier to notify DMA_UNMAP
Date: Thu, 17 Nov 2016 10:53:49 +0800 [thread overview]
Message-ID: <582D1BBD.9040103@intel.com> (raw)
In-Reply-To: <1479329194-10247-12-git-send-email-kwankhede@nvidia.com>
On 11/17/2016 04:46 AM, Kirti Wankhede wrote:
> Added blocking notifier to IOMMU TYPE1 driver to notify vendor drivers
> about DMA_UNMAP.
> Exported two APIs vfio_register_notifier() and vfio_unregister_notifier().
> Notifier should be registered, if external user wants to use
> vfio_pin_pages()/vfio_unpin_pages() APIs to pin/unpin pages.
> Vendor driver should use VFIO_IOMMU_NOTIFY_DMA_UNMAP action to invalidate
> mappings.
>
> Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com>
> Signed-off-by: Neo Jia <cjia@nvidia.com>
> Change-Id: I5910d0024d6be87f3e8d3e0ca0eaeaaa0b17f271
> ---
> drivers/vfio/vfio.c | 73 ++++++++++++++++++++++++++++++++++++++
> drivers/vfio/vfio_iommu_type1.c | 77 +++++++++++++++++++++++++++++++++--------
> include/linux/vfio.h | 12 +++++++
> 3 files changed, 147 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> index bd36c16b0ef2..c850ba324be2 100644
> --- a/drivers/vfio/vfio.c
> +++ b/drivers/vfio/vfio.c
> @@ -1901,6 +1901,79 @@ err_unpin_pages:
> }
> EXPORT_SYMBOL(vfio_unpin_pages);
>
> +int vfio_register_notifier(struct device *dev, struct notifier_block *nb)
> +{
> + struct vfio_container *container;
> + struct vfio_group *group;
> + struct vfio_iommu_driver *driver;
> + ssize_t ret;
> +
Any reason being 'ssize_t' here (and unregister)?
--
Thanks,
Jike
> + if (!dev || !nb)
> + return -EINVAL;
> +
> + group = vfio_group_get_from_dev(dev);
> + if (IS_ERR(group))
> + return PTR_ERR(group);
> +
> + ret = vfio_group_add_container_user(group);
> + if (ret)
> + goto err_register_nb;
> +
> + container = group->container;
> + down_read(&container->group_lock);
> +
> + driver = container->iommu_driver;
> + if (likely(driver && driver->ops->register_notifier))
> + ret = driver->ops->register_notifier(container->iommu_data, nb);
> + else
> + ret = -ENOTTY;
> +
> + up_read(&container->group_lock);
> + vfio_group_try_dissolve_container(group);
> +
> +err_register_nb:
> + vfio_group_put(group);
> + return ret;
> +}
> +EXPORT_SYMBOL(vfio_register_notifier);
> +
> +int vfio_unregister_notifier(struct device *dev, struct notifier_block *nb)
> +{
> + struct vfio_container *container;
> + struct vfio_group *group;
> + struct vfio_iommu_driver *driver;
> + ssize_t ret;
> +
> + if (!dev || !nb)
> + return -EINVAL;
> +
> + group = vfio_group_get_from_dev(dev);
> + if (IS_ERR(group))
> + return PTR_ERR(group);
> +
> + ret = vfio_group_add_container_user(group);
> + if (ret)
> + goto err_unregister_nb;
> +
> + container = group->container;
> + down_read(&container->group_lock);
> +
> + driver = container->iommu_driver;
> + if (likely(driver && driver->ops->unregister_notifier))
> + ret = driver->ops->unregister_notifier(container->iommu_data,
> + nb);
> + else
> + ret = -ENOTTY;
> +
> + up_read(&container->group_lock);
> + vfio_group_try_dissolve_container(group);
> +
> +err_unregister_nb:
> + vfio_group_put(group);
> + return ret;
> +}
> +EXPORT_SYMBOL(vfio_unregister_notifier);
> +
> /**
> * Module/class support
> */
> diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
> index 98191fc590f8..63fbc48a088f 100644
> --- a/drivers/vfio/vfio_iommu_type1.c
> +++ b/drivers/vfio/vfio_iommu_type1.c
> @@ -38,6 +38,7 @@
> #include <linux/workqueue.h>
> #include <linux/pid_namespace.h>
> #include <linux/mdev.h>
> +#include <linux/notifier.h>
>
> #define DRIVER_VERSION "0.2"
> #define DRIVER_AUTHOR "Alex Williamson <alex.williamson@redhat.com>"
> @@ -60,6 +61,7 @@ struct vfio_iommu {
> struct vfio_domain *external_domain; /* domain for external user */
> struct mutex lock;
> struct rb_root dma_list;
> + struct blocking_notifier_head notifier;
> bool v2;
> bool nesting;
> };
> @@ -561,7 +563,8 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data,
>
> mutex_lock(&iommu->lock);
>
> - if (!iommu->external_domain) {
> + /* Fail if notifier list is empty */
> + if ((!iommu->external_domain) || (!iommu->notifier.head)) {
> ret = -EINVAL;
> goto pin_done;
> }
> @@ -776,9 +779,9 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
> struct vfio_iommu_type1_dma_unmap *unmap)
> {
> uint64_t mask;
> - struct vfio_dma *dma;
> + struct vfio_dma *dma, *dma_last = NULL;
> size_t unmapped = 0;
> - int ret = 0;
> + int ret = 0, retries;
>
> mask = ((uint64_t)1 << __ffs(vfio_pgsize_bitmap(iommu))) - 1;
>
> @@ -788,7 +791,7 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
> return -EINVAL;
>
> WARN_ON(mask & PAGE_MASK);
> -
> +again:
> mutex_lock(&iommu->lock);
>
> /*
> @@ -844,6 +847,32 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
> */
> if (dma->task->mm != current->mm)
> break;
> +
> + if (!RB_EMPTY_ROOT(&dma->pfn_list)) {
> + struct vfio_iommu_type1_dma_unmap nb_unmap;
> +
> + if (dma_last == dma) {
> + BUG_ON(++retries > 10);
> + } else {
> + dma_last = dma;
> + retries = 0;
> + }
> +
> + nb_unmap.iova = dma->iova;
> + nb_unmap.size = dma->size;
> +
> + /*
> + * Notify anyone (mdev vendor drivers) to invalidate and
> + * unmap iovas within the range we're about to unmap.
> + * Vendor drivers MUST unpin pages in response to an
> + * invalidation.
> + */
> + mutex_unlock(&iommu->lock);
> + blocking_notifier_call_chain(&iommu->notifier,
> + VFIO_IOMMU_NOTIFY_DMA_UNMAP,
> + &nb_unmap);
> + goto again;
> + }
> unmapped += dma->size;
> vfio_remove_dma(iommu, dma);
> }
> @@ -1321,12 +1350,11 @@ static void vfio_iommu_unmap_unpin_reaccount(struct vfio_iommu *iommu)
>
> static void vfio_sanity_check_pfn_list(struct vfio_iommu *iommu)
> {
> - struct rb_node *n, *p;
> + struct rb_node *n;
>
> n = rb_first(&iommu->dma_list);
> for (; n; n = rb_next(n)) {
> struct vfio_dma *dma;
> - int unlocked = 0;
>
> dma = rb_entry(n, struct vfio_dma, node);
>
> @@ -1419,6 +1447,7 @@ static void *vfio_iommu_type1_open(unsigned long arg)
> INIT_LIST_HEAD(&iommu->domain_list);
> iommu->dma_list = RB_ROOT;
> mutex_init(&iommu->lock);
> + BLOCKING_INIT_NOTIFIER_HEAD(&iommu->notifier);
>
> return iommu;
> }
> @@ -1553,16 +1582,34 @@ static long vfio_iommu_type1_ioctl(void *iommu_data,
> return -ENOTTY;
> }
>
> +static int vfio_iommu_type1_register_notifier(void *iommu_data,
> + struct notifier_block *nb)
> +{
> + struct vfio_iommu *iommu = iommu_data;
> +
> + return blocking_notifier_chain_register(&iommu->notifier, nb);
> +}
> +
> +static int vfio_iommu_type1_unregister_notifier(void *iommu_data,
> + struct notifier_block *nb)
> +{
> + struct vfio_iommu *iommu = iommu_data;
> +
> + return blocking_notifier_chain_unregister(&iommu->notifier, nb);
> +}
> +
> static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
> - .name = "vfio-iommu-type1",
> - .owner = THIS_MODULE,
> - .open = vfio_iommu_type1_open,
> - .release = vfio_iommu_type1_release,
> - .ioctl = vfio_iommu_type1_ioctl,
> - .attach_group = vfio_iommu_type1_attach_group,
> - .detach_group = vfio_iommu_type1_detach_group,
> - .pin_pages = vfio_iommu_type1_pin_pages,
> - .unpin_pages = vfio_iommu_type1_unpin_pages,
> + .name = "vfio-iommu-type1",
> + .owner = THIS_MODULE,
> + .open = vfio_iommu_type1_open,
> + .release = vfio_iommu_type1_release,
> + .ioctl = vfio_iommu_type1_ioctl,
> + .attach_group = vfio_iommu_type1_attach_group,
> + .detach_group = vfio_iommu_type1_detach_group,
> + .pin_pages = vfio_iommu_type1_pin_pages,
> + .unpin_pages = vfio_iommu_type1_unpin_pages,
> + .register_notifier = vfio_iommu_type1_register_notifier,
> + .unregister_notifier = vfio_iommu_type1_unregister_notifier,
> };
>
> static int __init vfio_iommu_type1_init(void)
> diff --git a/include/linux/vfio.h b/include/linux/vfio.h
> index 3c862a030029..6ab13f7e2920 100644
> --- a/include/linux/vfio.h
> +++ b/include/linux/vfio.h
> @@ -80,6 +80,10 @@ struct vfio_iommu_driver_ops {
> unsigned long *phys_pfn);
> int (*unpin_pages)(void *iommu_data,
> unsigned long *user_pfn, int npage);
> + int (*register_notifier)(void *iommu_data,
> + struct notifier_block *nb);
> + int (*unregister_notifier)(void *iommu_data,
> + struct notifier_block *nb);
> };
>
> extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);
> @@ -103,6 +107,14 @@ 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);
>
> +#define VFIO_IOMMU_NOTIFY_DMA_UNMAP (1)
> +
> +extern int vfio_register_notifier(struct device *dev,
> + struct notifier_block *nb);
> +
> +extern int vfio_unregister_notifier(struct device *dev,
> + struct notifier_block *nb);
> +
> /*
> * Sub-module helpers
> */
>
next prev parent reply other threads:[~2016-11-17 2:57 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-16 20:46 [Qemu-devel] [PATCH v14 00/22] Add Mediated device support Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 01/22] vfio: Mediated device Core driver Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 02/22] vfio: VFIO based driver for Mediated devices Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 03/22] vfio: Rearrange functions to get vfio_group from dev Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 04/22] vfio: Common function to increment container_users Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 05/22] vfio iommu: Added pin and unpin callback functions to vfio_iommu_driver_ops Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 06/22] vfio iommu type1: Update arguments of vfio_lock_acct Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 07/22] vfio iommu type1: Update argument of vaddr_get_pfn() Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 08/22] vfio iommu type1: Add find_iommu_group() function Kirti Wankhede
2016-11-21 11:29 ` Auger Eric
2016-11-21 11:55 ` Kirti Wankhede
2016-11-21 12:42 ` Auger Eric
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 09/22] vfio iommu type1: Add task structure to vfio_dma Kirti Wankhede
2016-11-17 5:41 ` Alexey Kardashevskiy
2016-11-17 6:12 ` Alex Williamson
2016-11-17 6:42 ` Alexey Kardashevskiy
2016-11-17 6:23 ` Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 10/22] vfio iommu type1: Add support for mediated devices Kirti Wankhede
2016-11-16 23:57 ` Alex Williamson
2016-11-17 4:49 ` Kirti Wankhede
2016-11-17 4:52 ` Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 11/22] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede
2016-11-17 0:02 ` Alex Williamson
2016-11-17 2:53 ` Jike Song [this message]
2016-11-17 4:58 ` Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 12/22] vfio: Add notifier callback to parent's ops structure of mdev Kirti Wankhede
2016-11-17 2:15 ` Dong Jia Shi
2016-11-17 5:05 ` Kirti Wankhede
2016-11-17 5:04 ` Kirti Wankhede
2016-11-17 12:35 ` Jike Song
2016-11-17 15:27 ` Alex Williamson
2016-11-17 16:00 ` Kirti Wankhede
2016-11-17 16:14 ` Alex Williamson
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 13/22] vfio: Introduce common function to add capabilities Kirti Wankhede
2016-11-21 11:04 ` Auger Eric
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 14/22] vfio_pci: Update vfio_pci to use vfio_info_add_capability() Kirti Wankhede
2016-11-21 11:04 ` Auger Eric
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 15/22] vfio: Introduce vfio_set_irqs_validate_and_prepare() Kirti Wankhede
2016-11-21 10:51 ` Auger Eric
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 16/22] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare() Kirti Wankhede
2016-11-21 10:51 ` Auger Eric
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 17/22] vfio_platform: " Kirti Wankhede
2016-11-21 10:51 ` Auger Eric
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 18/22] vfio: Define device_api strings Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 19/22] docs: Add Documentation for Mediated devices Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 20/22] docs: Sysfs ABI for mediated device framework Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 21/22] docs: Sample driver to demonstrate how to use Mediated " Kirti Wankhede
2016-11-16 20:46 ` [Qemu-devel] [PATCH v14 22/22] MAINTAINERS: Add entry VFIO based Mediated device drivers Kirti Wankhede
2016-11-17 21:25 ` [Qemu-devel] [PATCH v14 00/22] Add Mediated device support Alex Williamson
2016-11-17 22:05 ` Neo Jia
2016-11-18 2:00 ` Kirti Wankhede
2016-11-18 2:26 ` Jike Song
2016-11-17 23:29 ` Tian, Kevin
2016-11-17 23:51 ` Alex Williamson
2016-11-18 2:59 ` Dong Jia Shi
2016-11-18 9:16 ` Zhenyu Wang
2016-11-18 15:40 ` Alex Williamson
2016-11-18 16:09 ` Daniel Vetter
2016-11-18 16:50 ` Alex Williamson
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=582D1BBD.9040103@intel.com \
--to=jike.song@intel.com \
--cc=alex.williamson@redhat.com \
--cc=bjsdjshi@linux.vnet.ibm.com \
--cc=cjia@nvidia.com \
--cc=kevin.tian@intel.com \
--cc=kraxel@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).