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=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 014E7CA9ECB for ; Thu, 31 Oct 2019 18:35:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC544217D9 for ; Thu, 31 Oct 2019 18:35:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729288AbfJaSfv (ORCPT ); Thu, 31 Oct 2019 14:35:51 -0400 Received: from mga12.intel.com ([192.55.52.136]:38691 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729027AbfJaSfu (ORCPT ); Thu, 31 Oct 2019 14:35:50 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 11:35:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,252,1569308400"; d="scan'208";a="230963750" Received: from iweiny-desk2.sc.intel.com ([10.3.52.157]) by fmsmga002.fm.intel.com with ESMTP; 31 Oct 2019 11:35:49 -0700 Date: Thu, 31 Oct 2019 11:35:49 -0700 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 , Christoph Hellwig , "Aneesh Kumar K . V" Subject: Re: [PATCH 02/19] mm/gup: factor out duplicate code from four routines Message-ID: <20191031183549.GC14771@iweiny-DESK2.sc.intel.com> References: <20191030224930.3990755-1-jhubbard@nvidia.com> <20191030224930.3990755-3-jhubbard@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191030224930.3990755-3-jhubbard@nvidia.com> User-Agent: Mutt/1.11.1 (2018-12-01) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Wed, Oct 30, 2019 at 03:49:13PM -0700, 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. Overall it seems like a pretty good clean up. It did take a bit of review but I _think_ it is correct. A couple of comments below. > > Cc: Christoph Hellwig > Cc: Aneesh Kumar K.V > Signed-off-by: John Hubbard > --- > mm/gup.c | 113 ++++++++++++++++++++++--------------------------------- > 1 file changed, 46 insertions(+), 67 deletions(-) > > diff --git a/mm/gup.c b/mm/gup.c > index 85caf76b3012..8fb0d9cdfaf5 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -1969,6 +1969,35 @@ 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; > +} > + > +static void __remove_refs_from_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); > +} I wonder if this is better implemented as "put_compound_head()"? To match the try_get_compound_head() call below? > + > +static int __huge_pt_done(struct page *head, int nr_recorded_pages, int *nr) > +{ > + *nr += nr_recorded_pages; > + SetPageReferenced(head); > + return 1; When will this return anything but 1? Ira > +} > + > #ifdef CONFIG_ARCH_HAS_HUGEPD > static unsigned long hugepte_addr_end(unsigned long addr, unsigned long end, > unsigned long sz) > @@ -1998,34 +2027,19 @@ static int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, > /* hugepages are never "special" */ > VM_BUG_ON(!pfn_valid(pte_pfn(pte))); > > - refs = 0; > head = pte_page(pte); > - > page = head + ((addr & (sz-1)) >> PAGE_SHIFT); > - do { > - VM_BUG_ON(compound_head(page) != head); > - pages[*nr] = page; > - (*nr)++; > - page++; > - refs++; > - } while (addr += PAGE_SIZE, addr != end); > + refs = __record_subpages(page, addr, end, pages, *nr); > > head = try_get_compound_head(head, refs); > - if (!head) { > - *nr -= refs; > + if (!head) > return 0; > - } > > if (unlikely(pte_val(pte) != pte_val(*ptep))) { > - /* Could be optimized better */ > - *nr -= refs; > - while (refs--) > - put_page(head); > + __remove_refs_from_head(head, refs); > return 0; > } > - > - SetPageReferenced(head); > - return 1; > + return __huge_pt_done(head, refs, nr); > } > > static int gup_huge_pd(hugepd_t hugepd, unsigned long addr, > @@ -2071,30 +2085,18 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr, > pages, nr); > } > > - refs = 0; > page = pmd_page(orig) + ((addr & ~PMD_MASK) >> PAGE_SHIFT); > - do { > - pages[*nr] = page; > - (*nr)++; > - page++; > - refs++; > - } while (addr += PAGE_SIZE, addr != end); > + refs = __record_subpages(page, addr, end, pages, *nr); > > head = try_get_compound_head(pmd_page(orig), refs); > - if (!head) { > - *nr -= refs; > + if (!head) > return 0; > - } > > if (unlikely(pmd_val(orig) != pmd_val(*pmdp))) { > - *nr -= refs; > - while (refs--) > - put_page(head); > + __remove_refs_from_head(head, refs); > return 0; > } > - > - SetPageReferenced(head); > - return 1; > + return __huge_pt_done(head, refs, nr); > } > > static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr, > @@ -2114,30 +2116,18 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr, > pages, nr); > } > > - refs = 0; > page = pud_page(orig) + ((addr & ~PUD_MASK) >> PAGE_SHIFT); > - do { > - pages[*nr] = page; > - (*nr)++; > - page++; > - refs++; > - } while (addr += PAGE_SIZE, addr != end); > + refs = __record_subpages(page, addr, end, pages, *nr); > > head = try_get_compound_head(pud_page(orig), refs); > - if (!head) { > - *nr -= refs; > + if (!head) > return 0; > - } > > if (unlikely(pud_val(orig) != pud_val(*pudp))) { > - *nr -= refs; > - while (refs--) > - put_page(head); > + __remove_refs_from_head(head, refs); > return 0; > } > - > - SetPageReferenced(head); > - return 1; > + return __huge_pt_done(head, refs, nr); > } > > static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr, > @@ -2151,30 +2141,19 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr, > return 0; > > BUILD_BUG_ON(pgd_devmap(orig)); > - refs = 0; > + > page = pgd_page(orig) + ((addr & ~PGDIR_MASK) >> PAGE_SHIFT); > - do { > - pages[*nr] = page; > - (*nr)++; > - page++; > - refs++; > - } while (addr += PAGE_SIZE, addr != end); > + refs = __record_subpages(page, addr, end, pages, *nr); > > head = try_get_compound_head(pgd_page(orig), refs); > - if (!head) { > - *nr -= refs; > + if (!head) > return 0; > - } > > if (unlikely(pgd_val(orig) != pgd_val(*pgdp))) { > - *nr -= refs; > - while (refs--) > - put_page(head); > + __remove_refs_from_head(head, refs); > return 0; > } > - > - SetPageReferenced(head); > - return 1; > + return __huge_pt_done(head, refs, nr); > } > > static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end, > -- > 2.23.0 > > 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 49ACCC47E49 for ; Thu, 31 Oct 2019 18:38:18 +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 856E2208C0 for ; Thu, 31 Oct 2019 18:38:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 856E2208C0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 473vGF0drHzF5bx for ; Fri, 1 Nov 2019 05:38:12 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=intel.com (client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=ira.weiny@intel.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=intel.com Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 473vCf2nX5zF5Yq for ; Fri, 1 Nov 2019 05:35:53 +1100 (AEDT) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 11:35:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,252,1569308400"; d="scan'208";a="230963750" Received: from iweiny-desk2.sc.intel.com ([10.3.52.157]) by fmsmga002.fm.intel.com with ESMTP; 31 Oct 2019 11:35:49 -0700 Date: Thu, 31 Oct 2019 11:35:49 -0700 From: Ira Weiny To: John Hubbard Subject: Re: [PATCH 02/19] mm/gup: factor out duplicate code from four routines Message-ID: <20191031183549.GC14771@iweiny-DESK2.sc.intel.com> References: <20191030224930.3990755-1-jhubbard@nvidia.com> <20191030224930.3990755-3-jhubbard@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191030224930.3990755-3-jhubbard@nvidia.com> User-Agent: Mutt/1.11.1 (2018-12-01) 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, Shuah Khan , 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, 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 Wed, Oct 30, 2019 at 03:49:13PM -0700, 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. Overall it seems like a pretty good clean up. It did take a bit of review but I _think_ it is correct. A couple of comments below. > > Cc: Christoph Hellwig > Cc: Aneesh Kumar K.V > Signed-off-by: John Hubbard > --- > mm/gup.c | 113 ++++++++++++++++++++++--------------------------------- > 1 file changed, 46 insertions(+), 67 deletions(-) > > diff --git a/mm/gup.c b/mm/gup.c > index 85caf76b3012..8fb0d9cdfaf5 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -1969,6 +1969,35 @@ 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; > +} > + > +static void __remove_refs_from_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); > +} I wonder if this is better implemented as "put_compound_head()"? To match the try_get_compound_head() call below? > + > +static int __huge_pt_done(struct page *head, int nr_recorded_pages, int *nr) > +{ > + *nr += nr_recorded_pages; > + SetPageReferenced(head); > + return 1; When will this return anything but 1? Ira > +} > + > #ifdef CONFIG_ARCH_HAS_HUGEPD > static unsigned long hugepte_addr_end(unsigned long addr, unsigned long end, > unsigned long sz) > @@ -1998,34 +2027,19 @@ static int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, > /* hugepages are never "special" */ > VM_BUG_ON(!pfn_valid(pte_pfn(pte))); > > - refs = 0; > head = pte_page(pte); > - > page = head + ((addr & (sz-1)) >> PAGE_SHIFT); > - do { > - VM_BUG_ON(compound_head(page) != head); > - pages[*nr] = page; > - (*nr)++; > - page++; > - refs++; > - } while (addr += PAGE_SIZE, addr != end); > + refs = __record_subpages(page, addr, end, pages, *nr); > > head = try_get_compound_head(head, refs); > - if (!head) { > - *nr -= refs; > + if (!head) > return 0; > - } > > if (unlikely(pte_val(pte) != pte_val(*ptep))) { > - /* Could be optimized better */ > - *nr -= refs; > - while (refs--) > - put_page(head); > + __remove_refs_from_head(head, refs); > return 0; > } > - > - SetPageReferenced(head); > - return 1; > + return __huge_pt_done(head, refs, nr); > } > > static int gup_huge_pd(hugepd_t hugepd, unsigned long addr, > @@ -2071,30 +2085,18 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr, > pages, nr); > } > > - refs = 0; > page = pmd_page(orig) + ((addr & ~PMD_MASK) >> PAGE_SHIFT); > - do { > - pages[*nr] = page; > - (*nr)++; > - page++; > - refs++; > - } while (addr += PAGE_SIZE, addr != end); > + refs = __record_subpages(page, addr, end, pages, *nr); > > head = try_get_compound_head(pmd_page(orig), refs); > - if (!head) { > - *nr -= refs; > + if (!head) > return 0; > - } > > if (unlikely(pmd_val(orig) != pmd_val(*pmdp))) { > - *nr -= refs; > - while (refs--) > - put_page(head); > + __remove_refs_from_head(head, refs); > return 0; > } > - > - SetPageReferenced(head); > - return 1; > + return __huge_pt_done(head, refs, nr); > } > > static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr, > @@ -2114,30 +2116,18 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr, > pages, nr); > } > > - refs = 0; > page = pud_page(orig) + ((addr & ~PUD_MASK) >> PAGE_SHIFT); > - do { > - pages[*nr] = page; > - (*nr)++; > - page++; > - refs++; > - } while (addr += PAGE_SIZE, addr != end); > + refs = __record_subpages(page, addr, end, pages, *nr); > > head = try_get_compound_head(pud_page(orig), refs); > - if (!head) { > - *nr -= refs; > + if (!head) > return 0; > - } > > if (unlikely(pud_val(orig) != pud_val(*pudp))) { > - *nr -= refs; > - while (refs--) > - put_page(head); > + __remove_refs_from_head(head, refs); > return 0; > } > - > - SetPageReferenced(head); > - return 1; > + return __huge_pt_done(head, refs, nr); > } > > static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr, > @@ -2151,30 +2141,19 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr, > return 0; > > BUILD_BUG_ON(pgd_devmap(orig)); > - refs = 0; > + > page = pgd_page(orig) + ((addr & ~PGDIR_MASK) >> PAGE_SHIFT); > - do { > - pages[*nr] = page; > - (*nr)++; > - page++; > - refs++; > - } while (addr += PAGE_SIZE, addr != end); > + refs = __record_subpages(page, addr, end, pages, *nr); > > head = try_get_compound_head(pgd_page(orig), refs); > - if (!head) { > - *nr -= refs; > + if (!head) > return 0; > - } > > if (unlikely(pgd_val(orig) != pgd_val(*pgdp))) { > - *nr -= refs; > - while (refs--) > - put_page(head); > + __remove_refs_from_head(head, refs); > return 0; > } > - > - SetPageReferenced(head); > - return 1; > + return __huge_pt_done(head, refs, nr); > } > > static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end, > -- > 2.23.0 > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ira Weiny Subject: Re: [PATCH 02/19] mm/gup: factor out duplicate code from four routines Date: Thu, 31 Oct 2019 11:35:49 -0700 Message-ID: <20191031183549.GC14771@iweiny-DESK2.sc.intel.com> References: <20191030224930.3990755-1-jhubbard@nvidia.com> <20191030224930.3990755-3-jhubbard@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id C57A46F536 for ; Thu, 31 Oct 2019 18:35:50 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20191030224930.3990755-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, Shuah Khan , 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, linux-block@vger.kernel.org, =?iso-8859-1?B?Suly9G1l?= Glisse , Al Viro , Dan Williams , Mauro Carvalho Chehab List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBPY3QgMzAsIDIwMTkgYXQgMDM6NDk6MTNQTSAtMDcwMCwgSm9obiBIdWJiYXJkIHdy b3RlOgo+IFRoZXJlIGFyZSBmb3VyIGxvY2F0aW9ucyBpbiBndXAuYyB0aGF0IGhhdmUgYSBmYWly IGFtb3VudCBvZiBjb2RlCj4gZHVwbGljYXRpb24uIFRoaXMgbWVhbnMgdGhhdCBjaGFuZ2luZyBv bmUgcmVxdWlyZXMgbWFraW5nIHRoZSBzYW1lCj4gY2hhbmdlcyBpbiBmb3VyIHBsYWNlcywgbm90 IHRvIG1lbnRpb24gcmVhZGluZyB0aGUgc2FtZSBjb2RlIGZvdXIKPiB0aW1lcywgYW5kIHdvbmRl cmluZyBpZiB0aGVyZSBhcmUgc3VidGxlIGRpZmZlcmVuY2VzLgo+IAo+IEZhY3RvciBvdXQgdGhl IGNvbW1vbiBjb2RlIGludG8gc3RhdGljIGZ1bmN0aW9ucywgdGh1cyByZWR1Y2luZyB0aGUKPiBv dmVyYWxsIGxpbmUgY291bnQgYW5kIHRoZSBjb2RlJ3MgY29tcGxleGl0eS4KPiAKPiBBbHNvLCB0 YWtlIHRoZSBvcHBvcnR1bml0eSB0byBzbGlnaHRseSBpbXByb3ZlIHRoZSBlZmZpY2llbmN5IG9m IHRoZQo+IGVycm9yIGNhc2VzLCBieSBkb2luZyBhIG1hc3Mgc3VidHJhY3Rpb24gb2YgdGhlIHJl ZmNvdW50LCBzdXJyb3VuZGVkCj4gYnkgZ2V0X3BhZ2UoKS9wdXRfcGFnZSgpLgo+IAo+IEFsc28s IGZ1cnRoZXIgc2ltcGxpZnkgKHNsaWdodGx5KSwgYnkgd2FpdGluZyB1bnRpbCB0aGUgdGhlIHN1 Y2Nlc3NmdWwKPiBlbmQgb2YgZWFjaCByb3V0aW5lLCB0byBpbmNyZW1lbnQgKm5yLgoKT3ZlcmFs bCBpdCBzZWVtcyBsaWtlIGEgcHJldHR5IGdvb2QgY2xlYW4gdXAuICBJdCBkaWQgdGFrZSBhIGJp dCBvZiByZXZpZXcgYnV0CkkgX3RoaW5rXyBpdCBpcyBjb3JyZWN0LiAgQSBjb3VwbGUgb2YgY29t bWVudHMgYmVsb3cuCgo+IAo+IENjOiBDaHJpc3RvcGggSGVsbHdpZyA8aGNoQGxzdC5kZT4KPiBD YzogQW5lZXNoIEt1bWFyIEsuViA8YW5lZXNoLmt1bWFyQGxpbnV4LmlibS5jb20+Cj4gU2lnbmVk LW9mZi1ieTogSm9obiBIdWJiYXJkIDxqaHViYmFyZEBudmlkaWEuY29tPgo+IC0tLQo+ICBtbS9n dXAuYyB8IDExMyArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCA2NyBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvbW0vZ3VwLmMgYi9tbS9ndXAuYwo+IGluZGV4IDg1Y2Fm NzZiMzAxMi4uOGZiMGQ5Y2RmYWY1IDEwMDY0NAo+IC0tLSBhL21tL2d1cC5jCj4gKysrIGIvbW0v Z3VwLmMKPiBAQCAtMTk2OSw2ICsxOTY5LDM1IEBAIHN0YXRpYyBpbnQgX19ndXBfZGV2aWNlX2h1 Z2VfcHVkKHB1ZF90IHB1ZCwgcHVkX3QgKnB1ZHAsIHVuc2lnbmVkIGxvbmcgYWRkciwKPiAgfQo+ ICAjZW5kaWYKPiAgCj4gK3N0YXRpYyBpbnQgX19yZWNvcmRfc3VicGFnZXMoc3RydWN0IHBhZ2Ug KnBhZ2UsIHVuc2lnbmVkIGxvbmcgYWRkciwKPiArCQkJICAgICB1bnNpZ25lZCBsb25nIGVuZCwg c3RydWN0IHBhZ2UgKipwYWdlcywgaW50IG5yKQo+ICt7Cj4gKwlpbnQgbnJfcmVjb3JkZWRfcGFn ZXMgPSAwOwo+ICsKPiArCWRvIHsKPiArCQlwYWdlc1tucl0gPSBwYWdlOwo+ICsJCW5yKys7Cj4g KwkJcGFnZSsrOwo+ICsJCW5yX3JlY29yZGVkX3BhZ2VzKys7Cj4gKwl9IHdoaWxlIChhZGRyICs9 IFBBR0VfU0laRSwgYWRkciAhPSBlbmQpOwo+ICsJcmV0dXJuIG5yX3JlY29yZGVkX3BhZ2VzOwo+ ICt9Cj4gKwo+ICtzdGF0aWMgdm9pZCBfX3JlbW92ZV9yZWZzX2Zyb21faGVhZChzdHJ1Y3QgcGFn ZSAqcGFnZSwgaW50IHJlZnMpCj4gK3sKPiArCS8qIERvIGEgZ2V0X3BhZ2UoKSBmaXJzdCwgaW4g Y2FzZSByZWZzID09IHBhZ2UtPl9yZWZjb3VudCAqLwo+ICsJZ2V0X3BhZ2UocGFnZSk7Cj4gKwlw YWdlX3JlZl9zdWIocGFnZSwgcmVmcyk7Cj4gKwlwdXRfcGFnZShwYWdlKTsKPiArfQoKSSB3b25k ZXIgaWYgdGhpcyBpcyBiZXR0ZXIgaW1wbGVtZW50ZWQgYXMgInB1dF9jb21wb3VuZF9oZWFkKCki PyAgVG8gbWF0Y2ggdGhlCnRyeV9nZXRfY29tcG91bmRfaGVhZCgpIGNhbGwgYmVsb3c/Cgo+ICsK PiArc3RhdGljIGludCBfX2h1Z2VfcHRfZG9uZShzdHJ1Y3QgcGFnZSAqaGVhZCwgaW50IG5yX3Jl Y29yZGVkX3BhZ2VzLCBpbnQgKm5yKQo+ICt7Cj4gKwkqbnIgKz0gbnJfcmVjb3JkZWRfcGFnZXM7 Cj4gKwlTZXRQYWdlUmVmZXJlbmNlZChoZWFkKTsKPiArCXJldHVybiAxOwoKV2hlbiB3aWxsIHRo aXMgcmV0dXJuIGFueXRoaW5nIGJ1dCAxPwoKSXJhCgo+ICt9Cj4gKwo+ICAjaWZkZWYgQ09ORklH X0FSQ0hfSEFTX0hVR0VQRAo+ICBzdGF0aWMgdW5zaWduZWQgbG9uZyBodWdlcHRlX2FkZHJfZW5k KHVuc2lnbmVkIGxvbmcgYWRkciwgdW5zaWduZWQgbG9uZyBlbmQsCj4gIAkJCQkgICAgICB1bnNp Z25lZCBsb25nIHN6KQo+IEBAIC0xOTk4LDM0ICsyMDI3LDE5IEBAIHN0YXRpYyBpbnQgZ3VwX2h1 Z2VwdGUocHRlX3QgKnB0ZXAsIHVuc2lnbmVkIGxvbmcgc3osIHVuc2lnbmVkIGxvbmcgYWRkciwK PiAgCS8qIGh1Z2VwYWdlcyBhcmUgbmV2ZXIgInNwZWNpYWwiICovCj4gIAlWTV9CVUdfT04oIXBm bl92YWxpZChwdGVfcGZuKHB0ZSkpKTsKPiAgCj4gLQlyZWZzID0gMDsKPiAgCWhlYWQgPSBwdGVf cGFnZShwdGUpOwo+IC0KPiAgCXBhZ2UgPSBoZWFkICsgKChhZGRyICYgKHN6LTEpKSA+PiBQQUdF X1NISUZUKTsKPiAtCWRvIHsKPiAtCQlWTV9CVUdfT04oY29tcG91bmRfaGVhZChwYWdlKSAhPSBo ZWFkKTsKPiAtCQlwYWdlc1sqbnJdID0gcGFnZTsKPiAtCQkoKm5yKSsrOwo+IC0JCXBhZ2UrKzsK PiAtCQlyZWZzKys7Cj4gLQl9IHdoaWxlIChhZGRyICs9IFBBR0VfU0laRSwgYWRkciAhPSBlbmQp Owo+ICsJcmVmcyA9IF9fcmVjb3JkX3N1YnBhZ2VzKHBhZ2UsIGFkZHIsIGVuZCwgcGFnZXMsICpu cik7Cj4gIAo+ICAJaGVhZCA9IHRyeV9nZXRfY29tcG91bmRfaGVhZChoZWFkLCByZWZzKTsKPiAt CWlmICghaGVhZCkgewo+IC0JCSpuciAtPSByZWZzOwo+ICsJaWYgKCFoZWFkKQo+ICAJCXJldHVy biAwOwo+IC0JfQo+ICAKPiAgCWlmICh1bmxpa2VseShwdGVfdmFsKHB0ZSkgIT0gcHRlX3ZhbCgq cHRlcCkpKSB7Cj4gLQkJLyogQ291bGQgYmUgb3B0aW1pemVkIGJldHRlciAqLwo+IC0JCSpuciAt PSByZWZzOwo+IC0JCXdoaWxlIChyZWZzLS0pCj4gLQkJCXB1dF9wYWdlKGhlYWQpOwo+ICsJCV9f cmVtb3ZlX3JlZnNfZnJvbV9oZWFkKGhlYWQsIHJlZnMpOwo+ICAJCXJldHVybiAwOwo+ICAJfQo+ IC0KPiAtCVNldFBhZ2VSZWZlcmVuY2VkKGhlYWQpOwo+IC0JcmV0dXJuIDE7Cj4gKwlyZXR1cm4g X19odWdlX3B0X2RvbmUoaGVhZCwgcmVmcywgbnIpOwo+ICB9Cj4gIAo+ICBzdGF0aWMgaW50IGd1 cF9odWdlX3BkKGh1Z2VwZF90IGh1Z2VwZCwgdW5zaWduZWQgbG9uZyBhZGRyLAo+IEBAIC0yMDcx LDMwICsyMDg1LDE4IEBAIHN0YXRpYyBpbnQgZ3VwX2h1Z2VfcG1kKHBtZF90IG9yaWcsIHBtZF90 ICpwbWRwLCB1bnNpZ25lZCBsb25nIGFkZHIsCj4gIAkJCQkJICAgICBwYWdlcywgbnIpOwo+ICAJ fQo+ICAKPiAtCXJlZnMgPSAwOwo+ICAJcGFnZSA9IHBtZF9wYWdlKG9yaWcpICsgKChhZGRyICYg flBNRF9NQVNLKSA+PiBQQUdFX1NISUZUKTsKPiAtCWRvIHsKPiAtCQlwYWdlc1sqbnJdID0gcGFn ZTsKPiAtCQkoKm5yKSsrOwo+IC0JCXBhZ2UrKzsKPiAtCQlyZWZzKys7Cj4gLQl9IHdoaWxlIChh ZGRyICs9IFBBR0VfU0laRSwgYWRkciAhPSBlbmQpOwo+ICsJcmVmcyA9IF9fcmVjb3JkX3N1YnBh Z2VzKHBhZ2UsIGFkZHIsIGVuZCwgcGFnZXMsICpucik7Cj4gIAo+ICAJaGVhZCA9IHRyeV9nZXRf Y29tcG91bmRfaGVhZChwbWRfcGFnZShvcmlnKSwgcmVmcyk7Cj4gLQlpZiAoIWhlYWQpIHsKPiAt CQkqbnIgLT0gcmVmczsKPiArCWlmICghaGVhZCkKPiAgCQlyZXR1cm4gMDsKPiAtCX0KPiAgCj4g IAlpZiAodW5saWtlbHkocG1kX3ZhbChvcmlnKSAhPSBwbWRfdmFsKCpwbWRwKSkpIHsKPiAtCQkq bnIgLT0gcmVmczsKPiAtCQl3aGlsZSAocmVmcy0tKQo+IC0JCQlwdXRfcGFnZShoZWFkKTsKPiAr CQlfX3JlbW92ZV9yZWZzX2Zyb21faGVhZChoZWFkLCByZWZzKTsKPiAgCQlyZXR1cm4gMDsKPiAg CX0KPiAtCj4gLQlTZXRQYWdlUmVmZXJlbmNlZChoZWFkKTsKPiAtCXJldHVybiAxOwo+ICsJcmV0 dXJuIF9faHVnZV9wdF9kb25lKGhlYWQsIHJlZnMsIG5yKTsKPiAgfQo+ICAKPiAgc3RhdGljIGlu dCBndXBfaHVnZV9wdWQocHVkX3Qgb3JpZywgcHVkX3QgKnB1ZHAsIHVuc2lnbmVkIGxvbmcgYWRk ciwKPiBAQCAtMjExNCwzMCArMjExNiwxOCBAQCBzdGF0aWMgaW50IGd1cF9odWdlX3B1ZChwdWRf dCBvcmlnLCBwdWRfdCAqcHVkcCwgdW5zaWduZWQgbG9uZyBhZGRyLAo+ICAJCQkJCSAgICAgcGFn ZXMsIG5yKTsKPiAgCX0KPiAgCj4gLQlyZWZzID0gMDsKPiAgCXBhZ2UgPSBwdWRfcGFnZShvcmln KSArICgoYWRkciAmIH5QVURfTUFTSykgPj4gUEFHRV9TSElGVCk7Cj4gLQlkbyB7Cj4gLQkJcGFn ZXNbKm5yXSA9IHBhZ2U7Cj4gLQkJKCpucikrKzsKPiAtCQlwYWdlKys7Cj4gLQkJcmVmcysrOwo+ IC0JfSB3aGlsZSAoYWRkciArPSBQQUdFX1NJWkUsIGFkZHIgIT0gZW5kKTsKPiArCXJlZnMgPSBf X3JlY29yZF9zdWJwYWdlcyhwYWdlLCBhZGRyLCBlbmQsIHBhZ2VzLCAqbnIpOwo+ICAKPiAgCWhl YWQgPSB0cnlfZ2V0X2NvbXBvdW5kX2hlYWQocHVkX3BhZ2Uob3JpZyksIHJlZnMpOwo+IC0JaWYg KCFoZWFkKSB7Cj4gLQkJKm5yIC09IHJlZnM7Cj4gKwlpZiAoIWhlYWQpCj4gIAkJcmV0dXJuIDA7 Cj4gLQl9Cj4gIAo+ICAJaWYgKHVubGlrZWx5KHB1ZF92YWwob3JpZykgIT0gcHVkX3ZhbCgqcHVk cCkpKSB7Cj4gLQkJKm5yIC09IHJlZnM7Cj4gLQkJd2hpbGUgKHJlZnMtLSkKPiAtCQkJcHV0X3Bh Z2UoaGVhZCk7Cj4gKwkJX19yZW1vdmVfcmVmc19mcm9tX2hlYWQoaGVhZCwgcmVmcyk7Cj4gIAkJ cmV0dXJuIDA7Cj4gIAl9Cj4gLQo+IC0JU2V0UGFnZVJlZmVyZW5jZWQoaGVhZCk7Cj4gLQlyZXR1 cm4gMTsKPiArCXJldHVybiBfX2h1Z2VfcHRfZG9uZShoZWFkLCByZWZzLCBucik7Cj4gIH0KPiAg Cj4gIHN0YXRpYyBpbnQgZ3VwX2h1Z2VfcGdkKHBnZF90IG9yaWcsIHBnZF90ICpwZ2RwLCB1bnNp Z25lZCBsb25nIGFkZHIsCj4gQEAgLTIxNTEsMzAgKzIxNDEsMTkgQEAgc3RhdGljIGludCBndXBf aHVnZV9wZ2QocGdkX3Qgb3JpZywgcGdkX3QgKnBnZHAsIHVuc2lnbmVkIGxvbmcgYWRkciwKPiAg CQlyZXR1cm4gMDsKPiAgCj4gIAlCVUlMRF9CVUdfT04ocGdkX2Rldm1hcChvcmlnKSk7Cj4gLQly ZWZzID0gMDsKPiArCj4gIAlwYWdlID0gcGdkX3BhZ2Uob3JpZykgKyAoKGFkZHIgJiB+UEdESVJf TUFTSykgPj4gUEFHRV9TSElGVCk7Cj4gLQlkbyB7Cj4gLQkJcGFnZXNbKm5yXSA9IHBhZ2U7Cj4g LQkJKCpucikrKzsKPiAtCQlwYWdlKys7Cj4gLQkJcmVmcysrOwo+IC0JfSB3aGlsZSAoYWRkciAr PSBQQUdFX1NJWkUsIGFkZHIgIT0gZW5kKTsKPiArCXJlZnMgPSBfX3JlY29yZF9zdWJwYWdlcyhw YWdlLCBhZGRyLCBlbmQsIHBhZ2VzLCAqbnIpOwo+ICAKPiAgCWhlYWQgPSB0cnlfZ2V0X2NvbXBv dW5kX2hlYWQocGdkX3BhZ2Uob3JpZyksIHJlZnMpOwo+IC0JaWYgKCFoZWFkKSB7Cj4gLQkJKm5y IC09IHJlZnM7Cj4gKwlpZiAoIWhlYWQpCj4gIAkJcmV0dXJuIDA7Cj4gLQl9Cj4gIAo+ICAJaWYg KHVubGlrZWx5KHBnZF92YWwob3JpZykgIT0gcGdkX3ZhbCgqcGdkcCkpKSB7Cj4gLQkJKm5yIC09 IHJlZnM7Cj4gLQkJd2hpbGUgKHJlZnMtLSkKPiAtCQkJcHV0X3BhZ2UoaGVhZCk7Cj4gKwkJX19y ZW1vdmVfcmVmc19mcm9tX2hlYWQoaGVhZCwgcmVmcyk7Cj4gIAkJcmV0dXJuIDA7Cj4gIAl9Cj4g LQo+IC0JU2V0UGFnZVJlZmVyZW5jZWQoaGVhZCk7Cj4gLQlyZXR1cm4gMTsKPiArCXJldHVybiBf X2h1Z2VfcHRfZG9uZShoZWFkLCByZWZzLCBucik7Cj4gIH0KPiAgCj4gIHN0YXRpYyBpbnQgZ3Vw X3BtZF9yYW5nZShwdWRfdCBwdWQsIHVuc2lnbmVkIGxvbmcgYWRkciwgdW5zaWduZWQgbG9uZyBl bmQsCj4gLS0gCj4gMi4yMy4wCj4gCj4gCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbA== 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 D07EECA9ECE for ; Thu, 31 Oct 2019 18:35:52 +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 B28752086D for ; Thu, 31 Oct 2019 18:35:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B28752086D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com 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 0AD2B6F536; Thu, 31 Oct 2019 18:35:52 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id C57A46F536 for ; Thu, 31 Oct 2019 18:35:50 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 11:35:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,252,1569308400"; d="scan'208";a="230963750" Received: from iweiny-desk2.sc.intel.com ([10.3.52.157]) by fmsmga002.fm.intel.com with ESMTP; 31 Oct 2019 11:35:49 -0700 Date: Thu, 31 Oct 2019 11:35:49 -0700 From: Ira Weiny To: John Hubbard Subject: Re: [PATCH 02/19] mm/gup: factor out duplicate code from four routines Message-ID: <20191031183549.GC14771@iweiny-DESK2.sc.intel.com> References: <20191030224930.3990755-1-jhubbard@nvidia.com> <20191030224930.3990755-3-jhubbard@nvidia.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191030224930.3990755-3-jhubbard@nvidia.com> User-Agent: Mutt/1.11.1 (2018-12-01) 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, Shuah Khan , 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, 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: <20191031183549.Z92eDG5Y-GDaeiPosoo4eBqd-IXVw3mcaRDStocNB10@z> T24gV2VkLCBPY3QgMzAsIDIwMTkgYXQgMDM6NDk6MTNQTSAtMDcwMCwgSm9obiBIdWJiYXJkIHdy b3RlOgo+IFRoZXJlIGFyZSBmb3VyIGxvY2F0aW9ucyBpbiBndXAuYyB0aGF0IGhhdmUgYSBmYWly IGFtb3VudCBvZiBjb2RlCj4gZHVwbGljYXRpb24uIFRoaXMgbWVhbnMgdGhhdCBjaGFuZ2luZyBv bmUgcmVxdWlyZXMgbWFraW5nIHRoZSBzYW1lCj4gY2hhbmdlcyBpbiBmb3VyIHBsYWNlcywgbm90 IHRvIG1lbnRpb24gcmVhZGluZyB0aGUgc2FtZSBjb2RlIGZvdXIKPiB0aW1lcywgYW5kIHdvbmRl cmluZyBpZiB0aGVyZSBhcmUgc3VidGxlIGRpZmZlcmVuY2VzLgo+IAo+IEZhY3RvciBvdXQgdGhl IGNvbW1vbiBjb2RlIGludG8gc3RhdGljIGZ1bmN0aW9ucywgdGh1cyByZWR1Y2luZyB0aGUKPiBv dmVyYWxsIGxpbmUgY291bnQgYW5kIHRoZSBjb2RlJ3MgY29tcGxleGl0eS4KPiAKPiBBbHNvLCB0 YWtlIHRoZSBvcHBvcnR1bml0eSB0byBzbGlnaHRseSBpbXByb3ZlIHRoZSBlZmZpY2llbmN5IG9m IHRoZQo+IGVycm9yIGNhc2VzLCBieSBkb2luZyBhIG1hc3Mgc3VidHJhY3Rpb24gb2YgdGhlIHJl ZmNvdW50LCBzdXJyb3VuZGVkCj4gYnkgZ2V0X3BhZ2UoKS9wdXRfcGFnZSgpLgo+IAo+IEFsc28s IGZ1cnRoZXIgc2ltcGxpZnkgKHNsaWdodGx5KSwgYnkgd2FpdGluZyB1bnRpbCB0aGUgdGhlIHN1 Y2Nlc3NmdWwKPiBlbmQgb2YgZWFjaCByb3V0aW5lLCB0byBpbmNyZW1lbnQgKm5yLgoKT3ZlcmFs bCBpdCBzZWVtcyBsaWtlIGEgcHJldHR5IGdvb2QgY2xlYW4gdXAuICBJdCBkaWQgdGFrZSBhIGJp dCBvZiByZXZpZXcgYnV0CkkgX3RoaW5rXyBpdCBpcyBjb3JyZWN0LiAgQSBjb3VwbGUgb2YgY29t bWVudHMgYmVsb3cuCgo+IAo+IENjOiBDaHJpc3RvcGggSGVsbHdpZyA8aGNoQGxzdC5kZT4KPiBD YzogQW5lZXNoIEt1bWFyIEsuViA8YW5lZXNoLmt1bWFyQGxpbnV4LmlibS5jb20+Cj4gU2lnbmVk LW9mZi1ieTogSm9obiBIdWJiYXJkIDxqaHViYmFyZEBudmlkaWEuY29tPgo+IC0tLQo+ICBtbS9n dXAuYyB8IDExMyArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCA2NyBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvbW0vZ3VwLmMgYi9tbS9ndXAuYwo+IGluZGV4IDg1Y2Fm NzZiMzAxMi4uOGZiMGQ5Y2RmYWY1IDEwMDY0NAo+IC0tLSBhL21tL2d1cC5jCj4gKysrIGIvbW0v Z3VwLmMKPiBAQCAtMTk2OSw2ICsxOTY5LDM1IEBAIHN0YXRpYyBpbnQgX19ndXBfZGV2aWNlX2h1 Z2VfcHVkKHB1ZF90IHB1ZCwgcHVkX3QgKnB1ZHAsIHVuc2lnbmVkIGxvbmcgYWRkciwKPiAgfQo+ ICAjZW5kaWYKPiAgCj4gK3N0YXRpYyBpbnQgX19yZWNvcmRfc3VicGFnZXMoc3RydWN0IHBhZ2Ug KnBhZ2UsIHVuc2lnbmVkIGxvbmcgYWRkciwKPiArCQkJICAgICB1bnNpZ25lZCBsb25nIGVuZCwg c3RydWN0IHBhZ2UgKipwYWdlcywgaW50IG5yKQo+ICt7Cj4gKwlpbnQgbnJfcmVjb3JkZWRfcGFn ZXMgPSAwOwo+ICsKPiArCWRvIHsKPiArCQlwYWdlc1tucl0gPSBwYWdlOwo+ICsJCW5yKys7Cj4g KwkJcGFnZSsrOwo+ICsJCW5yX3JlY29yZGVkX3BhZ2VzKys7Cj4gKwl9IHdoaWxlIChhZGRyICs9 IFBBR0VfU0laRSwgYWRkciAhPSBlbmQpOwo+ICsJcmV0dXJuIG5yX3JlY29yZGVkX3BhZ2VzOwo+ ICt9Cj4gKwo+ICtzdGF0aWMgdm9pZCBfX3JlbW92ZV9yZWZzX2Zyb21faGVhZChzdHJ1Y3QgcGFn ZSAqcGFnZSwgaW50IHJlZnMpCj4gK3sKPiArCS8qIERvIGEgZ2V0X3BhZ2UoKSBmaXJzdCwgaW4g Y2FzZSByZWZzID09IHBhZ2UtPl9yZWZjb3VudCAqLwo+ICsJZ2V0X3BhZ2UocGFnZSk7Cj4gKwlw YWdlX3JlZl9zdWIocGFnZSwgcmVmcyk7Cj4gKwlwdXRfcGFnZShwYWdlKTsKPiArfQoKSSB3b25k ZXIgaWYgdGhpcyBpcyBiZXR0ZXIgaW1wbGVtZW50ZWQgYXMgInB1dF9jb21wb3VuZF9oZWFkKCki PyAgVG8gbWF0Y2ggdGhlCnRyeV9nZXRfY29tcG91bmRfaGVhZCgpIGNhbGwgYmVsb3c/Cgo+ICsK PiArc3RhdGljIGludCBfX2h1Z2VfcHRfZG9uZShzdHJ1Y3QgcGFnZSAqaGVhZCwgaW50IG5yX3Jl Y29yZGVkX3BhZ2VzLCBpbnQgKm5yKQo+ICt7Cj4gKwkqbnIgKz0gbnJfcmVjb3JkZWRfcGFnZXM7 Cj4gKwlTZXRQYWdlUmVmZXJlbmNlZChoZWFkKTsKPiArCXJldHVybiAxOwoKV2hlbiB3aWxsIHRo aXMgcmV0dXJuIGFueXRoaW5nIGJ1dCAxPwoKSXJhCgo+ICt9Cj4gKwo+ICAjaWZkZWYgQ09ORklH X0FSQ0hfSEFTX0hVR0VQRAo+ICBzdGF0aWMgdW5zaWduZWQgbG9uZyBodWdlcHRlX2FkZHJfZW5k KHVuc2lnbmVkIGxvbmcgYWRkciwgdW5zaWduZWQgbG9uZyBlbmQsCj4gIAkJCQkgICAgICB1bnNp Z25lZCBsb25nIHN6KQo+IEBAIC0xOTk4LDM0ICsyMDI3LDE5IEBAIHN0YXRpYyBpbnQgZ3VwX2h1 Z2VwdGUocHRlX3QgKnB0ZXAsIHVuc2lnbmVkIGxvbmcgc3osIHVuc2lnbmVkIGxvbmcgYWRkciwK PiAgCS8qIGh1Z2VwYWdlcyBhcmUgbmV2ZXIgInNwZWNpYWwiICovCj4gIAlWTV9CVUdfT04oIXBm bl92YWxpZChwdGVfcGZuKHB0ZSkpKTsKPiAgCj4gLQlyZWZzID0gMDsKPiAgCWhlYWQgPSBwdGVf cGFnZShwdGUpOwo+IC0KPiAgCXBhZ2UgPSBoZWFkICsgKChhZGRyICYgKHN6LTEpKSA+PiBQQUdF X1NISUZUKTsKPiAtCWRvIHsKPiAtCQlWTV9CVUdfT04oY29tcG91bmRfaGVhZChwYWdlKSAhPSBo ZWFkKTsKPiAtCQlwYWdlc1sqbnJdID0gcGFnZTsKPiAtCQkoKm5yKSsrOwo+IC0JCXBhZ2UrKzsK PiAtCQlyZWZzKys7Cj4gLQl9IHdoaWxlIChhZGRyICs9IFBBR0VfU0laRSwgYWRkciAhPSBlbmQp Owo+ICsJcmVmcyA9IF9fcmVjb3JkX3N1YnBhZ2VzKHBhZ2UsIGFkZHIsIGVuZCwgcGFnZXMsICpu cik7Cj4gIAo+ICAJaGVhZCA9IHRyeV9nZXRfY29tcG91bmRfaGVhZChoZWFkLCByZWZzKTsKPiAt CWlmICghaGVhZCkgewo+IC0JCSpuciAtPSByZWZzOwo+ICsJaWYgKCFoZWFkKQo+ICAJCXJldHVy biAwOwo+IC0JfQo+ICAKPiAgCWlmICh1bmxpa2VseShwdGVfdmFsKHB0ZSkgIT0gcHRlX3ZhbCgq cHRlcCkpKSB7Cj4gLQkJLyogQ291bGQgYmUgb3B0aW1pemVkIGJldHRlciAqLwo+IC0JCSpuciAt PSByZWZzOwo+IC0JCXdoaWxlIChyZWZzLS0pCj4gLQkJCXB1dF9wYWdlKGhlYWQpOwo+ICsJCV9f cmVtb3ZlX3JlZnNfZnJvbV9oZWFkKGhlYWQsIHJlZnMpOwo+ICAJCXJldHVybiAwOwo+ICAJfQo+ IC0KPiAtCVNldFBhZ2VSZWZlcmVuY2VkKGhlYWQpOwo+IC0JcmV0dXJuIDE7Cj4gKwlyZXR1cm4g X19odWdlX3B0X2RvbmUoaGVhZCwgcmVmcywgbnIpOwo+ICB9Cj4gIAo+ICBzdGF0aWMgaW50IGd1 cF9odWdlX3BkKGh1Z2VwZF90IGh1Z2VwZCwgdW5zaWduZWQgbG9uZyBhZGRyLAo+IEBAIC0yMDcx LDMwICsyMDg1LDE4IEBAIHN0YXRpYyBpbnQgZ3VwX2h1Z2VfcG1kKHBtZF90IG9yaWcsIHBtZF90 ICpwbWRwLCB1bnNpZ25lZCBsb25nIGFkZHIsCj4gIAkJCQkJICAgICBwYWdlcywgbnIpOwo+ICAJ fQo+ICAKPiAtCXJlZnMgPSAwOwo+ICAJcGFnZSA9IHBtZF9wYWdlKG9yaWcpICsgKChhZGRyICYg flBNRF9NQVNLKSA+PiBQQUdFX1NISUZUKTsKPiAtCWRvIHsKPiAtCQlwYWdlc1sqbnJdID0gcGFn ZTsKPiAtCQkoKm5yKSsrOwo+IC0JCXBhZ2UrKzsKPiAtCQlyZWZzKys7Cj4gLQl9IHdoaWxlIChh ZGRyICs9IFBBR0VfU0laRSwgYWRkciAhPSBlbmQpOwo+ICsJcmVmcyA9IF9fcmVjb3JkX3N1YnBh Z2VzKHBhZ2UsIGFkZHIsIGVuZCwgcGFnZXMsICpucik7Cj4gIAo+ICAJaGVhZCA9IHRyeV9nZXRf Y29tcG91bmRfaGVhZChwbWRfcGFnZShvcmlnKSwgcmVmcyk7Cj4gLQlpZiAoIWhlYWQpIHsKPiAt CQkqbnIgLT0gcmVmczsKPiArCWlmICghaGVhZCkKPiAgCQlyZXR1cm4gMDsKPiAtCX0KPiAgCj4g IAlpZiAodW5saWtlbHkocG1kX3ZhbChvcmlnKSAhPSBwbWRfdmFsKCpwbWRwKSkpIHsKPiAtCQkq bnIgLT0gcmVmczsKPiAtCQl3aGlsZSAocmVmcy0tKQo+IC0JCQlwdXRfcGFnZShoZWFkKTsKPiAr CQlfX3JlbW92ZV9yZWZzX2Zyb21faGVhZChoZWFkLCByZWZzKTsKPiAgCQlyZXR1cm4gMDsKPiAg CX0KPiAtCj4gLQlTZXRQYWdlUmVmZXJlbmNlZChoZWFkKTsKPiAtCXJldHVybiAxOwo+ICsJcmV0 dXJuIF9faHVnZV9wdF9kb25lKGhlYWQsIHJlZnMsIG5yKTsKPiAgfQo+ICAKPiAgc3RhdGljIGlu dCBndXBfaHVnZV9wdWQocHVkX3Qgb3JpZywgcHVkX3QgKnB1ZHAsIHVuc2lnbmVkIGxvbmcgYWRk ciwKPiBAQCAtMjExNCwzMCArMjExNiwxOCBAQCBzdGF0aWMgaW50IGd1cF9odWdlX3B1ZChwdWRf dCBvcmlnLCBwdWRfdCAqcHVkcCwgdW5zaWduZWQgbG9uZyBhZGRyLAo+ICAJCQkJCSAgICAgcGFn ZXMsIG5yKTsKPiAgCX0KPiAgCj4gLQlyZWZzID0gMDsKPiAgCXBhZ2UgPSBwdWRfcGFnZShvcmln KSArICgoYWRkciAmIH5QVURfTUFTSykgPj4gUEFHRV9TSElGVCk7Cj4gLQlkbyB7Cj4gLQkJcGFn ZXNbKm5yXSA9IHBhZ2U7Cj4gLQkJKCpucikrKzsKPiAtCQlwYWdlKys7Cj4gLQkJcmVmcysrOwo+ IC0JfSB3aGlsZSAoYWRkciArPSBQQUdFX1NJWkUsIGFkZHIgIT0gZW5kKTsKPiArCXJlZnMgPSBf X3JlY29yZF9zdWJwYWdlcyhwYWdlLCBhZGRyLCBlbmQsIHBhZ2VzLCAqbnIpOwo+ICAKPiAgCWhl YWQgPSB0cnlfZ2V0X2NvbXBvdW5kX2hlYWQocHVkX3BhZ2Uob3JpZyksIHJlZnMpOwo+IC0JaWYg KCFoZWFkKSB7Cj4gLQkJKm5yIC09IHJlZnM7Cj4gKwlpZiAoIWhlYWQpCj4gIAkJcmV0dXJuIDA7 Cj4gLQl9Cj4gIAo+ICAJaWYgKHVubGlrZWx5KHB1ZF92YWwob3JpZykgIT0gcHVkX3ZhbCgqcHVk cCkpKSB7Cj4gLQkJKm5yIC09IHJlZnM7Cj4gLQkJd2hpbGUgKHJlZnMtLSkKPiAtCQkJcHV0X3Bh Z2UoaGVhZCk7Cj4gKwkJX19yZW1vdmVfcmVmc19mcm9tX2hlYWQoaGVhZCwgcmVmcyk7Cj4gIAkJ cmV0dXJuIDA7Cj4gIAl9Cj4gLQo+IC0JU2V0UGFnZVJlZmVyZW5jZWQoaGVhZCk7Cj4gLQlyZXR1 cm4gMTsKPiArCXJldHVybiBfX2h1Z2VfcHRfZG9uZShoZWFkLCByZWZzLCBucik7Cj4gIH0KPiAg Cj4gIHN0YXRpYyBpbnQgZ3VwX2h1Z2VfcGdkKHBnZF90IG9yaWcsIHBnZF90ICpwZ2RwLCB1bnNp Z25lZCBsb25nIGFkZHIsCj4gQEAgLTIxNTEsMzAgKzIxNDEsMTkgQEAgc3RhdGljIGludCBndXBf aHVnZV9wZ2QocGdkX3Qgb3JpZywgcGdkX3QgKnBnZHAsIHVuc2lnbmVkIGxvbmcgYWRkciwKPiAg CQlyZXR1cm4gMDsKPiAgCj4gIAlCVUlMRF9CVUdfT04ocGdkX2Rldm1hcChvcmlnKSk7Cj4gLQly ZWZzID0gMDsKPiArCj4gIAlwYWdlID0gcGdkX3BhZ2Uob3JpZykgKyAoKGFkZHIgJiB+UEdESVJf TUFTSykgPj4gUEFHRV9TSElGVCk7Cj4gLQlkbyB7Cj4gLQkJcGFnZXNbKm5yXSA9IHBhZ2U7Cj4g LQkJKCpucikrKzsKPiAtCQlwYWdlKys7Cj4gLQkJcmVmcysrOwo+IC0JfSB3aGlsZSAoYWRkciAr PSBQQUdFX1NJWkUsIGFkZHIgIT0gZW5kKTsKPiArCXJlZnMgPSBfX3JlY29yZF9zdWJwYWdlcyhw YWdlLCBhZGRyLCBlbmQsIHBhZ2VzLCAqbnIpOwo+ICAKPiAgCWhlYWQgPSB0cnlfZ2V0X2NvbXBv dW5kX2hlYWQocGdkX3BhZ2Uob3JpZyksIHJlZnMpOwo+IC0JaWYgKCFoZWFkKSB7Cj4gLQkJKm5y IC09IHJlZnM7Cj4gKwlpZiAoIWhlYWQpCj4gIAkJcmV0dXJuIDA7Cj4gLQl9Cj4gIAo+ICAJaWYg KHVubGlrZWx5KHBnZF92YWwob3JpZykgIT0gcGdkX3ZhbCgqcGdkcCkpKSB7Cj4gLQkJKm5yIC09 IHJlZnM7Cj4gLQkJd2hpbGUgKHJlZnMtLSkKPiAtCQkJcHV0X3BhZ2UoaGVhZCk7Cj4gKwkJX19y ZW1vdmVfcmVmc19mcm9tX2hlYWQoaGVhZCwgcmVmcyk7Cj4gIAkJcmV0dXJuIDA7Cj4gIAl9Cj4g LQo+IC0JU2V0UGFnZVJlZmVyZW5jZWQoaGVhZCk7Cj4gLQlyZXR1cm4gMTsKPiArCXJldHVybiBf X2h1Z2VfcHRfZG9uZShoZWFkLCByZWZzLCBucik7Cj4gIH0KPiAgCj4gIHN0YXRpYyBpbnQgZ3Vw X3BtZF9yYW5nZShwdWRfdCBwdWQsIHVuc2lnbmVkIGxvbmcgYWRkciwgdW5zaWduZWQgbG9uZyBl bmQsCj4gLS0gCj4gMi4yMy4wCj4gCj4gCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbA==