Re: [PATCH 6/4] x86/mm: Simplify probe_page_size_mask()

[Juergen Gross]

On 03/05/2015 08:27 AM, Ingo Molnar wrote:
> Now that we've simplified the gbpages config space, move the
> 'page_size_mask' initialization into probe_page_size_mask(), right
> next to the PSE and PGE enablement lines.
>
> Cc: Luis R. Rodriguez <mcgrof@xxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
> Cc: Borislav Petkov <bp@xxxxxxxxx>
> Cc: Borislav Petkov <bp@xxxxxxx>
> Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
> Cc: David Vrabel <david.vrabel@xxxxxxxxxx>
> Cc: Dexuan Cui <decui@xxxxxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Cc: H. Peter Anvin <hpa@xxxxxxxxx>
> Cc: JBeulich@xxxxxxxx
> Cc: Jan Beulich <JBeulich@xxxxxxxx>
> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
> Cc: Juergen Gross <jgross@xxxxxxxx>
> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> Cc: Pavel Machek <pavel@xxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Tony Lindgren <tony@xxxxxxxxxxx>
> Cc: Toshi Kani <toshi.kani@xxxxxx>
> Cc: Vlastimil Babka <vbabka@xxxxxxx>
> Cc: Xishi Qiu <qiuxishi@xxxxxxxxxx>
> Cc: julia.lawall@xxxxxxx
> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
> ---
>   arch/x86/mm/init.c | 23 ++++++++++-------------
>   1 file changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
> index 8704153f2675..6dc85d51cd98 100644
> --- a/arch/x86/mm/init.c
> +++ b/arch/x86/mm/init.c
> @@ -131,29 +131,18 @@ void  __init early_alloc_pgt_buf(void)
>
>   int after_bootmem;
>
> -static int page_size_mask;
> -
>   early_param_on_off("gbpages", "nogbpages", direct_gbpages, CONFIG_X86_DIRECT_GBPAGES);
>
> -static void __init init_gbpages(void)
> -{
> -	if (direct_gbpages && cpu_has_gbpages) {
> -		printk(KERN_INFO "Using GB pages for direct mapping\n");
> -		page_size_mask |= 1 << PG_LEVEL_1G;
> -	} else
> -		direct_gbpages = 0;
> -}
> -
>   struct map_range {
>   	unsigned long start;
>   	unsigned long end;
>   	unsigned page_size_mask;
>   };
>
> +static int page_size_mask;
> +
>   static void __init probe_page_size_mask(void)
>   {
> -	init_gbpages();
> -
>   #if !defined(CONFIG_DEBUG_PAGEALLOC) && !defined(CONFIG_KMEMCHECK)
>   	/*
>   	 * For CONFIG_DEBUG_PAGEALLOC, identity mapping will use small pages.
> @@ -173,6 +162,14 @@ static void __init probe_page_size_mask(void)
>   		cr4_set_bits_and_update_boot(X86_CR4_PGE);
>   		__supported_pte_mask |= _PAGE_GLOBAL;
>   	}
> +
> +	/* Enable 1 GB linear kernel mappings if available: */
> +	if (direct_gbpages && cpu_has_gbpages) {
> +		printk(KERN_INFO "Using GB pages for direct mapping\n");

pr_info()?

> +		page_size_mask |= 1 << PG_LEVEL_1G;
> +	} else {
> +		direct_gbpages = 0;
> +	}
>   }
>
>   #ifdef CONFIG_X86_32
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/