From patchwork Fri Apr 21 16:12:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 9693127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 08DE26038D for ; Fri, 21 Apr 2017 16:13:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED5F12864F for ; Fri, 21 Apr 2017 16:13:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF14828652; Fri, 21 Apr 2017 16:13:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 17F262864F for ; Fri, 21 Apr 2017 16:13:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=m4yq6YWYlXCrVB4W+yk4/4rsr+hD3PPrY4bHfdKZtjw=; b=uMwhPDsH3MRk92 8mL5w6zcU5oXKRTOd5ore/2Q/1LCr2kaFffdQEtyJ/WC8/xGG4YnQiGAUI5VXoyMKORT2cuLYBpRk FmS/SJhFwsEl7XofPGgCbwfA6cwAUlg+q+wxQdqQIrD81SuEoMT4bB1lcxPpvCpWz7ZfEgm4dWGvm ty7luEYzYCLB4XU+O2rIkwh3SVhtgDQTKtdQi1rh8gXIfK2EKqkoiEcaJITmDsMULkys+ZC7OjLbZ LxCMdPGZfFWr5TVvZKepshteACxgsr+NHkMFhoSpScyTtfCHX0LLl9k1e3dhZMMbNRGMN7uwt9G9A 9MNcQ9iN8RJo8pMgb1ng==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d1bBg-0006N7-B4; Fri, 21 Apr 2017 16:13:36 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d1bBd-0006Mt-TE for linux-arm-kernel@bombadil.infradead.org; Fri, 21 Apr 2017 16:13:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding: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=wtlEqKIZcv47u0mWYGMvNbAn/1UfZo86qu3Z6mYMkAc=; b=R6+NBhBjOlLeAgxFUsk1j22vJ rm9R354u5LizCEMpU8ScstfsaeHg9ydwgq+h8LPBhJCJoJix0idirGbDr7XeAUfM2lh8gMHT5mpSS 3pxLFtXICeG8PEk0tZGxnlPtE3mjKkWdMMeFeGF0jjf78LnyW21lUD1SytlW0zIzoGlKm1OyrsBWl Qkn6zM1P6MNhtE4+/iAe6SSg3lgYDKrHCRLhXgYlIkhiiME4YXk8TdrBJs2H/u20u3+YUiw5i/w5E Cu4f7Q+1ulzEbNtYQVwQ4sWxt0ODMRhBjjPXZF0NGm+4dgD48oDOs4cm8wvXB9OnitR/cdZ5SePKt WvXDc/SBA==; Received: from foss.arm.com ([217.140.101.70]) by merlin.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d1bBb-0000Xa-CB for linux-arm-kernel@lists.infradead.org; Fri, 21 Apr 2017 16:13:33 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1038515BF; Fri, 21 Apr 2017 09:12:39 -0700 (PDT) Received: from e104818-lin.cambridge.arm.com (e104818-lin.cambridge.arm.com [10.1.206.48]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 936523F3E1; Fri, 21 Apr 2017 09:12:37 -0700 (PDT) Date: Fri, 21 Apr 2017 17:12:35 +0100 From: Catalin Marinas To: Robin Murphy Subject: Re: [PATCH] arm64/dma-mapping: fix DMA_ATTR_FORCE_CONTIGUOUS mmaping code Message-ID: <20170421161234.GD5312@e104818-lin.cambridge.arm.com> References: <1490781926-6209-1-git-send-email-a.hajda@samsung.com> <15b1be13-625f-db74-d213-ad1df86f7eb5@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <15b1be13-625f-db74-d213-ad1df86f7eb5@arm.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170421_121331_978664_6AAD4852 X-CRM114-Status: GOOD ( 24.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Geert Uytterhoeven , Bartlomiej Zolnierkiewicz , Will Deacon , Andrzej Hajda , iommu@lists.linux-foundation.org, Laura Abbott , linux-arm-kernel@lists.infradead.org, Marek Szyprowski Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Mar 29, 2017 at 01:55:32PM +0100, Robin Murphy wrote: > On 29/03/17 11:05, Andrzej Hajda wrote: > > In case of DMA_ATTR_FORCE_CONTIGUOUS allocations vm_area->pages > > is invalid. __iommu_mmap_attrs and __iommu_get_sgtable cannot use > > it. In first case temporary pages array is passed to iommu_dma_mmap, > > in 2nd case single entry sg table is created directly instead > > of calling helper. > > > > Fixes: 44176bb ("arm64: Add support for DMA_ATTR_FORCE_CONTIGUOUS to IOMMU") > > Signed-off-by: Andrzej Hajda > > --- > > Hi, > > > > I am not familiar with this framework so please don't be too cruel ;) > > Alternative solution I see is to always create vm_area->pages, > > I do not know which approach is preferred. > > > > Regards > > Andrzej > > --- > > arch/arm64/mm/dma-mapping.c | 40 ++++++++++++++++++++++++++++++++++++++-- > > 1 file changed, 38 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c > > index f7b5401..bba2bc8 100644 > > --- a/arch/arm64/mm/dma-mapping.c > > +++ b/arch/arm64/mm/dma-mapping.c > > @@ -704,7 +704,30 @@ static int __iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma, > > return ret; > > > > area = find_vm_area(cpu_addr); > > - if (WARN_ON(!area || !area->pages)) > > + if (WARN_ON(!area)) > > From the look of things, it doesn't seem strictly necessary to change > this, but whether that's a good thing is another matter. I'm not sure > that dma_common_contiguous_remap() should really be leaving a dangling > pointer in area->pages as it apparently does... :/ On this specific point, I don't think area->pages should be set either (cc'ing Laura). As in the vmalloc vs vmap case, area->pages when pages need to be freed (via vfree), which is not the case here. The dma_common_pages_remap() would need to set area->pages when called directly from the iommu DMA ops. Proposal below, not tested with the iommu ops. I assume the patch would cause __iommu_mmap_attrs() to return -ENXIO if DMA_ATTR_FORCE_CONTIGUOUS is set. ------------8<--------------------------------- diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c index efd71cf4fdea..ab7071041141 100644 --- a/drivers/base/dma-mapping.c +++ b/drivers/base/dma-mapping.c @@ -277,8 +277,8 @@ EXPORT_SYMBOL(dma_common_mmap); * remaps an array of PAGE_SIZE pages into another vm_area * Cannot be used in non-sleeping contexts */ -void *dma_common_pages_remap(struct page **pages, size_t size, - unsigned long vm_flags, pgprot_t prot, +static struct vm_struct *__dma_common_pages_remap(struct page **pages, + size_t size, unsigned long vm_flags, pgprot_t prot, const void *caller) { struct vm_struct *area; @@ -287,13 +287,26 @@ void *dma_common_pages_remap(struct page **pages, size_t size, if (!area) return NULL; - area->pages = pages; - if (map_vm_area(area, prot, pages)) { vunmap(area->addr); return NULL; } + return area; +} + +void *dma_common_pages_remap(struct page **pages, size_t size, + unsigned long vm_flags, pgprot_t prot, + const void *caller) +{ + struct vm_struct *area; + + area = __dma_common_pages_remap(pages, size, vm_flags, prot, caller); + if (!area) + return NULL; + + area->pages = pages; + return area->addr; } @@ -308,7 +321,7 @@ void *dma_common_contiguous_remap(struct page *page, size_t size, { int i; struct page **pages; - void *ptr; + struct vm_struct *area; unsigned long pfn; pages = kmalloc(sizeof(struct page *) << get_order(size), GFP_KERNEL); @@ -318,11 +331,13 @@ void *dma_common_contiguous_remap(struct page *page, size_t size, for (i = 0, pfn = page_to_pfn(page); i < (size >> PAGE_SHIFT); i++) pages[i] = pfn_to_page(pfn + i); - ptr = dma_common_pages_remap(pages, size, vm_flags, prot, caller); + area = __dma_common_pages_remap(pages, size, vm_flags, prot, caller); kfree(pages); - return ptr; + if (!area) + return NULL; + return area->addr; } /*