vfio/type1: fix dirty bitmap calculation in vfio_dma_rw

[ Upstream commit 2c5af98592f65517170c7bcc714566590d3f7397 ]

The count of dirtied pages is not only determined by count of copied
pages, but also by the start offset.

e.g. if offset = PAGE_SIZE - 1, and *copied=2, the dirty pages count
is 2, instead of 1 or 0.

Fixes: d6a4c185660c ("vfio iommu: Implementation of ioctl for dirty pages tracking")
Signed-off-by: Yan Zhao <yan.y.zhao@intel.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index f48f0db908a46c60dcc00db9668ec78fdd2e4f0e..eb7bb14e4f62a421b6289eee1ad3d03be66eaf52 100644 (file)
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -2899,7 +2899,8 @@ static int vfio_iommu_type1_dma_rw_chunk(struct vfio_iommu *iommu,
                         * size
                         */
                        bitmap_set(dma->bitmap, offset >> pgshift,
-                                  *copied >> pgshift);
+                                  ((offset + *copied - 1) >> pgshift) -
+                                  (offset >> pgshift) + 1);
                }
        } else
                *copied = copy_from_user(data, (void __user *)vaddr,