x86/tlb_info: detect more tlb configuration
PATCH RESEND 1/1 x86/tlb_info: detect more tlb configuration
From: "Kirill A. Shutemov" <[email protected]>
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 <[email protected]>
Acked-by Alex Shi <[email protected]>
--- 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(-)
arch/x86/include/asm/processor.h +1 -0
@@ -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;/*
arch/x86/kernel/cpu/common.c +4 -3
@@ -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)
arch/x86/kernel/cpu/intel.c +6 -0
@@ -525,6 +525,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" },
@@ -602,6 +604,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 ; } }
Signature · 1 line
1.8.3.2