Skip to content

Commit 5442c26

Browse files
suryasaimadhuIngo Molnar
authored andcommitted
x86/cpufeature, kvm/svm: Rename (shorten) the new "virtualized VMSAVE/VMLOAD" CPUID flag
"virtual_vmload_vmsave" is what is going to land in /proc/cpuinfo now as per v4.13-rc4, for a single feature bit which is clearly too long. So rename it to what it is called in the processor manual. "v_vmsave_vmload" is a bit shorter, after all. We could go more aggressively here but having it the same as in the processor manual is advantageous. Signed-off-by: Borislav Petkov <[email protected]> Acked-by: Radim Krčmář <[email protected]> Cc: Janakarajan Natarajan <[email protected]> Cc: Jörg Rödel <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: kvm-ML <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 10e6676 commit 5442c26

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/x86/include/asm/cpufeatures.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
#define X86_FEATURE_PAUSEFILTER (15*32+10) /* filtered pause intercept */
287287
#define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */
288288
#define X86_FEATURE_AVIC (15*32+13) /* Virtual Interrupt Controller */
289-
#define X86_FEATURE_VIRTUAL_VMLOAD_VMSAVE (15*32+15) /* Virtual VMLOAD VMSAVE */
289+
#define X86_FEATURE_V_VMSAVE_VMLOAD (15*32+15) /* Virtual VMSAVE VMLOAD */
290290

291291
/* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */
292292
#define X86_FEATURE_AVX512VBMI (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/

arch/x86/kvm/svm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ static __init int svm_hardware_setup(void)
11001100

11011101
if (vls) {
11021102
if (!npt_enabled ||
1103-
!boot_cpu_has(X86_FEATURE_VIRTUAL_VMLOAD_VMSAVE) ||
1103+
!boot_cpu_has(X86_FEATURE_V_VMSAVE_VMLOAD) ||
11041104
!IS_ENABLED(CONFIG_X86_64)) {
11051105
vls = false;
11061106
} else {

0 commit comments

Comments
 (0)