Commit b136fd59 authored Apr 30, 2019 by Christoph Hellwig Committed by Vinayak Menon Jun 21, 2019

arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable



commit a98d9ae937d256ed679a935fc82d9deaa710d98e upstream.

DMA allocations that can't sleep may return non-remapped addresses, but
we do not properly handle them in the mmap and get_sgtable methods.
Resolve non-vmalloc addresses using virt_to_page to handle this corner
case.

Change-Id: I0e024fef3a3f9a8b0a6cb0a55545be9497d036e8
Cc: <stable@vger.kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-Commit: cf378015
Git-Repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git


Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>

parent 74939878

arch/arm64/mm/dma-mapping.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -850,6 +850,11 @@ static int __iommu_mmap_attrs(struct device dev, struct vm_area_struct vma,
		if (dma_mmap_from_dev_coherent(dev, vma, cpu_addr, size, &ret))
		return ret;

		if (!is_vmalloc_addr(cpu_addr)) {
		unsigned long pfn = page_to_pfn(virt_to_page(cpu_addr));
		return __swiotlb_mmap_pfn(vma, pfn, size);
		}

		if (attrs & DMA_ATTR_FORCE_CONTIGUOUS) {
		/*
		* DMA_ATTR_FORCE_CONTIGUOUS allocations are always remapped,
		@@ -873,6 +878,11 @@ static int __iommu_get_sgtable(struct device dev, struct sg_table sgt,
		unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
		struct vm_struct *area = find_vm_area(cpu_addr);

		if (!is_vmalloc_addr(cpu_addr)) {
		struct page *page = virt_to_page(cpu_addr);
		return __swiotlb_get_sgtable_page(sgt, page, size);
		}

		if (attrs & DMA_ATTR_FORCE_CONTIGUOUS) {
		/*
		* DMA_ATTR_FORCE_CONTIGUOUS allocations are always remapped,