lkml.org 
[lkml]   [2018]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH v4 4/5] arm64: introduce pfn_valid_region()
On Fri, Mar 30, 2018 at 10:15 AM, Jia He <hejianet@gmail.com> wrote:
> This is the preparation for further optimizing in early_pfn_valid
> on arm and arm64.
>
> Signed-off-by: Jia He <jia.he@hxt-semitech.com>
> ---
> 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 <asm/memory.h>
> 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(&regions[*last_idx]);
> + }
> +
> + *last_idx = memblock_search_pfn_regions(pfn);
> + if (*last_idx == -1)
> + return false;
> +
> + return !memblock_is_nomap(&regions[*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 <asm/memory.h>
> 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(&regions[*last_idx]);
> + }
> +
> + *last_idx = memblock_search_pfn_regions(pfn);
> + if (*last_idx == -1)
> + return false;
> +
> + return !memblock_is_nomap(&regions[*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
>

\
 
 \ /
  Last update: 2018-03-30 11:25    [W:0.040 / U:0.568 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site