From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by kanga.kvack.org (Postfix) with ESMTP id 9E72A6B34C1 for ; Sat, 24 Nov 2018 00:01:35 -0500 (EST) Received: by mail-lj1-f197.google.com with SMTP id g92-v6so3692339ljg.23 for ; Fri, 23 Nov 2018 21:01:35 -0800 (PST) Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m72sor13077459lfe.8.2018.11.23.21.01.33 for (Google Transport Security); Fri, 23 Nov 2018 21:01:34 -0800 (PST) MIME-Version: 1.0 References: <20181115154950.GA27985@jordon-HP-15-Notebook-PC> <20181123213448.GW3065@bombadil.infradead.org> In-Reply-To: <20181123213448.GW3065@bombadil.infradead.org> From: Souptick Joarder Date: Sat, 24 Nov 2018 10:31:20 +0530 Message-ID: Subject: Re: [PATCH 6/9] iommu/dma-iommu.c: Convert to use vm_insert_range Content-Type: text/plain; charset="UTF-8" Sender: owner-linux-mm@kvack.org List-ID: To: Matthew Wilcox Cc: robin.murphy@arm.com, Andrew Morton , Michal Hocko , joro@8bytes.org, Linux-MM , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org On Sat, Nov 24, 2018 at 3:04 AM Matthew Wilcox wrote: > > On Fri, Nov 23, 2018 at 05:23:06PM +0000, Robin Murphy wrote: > > On 15/11/2018 15:49, Souptick Joarder wrote: > > > Convert to use vm_insert_range() to map range of kernel > > > memory to user vma. > > > > > > Signed-off-by: Souptick Joarder > > > Reviewed-by: Matthew Wilcox > > > --- > > > drivers/iommu/dma-iommu.c | 12 ++---------- > > > 1 file changed, 2 insertions(+), 10 deletions(-) > > > > > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > > > index d1b0475..69c66b1 100644 > > > --- a/drivers/iommu/dma-iommu.c > > > +++ b/drivers/iommu/dma-iommu.c > > > @@ -622,17 +622,9 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp, > > > int iommu_dma_mmap(struct page **pages, size_t size, struct vm_area_struct *vma) > > > { > > > - unsigned long uaddr = vma->vm_start; > > > - unsigned int i, count = PAGE_ALIGN(size) >> PAGE_SHIFT; > > > - int ret = -ENXIO; > > > + unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT; > > > - for (i = vma->vm_pgoff; i < count && uaddr < vma->vm_end; i++) { > > > - ret = vm_insert_page(vma, uaddr, pages[i]); > > > - if (ret) > > > - break; > > > - uaddr += PAGE_SIZE; > > > - } > > > - return ret; > > > + return vm_insert_range(vma, vma->vm_start, pages, count); > > > > AFIACS, vm_insert_range() doesn't respect vma->vm_pgoff, so doesn't this > > break partial mmap()s of a large buffer? (which I believe can be a thing) > > Whoops. That should have been: > > return vm_insert_range(vma, vma->vm_start, pages + vma->vm_pgoff, count); > > I suppose. Matthew, patch "drm/rockchip/rockchip_drm_gem.c: Convert to use vm_insert_range" also need to address the same issue ? > > Although arguably we should respect vm_pgoff inside vm_insert_region() > and then callers automatically get support for vm_pgoff without having > to think about it ... although we should then also pass in the length > of the pages array to avoid pages being mapped in which aren't part of > the allocated array. > > Hm. More thought required.