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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 4F5DFC33CB2 for ; Fri, 31 Jan 2020 06:13:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1045921734 for ; Fri, 31 Jan 2020 06:13:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="h023QpHL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1045921734 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B62896B0505; Fri, 31 Jan 2020 01:13:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AEE616B0507; Fri, 31 Jan 2020 01:13:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A291F6B0508; Fri, 31 Jan 2020 01:13:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0156.hostedemail.com [216.40.44.156]) by kanga.kvack.org (Postfix) with ESMTP id 83FB56B0505 for ; Fri, 31 Jan 2020 01:13:08 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 3415D3A91 for ; Fri, 31 Jan 2020 06:13:08 +0000 (UTC) X-FDA: 76436911656.26.jar19_1b56740368059 X-HE-Tag: jar19_1b56740368059 X-Filterd-Recvd-Size: 5355 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Fri, 31 Jan 2020 06:13:07 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6FFF42253D; Fri, 31 Jan 2020 06:13:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580451187; bh=v7fCLtuH8LLYORhJMTlFMcxW/h4mMsH7p9RUOxo3h0E=; h=Date:From:To:Subject:In-Reply-To:From; b=h023QpHLnUTVsGt2y8igF+Uj0JYJ1rfgis6wvmJ4UZyQrU1V8KpBkGiEEmqV/07xf OcAZ0hPGgTziYfuaJcgBEVwCA9KmGquKIoI7JB52MSFzAcTL2vU0jX1rEuuT2hJcQN NB4UAv4lWr+S4y6BOyt2kLHOLLOgJ8ZHBN3/Em4g= Date: Thu, 30 Jan 2020 22:13:05 -0800 From: Andrew Morton To: akpm@linux-foundation.org, alex.williamson@redhat.com, aneesh.kumar@linux.ibm.com, axboe@kernel.dk, bjorn.topel@intel.com, corbet@lwn.net, dan.j.williams@intel.com, daniel.vetter@ffwll.ch, hch@lst.de, hverkuil-cisco@xs4all.nl, ira.weiny@intel.com, jack@suse.cz, jgg@mellanox.com, jgg@ziepe.ca, jglisse@redhat.com, jhubbard@nvidia.com, kirill@shutemov.name, leonro@mellanox.com, linux-mm@kvack.org, mchehab@kernel.org, mm-commits@vger.kernel.org, rppt@linux.ibm.com, torvalds@linux-foundation.org Subject: [patch 037/118] mm/process_vm_access: set FOLL_PIN via pin_user_pages_remote() Message-ID: <20200131061305.O7a_f03M2%akpm@linux-foundation.org> In-Reply-To: <20200130221021.5f0211c56346d5485af07923@linux-foundation.org> User-Agent: s-nail v14.8.16 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: =46rom: John Hubbard Subject: mm/process_vm_access: set FOLL_PIN via pin_user_pages_remote() Convert process_vm_access to use the new pin_user_pages_remote() call, which sets FOLL_PIN. Setting FOLL_PIN is now required for code that requires tracking of pinned pages. Also, release the pages via put_user_page*(). Also, rename "pages" to "pinned_pages", as this makes for easier reading of process_vm_rw_single_vec(). Link: http://lkml.kernel.org/r/20200107224558.2362728-15-jhubbard@nvidia.com Signed-off-by: John Hubbard Reviewed-by: Jan Kara Reviewed-by: J=C3=A9r=C3=B4me Glisse Reviewed-by: Ira Weiny Cc: Alex Williamson Cc: Aneesh Kumar K.V Cc: Bj=C3=B6rn T=C3=B6pel Cc: Christoph Hellwig Cc: Daniel Vetter Cc: Dan Williams Cc: Hans Verkuil Cc: Jason Gunthorpe Cc: Jason Gunthorpe Cc: Jens Axboe Cc: Jonathan Corbet Cc: Kirill A. Shutemov Cc: Leon Romanovsky Cc: Mauro Carvalho Chehab Cc: Mike Rapoport Signed-off-by: Andrew Morton --- mm/process_vm_access.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) --- a/mm/process_vm_access.c~mm-process_vm_access-set-foll_pin-via-pin_user= _pages_remote +++ a/mm/process_vm_access.c @@ -42,12 +42,11 @@ static int process_vm_rw_pages(struct pa if (copy > len) copy =3D len; =20 - if (vm_write) { + if (vm_write) copied =3D copy_page_from_iter(page, offset, copy, iter); - set_page_dirty_lock(page); - } else { + else copied =3D copy_page_to_iter(page, offset, copy, iter); - } + len -=3D copied; if (copied < copy && iov_iter_count(iter)) return -EFAULT; @@ -96,7 +95,7 @@ static int process_vm_rw_single_vec(unsi flags |=3D FOLL_WRITE; =20 while (!rc && nr_pages && iov_iter_count(iter)) { - int pages =3D min(nr_pages, max_pages_per_loop); + int pinned_pages =3D min(nr_pages, max_pages_per_loop); int locked =3D 1; size_t bytes; =20 @@ -106,14 +105,15 @@ static int process_vm_rw_single_vec(unsi * current/current->mm */ down_read(&mm->mmap_sem); - pages =3D get_user_pages_remote(task, mm, pa, pages, flags, - process_pages, NULL, &locked); + pinned_pages =3D pin_user_pages_remote(task, mm, pa, pinned_pages, + flags, process_pages, + NULL, &locked); if (locked) up_read(&mm->mmap_sem); - if (pages <=3D 0) + if (pinned_pages <=3D 0) return -EFAULT; =20 - bytes =3D pages * PAGE_SIZE - start_offset; + bytes =3D pinned_pages * PAGE_SIZE - start_offset; if (bytes > len) bytes =3D len; =20 @@ -122,10 +122,12 @@ static int process_vm_rw_single_vec(unsi vm_write); len -=3D bytes; start_offset =3D 0; - nr_pages -=3D pages; - pa +=3D pages * PAGE_SIZE; - while (pages) - put_page(process_pages[--pages]); + nr_pages -=3D pinned_pages; + pa +=3D pinned_pages * PAGE_SIZE; + + /* If vm_write is set, the pages need to be made dirty: */ + put_user_pages_dirty_lock(process_pages, pinned_pages, + vm_write); } =20 return rc; _