From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi0-f72.google.com (mail-oi0-f72.google.com [209.85.218.72]) by kanga.kvack.org (Postfix) with ESMTP id A9D916B0027 for ; Fri, 30 Mar 2018 05:24:28 -0400 (EDT) Received: by mail-oi0-f72.google.com with SMTP id y10-v6so4552985oia.15 for ; Fri, 30 Mar 2018 02:24:28 -0700 (PDT) Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id p189-v6sor3201421oih.28.2018.03.30.02.24.27 for (Google Transport Security); Fri, 30 Mar 2018 02:24:27 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1522397755-33393-5-git-send-email-hejianet@gmail.com> References: <1522397755-33393-1-git-send-email-hejianet@gmail.com> <1522397755-33393-5-git-send-email-hejianet@gmail.com> From: Daniel Vacek Date: Fri, 30 Mar 2018 11:24:26 +0200 Message-ID: Subject: Re: [PATCH v4 4/5] arm64: introduce pfn_valid_region() Content-Type: text/plain; charset="UTF-8" Sender: owner-linux-mm@kvack.org List-ID: To: Jia He Cc: Russell King , Andrew Morton , Michal Hocko , Catalin Marinas , Mel Gorman , Will Deacon , Mark Rutland , "H. Peter Anvin" , Pavel Tatashin , Daniel Jordan , AKASHI Takahiro , Gioh Kim , Steven Sistare , Eugeniu Rosca , Vlastimil Babka , open list , linux-mm@kvack.org, James Morse , Ard Biesheuvel , Steve Capper , Thomas Gleixner , Ingo Molnar , x86@kernel.org, Greg Kroah-Hartman , Kate Stewart , Philippe Ombredanne , Johannes Weiner , Kemi Wang , Petr Tesarik , YASUAKI ISHIMATSU , Andrey Ryabinin , Nikolay Borisov , richard.weiyang@gmail.com, Jia He On Fri, Mar 30, 2018 at 10:15 AM, Jia He wrote: > This is the preparation for further optimizing in early_pfn_valid > on arm and arm64. > > Signed-off-by: Jia He > --- > arch/arm/include/asm/page.h | 3 ++- > arch/arm/mm/init.c | 23 +++++++++++++++++++++++ > arch/arm64/include/asm/page.h | 3 ++- > arch/arm64/mm/init.c | 23 +++++++++++++++++++++++ > 4 files changed, 50 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h > index 7a0404f..559b414 100644 > --- a/arch/arm/include/asm/page.h > +++ b/arch/arm/include/asm/page.h > @@ -158,7 +158,8 @@ typedef struct page *pgtable_t; > > #ifdef CONFIG_HAVE_ARCH_PFN_VALID > extern int early_region_idx; > -extern int pfn_valid(unsigned long); > +extern int pfn_valid(unsigned long pfn); > +extern int pfn_valid_region(unsigned long pfn, int *last_idx); > #endif > > #include > diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c > index 7779804..11f9b82 100644 > --- a/arch/arm/mm/init.c > +++ b/arch/arm/mm/init.c > @@ -201,6 +201,29 @@ int pfn_valid(unsigned long pfn) > } > EXPORT_SYMBOL(pfn_valid); > > +int pfn_valid_region(unsigned long pfn, int *last_idx) > +{ > + unsigned long start_pfn, end_pfn; > + struct memblock_type *type = &memblock.memory; > + struct memblock_region *regions = type->regions; > + > + if (*last_idx != -1) { > + start_pfn = PFN_DOWN(regions[*last_idx].base); > + end_pfn = PFN_DOWN(regions[*last_idx].base + > + regions[*last_idx].size); > + > + if (pfn >= start_pfn && pfn < end_pfn) > + return !memblock_is_nomap(®ions[*last_idx]); > + } > + > + *last_idx = memblock_search_pfn_regions(pfn); > + if (*last_idx == -1) > + return false; > + > + return !memblock_is_nomap(®ions[*last_idx]); > +} > +EXPORT_SYMBOL(pfn_valid_region); > + > /* HAVE_MEMBLOCK is always enabled on arm */ > unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn, > int *last_idx) Since you have both functions in the same file, can you make the early_region_idx global static here and get rid of the arguments, perhaps? > diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h > index 84b503a..27892d5 100644 > --- a/arch/arm64/include/asm/page.h > +++ b/arch/arm64/include/asm/page.h > @@ -39,7 +39,8 @@ typedef struct page *pgtable_t; > > #ifdef CONFIG_HAVE_ARCH_PFN_VALID > extern int early_region_idx; > -extern int pfn_valid(unsigned long); > +extern int pfn_valid(unsigned long pfn); > +extern int pfn_valid_region(unsigned long pfn, int *last_idx); > #endif > > #include > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > index cd9b473..6dedd77 100644 > --- a/arch/arm64/mm/init.c > +++ b/arch/arm64/mm/init.c > @@ -293,6 +293,29 @@ int pfn_valid(unsigned long pfn) > } > EXPORT_SYMBOL(pfn_valid); > > +int pfn_valid_region(unsigned long pfn, int *last_idx) > +{ > + unsigned long start_pfn, end_pfn; > + struct memblock_type *type = &memblock.memory; > + struct memblock_region *regions = type->regions; > + > + if (*last_idx != -1) { > + start_pfn = PFN_DOWN(regions[*last_idx].base); > + end_pfn = PFN_DOWN(regions[*last_idx].base + > + regions[*last_idx].size); > + > + if (pfn >= start_pfn && pfn < end_pfn) > + return !memblock_is_nomap(®ions[*last_idx]); > + } > + > + *last_idx = memblock_search_pfn_regions(pfn); > + if (*last_idx == -1) > + return false; > + > + return !memblock_is_nomap(®ions[*last_idx]); > +} > +EXPORT_SYMBOL(pfn_valid_region); > + > /* HAVE_MEMBLOCK is always enabled on arm64 */ > unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn, > int *last_idx) Ditto. --nX > -- > 2.7.4 >