vdpa/mlx5: Fix PA offset with unaligned starting iotlb map

commit 29ce8b8a4fa74e841342c8b8f8941848a3c6f29f upstream.

When calculating the physical address range based on the iotlb and mr
[start,end) ranges, the offset of mr->start relative to map->start
is not taken into account. This leads to some incorrect and duplicate
mappings.

For the case when mr->start < map->start the code is already correct:
the range in [mr->start, map->start) was handled by a different
iteration.

Fixes: 94abbccdf291 ("vdpa/mlx5: Add shared memory registration code")
Cc: stable@vger.kernel.org
Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>
Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com>
Message-Id: <20241021134040.975221-2-dtatulea@nvidia.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c
index 113aac0446de53babb0d2b7ccacfb116f3def2db..4f0a2edc2333d8c3a8b519f753da6c6727e8ee3f 100644 (file)
--- a/drivers/vdpa/mlx5/core/mr.c
+++ b/drivers/vdpa/mlx5/core/mr.c
@@ -232,7 +232,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
        struct page *pg;
        unsigned int nsg;
        int sglen;
-       u64 pa;
+       u64 pa, offset;
        u64 paend;
        struct scatterlist *sg;
        struct device *dma = mvdev->vdev.dma_dev;
@@ -255,8 +255,10 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
        sg = mr->sg_head.sgl;
        for (map = vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1);
             map; map = vhost_iotlb_itree_next(map, mr->start, mr->end - 1)) {
-               paend = map->addr + maplen(map, mr);
-               for (pa = map->addr; pa < paend; pa += sglen) {
+               offset = mr->start > map->start ? mr->start - map->start : 0;
+               pa = map->addr + offset;
+               paend = map->addr + offset + maplen(map, mr);
+               for (; pa < paend; pa += sglen) {
                        pg = pfn_to_page(__phys_to_pfn(pa));
                        if (!sg) {
                                mlx5_vdpa_warn(mvdev, "sg null. start 0x%llx, end 0x%llx\n",