Commit f1b785f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio fix from Michael Tsirkin:
 "A last minute mlx5 bugfix"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vdpa/mlx5: Fix PA offset with unaligned starting iotlb map
parents 14b63209 29ce8b8a

drivers/vdpa/mlx5/core/mr.c

+5 −3
Original line number Diff line number Diff line
@@ -373,7 +373,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;
@@ -396,8 +396,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",