From: Christoph Hellwig <hch@lst.de>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: Diana Craciun <diana.craciun@oss.nxp.com>,
Cornelia Huck <cohuck@redhat.com>,
Kirti Wankhede <kwankhede@nvidia.com>,
Eric Auger <eric.auger@redhat.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
Terrence Xu <terrence.xu@intel.com>,
kvm@vger.kernel.org, Jason Gunthorpe <jgg@nvidia.com>,
Kevin Tian <kevin.tian@intel.com>
Subject: [PATCH 15/15] vfio/iommu_type1: remove IS_IOMMU_CAP_DOMAIN_IN_CONTAINER
Date: Fri, 24 Sep 2021 17:57:05 +0200 [thread overview]
Message-ID: <20210924155705.4258-16-hch@lst.de> (raw)
In-Reply-To: <20210924155705.4258-1-hch@lst.de>
IS_IOMMU_CAP_DOMAIN_IN_CONTAINER just obsfucated the checks being
performed, so open code it in the callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
---
drivers/vfio/vfio_iommu_type1.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index f1e408806e6871..7e89d3c1b825e2 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -139,9 +139,6 @@ struct vfio_regions {
size_t len;
};
-#define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu) \
- (!list_empty(&iommu->domain_list))
-
#define DIRTY_BITMAP_BYTES(n) (ALIGN(n, BITS_PER_TYPE(u64)) / BITS_PER_BYTE)
/*
@@ -879,7 +876,7 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data,
* already pinned and accounted. Accounting should be done if there is no
* iommu capable domain in the container.
*/
- do_accounting = !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu);
+ do_accounting = list_empty(&iommu->domain_list);
for (i = 0; i < npage; i++) {
struct vfio_pfn *vpfn;
@@ -968,7 +965,7 @@ static int vfio_iommu_type1_unpin_pages(void *iommu_data,
mutex_lock(&iommu->lock);
- do_accounting = !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu);
+ do_accounting = list_empty(&iommu->domain_list);
for (i = 0; i < npage; i++) {
struct vfio_dma *dma;
dma_addr_t iova;
@@ -1089,7 +1086,7 @@ static long vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma,
if (!dma->size)
return 0;
- if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu))
+ if (list_empty(&iommu->domain_list))
return 0;
/*
@@ -1666,7 +1663,7 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
vfio_link_dma(iommu, dma);
/* Don't pin and map if container doesn't contain IOMMU capable domain*/
- if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu))
+ if (list_empty(&iommu->domain_list))
dma->size = size;
else
ret = vfio_pin_map_dma(iommu, dma, size);
@@ -2472,7 +2469,7 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
kfree(group);
if (list_empty(&iommu->emulated_iommu_groups) &&
- !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu)) {
+ list_empty(&iommu->domain_list)) {
WARN_ON(iommu->notifier.head);
vfio_iommu_unmap_unpin_all(iommu);
}
--
2.30.2
next prev parent reply other threads:[~2021-09-24 16:16 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 15:56 cleanup vfio iommu_group creation v6 Christoph Hellwig
2021-09-24 15:56 ` [PATCH 01/15] vfio: Move vfio_iommu_group_get() to vfio_register_group_dev() Christoph Hellwig
2021-09-24 15:56 ` [PATCH 02/15] vfio: factor out a vfio_iommu_driver_allowed helper Christoph Hellwig
2021-09-24 15:56 ` [PATCH 03/15] vfio: remove the iommudata check in vfio_noiommu_attach_group Christoph Hellwig
2021-09-24 15:56 ` [PATCH 04/15] vfio: factor out a vfio_group_find_or_alloc helper Christoph Hellwig
2021-09-24 15:56 ` [PATCH 05/15] vfio: refactor noiommu group creation Christoph Hellwig
2021-09-24 15:56 ` [PATCH 06/15] vfio: remove the iommudata hack for noiommu groups Christoph Hellwig
2021-09-24 15:56 ` [PATCH 07/15] vfio: simplify iommu group allocation for mediated devices Christoph Hellwig
2021-09-24 15:56 ` [PATCH 08/15] vfio: remove unused method from vfio_iommu_driver_ops Christoph Hellwig
2021-09-24 15:56 ` [PATCH 09/15] vfio: move the vfio_iommu_driver_ops interface out of <linux/vfio.h> Christoph Hellwig
2021-09-24 15:57 ` [PATCH 10/15] vfio: remove the unused mdev iommu hook Christoph Hellwig
2021-09-24 15:57 ` [PATCH 11/15] vfio: clean up the check for mediated device in vfio_iommu_type1 Christoph Hellwig
2021-09-24 15:57 ` [PATCH 12/15] vfio/spapr_tce: reject mediated devices Christoph Hellwig
2021-09-24 15:57 ` [PATCH 13/15] vfio/iommu_type1: initialize pgsize_bitmap in ->open Christoph Hellwig
2021-09-24 17:48 ` Jason Gunthorpe
2021-09-24 18:37 ` Alex Williamson
2021-09-27 11:49 ` Christoph Hellwig
2021-09-27 12:56 ` Alex Williamson
2021-09-27 13:53 ` Christoph Hellwig
2021-09-24 15:57 ` [PATCH 14/15] vfio/iommu_type1: remove the "external" domain Christoph Hellwig
2021-09-24 15:57 ` Christoph Hellwig [this message]
2021-09-30 20:16 ` cleanup vfio iommu_group creation v6 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=20210924155705.4258-16-hch@lst.de \
--to=hch@lst.de \
--cc=alex.williamson@redhat.com \
--cc=cohuck@redhat.com \
--cc=diana.craciun@oss.nxp.com \
--cc=eric.auger@redhat.com \
--cc=jgg@nvidia.com \
--cc=jgg@ziepe.ca \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=terrence.xu@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: 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