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, 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 97FB8C43331 for ; Wed, 13 Nov 2019 11:15:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 762952245B for ; Wed, 13 Nov 2019 11:15:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727862AbfKMLP2 (ORCPT ); Wed, 13 Nov 2019 06:15:28 -0500 Received: from mx2.suse.de ([195.135.220.15]:47422 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727316AbfKMLP1 (ORCPT ); Wed, 13 Nov 2019 06:15:27 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 69351B4F8; Wed, 13 Nov 2019 11:15:23 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id D45001E1498; Wed, 13 Nov 2019 12:15:21 +0100 (CET) Date: Wed, 13 Nov 2019 12:15:21 +0100 From: Jan Kara 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" , Ira Weiny , 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 , Christoph Hellwig , "Aneesh Kumar K . V" Subject: Re: [PATCH v4 02/23] mm/gup: factor out duplicate code from four routines Message-ID: <20191113111521.GI6367@quack2.suse.cz> References: <20191113042710.3997854-1-jhubbard@nvidia.com> <20191113042710.3997854-3-jhubbard@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20191113042710.3997854-3-jhubbard@nvidia.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Tue 12-11-19 20:26:49, John Hubbard wrote: > There are four locations in gup.c that have a fair amount of code > duplication. This means that changing one requires making the same > changes in four places, not to mention reading the same code four > times, and wondering if there are subtle differences. > > Factor out the common code into static functions, thus reducing the > overall line count and the code's complexity. > > Also, take the opportunity to slightly improve the efficiency of the > error cases, by doing a mass subtraction of the refcount, surrounded > by get_page()/put_page(). > > Also, further simplify (slightly), by waiting until the the successful > end of each routine, to increment *nr. > > Reviewed-by: Jérôme Glisse > Cc: Ira Weiny > Cc: Christoph Hellwig > Cc: Aneesh Kumar K.V > Signed-off-by: John Hubbard > diff --git a/mm/gup.c b/mm/gup.c > index 85caf76b3012..199da99e8ffc 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -1969,6 +1969,34 @@ static int __gup_device_huge_pud(pud_t pud, pud_t *pudp, unsigned long addr, > } > #endif > > +static int __record_subpages(struct page *page, unsigned long addr, > + unsigned long end, struct page **pages, int nr) > +{ > + int nr_recorded_pages = 0; > + > + do { > + pages[nr] = page; > + nr++; > + page++; > + nr_recorded_pages++; > + } while (addr += PAGE_SIZE, addr != end); > + return nr_recorded_pages; > +} Why don't you pass in already pages + nr? > + > +static void put_compound_head(struct page *page, int refs) > +{ > + /* Do a get_page() first, in case refs == page->_refcount */ > + get_page(page); > + page_ref_sub(page, refs); > + put_page(page); > +} > + > +static void __huge_pt_done(struct page *head, int nr_recorded_pages, int *nr) > +{ > + *nr += nr_recorded_pages; > + SetPageReferenced(head); > +} I don't find this last helper very useful. It seems to muddy water more than necessary... Other than that the cleanup looks nice to me. Honza -- Jan Kara SUSE Labs, CR 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, 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 46206C43331 for ; Wed, 13 Nov 2019 11:18:49 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E6AD3222D3 for ; Wed, 13 Nov 2019 11:18:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E6AD3222D3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 47ChvB1fNtzF43d for ; Wed, 13 Nov 2019 22:18:46 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=195.135.220.15; helo=mx1.suse.de; envelope-from=jack@suse.cz; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 47ChqM213dzF7Fr for ; Wed, 13 Nov 2019 22:15:27 +1100 (AEDT) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 69351B4F8; Wed, 13 Nov 2019 11:15:23 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id D45001E1498; Wed, 13 Nov 2019 12:15:21 +0100 (CET) Date: Wed, 13 Nov 2019 12:15:21 +0100 From: Jan Kara To: John Hubbard Subject: Re: [PATCH v4 02/23] mm/gup: factor out duplicate code from four routines Message-ID: <20191113111521.GI6367@quack2.suse.cz> References: <20191113042710.3997854-1-jhubbard@nvidia.com> <20191113042710.3997854-3-jhubbard@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20191113042710.3997854-3-jhubbard@nvidia.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , Jan Kara , kvm@vger.kernel.org, linux-doc@vger.kernel.org, David Airlie , Dave Chinner , dri-devel@lists.freedesktop.org, LKML , linux-mm@kvack.org, Paul Mackerras , linux-kselftest@vger.kernel.org, Ira Weiny , Christoph Hellwig , Jonathan Corbet , linux-rdma@vger.kernel.org, Christoph Hellwig , Jason Gunthorpe , Vlastimil Babka , =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= , linux-media@vger.kernel.org, Shuah Khan , linux-block@vger.kernel.org, =?iso-8859-1?B?Suly9G1l?= Glisse , Al Viro , Dan Williams , Mauro Carvalho Chehab , bpf@vger.kernel.org, Magnus Karlsson , Jens Axboe , netdev@vger.kernel.org, Alex Williamson , Daniel Vetter , "Aneesh Kumar K . V" , linux-fsdevel@vger.kernel.org, Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S . Miller" , Mike Kravetz Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Tue 12-11-19 20:26:49, John Hubbard wrote: > There are four locations in gup.c that have a fair amount of code > duplication. This means that changing one requires making the same > changes in four places, not to mention reading the same code four > times, and wondering if there are subtle differences. > > Factor out the common code into static functions, thus reducing the > overall line count and the code's complexity. > > Also, take the opportunity to slightly improve the efficiency of the > error cases, by doing a mass subtraction of the refcount, surrounded > by get_page()/put_page(). > > Also, further simplify (slightly), by waiting until the the successful > end of each routine, to increment *nr. > > Reviewed-by: Jérôme Glisse > Cc: Ira Weiny > Cc: Christoph Hellwig > Cc: Aneesh Kumar K.V > Signed-off-by: John Hubbard > diff --git a/mm/gup.c b/mm/gup.c > index 85caf76b3012..199da99e8ffc 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -1969,6 +1969,34 @@ static int __gup_device_huge_pud(pud_t pud, pud_t *pudp, unsigned long addr, > } > #endif > > +static int __record_subpages(struct page *page, unsigned long addr, > + unsigned long end, struct page **pages, int nr) > +{ > + int nr_recorded_pages = 0; > + > + do { > + pages[nr] = page; > + nr++; > + page++; > + nr_recorded_pages++; > + } while (addr += PAGE_SIZE, addr != end); > + return nr_recorded_pages; > +} Why don't you pass in already pages + nr? > + > +static void put_compound_head(struct page *page, int refs) > +{ > + /* Do a get_page() first, in case refs == page->_refcount */ > + get_page(page); > + page_ref_sub(page, refs); > + put_page(page); > +} > + > +static void __huge_pt_done(struct page *head, int nr_recorded_pages, int *nr) > +{ > + *nr += nr_recorded_pages; > + SetPageReferenced(head); > +} I don't find this last helper very useful. It seems to muddy water more than necessary... Other than that the cleanup looks nice to me. Honza -- Jan Kara SUSE Labs, CR From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Subject: Re: [PATCH v4 02/23] mm/gup: factor out duplicate code from four routines Date: Wed, 13 Nov 2019 12:15:21 +0100 Message-ID: <20191113111521.GI6367@quack2.suse.cz> References: <20191113042710.3997854-1-jhubbard@nvidia.com> <20191113042710.3997854-3-jhubbard@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 78A676ECD9 for ; Wed, 13 Nov 2019 11:15:25 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20191113042710.3997854-3-jhubbard@nvidia.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: John Hubbard Cc: Michal Hocko , Jan Kara , kvm@vger.kernel.org, linux-doc@vger.kernel.org, David Airlie , Dave Chinner , dri-devel@lists.freedesktop.org, LKML , linux-mm@kvack.org, Paul Mackerras , linux-kselftest@vger.kernel.org, Ira Weiny , Christoph Hellwig , Jonathan Corbet , linux-rdma@vger.kernel.org, Michael Ellerman , Christoph Hellwig , Jason Gunthorpe , Vlastimil Babka , =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= , linux-media@vger.kernel.org, Shuah Khan , linux-block@vger.kernel.org, =?iso-8859-1?B?Suly9G1l?= Glisse , Al Viro , Dan Williams List-Id: dri-devel@lists.freedesktop.org T24gVHVlIDEyLTExLTE5IDIwOjI2OjQ5LCBKb2huIEh1YmJhcmQgd3JvdGU6Cj4gVGhlcmUgYXJl IGZvdXIgbG9jYXRpb25zIGluIGd1cC5jIHRoYXQgaGF2ZSBhIGZhaXIgYW1vdW50IG9mIGNvZGUK PiBkdXBsaWNhdGlvbi4gVGhpcyBtZWFucyB0aGF0IGNoYW5naW5nIG9uZSByZXF1aXJlcyBtYWtp bmcgdGhlIHNhbWUKPiBjaGFuZ2VzIGluIGZvdXIgcGxhY2VzLCBub3QgdG8gbWVudGlvbiByZWFk aW5nIHRoZSBzYW1lIGNvZGUgZm91cgo+IHRpbWVzLCBhbmQgd29uZGVyaW5nIGlmIHRoZXJlIGFy ZSBzdWJ0bGUgZGlmZmVyZW5jZXMuCj4gCj4gRmFjdG9yIG91dCB0aGUgY29tbW9uIGNvZGUgaW50 byBzdGF0aWMgZnVuY3Rpb25zLCB0aHVzIHJlZHVjaW5nIHRoZQo+IG92ZXJhbGwgbGluZSBjb3Vu dCBhbmQgdGhlIGNvZGUncyBjb21wbGV4aXR5Lgo+IAo+IEFsc28sIHRha2UgdGhlIG9wcG9ydHVu aXR5IHRvIHNsaWdodGx5IGltcHJvdmUgdGhlIGVmZmljaWVuY3kgb2YgdGhlCj4gZXJyb3IgY2Fz ZXMsIGJ5IGRvaW5nIGEgbWFzcyBzdWJ0cmFjdGlvbiBvZiB0aGUgcmVmY291bnQsIHN1cnJvdW5k ZWQKPiBieSBnZXRfcGFnZSgpL3B1dF9wYWdlKCkuCj4gCj4gQWxzbywgZnVydGhlciBzaW1wbGlm eSAoc2xpZ2h0bHkpLCBieSB3YWl0aW5nIHVudGlsIHRoZSB0aGUgc3VjY2Vzc2Z1bAo+IGVuZCBv ZiBlYWNoIHJvdXRpbmUsIHRvIGluY3JlbWVudCAqbnIuCj4gCj4gUmV2aWV3ZWQtYnk6IErDqXLD tG1lIEdsaXNzZSA8amdsaXNzZUByZWRoYXQuY29tPgo+IENjOiBJcmEgV2VpbnkgPGlyYS53ZWlu eUBpbnRlbC5jb20+Cj4gQ2M6IENocmlzdG9waCBIZWxsd2lnIDxoY2hAbHN0LmRlPgo+IENjOiBB bmVlc2ggS3VtYXIgSy5WIDxhbmVlc2gua3VtYXJAbGludXguaWJtLmNvbT4KPiBTaWduZWQtb2Zm LWJ5OiBKb2huIEh1YmJhcmQgPGpodWJiYXJkQG52aWRpYS5jb20+Cgo+IGRpZmYgLS1naXQgYS9t bS9ndXAuYyBiL21tL2d1cC5jCj4gaW5kZXggODVjYWY3NmIzMDEyLi4xOTlkYTk5ZThmZmMgMTAw NjQ0Cj4gLS0tIGEvbW0vZ3VwLmMKPiArKysgYi9tbS9ndXAuYwo+IEBAIC0xOTY5LDYgKzE5Njks MzQgQEAgc3RhdGljIGludCBfX2d1cF9kZXZpY2VfaHVnZV9wdWQocHVkX3QgcHVkLCBwdWRfdCAq cHVkcCwgdW5zaWduZWQgbG9uZyBhZGRyLAo+ICB9Cj4gICNlbmRpZgo+ICAKPiArc3RhdGljIGlu dCBfX3JlY29yZF9zdWJwYWdlcyhzdHJ1Y3QgcGFnZSAqcGFnZSwgdW5zaWduZWQgbG9uZyBhZGRy LAo+ICsJCQkgICAgIHVuc2lnbmVkIGxvbmcgZW5kLCBzdHJ1Y3QgcGFnZSAqKnBhZ2VzLCBpbnQg bnIpCj4gK3sKPiArCWludCBucl9yZWNvcmRlZF9wYWdlcyA9IDA7Cj4gKwo+ICsJZG8gewo+ICsJ CXBhZ2VzW25yXSA9IHBhZ2U7Cj4gKwkJbnIrKzsKPiArCQlwYWdlKys7Cj4gKwkJbnJfcmVjb3Jk ZWRfcGFnZXMrKzsKPiArCX0gd2hpbGUgKGFkZHIgKz0gUEFHRV9TSVpFLCBhZGRyICE9IGVuZCk7 Cj4gKwlyZXR1cm4gbnJfcmVjb3JkZWRfcGFnZXM7Cj4gK30KCldoeSBkb24ndCB5b3UgcGFzcyBp biBhbHJlYWR5IHBhZ2VzICsgbnI/Cgo+ICsKPiArc3RhdGljIHZvaWQgcHV0X2NvbXBvdW5kX2hl YWQoc3RydWN0IHBhZ2UgKnBhZ2UsIGludCByZWZzKQo+ICt7Cj4gKwkvKiBEbyBhIGdldF9wYWdl KCkgZmlyc3QsIGluIGNhc2UgcmVmcyA9PSBwYWdlLT5fcmVmY291bnQgKi8KPiArCWdldF9wYWdl KHBhZ2UpOwo+ICsJcGFnZV9yZWZfc3ViKHBhZ2UsIHJlZnMpOwo+ICsJcHV0X3BhZ2UocGFnZSk7 Cj4gK30KPiArCj4gK3N0YXRpYyB2b2lkIF9faHVnZV9wdF9kb25lKHN0cnVjdCBwYWdlICpoZWFk LCBpbnQgbnJfcmVjb3JkZWRfcGFnZXMsIGludCAqbnIpCj4gK3sKPiArCSpuciArPSBucl9yZWNv cmRlZF9wYWdlczsKPiArCVNldFBhZ2VSZWZlcmVuY2VkKGhlYWQpOwo+ICt9CgpJIGRvbid0IGZp bmQgdGhpcyBsYXN0IGhlbHBlciB2ZXJ5IHVzZWZ1bC4gSXQgc2VlbXMgdG8gbXVkZHkgd2F0ZXIg bW9yZQp0aGFuIG5lY2Vzc2FyeS4uLgoKT3RoZXIgdGhhbiB0aGF0IHRoZSBjbGVhbnVwIGxvb2tz IG5pY2UgdG8gbWUuCgoJCQkJCQkJCUhvbnphCi0tIApKYW4gS2FyYSA8amFja0BzdXNlLmNvbT4K U1VTRSBMYWJzLCBDUgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWw= 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, USER_AGENT_SANE_1 autolearn=ham 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 9B270C17449 for ; Wed, 13 Nov 2019 11:15:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75B08222D3 for ; Wed, 13 Nov 2019 11:15:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75B08222D3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EAAAC6ECD9; Wed, 13 Nov 2019 11:15:26 +0000 (UTC) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 78A676ECD9 for ; Wed, 13 Nov 2019 11:15:25 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 69351B4F8; Wed, 13 Nov 2019 11:15:23 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id D45001E1498; Wed, 13 Nov 2019 12:15:21 +0100 (CET) Date: Wed, 13 Nov 2019 12:15:21 +0100 From: Jan Kara To: John Hubbard Subject: Re: [PATCH v4 02/23] mm/gup: factor out duplicate code from four routines Message-ID: <20191113111521.GI6367@quack2.suse.cz> References: <20191113042710.3997854-1-jhubbard@nvidia.com> <20191113042710.3997854-3-jhubbard@nvidia.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191113042710.3997854-3-jhubbard@nvidia.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , Jan Kara , kvm@vger.kernel.org, linux-doc@vger.kernel.org, David Airlie , Dave Chinner , dri-devel@lists.freedesktop.org, LKML , linux-mm@kvack.org, Paul Mackerras , linux-kselftest@vger.kernel.org, Ira Weiny , Christoph Hellwig , Jonathan Corbet , linux-rdma@vger.kernel.org, Michael Ellerman , Christoph Hellwig , Jason Gunthorpe , Vlastimil Babka , =?iso-8859-1?Q?Bj=F6rn_T=F6pel?= , linux-media@vger.kernel.org, Shuah Khan , linux-block@vger.kernel.org, =?iso-8859-1?B?Suly9G1l?= Glisse , Al Viro , Dan Williams , Mauro Carvalho Chehab , bpf@vger.kernel.org, Magnus Karlsson , Jens Axboe , netdev@vger.kernel.org, Alex Williamson , "Aneesh Kumar K . V" , linux-fsdevel@vger.kernel.org, Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S . Miller" , Mike Kravetz Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191113111521.1t0PasiNCefVHygOfsLvQyaYJdt8rx7kZrcjV5HZLuo@z> T24gVHVlIDEyLTExLTE5IDIwOjI2OjQ5LCBKb2huIEh1YmJhcmQgd3JvdGU6Cj4gVGhlcmUgYXJl IGZvdXIgbG9jYXRpb25zIGluIGd1cC5jIHRoYXQgaGF2ZSBhIGZhaXIgYW1vdW50IG9mIGNvZGUK PiBkdXBsaWNhdGlvbi4gVGhpcyBtZWFucyB0aGF0IGNoYW5naW5nIG9uZSByZXF1aXJlcyBtYWtp bmcgdGhlIHNhbWUKPiBjaGFuZ2VzIGluIGZvdXIgcGxhY2VzLCBub3QgdG8gbWVudGlvbiByZWFk aW5nIHRoZSBzYW1lIGNvZGUgZm91cgo+IHRpbWVzLCBhbmQgd29uZGVyaW5nIGlmIHRoZXJlIGFy ZSBzdWJ0bGUgZGlmZmVyZW5jZXMuCj4gCj4gRmFjdG9yIG91dCB0aGUgY29tbW9uIGNvZGUgaW50 byBzdGF0aWMgZnVuY3Rpb25zLCB0aHVzIHJlZHVjaW5nIHRoZQo+IG92ZXJhbGwgbGluZSBjb3Vu dCBhbmQgdGhlIGNvZGUncyBjb21wbGV4aXR5Lgo+IAo+IEFsc28sIHRha2UgdGhlIG9wcG9ydHVu aXR5IHRvIHNsaWdodGx5IGltcHJvdmUgdGhlIGVmZmljaWVuY3kgb2YgdGhlCj4gZXJyb3IgY2Fz ZXMsIGJ5IGRvaW5nIGEgbWFzcyBzdWJ0cmFjdGlvbiBvZiB0aGUgcmVmY291bnQsIHN1cnJvdW5k ZWQKPiBieSBnZXRfcGFnZSgpL3B1dF9wYWdlKCkuCj4gCj4gQWxzbywgZnVydGhlciBzaW1wbGlm eSAoc2xpZ2h0bHkpLCBieSB3YWl0aW5nIHVudGlsIHRoZSB0aGUgc3VjY2Vzc2Z1bAo+IGVuZCBv ZiBlYWNoIHJvdXRpbmUsIHRvIGluY3JlbWVudCAqbnIuCj4gCj4gUmV2aWV3ZWQtYnk6IErDqXLD tG1lIEdsaXNzZSA8amdsaXNzZUByZWRoYXQuY29tPgo+IENjOiBJcmEgV2VpbnkgPGlyYS53ZWlu eUBpbnRlbC5jb20+Cj4gQ2M6IENocmlzdG9waCBIZWxsd2lnIDxoY2hAbHN0LmRlPgo+IENjOiBB bmVlc2ggS3VtYXIgSy5WIDxhbmVlc2gua3VtYXJAbGludXguaWJtLmNvbT4KPiBTaWduZWQtb2Zm LWJ5OiBKb2huIEh1YmJhcmQgPGpodWJiYXJkQG52aWRpYS5jb20+Cgo+IGRpZmYgLS1naXQgYS9t bS9ndXAuYyBiL21tL2d1cC5jCj4gaW5kZXggODVjYWY3NmIzMDEyLi4xOTlkYTk5ZThmZmMgMTAw NjQ0Cj4gLS0tIGEvbW0vZ3VwLmMKPiArKysgYi9tbS9ndXAuYwo+IEBAIC0xOTY5LDYgKzE5Njks MzQgQEAgc3RhdGljIGludCBfX2d1cF9kZXZpY2VfaHVnZV9wdWQocHVkX3QgcHVkLCBwdWRfdCAq cHVkcCwgdW5zaWduZWQgbG9uZyBhZGRyLAo+ICB9Cj4gICNlbmRpZgo+ICAKPiArc3RhdGljIGlu dCBfX3JlY29yZF9zdWJwYWdlcyhzdHJ1Y3QgcGFnZSAqcGFnZSwgdW5zaWduZWQgbG9uZyBhZGRy LAo+ICsJCQkgICAgIHVuc2lnbmVkIGxvbmcgZW5kLCBzdHJ1Y3QgcGFnZSAqKnBhZ2VzLCBpbnQg bnIpCj4gK3sKPiArCWludCBucl9yZWNvcmRlZF9wYWdlcyA9IDA7Cj4gKwo+ICsJZG8gewo+ICsJ CXBhZ2VzW25yXSA9IHBhZ2U7Cj4gKwkJbnIrKzsKPiArCQlwYWdlKys7Cj4gKwkJbnJfcmVjb3Jk ZWRfcGFnZXMrKzsKPiArCX0gd2hpbGUgKGFkZHIgKz0gUEFHRV9TSVpFLCBhZGRyICE9IGVuZCk7 Cj4gKwlyZXR1cm4gbnJfcmVjb3JkZWRfcGFnZXM7Cj4gK30KCldoeSBkb24ndCB5b3UgcGFzcyBp biBhbHJlYWR5IHBhZ2VzICsgbnI/Cgo+ICsKPiArc3RhdGljIHZvaWQgcHV0X2NvbXBvdW5kX2hl YWQoc3RydWN0IHBhZ2UgKnBhZ2UsIGludCByZWZzKQo+ICt7Cj4gKwkvKiBEbyBhIGdldF9wYWdl KCkgZmlyc3QsIGluIGNhc2UgcmVmcyA9PSBwYWdlLT5fcmVmY291bnQgKi8KPiArCWdldF9wYWdl KHBhZ2UpOwo+ICsJcGFnZV9yZWZfc3ViKHBhZ2UsIHJlZnMpOwo+ICsJcHV0X3BhZ2UocGFnZSk7 Cj4gK30KPiArCj4gK3N0YXRpYyB2b2lkIF9faHVnZV9wdF9kb25lKHN0cnVjdCBwYWdlICpoZWFk LCBpbnQgbnJfcmVjb3JkZWRfcGFnZXMsIGludCAqbnIpCj4gK3sKPiArCSpuciArPSBucl9yZWNv cmRlZF9wYWdlczsKPiArCVNldFBhZ2VSZWZlcmVuY2VkKGhlYWQpOwo+ICt9CgpJIGRvbid0IGZp bmQgdGhpcyBsYXN0IGhlbHBlciB2ZXJ5IHVzZWZ1bC4gSXQgc2VlbXMgdG8gbXVkZHkgd2F0ZXIg bW9yZQp0aGFuIG5lY2Vzc2FyeS4uLgoKT3RoZXIgdGhhbiB0aGF0IHRoZSBjbGVhbnVwIGxvb2tz IG5pY2UgdG8gbWUuCgoJCQkJCQkJCUhvbnphCi0tIApKYW4gS2FyYSA8amFja0BzdXNlLmNvbT4K U1VTRSBMYWJzLCBDUgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWw=