Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932997AbaJ3M3n (ORCPT ); Thu, 30 Oct 2014 08:29:43 -0400 Received: from mta-out1.inet.fi ([62.71.2.194]:39382 "EHLO kirsi1.inet.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759052AbaJ3M3j (ORCPT ); Thu, 30 Oct 2014 08:29:39 -0400 Date: Thu, 30 Oct 2014 14:28:53 +0200 From: "Kirill A. Shutemov" To: Andrea Arcangeli Cc: Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Michel Lespinasse , Andrew Jones , Hugh Dickins , Mel Gorman , Andres Lagar-Cavilla , Minchan Kim , KOSAKI Motohiro , "\\\"Dr. David Alan Gilbert\\\"" , Peter Feiner , Peter Zijlstra , Benjamin Herrenschmidt , James Bottomley , David Miller , Steve Capper , Johannes Weiner Subject: Re: [PATCH 4/5] mm: gup: use get_user_pages_unlocked Message-ID: <20141030122853.GD31134@node.dhcp.inet.fi> References: <1414600520-7664-1-git-send-email-aarcange@redhat.com> <1414600520-7664-5-git-send-email-aarcange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1414600520-7664-5-git-send-email-aarcange@redhat.com> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 29, 2014 at 05:35:19PM +0100, Andrea Arcangeli wrote: > This allows those get_user_pages calls to pass FAULT_FLAG_ALLOW_RETRY > to the page fault in order to release the mmap_sem during the I/O. > > Signed-off-by: Andrea Arcangeli > --- > drivers/iommu/amd_iommu_v2.c | 6 ++---- > drivers/media/pci/ivtv/ivtv-udma.c | 6 ++---- > drivers/scsi/st.c | 7 ++----- > drivers/video/fbdev/pvr2fb.c | 6 ++---- > mm/process_vm_access.c | 7 ++----- > net/ceph/pagevec.c | 6 ++---- > 6 files changed, 12 insertions(+), 26 deletions(-) > > diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c > index 90d734b..4cd8a87 100644 > --- a/drivers/iommu/amd_iommu_v2.c > +++ b/drivers/iommu/amd_iommu_v2.c > @@ -521,10 +521,8 @@ static void do_fault(struct work_struct *work) > > write = !!(fault->flags & PPR_FAULT_WRITE); > > - down_read(&fault->state->mm->mmap_sem); > - npages = get_user_pages(NULL, fault->state->mm, > - fault->address, 1, write, 0, &page, NULL); > - up_read(&fault->state->mm->mmap_sem); > + npages = get_user_pages_unlocked(NULL, fault->state->mm, > + fault->address, 1, write, 0, &page); > > if (npages == 1) { > put_page(page); > diff --git a/drivers/media/pci/ivtv/ivtv-udma.c b/drivers/media/pci/ivtv/ivtv-udma.c > index 7338cb2..96d866b 100644 > --- a/drivers/media/pci/ivtv/ivtv-udma.c > +++ b/drivers/media/pci/ivtv/ivtv-udma.c > @@ -124,10 +124,8 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr, > } > > /* Get user pages for DMA Xfer */ > - down_read(¤t->mm->mmap_sem); > - err = get_user_pages(current, current->mm, > - user_dma.uaddr, user_dma.page_count, 0, 1, dma->map, NULL); > - up_read(¤t->mm->mmap_sem); > + err = get_user_pages_unlocked(current, current->mm, > + user_dma.uaddr, user_dma.page_count, 0, 1, dma->map); > > if (user_dma.page_count != err) { > IVTV_DEBUG_WARN("failed to map user pages, returned %d instead of %d\n", > diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c > index 4daa372..a98e00b 100644 > --- a/drivers/scsi/st.c > +++ b/drivers/scsi/st.c > @@ -4538,18 +4538,15 @@ static int sgl_map_user_pages(struct st_buffer *STbp, > return -ENOMEM; > > /* Try to fault in all of the necessary pages */ > - down_read(¤t->mm->mmap_sem); > /* rw==READ means read from drive, write into memory area */ Consolidate two one-line configs into a one? Acked-by: Kirill A. Shutemov -- Kirill A. Shutemov -- 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/