From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D0F4C43387 for ; Mon, 14 Jan 2019 09:44:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01C3420663 for ; Mon, 14 Jan 2019 09:44:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="pp2iJDM+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726706AbfANJm3 (ORCPT ); Mon, 14 Jan 2019 04:42:29 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:41670 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726696AbfANJm1 (ORCPT ); Mon, 14 Jan 2019 04:42:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=wJNlbX3pk61VNKILmkGaJ4l/lvPfqfUIofq6zcr3bU8=; b=pp2iJDM+RFfKv25LTCIGEQIDAx /Yi4uFTpasIzcRodg4iWTLGcggTBl2TfmCIeoBPgG4g0DlKrKsNMmrqviKZTDxATprbIH7ogFJ5gq bCPAtdZ+1z64YNlcFQSOW7g5lQ5TmtA1ya+rf2+l6SoSA2XLDVbLyIZsP8vUHshS/IUp8jUyimdDd 9WQKAevB2ZEs621koV6pTpQ1+WKE97CJ5xjUrZ63yAsN819iFyRqLj5tofzrIKM7avh56evlJLPbW 6eHV3f9eT3SYYJrti0o0UDY5RpUJImUOYQOVAb4MfT/ZCqZxS+ytVMQ10LfJajPzAsFMXPQh7eP+P qEF/akUw==; Received: from 089144213167.atnat0022.highway.a1.net ([89.144.213.167] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1giylB-0006Jx-IY; Mon, 14 Jan 2019 09:42:22 +0000 From: Christoph Hellwig To: Robin Murphy Cc: Joerg Roedel , Catalin Marinas , Will Deacon , Tom Lendacky , iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/19] dma-iommu: fix and refactor iommu_dma_mmap Date: Mon, 14 Jan 2019 10:41:46 +0100 Message-Id: <20190114094159.27326-7-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190114094159.27326-1-hch@lst.de> References: <20190114094159.27326-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current iommu_dma_mmap code does not properly handle memory from the page allocator that hasn't been remapped, which can happen in the rare case of allocations for a coherent device that aren't allowed to block. Fix this by replacing iommu_dma_mmap with a slightly tweaked copy of dma_common_mmap with special handling for the remapped array of pages allocated from __iommu_dma_alloc. Signed-off-by: Christoph Hellwig --- drivers/iommu/dma-iommu.c | 59 +++++++++++++++------------------------ 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index e0ffe22775ac..26f479d49103 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -592,23 +592,27 @@ static struct page **__iommu_dma_alloc(struct device *dev, size_t size, } /** - * __iommu_dma_mmap - Map a buffer into provided user VMA - * @pages: Array representing buffer from __iommu_dma_alloc() + * iommu_dma_mmap_remap - Map a remapped page array into provided user VMA + * @cpu_addr: virtual address of the memory to be remapped * @size: Size of buffer in bytes * @vma: VMA describing requested userspace mapping * - * Maps the pages of the buffer in @pages into @vma. The caller is responsible + * Maps the pages pointed to by @cpu_addr into @vma. The caller is responsible * for verifying the correct size and protection of @vma beforehand. */ -static int __iommu_dma_mmap(struct page **pages, size_t size, +static int iommu_dma_mmap_remap(void *cpu_addr, size_t size, struct vm_area_struct *vma) { + struct vm_struct *area = find_vm_area(cpu_addr); unsigned long uaddr = vma->vm_start; unsigned int i, count = PAGE_ALIGN(size) >> PAGE_SHIFT; int ret = -ENXIO; + if (WARN_ON(!area || !area->pages)) + return -ENXIO; + for (i = vma->vm_pgoff; i < count && uaddr < vma->vm_end; i++) { - ret = vm_insert_page(vma, uaddr, pages[i]); + ret = vm_insert_page(vma, uaddr, area->pages[i]); if (ret) break; uaddr += PAGE_SIZE; @@ -1047,29 +1051,14 @@ static void iommu_dma_free(struct device *dev, size_t size, void *cpu_addr, } } -static int __iommu_dma_mmap_pfn(struct vm_area_struct *vma, - unsigned long pfn, size_t size) -{ - int ret = -ENXIO; - unsigned long nr_vma_pages = vma_pages(vma); - unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; - unsigned long off = vma->vm_pgoff; - - if (off < nr_pages && nr_vma_pages <= (nr_pages - off)) { - ret = remap_pfn_range(vma, vma->vm_start, - pfn + off, - vma->vm_end - vma->vm_start, - vma->vm_page_prot); - } - - return ret; -} - static int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size, unsigned long attrs) { - struct vm_struct *area; + unsigned long user_count = vma_pages(vma); + unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT; + unsigned long off = vma->vm_pgoff; + unsigned long pfn; int ret; vma->vm_page_prot = arch_dma_mmap_pgprot(dev, vma->vm_page_prot, attrs); @@ -1077,20 +1066,18 @@ static int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma, if (dma_mmap_from_dev_coherent(dev, vma, cpu_addr, size, &ret)) return ret; - if (attrs & DMA_ATTR_FORCE_CONTIGUOUS) { - /* - * DMA_ATTR_FORCE_CONTIGUOUS allocations are always remapped, - * hence in the vmalloc space. - */ - unsigned long pfn = vmalloc_to_pfn(cpu_addr); - return __iommu_dma_mmap_pfn(vma, pfn, size); - } - - area = find_vm_area(cpu_addr); - if (WARN_ON(!area || !area->pages)) + if (off >= count || user_count > count - off) return -ENXIO; - return __iommu_dma_mmap(area->pages, size, vma); + if (is_vmalloc_addr(cpu_addr)) { + if (!(attrs & DMA_ATTR_FORCE_CONTIGUOUS)) + return iommu_dma_mmap_remap(cpu_addr, size, vma); + pfn = vmalloc_to_pfn(cpu_addr); + } else + pfn = page_to_pfn(virt_to_page(cpu_addr)); + + return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff, + user_count << PAGE_SHIFT, vma->vm_page_prot); } static int __iommu_dma_get_sgtable_page(struct sg_table *sgt, struct page *page, -- 2.20.1