Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5442c269 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

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: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Cc: Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>
Cc: Jörg Rödel <joro@8bytes.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kvm-ML <kvm@vger.kernel.org>
Link: http://lkml.kernel.org/r/20170801185552.GA3743@nazgul.tnic


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 10e66760

arch/x86/include/asm/cpufeatures.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -286,7 +286,7 @@ 
#define X86_FEATURE_PAUSEFILTER (15*32+10) /* filtered pause intercept */

#define X86_FEATURE_PAUSEFILTER (15*32+10) /* filtered pause intercept */

#define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */

#define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */

#define X86_FEATURE_AVIC	(15*32+13) /* Virtual Interrupt Controller */

#define X86_FEATURE_AVIC	(15*32+13) /* Virtual Interrupt Controller */

#define X86_FEATURE_VIRTUAL_VMLOAD_VMSAVE (15*32+15) /* Virtual VMLOAD VMSAVE */

#define X86_FEATURE_V_VMSAVE_VMLOAD (15*32+15) /* Virtual VMSAVE VMLOAD */





/* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */

/* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */

#define X86_FEATURE_AVX512VBMI  (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/

#define X86_FEATURE_AVX512VBMI  (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/

arch/x86/kvm/svm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1100,7 +1100,7 @@ static __init int svm_hardware_setup(void) 




	if (vls) {

	if (vls) {

		if (!npt_enabled ||

		if (!npt_enabled ||

		    !boot_cpu_has(X86_FEATURE_VIRTUAL_VMLOAD_VMSAVE) ||

		    !boot_cpu_has(X86_FEATURE_V_VMSAVE_VMLOAD) ||

		    !IS_ENABLED(CONFIG_X86_64)) {

		    !IS_ENABLED(CONFIG_X86_64)) {

			vls = false;

			vls = false;

		} else {

		} else {