[Devel] [PATCH RHEL8 COMMIT] Revert "kvm: fix AMD IBRS/IBPB/STIBP/SSBD reporting #PSBM-120787"

[Konstantin Khorenko]

The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.el8
------>
commit eb7aa6cb2a5e6e651f835254e5fb8d1f7524c94c
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Tue Dec 8 13:14:15 2020 +0300

    Revert "kvm: fix AMD IBRS/IBPB/STIBP/SSBD reporting #PSBM-120787"
    
    This reverts commit 39d637ddbcf876f897e01c737bbb351461921df0.
    
    We will take the mainstream version of the patch instead:
      From: Paolo Bonzini <pbonzini at redhat.com>
      Subject: [PATCH] KVM: x86: reinstate vendor-agnostic check on SPEC_CTRL cpuid bits
      Date: Thu,  3 Dec 2020 10:15:16 -0500
      Message-Id: <20201203151516.14441-1-pbonzini at redhat.com>
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 arch/x86/kvm/cpuid.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index a995faa586a7..d2ce3812633b 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -396,11 +396,11 @@ void kvm_set_cpu_caps(void)
 	 * arch/x86/kernel/cpu/bugs.c is kind enough to
 	 * record that in cpufeatures so use them.
 	 */
-	if (boot_cpu_has( X86_FEATURE_AMD_IBPB))
+	if (boot_cpu_has(X86_FEATURE_IBPB))
 		kvm_cpu_cap_set(X86_FEATURE_AMD_IBPB);
-	if (boot_cpu_has(X86_FEATURE_AMD_IBRS))
+	if (boot_cpu_has(X86_FEATURE_IBRS))
 		kvm_cpu_cap_set(X86_FEATURE_AMD_IBRS);
-	if (boot_cpu_has(X86_FEATURE_AMD_STIBP))
+	if (boot_cpu_has(X86_FEATURE_STIBP))
 		kvm_cpu_cap_set(X86_FEATURE_AMD_STIBP);
 	if (boot_cpu_has(X86_FEATURE_SPEC_CTRL_SSBD))
 		kvm_cpu_cap_set(X86_FEATURE_AMD_SSBD);