Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757413Ab3FDPHX (ORCPT ); Tue, 4 Jun 2013 11:07:23 -0400 Received: from mga11.intel.com ([192.55.52.93]:21343 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751173Ab3FDPHV (ORCPT ); Tue, 4 Jun 2013 11:07:21 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,800,1363158000"; d="scan'208";a="344614254" From: "Kirill A. Shutemov" To: "Kirill A. Shutemov" Cc: "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar , Alex Shi , "Kirill A. Shutemov" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1370358196-5699-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1370358196-5699-1-git-send-email-kirill.shutemov@linux.intel.com> Subject: RE: [PATCH] x86/tlb_info: detect more tlb configuration Content-Transfer-Encoding: 7bit Message-Id: <20130604150956.05843E0090@blue.fi.intel.com> Date: Tue, 4 Jun 2013 18:09:55 +0300 (EEST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3963 Lines: 96 Kirill A. Shutemov wrote: > From: "Kirill A. Shutemov" > Err.. Forgot CC lists. > Software Developer’s Manual covers two more TLB configurations: > > 63H Data TLB: 1 GByte pages, 4-way set associative, 4 entries > 76H Instruction TLB: 2M/4M pages, fully associative, 8 entries > > Let's detect them as well. > > Signed-off-by: Kirill A. Shutemov > --- > arch/x86/include/asm/processor.h | 1 + > arch/x86/kernel/cpu/common.c | 7 ++++--- > arch/x86/kernel/cpu/intel.c | 6 ++++++ > 3 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h > index 3270116..1476a41 100644 > --- a/arch/x86/include/asm/processor.h > +++ b/arch/x86/include/asm/processor.h > @@ -72,6 +72,7 @@ extern u16 __read_mostly tlb_lli_4m[NR_INFO]; > extern u16 __read_mostly tlb_lld_4k[NR_INFO]; > extern u16 __read_mostly tlb_lld_2m[NR_INFO]; > extern u16 __read_mostly tlb_lld_4m[NR_INFO]; > +extern u16 __read_mostly tlb_lld_1g[NR_INFO]; > extern s8 __read_mostly tlb_flushall_shift; > > /* > diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c > index d814772..ee2f15b 100644 > --- a/arch/x86/kernel/cpu/common.c > +++ b/arch/x86/kernel/cpu/common.c > @@ -470,6 +470,7 @@ u16 __read_mostly tlb_lli_4m[NR_INFO]; > u16 __read_mostly tlb_lld_4k[NR_INFO]; > u16 __read_mostly tlb_lld_2m[NR_INFO]; > u16 __read_mostly tlb_lld_4m[NR_INFO]; > +u16 __read_mostly tlb_lld_1g[NR_INFO]; > > /* > * tlb_flushall_shift shows the balance point in replacing cr3 write > @@ -484,13 +485,13 @@ void __cpuinit cpu_detect_tlb(struct cpuinfo_x86 *c) > if (this_cpu->c_detect_tlb) > this_cpu->c_detect_tlb(c); > > - printk(KERN_INFO "Last level iTLB entries: 4KB %d, 2MB %d, 4MB %d\n" \ > - "Last level dTLB entries: 4KB %d, 2MB %d, 4MB %d\n" \ > + printk(KERN_INFO "Last level iTLB entries: 4KB %d, 2MB %d, 4MB %d\n" > + "Last level dTLB entries: 4KB %d, 2MB %d, 4MB %d, 1GB %d\n" > "tlb_flushall_shift: %d\n", > tlb_lli_4k[ENTRIES], tlb_lli_2m[ENTRIES], > tlb_lli_4m[ENTRIES], tlb_lld_4k[ENTRIES], > tlb_lld_2m[ENTRIES], tlb_lld_4m[ENTRIES], > - tlb_flushall_shift); > + tlb_lld_1g[ENTRIES], tlb_flushall_shift); > } > > void __cpuinit detect_ht(struct cpuinfo_x86 *c) > diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c > index 1905ce9..1130519 100644 > --- a/arch/x86/kernel/cpu/intel.c > +++ b/arch/x86/kernel/cpu/intel.c > @@ -529,6 +529,8 @@ static const struct _tlb_table intel_tlb_table[] __cpuinitconst = { > { 0x5b, TLB_DATA_4K_4M, 64, " TLB_DATA 4 KByte and 4 MByte pages" }, > { 0x5c, TLB_DATA_4K_4M, 128, " TLB_DATA 4 KByte and 4 MByte pages" }, > { 0x5d, TLB_DATA_4K_4M, 256, " TLB_DATA 4 KByte and 4 MByte pages" }, > + { 0x63, TLB_DATA_1G, 4, " TLB_DATA 1 GByte pages, 4-way set associative" }, > + { 0x76, TLB_INST_2M_4M, 8, " TLB_INST 2-MByte or 4-MByte pages, fully associative" }, > { 0xb0, TLB_INST_4K, 128, " TLB_INST 4 KByte pages, 4-way set associative" }, > { 0xb1, TLB_INST_2M_4M, 4, " TLB_INST 2M pages, 4-way, 8 entries or 4M pages, 4-way entries" }, > { 0xb2, TLB_INST_4K, 64, " TLB_INST 4KByte pages, 4-way set associative" }, > @@ -606,6 +608,10 @@ static void __cpuinit intel_tlb_lookup(const unsigned char desc) > if (tlb_lld_4m[ENTRIES] < intel_tlb_table[k].entries) > tlb_lld_4m[ENTRIES] = intel_tlb_table[k].entries; > break; > + case TLB_DATA_1G: > + if (tlb_lld_1g[ENTRIES] < intel_tlb_table[k].entries) > + tlb_lld_1g[ENTRIES] = intel_tlb_table[k].entries; > + break; > } > } > > -- > 1.7.10.4 -- Kirill A. Shutemov -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/