Skip to contentSkip to conversation

x86/cpuid: Add missing TLB cpuid values

PATCH In review Jacek Tomaka 3 participants 5 messages Apr 23, 2018 – Apr 26, 2018 1 message not in the archive x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/cpuid: Add missing TLB cpuid values

From: [email protected]

Make kernel print correct message upon boot on Intel Xeon Phi 7210 (and others).

Before:

[ 0.320005] Last level dTLB entries: 4KB 0, 2MB 0, 4MB 0, 1GB 0
After:
[ 0.320005] Last level dTLB entries: 4KB 256, 2MB 128, 4MB 128, 1GB 16

The entries do exist in the official Intel's documentation but the type column there is incorrect (states "Cache" where it should read "TLB")
https://www.intel.com/content/www/us/en/architecture-and-technology/64-ia-32-architectures-software-developer-vol-2a-manual.html

---
 arch/x86/kernel/cpu/intel.c | 3 +++
 1 file changed, 3 insertions(+)
arch/x86/kernel/cpu/intel.c +3 -0
index b9693b80fc21..21e6cc52d56f 100644
@@ -835,6 +835,9 @@ static const struct _tlb_table intel_tlb_table[] = {
 	{ 0x5d, TLB_DATA_4K_4M,		256,	" TLB_DATA 4 KByte and 4 MByte pages" },
 	{ 0x61, TLB_INST_4K,		48,	" TLB_INST 4 KByte pages, full associative" },
 	{ 0x63, TLB_DATA_1G,		4,	" TLB_DATA 1 GByte pages, 4-way set associative" },
+	{ 0x6b, TLB_DATA_4K, 		256, 	" TLB_DATA 4 KByte pages, 8-way associative" },
+	{ 0x6c, TLB_DATA_2M_4M, 	128, 	" TLB_DATA 2 MByte or 4 MByte pages, 8-way associative" },
+	{ 0x6d, TLB_DATA_1G, 		16, 	" TLB_DATA 1 GByte pages, fully 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" },
Signature · 1 line
2.17.0
#1 lore raw

[tip:x86/urgent] x86/cpu/intel: Add missing TLB cpuid values

x86/cpu/intel: Add missing TLB cpuid values
Commit-ID:  88ba3829dfd83219bb2b1954acb0c206a602ce83
Gitweb:     https://git.kernel.org/tip/88ba3829dfd83219bb2b1954acb0c206a602ce83
Author:     [email protected] <[email protected]>
AuthorDate: Tue, 24 Apr 2018 00:14:25 +0800
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 25 Apr 2018 10:56:23 +0200

x86/cpu/intel: Add missing TLB cpuid values

Make kernel print the correct number of TLB entries on Intel Xeon Phi 7210 (and others)

Before:

[ 0.320005] Last level dTLB entries: 4KB 0, 2MB 0, 4MB 0, 1GB 0
After:
[ 0.320005] Last level dTLB entries: 4KB 256, 2MB 128, 4MB 128, 1GB 16

The entries do exist in the official Intel SMD but the type column there is incorrect (states "Cache" where it should read "TLB"), but the entries for the values 0x6B, 0x6C and 0x6D are correctly described as 'Data TLB'.

---
 arch/x86/kernel/cpu/intel.c | 3 +++
 1 file changed, 3 insertions(+)
arch/x86/kernel/cpu/intel.c +3 -0
index b9693b80fc21..55b646c43ef6 100644
@@ -835,6 +835,9 @@ static const struct _tlb_table intel_tlb_table[] = {
 	{ 0x5d, TLB_DATA_4K_4M,		256,	" TLB_DATA 4 KByte and 4 MByte pages" },
 	{ 0x61, TLB_INST_4K,		48,	" TLB_INST 4 KByte pages, full associative" },
 	{ 0x63, TLB_DATA_1G,		4,	" TLB_DATA 1 GByte pages, 4-way set associative" },
+	{ 0x6b, TLB_DATA_4K,		256,	" TLB_DATA 4 KByte pages, 8-way associative" },
+	{ 0x6c, TLB_DATA_2M_4M,		128	" TLB_DATA 2 MByte or 4 MByte pages, 8-way associative" },
+	{ 0x6d, TLB_DATA_1G,		16,	" TLB_DATA 1 GByte pages, fully 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" },

A message that is not in the archive (sent off-list or not yet received): CAKVxXCU4G2JNL1dCh5BH7Sc8WjEOg72_jdt3hCwf5J4LU3Fi6A@mail.gmail.com

#3 lore raw

Re: [tip:x86/urgent] x86/cpu/intel: Add missing TLB cpuid values

Quoted 10 lines · Jacek Tomaka

Hi Thomas,

Looks like the patch has lost a coma after 128.
+ { 0x6c, TLB_DATA_2M_4M, 128 " TLB_DATA 2 MByte or 4
MByte pages, 8-way associative" },
should be :
+ { 0x6c, TLB_DATA_2M_4M, 128, " TLB_DATA 2 MByte or 4
MByte pages, 8-way associative" },

Do you want me to resend the patch with your updates?

Nah. I fix it up as I fatfingered it when I cleaned up the whitespace damage.

Thanks,

tglx

#4 lore raw

Re: [tip:x86/urgent] x86/cpu/intel: Add missing TLB cpuid values

Quoted 11 lines · Thomas Gleixner
Quoted 9 lines · Jacek Tomaka

Hi Thomas,

Looks like the patch has lost a coma after 128.
+ { 0x6c, TLB_DATA_2M_4M, 128 " TLB_DATA 2 MByte or 4
MByte pages, 8-way associative" },
should be :
+ { 0x6c, TLB_DATA_2M_4M, 128, " TLB_DATA 2 MByte or 4
MByte pages, 8-way associative" },

Quoted 4 lines
Quoted 1 line

Do you want me to resend the patch with your updates?

Nah. I fix it up as I fatfingered it when I cleaned up the whitespace damage.

As a bonus I enable INTEL support when compiling it.

#5 lore raw

[tip:x86/urgent] x86/cpu/intel: Add missing TLB cpuid values

In reply to Jacek Tomaka
x86/cpu/intel: Add missing TLB cpuid values
Commit-ID:  b837913fc2d9061bf9b8c0dd6bf2d24e2f98b84a
Gitweb:     https://git.kernel.org/tip/b837913fc2d9061bf9b8c0dd6bf2d24e2f98b84a
Author:     [email protected] <[email protected]>
AuthorDate: Tue, 24 Apr 2018 00:14:25 +0800
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Thu, 26 Apr 2018 21:42:44 +0200

x86/cpu/intel: Add missing TLB cpuid values

Make kernel print the correct number of TLB entries on Intel Xeon Phi 7210 (and others)

Before:

[ 0.320005] Last level dTLB entries: 4KB 0, 2MB 0, 4MB 0, 1GB 0
After:
[ 0.320005] Last level dTLB entries: 4KB 256, 2MB 128, 4MB 128, 1GB 16

The entries do exist in the official Intel SMD but the type column there is incorrect (states "Cache" where it should read "TLB"), but the entries for the values 0x6B, 0x6C and 0x6D are correctly described as 'Data TLB'.

---
 arch/x86/kernel/cpu/intel.c | 3 +++
 1 file changed, 3 insertions(+)
arch/x86/kernel/cpu/intel.c +3 -0
index b9693b80fc21..60d1897041da 100644
@@ -835,6 +835,9 @@ static const struct _tlb_table intel_tlb_table[] = {
 	{ 0x5d, TLB_DATA_4K_4M,		256,	" TLB_DATA 4 KByte and 4 MByte pages" },
 	{ 0x61, TLB_INST_4K,		48,	" TLB_INST 4 KByte pages, full associative" },
 	{ 0x63, TLB_DATA_1G,		4,	" TLB_DATA 1 GByte pages, 4-way set associative" },
+	{ 0x6b, TLB_DATA_4K,		256,	" TLB_DATA 4 KByte pages, 8-way associative" },
+	{ 0x6c, TLB_DATA_2M_4M,		128,	" TLB_DATA 2 MByte or 4 MByte pages, 8-way associative" },
+	{ 0x6d, TLB_DATA_1G,		16,	" TLB_DATA 1 GByte pages, fully 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" },