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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 13B08C33C99 for ; Wed, 13 Nov 2019 19:09:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4AE1B206FE for ; Wed, 13 Nov 2019 19:09:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4AE1B206FE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 701DB6B0006; Wed, 13 Nov 2019 14:09:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 68B576B0008; Wed, 13 Nov 2019 14:09:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 552566B000A; Wed, 13 Nov 2019 14:09:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0040.hostedemail.com [216.40.44.40]) by kanga.kvack.org (Postfix) with ESMTP id 3BE0F6B0006 for ; Wed, 13 Nov 2019 14:09:41 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 90CA7181AEF23 for ; Wed, 13 Nov 2019 19:09:40 +0000 (UTC) X-FDA: 76152193320.07.pot05_1a20731bce141 X-HE-Tag: pot05_1a20731bce141 X-Filterd-Recvd-Size: 6929 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Wed, 13 Nov 2019 19:09:39 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2019 11:09:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,301,1569308400"; d="scan'208";a="355565939" Received: from iweiny-desk2.sc.intel.com ([10.3.52.157]) by orsmga004.jf.intel.com with ESMTP; 13 Nov 2019 11:09:36 -0800 Date: Wed, 13 Nov 2019 11:09:35 -0800 From: Ira Weiny To: John Hubbard Cc: Andrew Morton , Al Viro , Alex Williamson , Benjamin Herrenschmidt , =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= , Christoph Hellwig , Dan Williams , Daniel Vetter , Dave Chinner , David Airlie , "David S . Miller" , Jan Kara , Jason Gunthorpe , Jens Axboe , Jonathan Corbet , =?iso-8859-1?B?Suly9G1l?= Glisse , Magnus Karlsson , Mauro Carvalho Chehab , Michael Ellerman , Michal Hocko , Mike Kravetz , Paul Mackerras , Shuah Khan , Vlastimil Babka , bpf@vger.kernel.org, dri-devel@lists.freedesktop.org, kvm@vger.kernel.org, linux-block@vger.kernel.org, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-media@vger.kernel.org, linux-rdma@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, linux-mm@kvack.org, LKML Subject: Re: [PATCH v4 23/23] mm/gup: remove support for gup(FOLL_LONGTERM) Message-ID: <20191113190935.GD12947@iweiny-DESK2.sc.intel.com> References: <20191113042710.3997854-1-jhubbard@nvidia.com> <20191113042710.3997854-24-jhubbard@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191113042710.3997854-24-jhubbard@nvidia.com> User-Agent: Mutt/1.11.1 (2018-12-01) 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: On Tue, Nov 12, 2019 at 08:27:10PM -0800, John Hubbard wrote: > Now that all other kernel callers of get_user_pages(FOLL_LONGTERM) > have been converted to pin_longterm_pages(), lock it down: > > 1) Add an assertion to get_user_pages(), preventing callers from > passing FOLL_LONGTERM (in addition to the existing assertion that > prevents FOLL_PIN). > > 2) Remove the associated GUP_LONGTERM_BENCHMARK test. > > Signed-off-by: John Hubbard > --- > mm/gup.c | 8 ++++---- > mm/gup_benchmark.c | 9 +-------- > tools/testing/selftests/vm/gup_benchmark.c | 7 ++----- > 3 files changed, 7 insertions(+), 17 deletions(-) > > diff --git a/mm/gup.c b/mm/gup.c > index 82e7e4ce5027..90f5f95ee7ac 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -1756,11 +1756,11 @@ long get_user_pages(unsigned long start, unsigned long nr_pages, > struct vm_area_struct **vmas) > { > /* > - * FOLL_PIN must only be set internally by the pin_user_page*() and > - * pin_longterm_*() APIs, never directly by the caller, so enforce that > - * with an assertion: > + * FOLL_PIN and FOLL_LONGTERM must only be set internally by the > + * pin_user_page*() and pin_longterm_*() APIs, never directly by the > + * caller, so enforce that with an assertion: > */ > - if (WARN_ON_ONCE(gup_flags & FOLL_PIN)) > + if (WARN_ON_ONCE(gup_flags & (FOLL_PIN | FOLL_LONGTERM))) Don't we want to block FOLL_LONGTERM in get_user_pages_fast() as well after all this? Ira > return -EINVAL; > > return __gup_longterm_locked(current, current->mm, start, nr_pages, > diff --git a/mm/gup_benchmark.c b/mm/gup_benchmark.c > index 8f980d91dbf5..679f0e6a0adb 100644 > --- a/mm/gup_benchmark.c > +++ b/mm/gup_benchmark.c > @@ -6,7 +6,7 @@ > #include > > #define GUP_FAST_BENCHMARK _IOWR('g', 1, struct gup_benchmark) > -#define GUP_LONGTERM_BENCHMARK _IOWR('g', 2, struct gup_benchmark) > +/* Command 2 has been deleted. */ > #define GUP_BENCHMARK _IOWR('g', 3, struct gup_benchmark) > #define PIN_FAST_BENCHMARK _IOWR('g', 4, struct gup_benchmark) > #define PIN_LONGTERM_BENCHMARK _IOWR('g', 5, struct gup_benchmark) > @@ -28,7 +28,6 @@ static void put_back_pages(int cmd, struct page **pages, unsigned long nr_pages) > > switch (cmd) { > case GUP_FAST_BENCHMARK: > - case GUP_LONGTERM_BENCHMARK: > case GUP_BENCHMARK: > for (i = 0; i < nr_pages; i++) > put_page(pages[i]); > @@ -97,11 +96,6 @@ static int __gup_benchmark_ioctl(unsigned int cmd, > nr = get_user_pages_fast(addr, nr, gup->flags, > pages + i); > break; > - case GUP_LONGTERM_BENCHMARK: > - nr = get_user_pages(addr, nr, > - gup->flags | FOLL_LONGTERM, > - pages + i, NULL); > - break; > case GUP_BENCHMARK: > nr = get_user_pages(addr, nr, gup->flags, pages + i, > NULL); > @@ -159,7 +153,6 @@ static long gup_benchmark_ioctl(struct file *filep, unsigned int cmd, > > switch (cmd) { > case GUP_FAST_BENCHMARK: > - case GUP_LONGTERM_BENCHMARK: > case GUP_BENCHMARK: > case PIN_FAST_BENCHMARK: > case PIN_LONGTERM_BENCHMARK: > diff --git a/tools/testing/selftests/vm/gup_benchmark.c b/tools/testing/selftests/vm/gup_benchmark.c > index 03928e47a86f..836b7082db13 100644 > --- a/tools/testing/selftests/vm/gup_benchmark.c > +++ b/tools/testing/selftests/vm/gup_benchmark.c > @@ -15,7 +15,7 @@ > #define PAGE_SIZE sysconf(_SC_PAGESIZE) > > #define GUP_FAST_BENCHMARK _IOWR('g', 1, struct gup_benchmark) > -#define GUP_LONGTERM_BENCHMARK _IOWR('g', 2, struct gup_benchmark) > +/* Command 2 has been deleted. */ > #define GUP_BENCHMARK _IOWR('g', 3, struct gup_benchmark) > > /* > @@ -49,7 +49,7 @@ int main(int argc, char **argv) > char *file = "/dev/zero"; > char *p; > > - while ((opt = getopt(argc, argv, "m:r:n:f:abctTLUuwSH")) != -1) { > + while ((opt = getopt(argc, argv, "m:r:n:f:abctTUuwSH")) != -1) { > switch (opt) { > case 'a': > cmd = PIN_FAST_BENCHMARK; > @@ -75,9 +75,6 @@ int main(int argc, char **argv) > case 'T': > thp = 0; > break; > - case 'L': > - cmd = GUP_LONGTERM_BENCHMARK; > - break; > case 'U': > cmd = GUP_BENCHMARK; > break; > -- > 2.24.0 >