Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757471AbbDPOmG (ORCPT ); Thu, 16 Apr 2015 10:42:06 -0400 Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]:12270 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757375AbbDPOmC convert rfc822-to-8bit (ORCPT ); Thu, 16 Apr 2015 10:42:02 -0400 From: =?UTF-8?q?=C3=98rjan=20Eide?= To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org Cc: djkurtz@chromium.org Subject: [PATCH 2/2] ARM: DMA: Use vm_pgoff for IOMMU mmap Date: Thu, 16 Apr 2015 16:41:52 +0200 Message-Id: <1429195312-25898-2-git-send-email-orjan.eide@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429195312-25898-1-git-send-email-orjan.eide@arm.com> References: <1429195312-25898-1-git-send-email-orjan.eide@arm.com> MIME-Version: 1.0 X-OriginalArrivalTime: 16 Apr 2015 14:41:53.0699 (UTC) FILETIME=[7B1EF730:01D07853] X-MC-Unique: iKibjb-wRzKmoNVEoxl5ow-3 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1990 Lines: 53 arm_iommu_mmap_attrs() ignores the page offset in vma->vm_pgoff that was specified in the mmap call. Any user of dma_mmap_* will get an unexpected result when the device uses the IOMMU DMA ops. Some DRM driver that use dma_mmap_* seems to depend on it ignoring vma->vm_pgoff. Both the Samsung Exynos DRM driver before v3.18, and the current Rockchip DRM driver, use the page offset to pass GEM cookies that are used to look up the GEM buffers and then call dma_mmap_attrs() with the cookie value still in vma->vm_pgoff. rockchip_gem_mmap_buf() in drivers/gpu/drm/rockchip/rockchip_drm_gem.c still does this. It should be fixed before fixing arm_iommu_mmap_attrs(). Signed-off-by: Ørjan Eide --- arch/arm/mm/dma-mapping.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index c274476..07d571b 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1364,6 +1364,9 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma, { unsigned long uaddr = vma->vm_start; unsigned long usize = vma->vm_end - vma->vm_start; + unsigned long nr_vma_pages = usize >> PAGE_SHIFT; + unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; + unsigned long off = vma->vm_pgoff; struct page **pages = __iommu_get_pages(cpu_addr, attrs); vma->vm_page_prot = __get_dma_pgprot(attrs, vma->vm_page_prot); @@ -1371,6 +1374,11 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma, if (!pages) return -ENXIO; + if (off >= nr_pages || nr_vma_pages > (nr_pages - off)) + return -ENXIO; + + pages += off; + do { int ret = vm_insert_page(vma, uaddr, *pages++); if (ret) { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/