From: Lu Baolu <baolu.lu@linux.intel.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Joerg Roedel <joro@8bytes.org>, Alex Williamson <alex.williamson@redhat.com>, Bjorn Helgaas <bhelgaas@google.com>, Jason Gunthorpe <jgg@nvidia.com>, Christoph Hellwig <hch@infradead.org>, Kevin Tian <kevin.tian@intel.com>, Ashok Raj <ashok.raj@intel.com> Cc: Will Deacon <will@kernel.org>, Robin Murphy <robin.murphy@arm.com>, Dan Williams <dan.j.williams@intel.com>, rafael@kernel.org, Diana Craciun <diana.craciun@oss.nxp.com>, Cornelia Huck <cohuck@redhat.com>, Eric Auger <eric.auger@redhat.com>, Liu Yi L <yi.l.liu@intel.com>, Jacob jun Pan <jacob.jun.pan@intel.com>, Chaitanya Kulkarni <kch@nvidia.com>, Stuart Yoder <stuyoder@gmail.com>, Laurentiu Tudor <laurentiu.tudor@nxp.com>, Thierry Reding <thierry.reding@gmail.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Jonathan Hunter <jonathanh@nvidia.com>, Li Yang <leoyang.li@nxp.com>, Dmitry Osipenko <digetx@gmail.com>, iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com> Subject: [PATCH v4 09/13] vfio: Remove use of vfio_group_viable() Date: Fri, 17 Dec 2021 14:37:04 +0800 [thread overview] Message-ID: <20211217063708.1740334-10-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20211217063708.1740334-1-baolu.lu@linux.intel.com> As DMA USER ownership is claimed for the iommu group when a vfio group is added to a vfio container, the vfio group viability is guaranteed as long as group->container_users > 0. Remove those unnecessary group viability checks which are only hit when group->container_users is not zero. The only remaining reference is in GROUP_GET_STATUS, which could be called at any time when group fd is valid. Here we just replace the vfio_group_viable() by directly calling iommu core to get viability status. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> --- drivers/vfio/vfio.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index b75ba7551079..241756b85705 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -1316,12 +1316,6 @@ static int vfio_group_set_container(struct vfio_group *group, int container_fd) return ret; } -static bool vfio_group_viable(struct vfio_group *group) -{ - return (iommu_group_for_each_dev(group->iommu_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)) @@ -1331,7 +1325,7 @@ static int vfio_group_add_container_user(struct vfio_group *group) atomic_dec(&group->container_users); return -EPERM; } - if (!group->container->iommu_driver || !vfio_group_viable(group)) { + if (!group->container->iommu_driver) { atomic_dec(&group->container_users); return -EINVAL; } @@ -1349,7 +1343,7 @@ static int vfio_group_get_device_fd(struct vfio_group *group, char *buf) int ret = 0; if (0 == atomic_read(&group->container_users) || - !group->container->iommu_driver || !vfio_group_viable(group)) + !group->container->iommu_driver) return -EINVAL; if (group->type == VFIO_NO_IOMMU && !capable(CAP_SYS_RAWIO)) @@ -1441,11 +1435,11 @@ static long vfio_group_fops_unl_ioctl(struct file *filep, status.flags = 0; - if (vfio_group_viable(group)) - status.flags |= VFIO_GROUP_FLAGS_VIABLE; - if (group->container) - status.flags |= VFIO_GROUP_FLAGS_CONTAINER_SET; + status.flags |= VFIO_GROUP_FLAGS_CONTAINER_SET | + VFIO_GROUP_FLAGS_VIABLE; + else if (iommu_group_dma_owner_unclaimed(group->iommu_group)) + status.flags |= VFIO_GROUP_FLAGS_VIABLE; if (copy_to_user((void __user *)arg, &status, minsz)) return -EFAULT; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Lu Baolu <baolu.lu@linux.intel.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Joerg Roedel <joro@8bytes.org>, Alex Williamson <alex.williamson@redhat.com>, Bjorn Helgaas <bhelgaas@google.com>, Jason Gunthorpe <jgg@nvidia.com>, Christoph Hellwig <hch@infradead.org>, Kevin Tian <kevin.tian@intel.com>, Ashok Raj <ashok.raj@intel.com> Cc: kvm@vger.kernel.org, rafael@kernel.org, David Airlie <airlied@linux.ie>, linux-pci@vger.kernel.org, Thierry Reding <thierry.reding@gmail.com>, Diana Craciun <diana.craciun@oss.nxp.com>, Dmitry Osipenko <digetx@gmail.com>, Will Deacon <will@kernel.org>, Stuart Yoder <stuyoder@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, Chaitanya Kulkarni <kch@nvidia.com>, Dan Williams <dan.j.williams@intel.com>, Cornelia Huck <cohuck@redhat.com>, linux-kernel@vger.kernel.org, Li Yang <leoyang.li@nxp.com>, iommu@lists.linux-foundation.org, Jacob jun Pan <jacob.jun.pan@intel.com>, Daniel Vetter <daniel@ffwll.ch>, Robin Murphy <robin.murphy@arm.com> Subject: [PATCH v4 09/13] vfio: Remove use of vfio_group_viable() Date: Fri, 17 Dec 2021 14:37:04 +0800 [thread overview] Message-ID: <20211217063708.1740334-10-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20211217063708.1740334-1-baolu.lu@linux.intel.com> As DMA USER ownership is claimed for the iommu group when a vfio group is added to a vfio container, the vfio group viability is guaranteed as long as group->container_users > 0. Remove those unnecessary group viability checks which are only hit when group->container_users is not zero. The only remaining reference is in GROUP_GET_STATUS, which could be called at any time when group fd is valid. Here we just replace the vfio_group_viable() by directly calling iommu core to get viability status. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> --- drivers/vfio/vfio.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index b75ba7551079..241756b85705 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -1316,12 +1316,6 @@ static int vfio_group_set_container(struct vfio_group *group, int container_fd) return ret; } -static bool vfio_group_viable(struct vfio_group *group) -{ - return (iommu_group_for_each_dev(group->iommu_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)) @@ -1331,7 +1325,7 @@ static int vfio_group_add_container_user(struct vfio_group *group) atomic_dec(&group->container_users); return -EPERM; } - if (!group->container->iommu_driver || !vfio_group_viable(group)) { + if (!group->container->iommu_driver) { atomic_dec(&group->container_users); return -EINVAL; } @@ -1349,7 +1343,7 @@ static int vfio_group_get_device_fd(struct vfio_group *group, char *buf) int ret = 0; if (0 == atomic_read(&group->container_users) || - !group->container->iommu_driver || !vfio_group_viable(group)) + !group->container->iommu_driver) return -EINVAL; if (group->type == VFIO_NO_IOMMU && !capable(CAP_SYS_RAWIO)) @@ -1441,11 +1435,11 @@ static long vfio_group_fops_unl_ioctl(struct file *filep, status.flags = 0; - if (vfio_group_viable(group)) - status.flags |= VFIO_GROUP_FLAGS_VIABLE; - if (group->container) - status.flags |= VFIO_GROUP_FLAGS_CONTAINER_SET; + status.flags |= VFIO_GROUP_FLAGS_CONTAINER_SET | + VFIO_GROUP_FLAGS_VIABLE; + else if (iommu_group_dma_owner_unclaimed(group->iommu_group)) + status.flags |= VFIO_GROUP_FLAGS_VIABLE; if (copy_to_user((void __user *)arg, &status, minsz)) return -EFAULT; -- 2.25.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2021-12-17 6:38 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-17 6:36 [PATCH v4 00/13] Fix BUG_ON in vfio_iommu_group_notifier() Lu Baolu 2021-12-17 6:36 ` Lu Baolu 2021-12-17 6:36 ` [PATCH v4 01/13] iommu: Add device dma ownership set/release interfaces Lu Baolu 2021-12-17 6:36 ` Lu Baolu 2021-12-17 6:36 ` [PATCH v4 02/13] driver core: Set DMA ownership during driver bind/unbind Lu Baolu 2021-12-17 6:36 ` Lu Baolu 2021-12-22 12:47 ` Greg Kroah-Hartman 2021-12-22 12:47 ` Greg Kroah-Hartman 2021-12-22 17:52 ` Jason Gunthorpe 2021-12-22 17:52 ` Jason Gunthorpe via iommu 2021-12-23 2:08 ` Lu Baolu 2021-12-23 2:08 ` Lu Baolu 2021-12-23 3:02 ` Lu Baolu 2021-12-23 3:02 ` Lu Baolu 2021-12-23 7:13 ` Greg Kroah-Hartman 2021-12-23 7:13 ` Greg Kroah-Hartman 2021-12-23 7:23 ` Lu Baolu 2021-12-23 7:23 ` Lu Baolu 2021-12-31 0:36 ` Jason Gunthorpe 2021-12-31 0:36 ` Jason Gunthorpe via iommu 2021-12-17 6:36 ` [PATCH v4 03/13] PCI: pci_stub: Suppress kernel DMA ownership auto-claiming Lu Baolu 2021-12-17 6:36 ` Lu Baolu 2021-12-29 20:42 ` Bjorn Helgaas 2021-12-29 20:42 ` Bjorn Helgaas 2021-12-30 5:34 ` Lu Baolu 2021-12-30 5:34 ` Lu Baolu 2021-12-30 22:24 ` Bjorn Helgaas 2021-12-30 22:24 ` Bjorn Helgaas 2021-12-31 0:40 ` Jason Gunthorpe 2021-12-31 0:40 ` Jason Gunthorpe via iommu 2021-12-31 1:10 ` Lu Baolu 2021-12-31 1:10 ` Lu Baolu 2021-12-31 1:58 ` Lu Baolu 2021-12-31 1:58 ` Lu Baolu 2022-01-03 19:53 ` Jason Gunthorpe 2022-01-03 19:53 ` Jason Gunthorpe via iommu 2022-01-04 1:54 ` Lu Baolu 2022-01-04 1:54 ` Lu Baolu 2021-12-31 1:06 ` Lu Baolu 2021-12-31 1:06 ` Lu Baolu 2021-12-17 6:36 ` [PATCH v4 04/13] PCI: portdrv: " Lu Baolu 2021-12-17 6:36 ` Lu Baolu 2021-12-29 21:16 ` Bjorn Helgaas 2021-12-29 21:16 ` Bjorn Helgaas 2021-12-30 5:49 ` Lu Baolu 2021-12-30 5:49 ` Lu Baolu 2021-12-17 6:37 ` [PATCH v4 05/13] iommu: Add security context management for assigned devices Lu Baolu 2021-12-17 6:37 ` Lu Baolu 2021-12-17 6:37 ` [PATCH v4 06/13] iommu: Expose group variants of dma ownership interfaces Lu Baolu 2021-12-17 6:37 ` Lu Baolu 2021-12-17 6:37 ` [PATCH v4 07/13] iommu: Add iommu_at[de]tach_device_shared() for multi-device groups Lu Baolu 2021-12-17 6:37 ` Lu Baolu 2021-12-21 16:50 ` Robin Murphy 2021-12-21 16:50 ` Robin Murphy 2021-12-21 18:46 ` Jason Gunthorpe 2021-12-21 18:46 ` Jason Gunthorpe via iommu 2021-12-22 4:22 ` Lu Baolu 2021-12-22 4:22 ` Lu Baolu 2021-12-22 4:25 ` Lu Baolu 2021-12-22 4:25 ` Lu Baolu 2021-12-22 20:26 ` Robin Murphy 2021-12-22 20:26 ` Robin Murphy 2021-12-23 0:57 ` Jason Gunthorpe 2021-12-23 0:57 ` Jason Gunthorpe via iommu 2021-12-23 5:53 ` Lu Baolu 2021-12-23 5:53 ` Lu Baolu 2021-12-23 14:03 ` Jason Gunthorpe 2021-12-23 14:03 ` Jason Gunthorpe via iommu 2021-12-24 1:30 ` Lu Baolu 2021-12-24 1:30 ` Lu Baolu 2021-12-24 2:50 ` Jason Gunthorpe 2021-12-24 2:50 ` Jason Gunthorpe via iommu 2021-12-24 6:44 ` Lu Baolu 2021-12-24 6:44 ` Lu Baolu 2022-01-04 1:53 ` Lu Baolu 2022-01-04 1:53 ` Lu Baolu 2021-12-24 3:19 ` Lu Baolu 2021-12-24 3:19 ` Lu Baolu 2021-12-24 14:24 ` Jason Gunthorpe 2021-12-24 14:24 ` Jason Gunthorpe via iommu 2021-12-17 6:37 ` [PATCH v4 08/13] vfio: Set DMA USER ownership for VFIO devices Lu Baolu 2021-12-17 6:37 ` Lu Baolu 2021-12-17 6:37 ` Lu Baolu [this message] 2021-12-17 6:37 ` [PATCH v4 09/13] vfio: Remove use of vfio_group_viable() Lu Baolu 2021-12-17 6:37 ` [PATCH v4 10/13] vfio: Delete the unbound_list Lu Baolu 2021-12-17 6:37 ` Lu Baolu 2021-12-17 6:37 ` [PATCH v4 11/13] vfio: Remove iommu group notifier Lu Baolu 2021-12-17 6:37 ` Lu Baolu 2021-12-17 6:37 ` [PATCH v4 12/13] iommu: Remove iommu group changes notifier Lu Baolu 2021-12-17 6:37 ` Lu Baolu 2021-12-17 6:37 ` [PATCH v4 13/13] drm/tegra: Use the iommu dma_owner mechanism Lu Baolu 2021-12-17 6:37 ` Lu Baolu 2022-01-04 5:23 ` [PATCH v4 00/13] Fix BUG_ON in vfio_iommu_group_notifier() Lu Baolu 2022-01-04 5:23 ` Lu Baolu
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=20211217063708.1740334-10-baolu.lu@linux.intel.com \ --to=baolu.lu@linux.intel.com \ --cc=airlied@linux.ie \ --cc=alex.williamson@redhat.com \ --cc=ashok.raj@intel.com \ --cc=bhelgaas@google.com \ --cc=cohuck@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=daniel@ffwll.ch \ --cc=diana.craciun@oss.nxp.com \ --cc=digetx@gmail.com \ --cc=eric.auger@redhat.com \ --cc=gregkh@linuxfoundation.org \ --cc=hch@infradead.org \ --cc=iommu@lists.linux-foundation.org \ --cc=jacob.jun.pan@intel.com \ --cc=jgg@nvidia.com \ --cc=jonathanh@nvidia.com \ --cc=joro@8bytes.org \ --cc=kch@nvidia.com \ --cc=kevin.tian@intel.com \ --cc=kvm@vger.kernel.org \ --cc=laurentiu.tudor@nxp.com \ --cc=leoyang.li@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=rafael@kernel.org \ --cc=robin.murphy@arm.com \ --cc=stuyoder@gmail.com \ --cc=thierry.reding@gmail.com \ --cc=will@kernel.org \ --cc=yi.l.liu@intel.com \ /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.