From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754689AbbCEIrN (ORCPT ); Thu, 5 Mar 2015 03:47:13 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:39512 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751170AbbCEIrM (ORCPT ); Thu, 5 Mar 2015 03:47:12 -0500 Date: Thu, 5 Mar 2015 09:47:05 +0100 From: Ingo Molnar To: Juergen Gross Cc: "Luis R. Rodriguez" , gregkh@linuxfoundation.org, akpm@linux-foundation.org, tony@atomide.com, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, luto@amacapital.net, toshi.kani@hp.com, dave.hansen@linux.intel.com, JBeulich@suse.com, pavel@ucw.cz, qiuxishi@huawei.com, david.vrabel@citrix.com, bp@suse.de, vbabka@suse.cz, iamjoonsoo.kim@lge.com, decui@microsoft.com, linux-kernel@vger.kernel.org, x86@kernel.org, julia.lawall@lip6.fr, "Luis R. Rodriguez" Subject: Re: [PATCH 6/4] x86/mm: Simplify probe_page_size_mask() Message-ID: <20150305084705.GD5969@gmail.com> References: <1425518654-3403-1-git-send-email-mcgrof@do-not-panic.com> <20150305072703.GB23951@gmail.com> <54F815F1.5080800@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <54F815F1.5080800@suse.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Juergen Gross wrote: > 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 > >Cc: Andrew Morton > >Cc: Andy Lutomirski > >Cc: Borislav Petkov > >Cc: Borislav Petkov > >Cc: Dave Hansen > >Cc: David Vrabel > >Cc: Dexuan Cui > >Cc: Greg Kroah-Hartman > >Cc: H. Peter Anvin > >Cc: JBeulich@suse.com > >Cc: Jan Beulich > >Cc: Joonsoo Kim > >Cc: Juergen Gross > >Cc: Linus Torvalds > >Cc: Pavel Machek > >Cc: Thomas Gleixner > >Cc: Tony Lindgren > >Cc: Toshi Kani > >Cc: Vlastimil Babka > >Cc: Xishi Qiu > >Cc: julia.lawall@lip6.fr > >Signed-off-by: Ingo Molnar > >--- > > 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()? Yeah - probably in a separate patch, as there's three other KERN_ users in arch/x86/mm/init.c. Thanks, Ingo