KVM: nVMX: Check GUEST_IA32_PERF_GLOBAL_CTRL on VM-Entry
Add condition to nested_vmx_check_guest_state() to check the validity of GUEST_IA32_PERF_GLOBAL_CTRL. Per Intel's SDM Vol 3 26.3.1.1: If the "load IA32_PERF_GLOBAL_CTRL" VM-entry control is 1, bits reserved in the IA32_PERF_GLOBAL_CTRL MSR must be 0 in the field for that register. Suggested-by: Jim Mattson <jmattson@google.com> Co-developed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com> Signed-off-by: Krish Sadhukhan <krish.sadhukhan@oracle.com> Signed-off-by: Oliver Upton <oupton@google.com> Reviewed-by: Jim Mattson <jmattson@google.com> Reviewed-by: Peter Shier <pshier@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Родитель
9477f4449b
Коммит
bfc6ad6ab3
|
@ -10,6 +10,7 @@
|
||||||
#include "hyperv.h"
|
#include "hyperv.h"
|
||||||
#include "mmu.h"
|
#include "mmu.h"
|
||||||
#include "nested.h"
|
#include "nested.h"
|
||||||
|
#include "pmu.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
#include "x86.h"
|
#include "x86.h"
|
||||||
|
|
||||||
|
@ -2790,6 +2791,11 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL) &&
|
||||||
|
CC(!kvm_valid_perf_global_ctrl(vcpu_to_pmu(vcpu),
|
||||||
|
vmcs12->guest_ia32_perf_global_ctrl)))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If the load IA32_EFER VM-entry control is 1, the following checks
|
* If the load IA32_EFER VM-entry control is 1, the following checks
|
||||||
* are performed on the field for the IA32_EFER MSR:
|
* are performed on the field for the IA32_EFER MSR:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче