Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp322960ybx; Wed, 30 Oct 2019 15:54:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqxAk6zH2pDimKVsiRbCsPjhVkz3mnq9bGeJaOBiZmIg8zud/2XW9tzTICO8BA/al5Gp8xIJ X-Received: by 2002:a50:f7cc:: with SMTP id i12mr2476173edn.81.1572476047799; Wed, 30 Oct 2019 15:54:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572476047; cv=none; d=google.com; s=arc-20160816; b=FSJvczVJ6+5pI116ISIFGIfNfukCqhk7KUGuPxlKKGLX6JzNMC/s79n2itdZimbWjq CWunwY3x6XsfWcq7H5GugAJ+OuPoe7cYYGon2zOlXQyD4Iabpww0IZM1hefcF9ncNzys JdZWQpAa4mzCXR6g9+G0wL6GFwmSZq51bmwow9luPRrOlDnKtjm4j/GTd2PrFBdtJZGJ CCiK2A8afmge9x1ihojM6fsQnqMZXXpbmQIpCPpMneeamAgTBVusKRex62nIbsAagSq1 gK/iEqSDRvj0fKRfVqUnz0AcvsNJJs0NdcWh3a1CGVRJZb2boMAzG1yR0QyxkDeTVJ18 kMnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=mlrZ/rix4TWnvu0gWBO75CbhcMvz3QaPMdjHmepPots=; b=E+DK17k9FoRtFY3YfLVFog/y0mZ12P8nSblRuqLS6HncTmI44Ke+CEq/VEhL1TGjJX DTWV72wJKI5gcK0RKowyZKK2skeUmBhUrpRvV0C8rNFZF2rTHtCxwiDFXOY7twx84JUc PbuMDRg/KhAMJBpUEwpNGlOVb9wbMZhFPweEkeLMYeSP4zg6pn9SoCh3cxpJLzzIK7Z3 8IaFu6OiDPp7lp7tH1vDX2T6n/HHhHxDnC6sfgd39auQX5odElaljaYsBiwiM9dO/+SC ejd3tWqmcRT79TSw8tCj+JbfmI0wRBgaMvKqEmtDuZdGprACGLny+qfrWHMwIecYUN6O ZEeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=T1okUU6x; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m16si2385305ejd.306.2019.10.30.15.53.44; Wed, 30 Oct 2019 15:54:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=T1okUU6x; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728215AbfJ3WwR (ORCPT + 99 others); Wed, 30 Oct 2019 18:52:17 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:10846 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727670AbfJ3Wtr (ORCPT ); Wed, 30 Oct 2019 18:49:47 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Wed, 30 Oct 2019 15:49:50 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Wed, 30 Oct 2019 15:49:44 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Wed, 30 Oct 2019 15:49:44 -0700 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 30 Oct 2019 22:49:44 +0000 Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 30 Oct 2019 22:49:44 +0000 Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Wed, 30 Oct 2019 22:49:43 +0000 Received: from blueforge.nvidia.com (Not Verified[10.110.48.28]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Wed, 30 Oct 2019 15:49:43 -0700 From: John Hubbard To: Andrew Morton CC: Al Viro , Alex Williamson , Benjamin Herrenschmidt , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Christoph Hellwig , Dan Williams , Daniel Vetter , Dave Chinner , David Airlie , "David S . Miller" , Ira Weiny , Jan Kara , Jason Gunthorpe , Jens Axboe , Jonathan Corbet , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Magnus Karlsson , "Mauro Carvalho Chehab" , Michael Ellerman , Michal Hocko , Mike Kravetz , "Paul Mackerras" , Shuah Khan , Vlastimil Babka , , , , , , , , , , , , , LKML , John Hubbard Subject: [PATCH 08/19] mm/process_vm_access: set FOLL_PIN via pin_user_pages_remote() Date: Wed, 30 Oct 2019 15:49:19 -0700 Message-ID: <20191030224930.3990755-9-jhubbard@nvidia.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191030224930.3990755-1-jhubbard@nvidia.com> References: <20191030224930.3990755-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1572475790; bh=mlrZ/rix4TWnvu0gWBO75CbhcMvz3QaPMdjHmepPots=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:X-NVConfidentiality: Content-Transfer-Encoding:Content-Type; b=T1okUU6xEFiVtVeoQJE96GgMlaT5QHQCTSORP2lhkD8eLigr7DeidXJDkKlLMKjgp suyl0vSyxruTx+5wktlA+v73ygMrBWwhZ3suojNDWt8GwtWUHRbfxxcqePdMFOnqWH 8pF9BGDuXtc+s13A8v+IiYxTtUcRGn3/Fda9cflCAEhL21x9avtCRB0/4GlQ7qoVNT IViDVH9dh3Vl7mArrvAZ3LKr0E9JZPsdHm0+SZQNP+nGbAmrzMotnN6uW5fgYzKzEn VsXqvyhgyE3u3T7p+IDCeRBQTg7e+DvgXTT/NjnEP9pYQZ1j2C/gu/xXXFcdv1lmJj cKzWDdboK7PPQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(). Signed-off-by: John Hubbard --- mm/process_vm_access.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c index 357aa7bef6c0..fd20ab675b85 100644 --- a/mm/process_vm_access.c +++ b/mm/process_vm_access.c @@ -42,12 +42,11 @@ static int process_vm_rw_pages(struct page **pages, 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(unsigned long addr, 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(unsigned long add= r, * 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(unsigned long add= r, 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; --=20 2.23.0