]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
KVM: VMX: Do not advertise RDPID if ENABLE_RDTSCP control is unsupported
authorSean Christopherson <seanjc@google.com>
Tue, 4 May 2021 17:17:20 +0000 (10:17 -0700)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 18 Jun 2021 09:07:34 +0000 (11:07 +0200)
commit49aadbc911ba894262208f6512f2f6fc1176651c
tree95367b6fbfcd5382f412dd1c12748869c9f71de4
parent4535a0c603c5c8c64bb6e4056a44dbe4ede1136f
KVM: VMX: Do not advertise RDPID if ENABLE_RDTSCP control is unsupported

BugLink: https://bugs.launchpad.net/bugs/1931292
commit 8aec21c04caa2000f91cf8822ae0811e4b0c3971 upstream.

Clear KVM's RDPID capability if the ENABLE_RDTSCP secondary exec control is
unsupported.  Despite being enumerated in a separate CPUID flag, RDPID is
bundled under the same VMCS control as RDTSCP and will #UD in VMX non-root
if ENABLE_RDTSCP is not enabled.

Fixes: 41cd02c6f7f6 ("kvm: x86: Expose RDPID in KVM_GET_SUPPORTED_CPUID")
Cc: stable@vger.kernel.org
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20210504171734.1434054-2-seanjc@google.com>
Reviewed-by: Jim Mattson <jmattson@google.com>
Reviewed-by: Reiji Watanabe <reijiw@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
arch/x86/kvm/vmx/vmx.c