From: Keqian Zhu <zhukeqian1@huawei.com>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<iommu@lists.linux-foundation.org>, <kvm@vger.kernel.org>,
<kvmarm@lists.cs.columbia.edu>,
Kirti Wankhede <kwankhede@nvidia.com>,
Cornelia Huck <cohuck@redhat.com>, Will Deacon <will@kernel.org>,
"Marc Zyngier" <maz@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
"Mark Rutland" <mark.rutland@arm.com>,
James Morse <james.morse@arm.com>,
"Robin Murphy" <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
"Suzuki K Poulose" <suzuki.poulose@arm.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Alexios Zavras <alexios.zavras@intel.com>,
<wanghaibin.wang@huawei.com>, <jiangkunkun@huawei.com>
Subject: Re: [PATCH v2 1/2] vfio/iommu_type1: Populate full dirty when detach non-pinned group
Date: Mon, 18 Jan 2021 20:25:09 +0800 [thread overview]
Message-ID: <f8de434c-1993-cfe8-c451-2235be1ceb85@huawei.com> (raw)
In-Reply-To: <20210115110144.61e3c843@omen.home.shazbot.org>
On 2021/1/16 2:01, Alex Williamson wrote:
> On Fri, 15 Jan 2021 17:26:42 +0800
> Keqian Zhu <zhukeqian1@huawei.com> wrote:
>
>> 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 | 18 +++++++++++++++++-
>> 1 file changed, 17 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
>> index 0b4dedaa9128..4e82b9a3440f 100644
>> --- a/drivers/vfio/vfio_iommu_type1.c
>> +++ b/drivers/vfio/vfio_iommu_type1.c
>> @@ -236,6 +236,19 @@ 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);
>> +
>> + if (dma->iommu_mapped)
>> + 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 +2428,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);
>> }
>>
>
> This doesn't do the right thing. This marks the bitmap dirty if:
>
> * The detached group dirty scope was not limited to pinned pages
>
> AND
>
> * Dirty tracking is enabled
>
> AND
>
> * The vfio_dma is *currently* (ie. after the detach) iommu_mapped
>
> We need to mark the bitmap dirty based on whether the vfio_dma *was*
> iommu_mapped by the group that is now detached. Thanks,
>
> Alex
>
Hi Alex,
Yes, I missed this point again :-(. The update_dirty_scope means we detached
an iommu backed group, and that means the vfio_dma *was* iommu_mapped by this
group, so we can populate full bitmap unconditionally, right?
Thanks,
Keqian
> .
>
next prev parent reply other threads:[~2021-01-18 12:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 9:26 [PATCH v2 0/2] vfio/iommu_type1: some fixes Keqian Zhu
2021-01-15 9:26 ` [PATCH v2 1/2] vfio/iommu_type1: Populate full dirty when detach non-pinned group Keqian Zhu
2021-01-15 18:01 ` Alex Williamson
2021-01-18 12:25 ` Keqian Zhu [this message]
2021-01-21 18:05 ` Alex Williamson
2021-01-15 9:26 ` [PATCH v2 2/2] vfio/iommu_type1: Sanity check pfn_list when remove vfio_dma Keqian Zhu
2021-01-15 19:14 ` Alex Williamson
2021-01-18 13:16 ` Keqian Zhu
2021-01-21 18:14 ` 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=f8de434c-1993-cfe8-c451-2235be1ceb85@huawei.com \
--to=zhukeqian1@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=alex.williamson@redhat.com \
--cc=alexios.zavras@intel.com \
--cc=catalin.marinas@arm.com \
--cc=cohuck@redhat.com \
--cc=daniel.lezcano@linaro.org \
--cc=iommu@lists.linux-foundation.org \
--cc=james.morse@arm.com \
--cc=jiangkunkun@huawei.com \
--cc=joro@8bytes.org \
--cc=julien.thierry.kdev@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=kwankhede@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=robin.murphy@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=wanghaibin.wang@huawei.com \
--cc=will@kernel.org \
/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).