* [PATCH v3 1/2] vfio/iommu_type1: Populate full dirty when detach non-pinned group
2021-01-22 9:26 [PATCH v3 0/2] vfio/iommu_type1: some fixes Keqian Zhu
@ 2021-01-22 9:26 ` Keqian Zhu
2021-01-22 9:26 ` [PATCH v3 2/2] vfio/iommu_type1: Fix some sanity checks in detach group Keqian Zhu
2021-02-02 17:21 ` [PATCH v3 0/2] vfio/iommu_type1: some fixes Alex Williamson
2 siblings, 0 replies; 6+ messages in thread
From: Keqian Zhu @ 2021-01-22 9:26 UTC (permalink / raw)
To: linux-kernel, linux-arm-kernel, kvm, kvmarm, iommu,
Alex Williamson, Kirti Wankhede, Cornelia Huck
Cc: Will Deacon, Marc Zyngier, Catalin Marinas, Mark Rutland,
James Morse, Robin Murphy, Joerg Roedel, Daniel Lezcano,
Thomas Gleixner, Suzuki K Poulose, Julien Thierry, Andrew Morton,
Alexios Zavras, wanghaibin.wang, jiangkunkun
If a group with non-pinned-page dirty scope is detached with dirty
logging enabled, we should fully populate the dirty bitmaps at the
time it's removed since we don't know the extent of its previous DMA,
nor will the group be present to trigger the full bitmap when the user
retrieves the dirty bitmap.
Fixes: d6a4c185660c ("vfio iommu: Implementation of ioctl for dirty pages tracking")
Suggested-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
---
drivers/vfio/vfio_iommu_type1.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 0b4dedaa9128..161725395f2f 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -236,6 +236,18 @@ static void vfio_dma_populate_bitmap(struct vfio_dma *dma, size_t pgsize)
}
}
+static void vfio_iommu_populate_bitmap_full(struct vfio_iommu *iommu)
+{
+ struct rb_node *n;
+ unsigned long pgshift = __ffs(iommu->pgsize_bitmap);
+
+ for (n = rb_first(&iommu->dma_list); n; n = rb_next(n)) {
+ struct vfio_dma *dma = rb_entry(n, struct vfio_dma, node);
+
+ bitmap_set(dma->bitmap, 0, dma->size >> pgshift);
+ }
+}
+
static int vfio_dma_bitmap_alloc_all(struct vfio_iommu *iommu, size_t pgsize)
{
struct rb_node *n;
@@ -2415,8 +2427,11 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
* Removal of a group without dirty tracking may allow the iommu scope
* to be promoted.
*/
- if (update_dirty_scope)
+ if (update_dirty_scope) {
update_pinned_page_dirty_scope(iommu);
+ if (iommu->dirty_page_tracking)
+ vfio_iommu_populate_bitmap_full(iommu);
+ }
mutex_unlock(&iommu->lock);
}
--
2.19.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 2/2] vfio/iommu_type1: Fix some sanity checks in detach group
2021-01-22 9:26 [PATCH v3 0/2] vfio/iommu_type1: some fixes Keqian Zhu
2021-01-22 9:26 ` [PATCH v3 1/2] vfio/iommu_type1: Populate full dirty when detach non-pinned group Keqian Zhu
@ 2021-01-22 9:26 ` Keqian Zhu
2021-01-27 23:46 ` Alex Williamson
2021-02-02 17:21 ` [PATCH v3 0/2] vfio/iommu_type1: some fixes Alex Williamson
2 siblings, 1 reply; 6+ messages in thread
From: Keqian Zhu @ 2021-01-22 9:26 UTC (permalink / raw)
To: linux-kernel, linux-arm-kernel, kvm, kvmarm, iommu,
Alex Williamson, Kirti Wankhede, Cornelia Huck
Cc: Will Deacon, Marc Zyngier, Catalin Marinas, Mark Rutland,
James Morse, Robin Murphy, Joerg Roedel, Daniel Lezcano,
Thomas Gleixner, Suzuki K Poulose, Julien Thierry, Andrew Morton,
Alexios Zavras, wanghaibin.wang, jiangkunkun
vfio_sanity_check_pfn_list() is used to check whether pfn_list and
notifier are empty when remove the external domain, so it makes a
wrong assumption that only external domain will use the pinning
interface.
Now we apply the pfn_list check when a vfio_dma is removed and apply
the notifier check when all domains are removed.
Fixes: a54eb55045ae ("vfio iommu type1: Add support for mediated devices")
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
---
drivers/vfio/vfio_iommu_type1.c | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 161725395f2f..d8c10f508321 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -957,6 +957,7 @@ static long vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma,
static void vfio_remove_dma(struct vfio_iommu *iommu, struct vfio_dma *dma)
{
+ WARN_ON(!RB_EMPTY_ROOT(&dma->pfn_list));
vfio_unmap_unpin(iommu, dma, true);
vfio_unlink_dma(iommu, dma);
put_task_struct(dma->task);
@@ -2250,23 +2251,6 @@ static void vfio_iommu_unmap_unpin_reaccount(struct vfio_iommu *iommu)
}
}
-static void vfio_sanity_check_pfn_list(struct vfio_iommu *iommu)
-{
- struct rb_node *n;
-
- n = rb_first(&iommu->dma_list);
- for (; n; n = rb_next(n)) {
- struct vfio_dma *dma;
-
- dma = rb_entry(n, struct vfio_dma, node);
-
- if (WARN_ON(!RB_EMPTY_ROOT(&dma->pfn_list)))
- break;
- }
- /* mdev vendor driver must unregister notifier */
- WARN_ON(iommu->notifier.head);
-}
-
/*
* Called when a domain is removed in detach. It is possible that
* the removed domain decided the iova aperture window. Modify the
@@ -2366,10 +2350,10 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
kfree(group);
if (list_empty(&iommu->external_domain->group_list)) {
- vfio_sanity_check_pfn_list(iommu);
-
- if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu))
+ if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu)) {
+ WARN_ON(iommu->notifier.head);
vfio_iommu_unmap_unpin_all(iommu);
+ }
kfree(iommu->external_domain);
iommu->external_domain = NULL;
@@ -2403,10 +2387,12 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
*/
if (list_empty(&domain->group_list)) {
if (list_is_singular(&iommu->domain_list)) {
- if (!iommu->external_domain)
+ if (!iommu->external_domain) {
+ WARN_ON(iommu->notifier.head);
vfio_iommu_unmap_unpin_all(iommu);
- else
+ } else {
vfio_iommu_unmap_unpin_reaccount(iommu);
+ }
}
iommu_domain_free(domain->domain);
list_del(&domain->next);
@@ -2488,9 +2474,10 @@ static void vfio_iommu_type1_release(void *iommu_data)
struct vfio_iommu *iommu = iommu_data;
struct vfio_domain *domain, *domain_tmp;
+ WARN_ON(iommu->notifier.head);
+
if (iommu->external_domain) {
vfio_release_domain(iommu->external_domain, true);
- vfio_sanity_check_pfn_list(iommu);
kfree(iommu->external_domain);
}
--
2.19.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 2/2] vfio/iommu_type1: Fix some sanity checks in detach group
2021-01-22 9:26 ` [PATCH v3 2/2] vfio/iommu_type1: Fix some sanity checks in detach group Keqian Zhu
@ 2021-01-27 23:46 ` Alex Williamson
2021-01-28 15:21 ` Keqian Zhu
0 siblings, 1 reply; 6+ messages in thread
From: Alex Williamson @ 2021-01-27 23:46 UTC (permalink / raw)
To: Keqian Zhu
Cc: linux-kernel, linux-arm-kernel, kvm, kvmarm, iommu,
Kirti Wankhede, Cornelia Huck, Will Deacon, Marc Zyngier,
Catalin Marinas, Mark Rutland, James Morse, Robin Murphy,
Joerg Roedel, Daniel Lezcano, Thomas Gleixner, Suzuki K Poulose,
Julien Thierry, Andrew Morton, Alexios Zavras, wanghaibin.wang,
jiangkunkun
On Fri, 22 Jan 2021 17:26:35 +0800
Keqian Zhu <zhukeqian1@huawei.com> wrote:
> vfio_sanity_check_pfn_list() is used to check whether pfn_list and
> notifier are empty when remove the external domain, so it makes a
> wrong assumption that only external domain will use the pinning
> interface.
>
> Now we apply the pfn_list check when a vfio_dma is removed and apply
> the notifier check when all domains are removed.
>
> Fixes: a54eb55045ae ("vfio iommu type1: Add support for mediated devices")
> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
> ---
> drivers/vfio/vfio_iommu_type1.c | 33 ++++++++++-----------------------
> 1 file changed, 10 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
> index 161725395f2f..d8c10f508321 100644
> --- a/drivers/vfio/vfio_iommu_type1.c
> +++ b/drivers/vfio/vfio_iommu_type1.c
> @@ -957,6 +957,7 @@ static long vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma,
>
> static void vfio_remove_dma(struct vfio_iommu *iommu, struct vfio_dma *dma)
> {
> + WARN_ON(!RB_EMPTY_ROOT(&dma->pfn_list));
> vfio_unmap_unpin(iommu, dma, true);
> vfio_unlink_dma(iommu, dma);
> put_task_struct(dma->task);
> @@ -2250,23 +2251,6 @@ static void vfio_iommu_unmap_unpin_reaccount(struct vfio_iommu *iommu)
> }
> }
>
> -static void vfio_sanity_check_pfn_list(struct vfio_iommu *iommu)
> -{
> - struct rb_node *n;
> -
> - n = rb_first(&iommu->dma_list);
> - for (; n; n = rb_next(n)) {
> - struct vfio_dma *dma;
> -
> - dma = rb_entry(n, struct vfio_dma, node);
> -
> - if (WARN_ON(!RB_EMPTY_ROOT(&dma->pfn_list)))
> - break;
> - }
> - /* mdev vendor driver must unregister notifier */
> - WARN_ON(iommu->notifier.head);
> -}
> -
> /*
> * Called when a domain is removed in detach. It is possible that
> * the removed domain decided the iova aperture window. Modify the
> @@ -2366,10 +2350,10 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
> kfree(group);
>
> if (list_empty(&iommu->external_domain->group_list)) {
> - vfio_sanity_check_pfn_list(iommu);
> -
> - if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu))
> + if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu)) {
> + WARN_ON(iommu->notifier.head);
> vfio_iommu_unmap_unpin_all(iommu);
> + }
>
> kfree(iommu->external_domain);
> iommu->external_domain = NULL;
> @@ -2403,10 +2387,12 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
> */
> if (list_empty(&domain->group_list)) {
> if (list_is_singular(&iommu->domain_list)) {
> - if (!iommu->external_domain)
> + if (!iommu->external_domain) {
> + WARN_ON(iommu->notifier.head);
> vfio_iommu_unmap_unpin_all(iommu);
> - else
> + } else {
> vfio_iommu_unmap_unpin_reaccount(iommu);
> + }
> }
> iommu_domain_free(domain->domain);
> list_del(&domain->next);
> @@ -2488,9 +2474,10 @@ static void vfio_iommu_type1_release(void *iommu_data)
> struct vfio_iommu *iommu = iommu_data;
> struct vfio_domain *domain, *domain_tmp;
>
> + WARN_ON(iommu->notifier.head);
I don't see that this does any harm, but isn't it actually redundant?
It seems vfio-core only calls the iommu backend release function after
removing all the groups, so the tests in _detach_group should catch all
cases. We're expecting the vfio bus/mdev driver to remove the notifier
when a device is closed, which necessarily occurs before detaching the
group. Thanks,
Alex
> +
> if (iommu->external_domain) {
> vfio_release_domain(iommu->external_domain, true);
> - vfio_sanity_check_pfn_list(iommu);
> kfree(iommu->external_domain);
> }
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3 2/2] vfio/iommu_type1: Fix some sanity checks in detach group
2021-01-27 23:46 ` Alex Williamson
@ 2021-01-28 15:21 ` Keqian Zhu
0 siblings, 0 replies; 6+ messages in thread
From: Keqian Zhu @ 2021-01-28 15:21 UTC (permalink / raw)
To: Alex Williamson
Cc: linux-kernel, linux-arm-kernel, kvm, kvmarm, iommu,
Kirti Wankhede, Cornelia Huck, Will Deacon, Marc Zyngier,
Catalin Marinas, Mark Rutland, James Morse, Robin Murphy,
Joerg Roedel, Daniel Lezcano, Thomas Gleixner, Suzuki K Poulose,
Julien Thierry, Andrew Morton, Alexios Zavras, wanghaibin.wang,
jiangkunkun
On 2021/1/28 7:46, Alex Williamson wrote:
> On Fri, 22 Jan 2021 17:26:35 +0800
> Keqian Zhu <zhukeqian1@huawei.com> wrote:
>
>> vfio_sanity_check_pfn_list() is used to check whether pfn_list and
>> notifier are empty when remove the external domain, so it makes a
>> wrong assumption that only external domain will use the pinning
>> interface.
>>
>> Now we apply the pfn_list check when a vfio_dma is removed and apply
>> the notifier check when all domains are removed.
>>
>> Fixes: a54eb55045ae ("vfio iommu type1: Add support for mediated devices")
>> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
>> ---
>> drivers/vfio/vfio_iommu_type1.c | 33 ++++++++++-----------------------
>> 1 file changed, 10 insertions(+), 23 deletions(-)
>>
>> diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
>> index 161725395f2f..d8c10f508321 100644
>> --- a/drivers/vfio/vfio_iommu_type1.c
>> +++ b/drivers/vfio/vfio_iommu_type1.c
>> @@ -957,6 +957,7 @@ static long vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma,
>>
>> static void vfio_remove_dma(struct vfio_iommu *iommu, struct vfio_dma *dma)
>> {
>> + WARN_ON(!RB_EMPTY_ROOT(&dma->pfn_list));
>> vfio_unmap_unpin(iommu, dma, true);
>> vfio_unlink_dma(iommu, dma);
>> put_task_struct(dma->task);
>> @@ -2250,23 +2251,6 @@ static void vfio_iommu_unmap_unpin_reaccount(struct vfio_iommu *iommu)
>> }
>> }
>>
>> -static void vfio_sanity_check_pfn_list(struct vfio_iommu *iommu)
>> -{
>> - struct rb_node *n;
>> -
>> - n = rb_first(&iommu->dma_list);
>> - for (; n; n = rb_next(n)) {
>> - struct vfio_dma *dma;
>> -
>> - dma = rb_entry(n, struct vfio_dma, node);
>> -
>> - if (WARN_ON(!RB_EMPTY_ROOT(&dma->pfn_list)))
>> - break;
>> - }
>> - /* mdev vendor driver must unregister notifier */
>> - WARN_ON(iommu->notifier.head);
>> -}
>> -
>> /*
>> * Called when a domain is removed in detach. It is possible that
>> * the removed domain decided the iova aperture window. Modify the
>> @@ -2366,10 +2350,10 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
>> kfree(group);
>>
>> if (list_empty(&iommu->external_domain->group_list)) {
>> - vfio_sanity_check_pfn_list(iommu);
>> -
>> - if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu))
>> + if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu)) {
>> + WARN_ON(iommu->notifier.head);
>> vfio_iommu_unmap_unpin_all(iommu);
>> + }
>>
>> kfree(iommu->external_domain);
>> iommu->external_domain = NULL;
>> @@ -2403,10 +2387,12 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
>> */
>> if (list_empty(&domain->group_list)) {
>> if (list_is_singular(&iommu->domain_list)) {
>> - if (!iommu->external_domain)
>> + if (!iommu->external_domain) {
>> + WARN_ON(iommu->notifier.head);
>> vfio_iommu_unmap_unpin_all(iommu);
>> - else
>> + } else {
>> vfio_iommu_unmap_unpin_reaccount(iommu);
>> + }
>> }
>> iommu_domain_free(domain->domain);
>> list_del(&domain->next);
>> @@ -2488,9 +2474,10 @@ static void vfio_iommu_type1_release(void *iommu_data)
>> struct vfio_iommu *iommu = iommu_data;
>> struct vfio_domain *domain, *domain_tmp;
>>
>> + WARN_ON(iommu->notifier.head);
>
> I don't see that this does any harm, but isn't it actually redundant?
> It seems vfio-core only calls the iommu backend release function after
> removing all the groups, so the tests in _detach_group should catch all
> cases. We're expecting the vfio bus/mdev driver to remove the notifier
> when a device is closed, which necessarily occurs before detaching the
> group. Thanks,
>
> Alex
Hi Alex,
Sorry that today I was busy at sending the smmu HTTU based dma dirty log tracking.
I will reply you tomorrow. Thanks!
Keqian.
>
>> +
>> if (iommu->external_domain) {
>> vfio_release_domain(iommu->external_domain, true);
>> - vfio_sanity_check_pfn_list(iommu);
>> kfree(iommu->external_domain);
>> }
>>
>
> .
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 0/2] vfio/iommu_type1: some fixes
2021-01-22 9:26 [PATCH v3 0/2] vfio/iommu_type1: some fixes Keqian Zhu
2021-01-22 9:26 ` [PATCH v3 1/2] vfio/iommu_type1: Populate full dirty when detach non-pinned group Keqian Zhu
2021-01-22 9:26 ` [PATCH v3 2/2] vfio/iommu_type1: Fix some sanity checks in detach group Keqian Zhu
@ 2021-02-02 17:21 ` Alex Williamson
2 siblings, 0 replies; 6+ messages in thread
From: Alex Williamson @ 2021-02-02 17:21 UTC (permalink / raw)
To: Keqian Zhu
Cc: linux-kernel, linux-arm-kernel, kvm, kvmarm, iommu,
Kirti Wankhede, Cornelia Huck, Will Deacon, Marc Zyngier,
Catalin Marinas, Mark Rutland, James Morse, Robin Murphy,
Joerg Roedel, Daniel Lezcano, Thomas Gleixner, Suzuki K Poulose,
Julien Thierry, Andrew Morton, Alexios Zavras, wanghaibin.wang,
jiangkunkun
On Fri, 22 Jan 2021 17:26:33 +0800
Keqian Zhu <zhukeqian1@huawei.com> wrote:
> v3:
> - Populate bitmap unconditionally.
> - Sanity check notifier when remove all domains.
>
> v2:
> - Address suggestions from Alex.
> - Remove unnecessary patches.
>
>
> Keqian Zhu (2):
> vfio/iommu_type1: Populate full dirty when detach non-pinned group
> vfio/iommu_type1: Fix some sanity checks in detach group
>
> drivers/vfio/vfio_iommu_type1.c | 50 +++++++++++++++++----------------
> 1 file changed, 26 insertions(+), 24 deletions(-)
>
Applied to vfio next branch for v5.12, dropped WARN_ON in release on
patch 2. Thanks,
Alex
^ permalink raw reply [flat|nested] 6+ messages in thread