Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1523841

[PATCH v14 04/22] vfio: Common function to increment container_users

From Kirti Wankhede <kwankhede@nvidia.com>
Newsgroups linux.kernel
Subject [PATCH v14 04/22] vfio: Common function to increment container_users
Date 2016-11-16 22:00 +0100
Message-ID <sEftg-7M4-31@gated-at.bofh.it> (permalink)
References <sEfjz-7Ip-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

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>
Reviewed-by: Jike Song <jike.song@intel.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;
+	}
+	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);
 
-- 
2.7.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v14 00/22] Add Mediated device support Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 21:50 +0100
  [PATCH v14 11/22] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 21:50 +0100
    Re: [PATCH v14 11/22] vfio iommu: Add blocking notifier to notify  DMA_UNMAP Alex Williamson <alex.williamson@redhat.com> - 2016-11-17 01:10 +0100
    Re: [PATCH v14 11/22] vfio iommu: Add blocking notifier to notify  DMA_UNMAP Jike Song <jike.song@intel.com> - 2016-11-17 04:00 +0100
    Re: [PATCH v14 11/22] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-17 06:00 +0100
  [PATCH v14 18/22] vfio: Define device_api strings Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 21:50 +0100
  [PATCH v14 09/22] vfio iommu type1: Add task structure to vfio_dma Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 21:50 +0100
    Re: [PATCH v14 09/22] vfio iommu type1: Add task structure to  vfio_dma Alexey Kardashevskiy <aik@ozlabs.ru> - 2016-11-17 06:50 +0100
      Re: [PATCH v14 09/22] vfio iommu type1: Add task structure to  vfio_dma Alex Williamson <alex.williamson@redhat.com> - 2016-11-17 07:20 +0100
        Re: [PATCH v14 09/22] vfio iommu type1: Add task structure to  vfio_dma Alexey Kardashevskiy <aik@ozlabs.ru> - 2016-11-17 07:50 +0100
      Re: [PATCH v14 09/22] vfio iommu type1: Add task structure to  vfio_dma Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-17 07:30 +0100
  [PATCH v14 07/22] vfio iommu type1: Update argument of vaddr_get_pfn() Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 21:50 +0100
  [PATCH v14 20/22] docs: Sysfs ABI for mediated device framework Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 21:50 +0100
  [PATCH v14 13/22] vfio: Introduce common function to add capabilities Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 21:50 +0100
    Re: [Qemu-devel] [PATCH v14 13/22] vfio: Introduce common function to  add capabilities Auger Eric <eric.auger@redhat.com> - 2016-11-21 12:10 +0100
  [PATCH v14 01/22] vfio: Mediated device Core driver Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 21:50 +0100
  [PATCH v14 03/22] vfio: Rearrange functions to get vfio_group from dev Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 22:00 +0100
  [PATCH v14 08/22] vfio iommu type1: Add find_iommu_group() function Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 22:00 +0100
    Re: [PATCH v14 08/22] vfio iommu type1: Add find_iommu_group()  function Auger Eric <eric.auger@redhat.com> - 2016-11-21 12:30 +0100
      Re: [PATCH v14 08/22] vfio iommu type1: Add find_iommu_group()  function Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-21 13:00 +0100
        Re: [PATCH v14 08/22] vfio iommu type1: Add find_iommu_group()  function Auger Eric <eric.auger@redhat.com> - 2016-11-21 13:50 +0100
  [PATCH v14 02/22] vfio: VFIO based driver for Mediated devices Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 22:00 +0100
  [PATCH v14 12/22] vfio: Add notifier callback to parent's ops structure of mdev Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 22:00 +0100
    Re: [PATCH v14 12/22] vfio: Add notifier callback to parent's ops  structure of mdev Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-17 06:10 +0100
    Re: [PATCH v14 12/22] vfio: Add notifier callback to parent's ops structure of mdev Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-17 06:10 +0100
    Re: [PATCH v14 12/22] vfio: Add notifier callback to parent's ops  structure of mdev Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-17 18:30 +0100
      Re: [PATCH v14 12/22] vfio: Add notifier callback to parent's ops  structure of mdev Alex Williamson <alex.williamson@redhat.com> - 2016-11-17 18:40 +0100
    Re: [PATCH v14 12/22] vfio: Add notifier callback to parent's ops  structure of mdev Jike Song <jike.song@intel.com> - 2016-11-17 18:40 +0100
      Re: [PATCH v14 12/22] vfio: Add notifier callback to parent's ops  structure of mdev Alex Williamson <alex.williamson@redhat.com> - 2016-11-17 19:00 +0100
  [PATCH v14 04/22] vfio: Common function to increment container_users Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-16 22:00 +0100
  Re: [PATCH v14 00/22] Add Mediated device support Alex Williamson <alex.williamson@redhat.com> - 2016-11-17 22:30 +0100
    Re: [PATCH v14 00/22] Add Mediated device support Neo Jia <cjia@nvidia.com> - 2016-11-17 23:20 +0100
      Re: [PATCH v14 00/22] Add Mediated device support Kirti Wankhede <kwankhede@nvidia.com> - 2016-11-18 03:10 +0100
        Re: [Qemu-devel] [PATCH v14 00/22] Add Mediated device support Jike Song <jike.song@intel.com> - 2016-11-18 03:30 +0100
    RE: [PATCH v14 00/22] Add Mediated device support "Tian, Kevin" <kevin.tian@intel.com> - 2016-11-18 00:30 +0100
      Re: [PATCH v14 00/22] Add Mediated device support Alex Williamson <alex.williamson@redhat.com> - 2016-11-18 01:00 +0100
        Re: [PATCH v14 00/22] Add Mediated device support Zhenyu Wang <zhenyuw@linux.intel.com> - 2016-11-18 10:30 +0100
          Re: [PATCH v14 00/22] Add Mediated device support Alex Williamson <alex.williamson@redhat.com> - 2016-11-18 16:50 +0100
            Re: [PATCH v14 00/22] Add Mediated device support Daniel Vetter <daniel@ffwll.ch> - 2016-11-18 17:20 +0100
              Re: [PATCH v14 00/22] Add Mediated device support Alex Williamson <alex.williamson@redhat.com> - 2016-11-18 18:00 +0100

csiph-web