Skip to contentSkip to conversation

x86, amd: rename vmmu support capability

PATCH In review Davidlohr Bueso 3 participants 6 messages Jul 13, 2012 – Jul 14, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86, amd: rename vmmu support capability

From: Davidlohr Bueso <[email protected]>

AMD has renamed nested page table technology to rapid virtualization indexing, reflect this change in the kernel.

---
 arch/x86/include/asm/cpufeature.h |    2 +-
 arch/x86/kernel/cpu/scattered.c   |    2 +-
 arch/x86/kvm/svm.c                |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/include/asm/cpufeature.h +1 -1
index f91e80f..a6fa778 100644
@@ -185,7 +185,7 @@
 #define X86_FEATURE_FLEXPRIORITY (8*32+ 2) /* Intel FlexPriority */
 #define X86_FEATURE_EPT         (8*32+ 3) /* Intel Extended Page Table */
 #define X86_FEATURE_VPID        (8*32+ 4) /* Intel Virtual Processor ID */
-#define X86_FEATURE_NPT		(8*32+ 5) /* AMD Nested Page Table support */
+#define X86_FEATURE_RVI		(8*32+ 5) /* AMD Rapid Virtualization Indexing support */
 #define X86_FEATURE_LBRV	(8*32+ 6) /* AMD LBR Virtualization support */
 #define X86_FEATURE_SVML	(8*32+ 7) /* "svm_lock" AMD SVM locking MSR */
 #define X86_FEATURE_NRIPS	(8*32+ 8) /* "nrip_save" AMD SVM next_rip save */
arch/x86/kernel/cpu/scattered.c +1 -1
index ee8e9ab..78ec9e6 100644
@@ -41,7 +41,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
 		{ X86_FEATURE_XSAVEOPT,		CR_EAX,	0, 0x0000000d, 1 },
 		{ X86_FEATURE_CPB,		CR_EDX, 9, 0x80000007, 0 },
 		{ X86_FEATURE_HW_PSTATE,	CR_EDX, 7, 0x80000007, 0 },
-		{ X86_FEATURE_NPT,		CR_EDX, 0, 0x8000000a, 0 },
+		{ X86_FEATURE_RVI,		CR_EDX, 0, 0x8000000a, 0 },
 		{ X86_FEATURE_LBRV,		CR_EDX, 1, 0x8000000a, 0 },
 		{ X86_FEATURE_SVML,		CR_EDX, 2, 0x8000000a, 0 },
 		{ X86_FEATURE_NRIPS,		CR_EDX, 3, 0x8000000a, 0 },
arch/x86/kvm/svm.c +1 -1
index f75af40..6863898 100644
@@ -900,7 +900,7 @@ static __init int svm_hardware_setup(void)
 			goto err;
 	}
 
-	if (!boot_cpu_has(X86_FEATURE_NPT))
+	if (!boot_cpu_has(X86_FEATURE_RVI))
 		npt_enabled = false;
 
 	if (npt_enabled && !npt) {
Signature · 1 line
1.7.4.1
maintainer
#1 lore raw
Quoted 6 lines · Davidlohr Bueso

From: Davidlohr Bueso <[email protected]>

AMD has renamed nested page table technology to rapid virtualization indexing, reflect this change in the kernel.

You know that /proc/cpuinfo is a userspace ABI, right?

And are you sure nothing is using that string - "npt" - since it got added almost three years ago by 414bb144efa2d2fe16d104d836d0d6b6e9265788?

Signature · 2 lines
Regards/Gruss,
    Boris.
#2 lore raw
Quoted 9 lines · Borislav Petkov
Quoted 6 lines · Davidlohr Bueso

From: Davidlohr Bueso <[email protected]>

AMD has renamed nested page table technology to rapid virtualization indexing, reflect this change in the kernel.

You know that /proc/cpuinfo is a userspace ABI, right?

Yes.

Quoted 4 lines

And are you sure nothing is using that string - "npt" - since it got added almost three years ago by 414bb144efa2d2fe16d104d836d0d6b6e9265788?

AFAIK no, it's not being used - that doesn't mean, of course, that there are no users.

Thanks,
Davidlohr

#3 lore raw
In reply to Borislav Petkov

Yep, NAK on this one.

Quoted 18 lines · Borislav Petkov
Quoted 3 lines · Davidlohr Bueso

From: Davidlohr Bueso <[email protected]>

AMD has renamed nested page table technology to rapid virtualization

indexing,

Quoted 3 lines

reflect this change in the kernel.

You know that /proc/cpuinfo is a userspace ABI, right?

And are you sure nothing is using that string - "npt" - since it got added almost three years ago by 414bb144efa2d2fe16d104d836d0d6b6e9265788?

Signature · 2 lines
Regards/Gruss,
   Boris.
Signature · 1 line
Sent from my mobile phone. Please excuse brevity and lack of formatting.
#4 lore raw
Quoted 1 line · H. Peter Anvin

Yep, NAK on this one.

Ok, we could at least add a comment when defining X86_FEATURE_NPT.

Thanks,
Davidlohr

Quoted 22 lines
Quoted 18 lines · Borislav Petkov
Quoted 3 lines · Davidlohr Bueso

From: Davidlohr Bueso <[email protected]>

AMD has renamed nested page table technology to rapid virtualization

indexing,

Quoted 3 lines

reflect this change in the kernel.

You know that /proc/cpuinfo is a userspace ABI, right?

And are you sure nothing is using that string - "npt" - since it got added almost three years ago by 414bb144efa2d2fe16d104d836d0d6b6e9265788?

Signature · 2 lines
Regards/Gruss,
   Boris.
maintainer
#5 lore raw
Quoted 4 lines · Davidlohr Bueso
Quoted 1 line · H. Peter Anvin

Yep, NAK on this one.

Ok, we could at least add a comment when defining X86_FEATURE_NPT.

And the valid, sane, technical reason for having a comment where any internet search could do, is... ?

Signature · 2 lines
Regards/Gruss,
    Boris.