Merge tag 'vfio-v5.7-rc4' of git://github.com/awilliam/linux-vfio (690e2aba) · Commits · 戴 / test

drivers/vfio/vfio_iommu_type1.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -342,8 +342,8 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
		vma = find_vma_intersection(mm, vaddr, vaddr + 1);

		if (vma && vma->vm_flags & VM_PFNMAP) {
		*pfn = ((vaddr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
		if (is_invalid_reserved_pfn(*pfn))
		if (!follow_pfn(vma, vaddr, pfn) &&
		is_invalid_reserved_pfn(*pfn))
		ret = 0;
		}
		done:
		@@ -555,7 +555,7 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data,
		continue;
		}

		remote_vaddr = dma->vaddr + iova - dma->iova;
		remote_vaddr = dma->vaddr + (iova - dma->iova);
		ret = vfio_pin_page_external(dma, remote_vaddr, &phys_pfn[i],
		do_accounting);
		if (ret)
		@@ -2345,10 +2345,10 @@ static int vfio_iommu_type1_dma_rw_chunk(struct vfio_iommu *iommu,
		vaddr = dma->vaddr + offset;

		if (write)
		copied = __copy_to_user((void __user )vaddr, data,
		copied = copy_to_user((void __user )vaddr, data,
		count) ? 0 : count;
		else
		copied = __copy_from_user(data, (void __user )vaddr,
		copied = copy_from_user(data, (void __user )vaddr,
		count) ? 0 : count;
		if (kthread)
		unuse_mm(mm);