From: Alex Williamson <alex.williamson@redhat.com>
To: Keqian Zhu <zhukeqian1@huawei.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>, 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 6/6] vfio/iommu_type1: Drop parameter "pgsize" of update_user_bitmap
Date: Fri, 15 Jan 2021 16:44:09 -0700 [thread overview]
Message-ID: <20210115164409.3e7ddb28@omen.home.shazbot.org> (raw)
In-Reply-To: <20210107044401.19828-7-zhukeqian1@huawei.com>
On Thu, 7 Jan 2021 12:44:01 +0800
Keqian Zhu <zhukeqian1@huawei.com> wrote:
> We always use the smallest supported page size of vfio_iommu as
> pgsize. Drop parameter "pgsize" of update_user_bitmap.
>
> Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
> ---
> drivers/vfio/vfio_iommu_type1.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
> index 82649a040148..bceda5e8baaa 100644
> --- a/drivers/vfio/vfio_iommu_type1.c
> +++ b/drivers/vfio/vfio_iommu_type1.c
> @@ -978,10 +978,9 @@ static void vfio_update_pgsize_bitmap(struct vfio_iommu *iommu)
> }
>
> static int update_user_bitmap(u64 __user *bitmap, struct vfio_iommu *iommu,
> - struct vfio_dma *dma, dma_addr_t base_iova,
> - size_t pgsize)
> + struct vfio_dma *dma, dma_addr_t base_iova)
> {
> - unsigned long pgshift = __ffs(pgsize);
> + unsigned long pgshift = __ffs(iommu->pgsize_bitmap);
> unsigned long nbits = dma->size >> pgshift;
> unsigned long bit_offset = (dma->iova - base_iova) >> pgshift;
> unsigned long copy_offset = bit_offset / BITS_PER_LONG;
> @@ -1046,7 +1045,7 @@ static int vfio_iova_dirty_bitmap(u64 __user *bitmap, struct vfio_iommu *iommu,
> if (dma->iova > iova + size - 1)
> break;
>
> - ret = update_user_bitmap(bitmap, iommu, dma, iova, pgsize);
> + ret = update_user_bitmap(bitmap, iommu, dma, iova);
> if (ret)
> return ret;
>
> @@ -1192,7 +1191,7 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
>
> if (unmap->flags & VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP) {
> ret = update_user_bitmap(bitmap->data, iommu, dma,
> - unmap->iova, pgsize);
> + unmap->iova);
> if (ret)
> break;
> }
Same as the previous, both call sites already have both pgsize and
pgshift, pass both rather than recalculate. Thanks,
Alex
next prev parent reply other threads:[~2021-01-15 23:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 4:43 [PATCH 0/6] vfio/iommu_type1: Some optimizations about dirty tracking Keqian Zhu
2021-01-07 4:43 ` [PATCH 1/6] vfio/iommu_type1: Make an explicit "promote" semantic Keqian Zhu
2021-01-15 22:42 ` Alex Williamson
2021-01-18 13:33 ` Keqian Zhu
2021-01-07 4:43 ` [PATCH 2/6] vfio/iommu_type1: Ignore external domain when promote pinned_scope Keqian Zhu
2021-01-15 23:23 ` Alex Williamson
2021-01-07 4:43 ` [PATCH 3/6] vfio/iommu_type1: Initially set the pinned_page_dirty_scope Keqian Zhu
2021-01-15 23:30 ` Alex Williamson
2021-01-18 13:34 ` Keqian Zhu
2021-01-07 4:43 ` [PATCH 4/6] vfio/iommu_type1: Drop parameter "pgsize" of vfio_dma_bitmap_alloc_all Keqian Zhu
2021-01-15 23:37 ` Alex Williamson
2021-01-07 4:44 ` [PATCH 5/6] vfio/iommu_type1: Drop parameter "pgsize" of vfio_iova_dirty_bitmap Keqian Zhu
2021-01-15 23:39 ` Alex Williamson
2021-01-07 4:44 ` [PATCH 6/6] vfio/iommu_type1: Drop parameter "pgsize" of update_user_bitmap Keqian Zhu
2021-01-15 23:44 ` Alex Williamson [this message]
2021-01-18 13:48 ` Keqian Zhu
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=20210115164409.3e7ddb28@omen.home.shazbot.org \
--to=alex.williamson@redhat.com \
--cc=akpm@linux-foundation.org \
--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=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 \
--cc=zhukeqian1@huawei.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).