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: [PATCH v10 04/19] vfio: Common function to increment container_users Date: Wed, 02 Nov 2016 19:34:22 +0800 [thread overview] Message-ID: <5819CF3E.9060304@intel.com> (raw) In-Reply-To: <1477517366-27871-5-git-send-email-kwankhede@nvidia.com> On 10/27/2016 05:29 AM, Kirti Wankhede wrote: > This change rearrange functions to have common function to increment > container_users > > Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com> > Signed-off-by: Neo Jia <cjia@nvidia.com> > Change-Id: I8bdeb352bc8439b107ffd519480fd4dc238677f2 > --- > drivers/vfio/vfio.c | 34 +++++++++++++++++++++------------- > 1 file changed, 21 insertions(+), 13 deletions(-) > > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c > index 23bc86c1d05d..2e83bdf007fe 100644 > --- a/drivers/vfio/vfio.c > +++ b/drivers/vfio/vfio.c > @@ -1385,6 +1385,23 @@ static bool vfio_group_viable(struct vfio_group *group) > group, vfio_dev_viable) == 0); > } > > +static int vfio_group_add_container_user(struct vfio_group *group) > +{ > + if (!atomic_inc_not_zero(&group->container_users)) > + return -EINVAL; > + > + if (group->noiommu) { > + atomic_dec(&group->container_users); > + return -EPERM; > + } trivial: a blank line here > + if (!group->container->iommu_driver || !vfio_group_viable(group)) { > + atomic_dec(&group->container_users); > + return -EINVAL; > + } > + > + return 0; > +} > + > static const struct file_operations vfio_device_fops; > > static int vfio_group_get_device_fd(struct vfio_group *group, char *buf) > @@ -1694,23 +1711,14 @@ static const struct file_operations vfio_device_fops = { > struct vfio_group *vfio_group_get_external_user(struct file *filep) > { > struct vfio_group *group = filep->private_data; > + int ret; > > if (filep->f_op != &vfio_group_fops) > return ERR_PTR(-EINVAL); > > - if (!atomic_inc_not_zero(&group->container_users)) > - return ERR_PTR(-EINVAL); > - > - if (group->noiommu) { > - atomic_dec(&group->container_users); > - return ERR_PTR(-EPERM); > - } > - > - if (!group->container->iommu_driver || > - !vfio_group_viable(group)) { > - atomic_dec(&group->container_users); > - return ERR_PTR(-EINVAL); > - } > + ret = vfio_group_add_container_user(group); > + if (ret) > + return ERR_PTR(ret); > > vfio_group_get(group); > Reviewed-by: Jike Song <jike.song@intel.com> -- Thanks, Jike
WARNING: multiple messages have this Message-ID (diff)
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 v10 04/19] vfio: Common function to increment container_users Date: Wed, 02 Nov 2016 19:34:22 +0800 [thread overview] Message-ID: <5819CF3E.9060304@intel.com> (raw) In-Reply-To: <1477517366-27871-5-git-send-email-kwankhede@nvidia.com> On 10/27/2016 05:29 AM, Kirti Wankhede wrote: > This change rearrange functions to have common function to increment > container_users > > Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com> > Signed-off-by: Neo Jia <cjia@nvidia.com> > Change-Id: I8bdeb352bc8439b107ffd519480fd4dc238677f2 > --- > drivers/vfio/vfio.c | 34 +++++++++++++++++++++------------- > 1 file changed, 21 insertions(+), 13 deletions(-) > > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c > index 23bc86c1d05d..2e83bdf007fe 100644 > --- a/drivers/vfio/vfio.c > +++ b/drivers/vfio/vfio.c > @@ -1385,6 +1385,23 @@ static bool vfio_group_viable(struct vfio_group *group) > group, vfio_dev_viable) == 0); > } > > +static int vfio_group_add_container_user(struct vfio_group *group) > +{ > + if (!atomic_inc_not_zero(&group->container_users)) > + return -EINVAL; > + > + if (group->noiommu) { > + atomic_dec(&group->container_users); > + return -EPERM; > + } trivial: a blank line here > + if (!group->container->iommu_driver || !vfio_group_viable(group)) { > + atomic_dec(&group->container_users); > + return -EINVAL; > + } > + > + return 0; > +} > + > static const struct file_operations vfio_device_fops; > > static int vfio_group_get_device_fd(struct vfio_group *group, char *buf) > @@ -1694,23 +1711,14 @@ static const struct file_operations vfio_device_fops = { > struct vfio_group *vfio_group_get_external_user(struct file *filep) > { > struct vfio_group *group = filep->private_data; > + int ret; > > if (filep->f_op != &vfio_group_fops) > return ERR_PTR(-EINVAL); > > - if (!atomic_inc_not_zero(&group->container_users)) > - return ERR_PTR(-EINVAL); > - > - if (group->noiommu) { > - atomic_dec(&group->container_users); > - return ERR_PTR(-EPERM); > - } > - > - if (!group->container->iommu_driver || > - !vfio_group_viable(group)) { > - atomic_dec(&group->container_users); > - return ERR_PTR(-EINVAL); > - } > + ret = vfio_group_add_container_user(group); > + if (ret) > + return ERR_PTR(ret); > > vfio_group_get(group); > Reviewed-by: Jike Song <jike.song@intel.com> -- Thanks, Jike
next prev parent reply other threads:[~2016-11-02 11:37 UTC|newest] Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-26 21:29 [PATCH v10 00/19] Add Mediated device support Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 01/19] vfio: Mediated device Core driver Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-29 4:30 ` Jike Song 2016-10-29 4:30 ` [Qemu-devel] " Jike Song 2016-10-29 10:06 ` Kirti Wankhede 2016-10-29 10:06 ` [Qemu-devel] " Kirti Wankhede 2016-10-29 18:11 ` Jike Song 2016-10-29 18:11 ` [Qemu-devel] " Jike Song 2016-11-02 7:59 ` Kirti Wankhede 2016-11-02 7:59 ` [Qemu-devel] " Kirti Wankhede 2016-11-02 10:31 ` Jike Song 2016-11-01 3:08 ` Jike Song 2016-11-01 3:08 ` [Qemu-devel] " Jike Song 2016-11-01 3:44 ` Alex Williamson 2016-11-01 3:44 ` [Qemu-devel] " Alex Williamson 2016-11-01 5:28 ` Jike Song 2016-11-01 5:28 ` [Qemu-devel] " Jike Song 2016-10-26 21:29 ` [PATCH v10 02/19] vfio: VFIO based driver for Mediated devices Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` Kirti Wankhede 2016-11-02 10:39 ` Jike Song 2016-11-02 10:39 ` [Qemu-devel] " Jike Song 2016-10-26 21:29 ` [PATCH v10 03/19] vfio: Rearrange functions to get vfio_group from dev Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` Kirti Wankhede 2016-11-02 10:41 ` Jike Song 2016-11-02 10:41 ` [Qemu-devel] " Jike Song 2016-10-26 21:29 ` [PATCH v10 04/19] vfio: Common function to increment container_users Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-11-02 11:34 ` Jike Song [this message] 2016-11-02 11:34 ` Jike Song 2016-10-26 21:29 ` [PATCH v10 05/19] vfio iommu: Added pin and unpin callback functions to vfio_iommu_driver_ops Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-11-01 8:07 ` Jike Song 2016-11-01 8:07 ` [Qemu-devel] " Jike Song 2016-10-26 21:29 ` [PATCH v10 06/19] vfio iommu type1: Update arguments of vfio_lock_acct Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 07/19] vfio iommu type1: Update argument of vaddr_get_pfn() Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-27 12:11 ` Jike Song 2016-10-27 12:11 ` [Qemu-devel] " Jike Song 2016-10-27 12:11 ` Jike Song 2016-10-27 12:24 ` Kirti Wankhede 2016-10-27 12:24 ` [Qemu-devel] " Kirti Wankhede 2016-10-27 12:24 ` Kirti Wankhede 2016-10-28 6:01 ` Jike Song 2016-10-28 6:01 ` [Qemu-devel] " Jike Song 2016-11-02 8:06 ` Kirti Wankhede 2016-11-02 8:06 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 08/19] vfio iommu type1: Add find_iommu_group() function Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-11-02 14:13 ` Jike Song 2016-11-02 14:13 ` [Qemu-devel] " Jike Song 2016-10-26 21:29 ` [PATCH v10 09/19] vfio iommu type1: Add support for mediated devices Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-27 23:01 ` Alex Williamson 2016-10-27 23:01 ` [Qemu-devel] " Alex Williamson 2016-11-02 13:29 ` Jike Song 2016-11-02 13:29 ` [Qemu-devel] " Jike Song 2016-10-26 21:29 ` [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-28 7:33 ` Jike Song 2016-10-28 7:33 ` [Qemu-devel] " Jike Song 2016-10-28 12:38 ` Kirti Wankhede 2016-10-28 12:38 ` [Qemu-devel] " Kirti Wankhede 2016-10-28 12:40 ` Alex Williamson 2016-10-28 12:40 ` [Qemu-devel] " Alex Williamson 2016-10-28 20:02 ` Kirti Wankhede 2016-10-28 20:02 ` [Qemu-devel] " Kirti Wankhede 2016-10-28 20:33 ` Alex Williamson 2016-10-28 20:33 ` [Qemu-devel] " Alex Williamson 2016-10-29 10:37 ` Kirti Wankhede 2016-10-29 10:37 ` [Qemu-devel] " Kirti Wankhede 2016-10-29 14:03 ` Alex Williamson 2016-10-29 14:03 ` [Qemu-devel] " Alex Williamson 2016-10-29 14:03 ` Alex Williamson 2016-11-01 3:45 ` [Qemu-devel] " Dong Jia Shi 2016-11-01 7:47 ` Kirti Wankhede 2016-11-01 7:47 ` [Qemu-devel] " Kirti Wankhede 2016-11-01 8:33 ` Dong Jia Shi 2016-11-01 8:33 ` Dong Jia Shi 2016-11-01 3:45 ` Dong Jia Shi 2016-10-31 3:50 ` Jike Song 2016-10-31 3:50 ` [Qemu-devel] " Jike Song 2016-10-31 5:59 ` Kirti Wankhede 2016-10-31 5:59 ` [Qemu-devel] " Kirti Wankhede 2016-10-31 6:05 ` Jike Song 2016-10-31 6:05 ` [Qemu-devel] " Jike Song 2016-10-26 21:29 ` [PATCH v10 11/19] vfio: Introduce common function to add capabilities Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 12/19] vfio_pci: Update vfio_pci to use vfio_info_add_capability() Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 13/19] vfio: Introduce vfio_set_irqs_validate_and_prepare() Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 14/19] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare() Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 15/19] vfio_platform: " Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 16/19] vfio: Define device_api strings Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 17/19] docs: Add Documentation for Mediated devices Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 18/19] docs: Sysfs ABI for mediated device framework Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-31 7:19 ` Jike Song 2016-10-31 7:19 ` [Qemu-devel] " Jike Song 2016-11-02 7:55 ` Kirti Wankhede 2016-11-02 7:55 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 21:29 ` [PATCH v10 19/19] docs: Sample driver to demonstrate how to use Mediated " Kirti Wankhede 2016-10-26 21:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-27 14:29 ` Jonathan Corbet 2016-10-27 14:29 ` [Qemu-devel] " Jonathan Corbet 2016-11-01 8:32 ` [PATCH v10 00/19] Add Mediated device support Jike Song 2016-11-01 8:32 ` [Qemu-devel] " Jike Song 2016-11-01 15:24 ` Gerd Hoffmann 2016-11-01 15:24 ` [Qemu-devel] " Gerd Hoffmann 2016-11-02 1:01 ` Jike Song
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=5819CF3E.9060304@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: 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.