From: Nicolin Chen <nicolinc@nvidia.com>
To: <joro@8bytes.org>, <will@kernel.org>, <robin.murphy@arm.com>,
<alex.williamson@redhat.com>
Cc: <suravee.suthikulpanit@amd.com>, <marcan@marcan.st>,
<sven@svenpeter.dev>, <alyssa@rosenzweig.io>,
<robdclark@gmail.com>, <dwmw2@infradead.org>,
<baolu.lu@linux.intel.com>, <mjrosato@linux.ibm.com>,
<gerald.schaefer@linux.ibm.com>, <orsonzhai@gmail.com>,
<baolin.wang@linux.alibaba.com>, <zhang.lyra@gmail.com>,
<thierry.reding@gmail.com>, <vdumpa@nvidia.com>,
<jonathanh@nvidia.com>, <jean-philippe@linaro.org>,
<cohuck@redhat.com>, <jgg@nvidia.com>, <tglx@linutronix.de>,
<shameerali.kolothum.thodi@huawei.com>,
<thunder.leizhen@huawei.com>, <christophe.jaillet@wanadoo.fr>,
<yangyingliang@huawei.com>, <jon@solid-run.com>,
<iommu@lists.linux.dev>, <linux-kernel@vger.kernel.org>,
<asahi@lists.linux.dev>, <linux-arm-kernel@lists.infradead.org>,
<linux-arm-msm@vger.kernel.org>, <linux-s390@vger.kernel.org>,
<linux-tegra@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>,
<kvm@vger.kernel.org>, <kevin.tian@intel.com>
Subject: [PATCH v6 4/5] vfio/iommu_type1: Clean up update_dirty_scope in detach_group()
Date: Mon, 15 Aug 2022 11:14:36 -0700 [thread overview]
Message-ID: <20220815181437.28127-5-nicolinc@nvidia.com> (raw)
In-Reply-To: <20220815181437.28127-1-nicolinc@nvidia.com>
All devices in emulated_iommu_groups have pinned_page_dirty_scope
set, so the update_dirty_scope in the first list_for_each_entry
is always false. Clean it up, and move the "if update_dirty_scope"
part from the detach_group_done routine to the domain_list part.
Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
drivers/vfio/vfio_iommu_type1.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 523927d61aac..3b63a5a237c9 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -2464,14 +2464,12 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
struct vfio_iommu *iommu = iommu_data;
struct vfio_domain *domain;
struct vfio_iommu_group *group;
- bool update_dirty_scope = false;
LIST_HEAD(iova_copy);
mutex_lock(&iommu->lock);
list_for_each_entry(group, &iommu->emulated_iommu_groups, next) {
if (group->iommu_group != iommu_group)
continue;
- update_dirty_scope = !group->pinned_page_dirty_scope;
list_del(&group->next);
kfree(group);
@@ -2480,7 +2478,8 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
WARN_ON(!list_empty(&iommu->device_list));
vfio_iommu_unmap_unpin_all(iommu);
}
- goto detach_group_done;
+ mutex_unlock(&iommu->lock);
+ return;
}
/*
@@ -2496,9 +2495,7 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
continue;
iommu_detach_group(domain->domain, group->iommu_group);
- update_dirty_scope = !group->pinned_page_dirty_scope;
list_del(&group->next);
- kfree(group);
/*
* Group ownership provides privilege, if the group list is
* empty, the domain goes away. If it's the last domain with
@@ -2522,6 +2519,16 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
vfio_iommu_aper_expand(iommu, &iova_copy);
vfio_update_pgsize_bitmap(iommu);
}
+ /*
+ * Removal of a group without dirty tracking may allow
+ * the iommu scope to be promoted.
+ */
+ if (!group->pinned_page_dirty_scope) {
+ iommu->num_non_pinned_groups--;
+ if (iommu->dirty_page_tracking)
+ vfio_iommu_populate_bitmap_full(iommu);
+ }
+ kfree(group);
break;
}
@@ -2530,16 +2537,6 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
else
vfio_iommu_iova_free(&iova_copy);
-detach_group_done:
- /*
- * Removal of a group without dirty tracking may allow the iommu scope
- * to be promoted.
- */
- if (update_dirty_scope) {
- iommu->num_non_pinned_groups--;
- if (iommu->dirty_page_tracking)
- vfio_iommu_populate_bitmap_full(iommu);
- }
mutex_unlock(&iommu->lock);
}
--
2.17.1
next prev parent reply other threads:[~2022-08-15 18:21 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-15 18:14 [PATCH v6 0/5] Simplify vfio_iommu_type1 attach/detach routine Nicolin Chen
2022-08-15 18:14 ` [PATCH v6 1/5] iommu: Return -EMEDIUMTYPE for incompatible domain and device/group Nicolin Chen
2022-09-07 12:41 ` Joerg Roedel
2022-09-07 13:47 ` Jason Gunthorpe
2022-09-07 14:06 ` Joerg Roedel
2022-09-07 17:10 ` Jason Gunthorpe
2022-09-08 13:28 ` Joerg Roedel
2022-09-08 16:14 ` Jason Gunthorpe
2022-09-09 3:17 ` Nicolin Chen
2022-09-09 5:00 ` Tian, Kevin
2022-09-09 12:07 ` Jason Gunthorpe
2022-09-13 2:22 ` Tian, Kevin
2022-09-13 5:07 ` Nicolin Chen
2022-09-07 14:23 ` Robin Murphy
2022-09-07 17:00 ` Jason Gunthorpe
2022-09-07 19:41 ` Robin Murphy
2022-09-08 0:43 ` Jason Gunthorpe
2022-09-08 9:30 ` Tian, Kevin
2022-09-08 12:08 ` Jason Gunthorpe
2022-09-10 23:35 ` Nicolin Chen
2022-09-13 2:24 ` Tian, Kevin
2022-09-13 8:36 ` Nicolin Chen
2022-09-08 9:54 ` Tian, Kevin
2022-09-08 10:25 ` Robin Murphy
2022-08-15 18:14 ` [PATCH v6 2/5] vfio/iommu_type1: Prefer to reuse domains vs match enforced cache coherency Nicolin Chen
2022-08-15 18:14 ` [PATCH v6 3/5] vfio/iommu_type1: Remove the domain->ops comparison Nicolin Chen
2022-08-15 18:14 ` Nicolin Chen [this message]
2022-08-15 18:14 ` [PATCH v6 5/5] vfio/iommu_type1: Simplify group attachment Nicolin Chen
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=20220815181437.28127-5-nicolinc@nvidia.com \
--to=nicolinc@nvidia.com \
--cc=alex.williamson@redhat.com \
--cc=alyssa@rosenzweig.io \
--cc=asahi@lists.linux.dev \
--cc=baolin.wang@linux.alibaba.com \
--cc=baolu.lu@linux.intel.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=cohuck@redhat.com \
--cc=dwmw2@infradead.org \
--cc=gerald.schaefer@linux.ibm.com \
--cc=iommu@lists.linux.dev \
--cc=jean-philippe@linaro.org \
--cc=jgg@nvidia.com \
--cc=jon@solid-run.com \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=mjrosato@linux.ibm.com \
--cc=orsonzhai@gmail.com \
--cc=robdclark@gmail.com \
--cc=robin.murphy@arm.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=sven@svenpeter.dev \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
--cc=thunder.leizhen@huawei.com \
--cc=vdumpa@nvidia.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=will@kernel.org \
--cc=yangyingliang@huawei.com \
--cc=zhang.lyra@gmail.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;
as well as URLs for NNTP newsgroup(s).