From mboxrd@z Thu Jan 1 00:00:00 1970 From: tip-bot for Borislav Petkov Subject: [tip:x86/urgent] x86/cpufeature, kvm/svm: Rename (shorten) the new "virtualized VMSAVE/VMLOAD" CPUID flag Date: Fri, 11 Aug 2017 05:13:07 -0700 Message-ID: References: <20170801185552.GA3743@nazgul.tnic> Reply-To: tglx@linutronix.de, peterz@infradead.org, rkrcmar@redhat.com, hpa@zytor.com, pbonzini@redhat.com, bp@suse.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, Janakarajan.Natarajan@amd.com, kvm@vger.kernel.org, mingo@kernel.org, joro@8bytes.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: hpa@zytor.com, rkrcmar@redhat.com, peterz@infradead.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, Janakarajan.Natarajan@amd.com, torvalds@linux-foundation.org, joro@8bytes.org, kvm@vger.kernel.org, mingo@kernel.org, bp@suse.de, pbonzini@redhat.com To: linux-tip-commits@vger.kernel.org Return-path: In-Reply-To: <20170801185552.GA3743@nazgul.tnic> Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org Commit-ID: 5442c26995527245c94c4a49e535eae8a60a5299 Gitweb: http://git.kernel.org/tip/5442c26995527245c94c4a49e535eae8a60a5299 Author: Borislav Petkov AuthorDate: Tue, 1 Aug 2017 20:55:52 +0200 Committer: Ingo Molnar CommitDate: Fri, 11 Aug 2017 13:42:28 +0200 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 Acked-by: Radim Krčmář Cc: Janakarajan Natarajan Cc: Jörg Rödel Cc: Linus Torvalds Cc: Paolo Bonzini Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: kvm-ML Link: http://lkml.kernel.org/r/20170801185552.GA3743@nazgul.tnic Signed-off-by: Ingo Molnar --- arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/kvm/svm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index ca3c48c..5a28e8e 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -286,7 +286,7 @@ #define X86_FEATURE_PAUSEFILTER (15*32+10) /* filtered pause intercept */ #define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */ #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 */ #define X86_FEATURE_AVX512VBMI (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/ diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 1107626..56ba053 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1100,7 +1100,7 @@ static __init int svm_hardware_setup(void) if (vls) { if (!npt_enabled || - !boot_cpu_has(X86_FEATURE_VIRTUAL_VMLOAD_VMSAVE) || + !boot_cpu_has(X86_FEATURE_V_VMSAVE_VMLOAD) || !IS_ENABLED(CONFIG_X86_64)) { vls = false; } else {