KVM: VMX: Add full nested support for IA32_PERF_GLOBAL_CTRL
v4 cover KVM: VMX: Add full nested support for IA32_PERF_GLOBAL_CTRL
[v1] https://lore.kernel.org/r/[email protected]
[v2] https://lore.kernel.org/r/[email protected]
[v3] https://lore.kernel.org/r/[email protected]
v1 => v2:
- Add Krish's Co-developed-by and Signed-off-by tags.
- Fix minor nit to kvm-unit-tests to use 'host' local variable throughout test_load_pgc()
- Teach guest_state_test_main() to check guest state from within nested VM
- Update proposed tests to use guest/host state checks, wherein the value is checked from MSR_CORE_PERF_GLOBAL_CTRL.
- Changelog line wrapping
v2 => v3:
- Remove the value unchanged condition from
kvm_is_valid_perf_global_ctrl
- Add line to changelog for patch 3/8
v3 => v4:
- Allow tests to set the guest func multiple times
- Style fixes throughout kvm-unit-tests patches, per Krish's review
This patchset exposes the "load IA32_PERF_GLOBAL_CTRL" to guests for nested VM-entry and VM-exit. There already was some existing code that supported the VM-exit ctrl, though it had an issue and was not exposed to the guest anyway. These patches are based on the original set that Krish Sadhukhan sent out earlier this year.
Purpose of each patch:
(1) Change the existing code that implemented the VM-exit functionality to use kvm_set_msr() to avoid being overwritten by atomic_perf_switch_msrs().
(2) Update prepare_vmcs02() to implement the VM-entry functionality, again using kvm_set_msr().
(3) Create a helper function for checking the validity of an
IA32_PERF_GLOBAL_CTRL value against pmu->global_ctrl_mask.
(4) Check guest state on VM-entry as described in the SDM.
(5) Check host state on VM-entry as described in the SDM.
(6) Expose the "load IA32_PERF_GLOBAL_CTRL" VM-entry and VM-exit controls if IA32_PERF_GLOBAL_CTRL is a valid MSR.
(7) Modify guest_state_test_main() to check guest state MSRs
(8) Tests in kvm-unit-tests to check the VM-entry and VM-exit controls work properly
Oliver Upton (6):
KVM: nVMX: Use kvm_set_msr to load IA32_PERF_GLOBAL_CTRL on vmexit
KVM: nVMX: Load GUEST_IA32_PERF_GLOBAL_CTRL MSR on vm-entry
KVM: VMX: Add helper to check reserved bits in IA32_PERF_GLOBAL_CTRL
KVM: nVMX: check GUEST_IA32_PERF_GLOBAL_CTRL on VM-Entry
KVM: nVMX: Check HOST_IA32_PERF_GLOBAL_CTRL on VM-entry
KVM: nVMX: Expose load IA32_PERF_GLOBAL_CTRL vm control if supported
arch/x86/kvm/pmu.h | 6 ++++++ arch/x86/kvm/vmx/nested.c | 37 +++++++++++++++++++++++++++++++++--- arch/x86/kvm/vmx/pmu_intel.c | 5 ++++- arch/x86/kvm/vmx/vmx.c | 21 ++++++++++++++++++++ arch/x86/kvm/vmx/vmx.h | 1 + 5 files changed, 66 insertions(+), 4 deletions(-)
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
PATCH v4 1/9 KVM: nVMX: Use kvm_set_msr to load IA32_PERF_GLOBAL_CTRL on vmexit
The existing implementation for loading the IA32_PERF_GLOBAL_CTRL MSR on VM-exit was incorrect, as the next call to atomic_switch_perf_msrs() could cause this value to be overwritten. Instead, call kvm_set_msr() which will allow atomic_switch_perf_msrs() to correctly set the values.
--- arch/x86/kvm/vmx/nested.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
arch/x86/kvm/vmx/nested.c +10 -3
@@ -3724,6 +3724,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) {struct kvm_segment seg; +struct msr_data msr_info;u32 entry_failure_code;if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_EFER )
@@ -3800,9 +3801,15 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,vmcs_write64 (GUEST_IA32_PAT , vmcs12->host_ia32_pat); vcpu->arch.pat = vmcs12->host_ia32_pat; } -if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ) -vmcs_write64 (GUEST_IA32_PERF_GLOBAL_CTRL , - vmcs12->host_ia32_perf_global_ctrl); +if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ) { + msr_info.host_initiated = false; + msr_info.index =MSR_CORE_PERF_GLOBAL_CTRL ; + msr_info.data = vmcs12->host_ia32_perf_global_ctrl; +if (kvm_set_msr (vcpu, &msr_info)) +pr_debug_ratelimited ( +"%s cannot write MSR (0x%x, 0x%llx)\n" , + __func__, msr_info.index, msr_info.data); + }/* Set L1 segment info according to Intel SDM 27.5.2 Loading Host Segment and Descriptor-Table Registers */
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [PATCH v4 1/9] KVM: nVMX: Use kvm_set_msr to load IA32_PERF_GLOBAL_CTRL on vmexit
Quoted 32 lines · Oliver Upton
The existing implementation for loading the
IA32_PERF_GLOBAL_CTRLMSR on VM-exit was incorrect, as the next call toatomic_switch_perf_msrs()could cause this value to be overwritten. Instead, callkvm_set_msr()which will allowatomic_switch_perf_msrs()to correctly set the values.Suggested-by Jim Mattson <[email protected]>Co-developed-by Krish Sadhukhan <[email protected]>Signed-off-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>Reviewed-by Jim Mattson <[email protected]>Reviewed-by Peter Shier <[email protected]>--- arch/x86/kvm/vmx/nested.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)arch/x86/kvm/vmx/nested.c +1
-1@@ -3724,6 +3724,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) {struct kvm_segment seg; +struct msr_data msr_info;u32 entry_failure_code;if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_EFER )@@ -3800,9 +3801,15 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,vmcs_write64 (GUEST_IA32_PAT , vmcs12->host_ia32_pat); vcpu->arch.pat = vmcs12->host_ia32_pat; } -if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL )
arch/x86/kvm/vmx/nested.c static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, · line 3811
Quoted 10 lines
arch/x86/kvm/vmx/nested.c +8
-2-vmcs_write64 (GUEST_IA32_PERF_GLOBAL_CTRL , - vmcs12->host_ia32_perf_global_ctrl); +if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ) { + msr_info.host_initiated = false; + msr_info.index =MSR_CORE_PERF_GLOBAL_CTRL ; + msr_info.data = vmcs12->host_ia32_perf_global_ctrl; +if (kvm_set_msr (vcpu, &msr_info)) +pr_debug_ratelimited ( +"%s cannot write MSR (0x%x, 0x%llx)\n" , + __func__, msr_info.index, msr_info.data);
Since this is for a single MSR, we should print the human-readable name of the MSR as well as its index, e.g.:
pr_debug_ratelimited( "%s cannot write PERF_GLOBAL_CONTROL MSR (0x%x, 0x%llx)\n",
Quoted 7 lines
arch/x86/kvm/vmx/nested.c +1
-0+ }/* Set L1 segment info according to Intel SDM 27.5.2 Loading Host Segment and Descriptor-Table Registers */ Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [PATCH v4 1/9] KVM: nVMX: Use kvm_set_msr to load IA32_PERF_GLOBAL_CTRL on vmexit
In reply to Oliver UptonQuoted 32 lines · Oliver Upton
The existing implementation for loading the
IA32_PERF_GLOBAL_CTRLMSR on VM-exit was incorrect, as the next call toatomic_switch_perf_msrs()could cause this value to be overwritten. Instead, callkvm_set_msr()which will allowatomic_switch_perf_msrs()to correctly set the values.Suggested-by Jim Mattson <[email protected]>Co-developed-by Krish Sadhukhan <[email protected]>Signed-off-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>Reviewed-by Jim Mattson <[email protected]>Reviewed-by Peter Shier <[email protected]>--- arch/x86/kvm/vmx/nested.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)arch/x86/kvm/vmx/nested.c +1
-1@@ -3724,6 +3724,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) {struct kvm_segment seg; +struct msr_data msr_info;u32 entry_failure_code;if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_EFER )@@ -3800,9 +3801,15 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,vmcs_write64 (GUEST_IA32_PAT , vmcs12->host_ia32_pat); vcpu->arch.pat = vmcs12->host_ia32_pat; } -if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL )
arch/x86/kvm/vmx/nested.c static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, · line 3811
Quoted 10 lines
arch/x86/kvm/vmx/nested.c +8
-2-vmcs_write64 (GUEST_IA32_PERF_GLOBAL_CTRL , - vmcs12->host_ia32_perf_global_ctrl); +if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ) { + msr_info.host_initiated = false; + msr_info.index =MSR_CORE_PERF_GLOBAL_CTRL ; + msr_info.data = vmcs12->host_ia32_perf_global_ctrl; +if (kvm_set_msr (vcpu, &msr_info)) +pr_debug_ratelimited ( +"%s cannot write MSR (0x%x, 0x%llx)\n" , + __func__, msr_info.index, msr_info.data);
I belatedly realized we don't actually do anything on failure. If you reorder the series to add the checks (currently patches 4/9 and 5/9) at the very beginning, can we then WARN on failure here (and in the guest flow too)?
Quoted 7 lines
arch/x86/kvm/vmx/nested.c +1
-0+ }/* Set L1 segment info according to Intel SDM 27.5.2 Loading Host Segment and Descriptor-Table Registers */ Signature · 1 line
2.23.0.187.g17f5b7556c-goog
PATCH v4 2/9 KVM: nVMX: Load GUEST_IA32_PERF_GLOBAL_CTRL MSR on vm-entry
In reply to Oliver UptonAdd condition to prepare_vmcs02 which loads IA32_PERF_GLOBAL_CTRL on VM-entry if the "load IA32_PERF_GLOBAL_CTRL" bit on the VM-entry control is set. Use kvm_set_msr() rather than directly writing to the field to avoid overwrite by atomic_switch_perf_msrs().
--- arch/x86/kvm/vmx/nested.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/x86/kvm/vmx/nested.c +11 -0
@@ -2281,6 +2281,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, {struct vcpu_vmx *vmx =to_vmx (vcpu);struct hv_enlightened_vmcs *hv_evmcs = vmx->nested.hv_evmcs; +struct msr_data msr_info;bool load_guest_pdptrs_vmcs12 = false;if (vmx->nested.dirty_vmcs12 || hv_evmcs) {
@@ -2404,6 +2405,16 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,if (!enable_ept) vcpu->arch.walk_mmu->inject_page_fault = vmx_inject_page_fault_nested; +if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ) { + msr_info.host_initiated = false; + msr_info.index =MSR_CORE_PERF_GLOBAL_CTRL ; + msr_info.data = vmcs12->guest_ia32_perf_global_ctrl; +if (kvm_set_msr (vcpu, &msr_info)) +pr_debug_ratelimited ( +"%s cannot write MSR (0x%x, 0x%llx)\n" , + __func__, msr_info.index, msr_info.data); + } +kvm_rsp_write (vcpu, vmcs12->guest_rsp);kvm_rip_write (vcpu, vmcs12->guest_rip);return 0 ;
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [PATCH v4 2/9] KVM: nVMX: Load GUEST_IA32_PERF_GLOBAL_CTRL MSR on vm-entry
Quoted 29 lines · Oliver Upton
Add condition to
prepare_vmcs02which loadsIA32_PERF_GLOBAL_CTRLon VM-entry if the "loadIA32_PERF_GLOBAL_CTRL" bit on the VM-entry control is set. Usekvm_set_msr()rather than directly writing to the field to avoid overwrite byatomic_switch_perf_msrs().Suggested-by Jim Mattson <[email protected]>Co-developed-by Krish Sadhukhan <[email protected]>Signed-off-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>Reviewed-by Jim Mattson <[email protected]>Reviewed-by Peter Shier <[email protected]>--- arch/x86/kvm/vmx/nested.c | 11 +++++++++++ 1 file changed, 11 insertions(+)arch/x86/kvm/vmx/nested.c +1
-0@@ -2281,6 +2281,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, {struct vcpu_vmx *vmx =to_vmx (vcpu);struct hv_enlightened_vmcs *hv_evmcs = vmx->nested.hv_evmcs; +struct msr_data msr_info;bool load_guest_pdptrs_vmcs12 = false;if (vmx->nested.dirty_vmcs12 || hv_evmcs) {@@ -2404,6 +2405,16 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,if (!enable_ept)
arch/x86/kvm/vmx/nested.c static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, · line 2415
Quoted 10 lines
arch/x86/kvm/vmx/nested.c +8
-0vcpu->arch.walk_mmu->inject_page_fault = vmx_inject_page_fault_nested; +if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ) { + msr_info.host_initiated = false; + msr_info.index =MSR_CORE_PERF_GLOBAL_CTRL ; + msr_info.data = vmcs12->guest_ia32_perf_global_ctrl; +if (kvm_set_msr (vcpu, &msr_info)) +pr_debug_ratelimited ( +"%s cannot write MSR (0x%x, 0x%llx)\n" , + __func__, msr_info.index, msr_info.data);
Same comment on printing the name. Might be work adding a helper function or macro? That'd also avoid blasting past the 80-column guideline.
Quoted 8 lines
arch/x86/kvm/vmx/nested.c +2
-0+ } +kvm_rsp_write (vcpu, vmcs12->guest_rsp);kvm_rip_write (vcpu, vmcs12->guest_rip);return 0 ;Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [PATCH v4 2/9] KVM: nVMX: Load GUEST_IA32_PERF_GLOBAL_CTRL MSR on vm-entry
Quoted 32 lines · Sean Christopherson
Quoted 31 lines · Oliver Upton
Add condition to
prepare_vmcs02which loadsIA32_PERF_GLOBAL_CTRLon VM-entry if the "loadIA32_PERF_GLOBAL_CTRL" bit on the VM-entry control is set. Usekvm_set_msr()rather than directly writing to the field to avoid overwrite byatomic_switch_perf_msrs().Suggested-by Jim Mattson <[email protected]>Co-developed-by Krish Sadhukhan <[email protected]>Signed-off-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>Reviewed-by Jim Mattson <[email protected]>Reviewed-by Peter Shier <[email protected]>--- arch/x86/kvm/vmx/nested.c | 11 +++++++++++ 1 file changed, 11 insertions(+)arch/x86/kvm/vmx/nested.c +1
-0@@ -2281,6 +2281,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, {struct vcpu_vmx *vmx =to_vmx (vcpu);struct hv_enlightened_vmcs *hv_evmcs = vmx->nested.hv_evmcs; +struct msr_data msr_info;bool load_guest_pdptrs_vmcs12 = false;if (vmx->nested.dirty_vmcs12 || hv_evmcs) {@@ -2404,6 +2405,16 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,if (!enable_ept) vcpu->arch.walk_mmu->inject_page_fault = vmx_inject_page_fault_nested;
Quoted 11 lines
arch/x86/kvm/vmx/nested.c static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, · line 2415
Quoted 8 lines
arch/x86/kvm/vmx/nested.c +8
-0+if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ) { + msr_info.host_initiated = false; + msr_info.index =MSR_CORE_PERF_GLOBAL_CTRL ; + msr_info.data = vmcs12->guest_ia32_perf_global_ctrl; +if (kvm_set_msr (vcpu, &msr_info)) +pr_debug_ratelimited ( +"%s cannot write MSR (0x%x, 0x%llx)\n" , + __func__, msr_info.index, msr_info.data);Same comment on printing the name. Might be work adding a helper function or macro? That'd also avoid blasting past the 80-column guideline.
Thanks for the review, Sean. I believe that in one of the prior sets I mailed out you had mentioned a macro for this as well, but was a fix throughout KVM. Shall I introduce the macro as part of this series, but only apply it to my changes (and fix other call sites later on)?
Quoted 8 lines
Quoted 8 lines
arch/x86/kvm/vmx/nested.c +2
-0+ } +kvm_rsp_write (vcpu, vmcs12->guest_rsp);kvm_rip_write (vcpu, vmcs12->guest_rip);return 0 ;Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [PATCH v4 2/9] KVM: nVMX: Load GUEST_IA32_PERF_GLOBAL_CTRL MSR on vm-entry
Quoted 45 lines · Oliver Upton
Quoted 32 lines · Sean Christopherson
Quoted 31 lines · Oliver Upton
Add condition to
prepare_vmcs02which loadsIA32_PERF_GLOBAL_CTRLon VM-entry if the "loadIA32_PERF_GLOBAL_CTRL" bit on the VM-entry control is set. Usekvm_set_msr()rather than directly writing to the field to avoid overwrite byatomic_switch_perf_msrs().Suggested-by Jim Mattson <[email protected]>Co-developed-by Krish Sadhukhan <[email protected]>Signed-off-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>Reviewed-by Jim Mattson <[email protected]>Reviewed-by Peter Shier <[email protected]>--- arch/x86/kvm/vmx/nested.c | 11 +++++++++++ 1 file changed, 11 insertions(+)arch/x86/kvm/vmx/nested.c +1
-0@@ -2281,6 +2281,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, {struct vcpu_vmx *vmx =to_vmx (vcpu);struct hv_enlightened_vmcs *hv_evmcs = vmx->nested.hv_evmcs; +struct msr_data msr_info;bool load_guest_pdptrs_vmcs12 = false;if (vmx->nested.dirty_vmcs12 || hv_evmcs) {@@ -2404,6 +2405,16 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,if (!enable_ept) vcpu->arch.walk_mmu->inject_page_fault = vmx_inject_page_fault_nested;Quoted 11 lines
arch/x86/kvm/vmx/nested.c static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, · line 2415
Quoted 8 lines
arch/x86/kvm/vmx/nested.c +8
-0+if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ) { + msr_info.host_initiated = false; + msr_info.index =MSR_CORE_PERF_GLOBAL_CTRL ; + msr_info.data = vmcs12->guest_ia32_perf_global_ctrl; +if (kvm_set_msr (vcpu, &msr_info)) +pr_debug_ratelimited ( +"%s cannot write MSR (0x%x, 0x%llx)\n" , + __func__, msr_info.index, msr_info.data);Same comment on printing the name. Might be work adding a helper function or macro? That'd also avoid blasting past the 80-column guideline.
Quoted 4 lines
Thanks for the review, Sean. I believe that in one of the prior sets I mailed out you had mentioned a macro for this as well, but was a fix throughout KVM. Shall I introduce the macro as part of this series, but only apply it to my changes (and fix other call sites later on)?
Heh, I'm not sure if by "KVM wide" I was thinking just interface to kvm_set_msr() and kvm_get_msr(), or if I was thiking this specific pr_debug line as well.
But, it's a moot point if we can pre-check the vmcs12 value and thus WARN on failure here.
PATCH v4 3/9 KVM: VMX: Add helper to check reserved bits in IA32_PERF_GLOBAL_CTRL
In reply to Oliver UptonCreate a helper function to check the validity of a proposed value for IA32_PERF_GLOBAL_CTRL from the existing check in intel_pmu_set_msr().
Per Intel's SDM, the reserved bits in IA32_PERF_GLOBAL_CTRL must be cleared for the corresponding host/guest state fields.
--- arch/x86/kvm/pmu.h | 6 ++++++ arch/x86/kvm/vmx/pmu_intel.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
arch/x86/kvm/pmu.h +6 -0
@@ -79,6 +79,12 @@ static inline bool pmc_is_enabled(struct kvm_pmc *pmc)return kvm_x86_ops->pmu_ops->pmc_is_enabled (pmc); } +static inline bool kvm_is_valid_perf_global_ctrl (struct kvm_pmu *pmu, +u64 data) +{ +return !(pmu->global_ctrl_mask & data); +} +/* returns general purpose PMC with the specified MSR. Note that it can be * used for both PERFCTRn and EVNTSELn; that is why it accepts base as a * paramenter to tell them apart.
arch/x86/kvm/vmx/pmu_intel.c +1 -1
@@ -223,7 +223,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)case MSR_CORE_PERF_GLOBAL_CTRL :if (pmu->global_ctrl == data)return 0 ; -if (!(data & pmu->global_ctrl_mask)) { +if (kvm_is_valid_perf_global_ctrl (pmu, data)) {global_ctrl_changed (pmu, data);return 0 ; }
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
PATCH v4 4/9 KVM: nVMX: check GUEST_IA32_PERF_GLOBAL_CTRL on VM-Entry
In reply to Oliver UptonAdd 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.
--- arch/x86/kvm/vmx/nested.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kvm/vmx/nested.c +7 -0
@@ -10,6 +10,7 @@#include "hyperv.h" #include "mmu.h" #include "nested.h" +#include "pmu.h" #include "trace.h" #include "x86.h"
@@ -2732,6 +2733,7 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu, u32 *exit_qual) {bool ia32e; +struct kvm_pmu *pmu =vcpu_to_pmu (vcpu); *exit_qual =ENTRY_FAIL_DEFAULT ;
@@ -2748,6 +2750,11 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu,return -EINVAL ; } +if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL && + !kvm_is_valid_perf_global_ctrl (pmu, + vmcs12->guest_ia32_perf_global_ctrl)) +return -EINVAL ; +/* * If the load IA32_EFER VM-entry control is 1, the following checks * are performed on the field for the IA32_EFER MSR:
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [PATCH v4 4/9] KVM: nVMX: check GUEST_IA32_PERF_GLOBAL_CTRL on VM-Entry
Quoted 30 lines · Oliver Upton
Add condition to
nested_vmx_check_guest_state()to check the validity ofGUEST_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 theIA32_PERF_GLOBAL_CTRLMSR must be 0 in the field for that register.Suggested-by Jim Mattson <[email protected]>Co-developed-by Krish Sadhukhan <[email protected]>Signed-off-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>Reviewed-by Jim Mattson <[email protected]>Reviewed-by Peter Shier <[email protected]>--- arch/x86/kvm/vmx/nested.c | 7 +++++++ 1 file changed, 7 insertions(+)arch/x86/kvm/vmx/nested.c +1
-0@@ -10,6 +10,7 @@#include "hyperv.h" #include "mmu.h" #include "nested.h" +#include "pmu.h" #include "trace.h" #include "x86.h"
arch/x86/kvm/vmx/nested.c static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu, · line 2736
Quoted 4 lines
arch/x86/kvm/vmx/nested.c +1
-0@@ -2732,6 +2733,7 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu, u32 *exit_qual) {bool ia32e; +struct kvm_pmu *pmu =vcpu_to_pmu (vcpu);
Nit: I wouldn't bother with a local variable, just call vcpu_to_pmu() when invoking kvm_is_valid_perf_global_ctrl(), especially since you need a line break anyways.
Quoted 18 lines
arch/x86/kvm/vmx/nested.c +5
-0*exit_qual =ENTRY_FAIL_DEFAULT ;@@ -2748,6 +2750,11 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu,return -EINVAL ; } +if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL && + !kvm_is_valid_perf_global_ctrl (pmu, + vmcs12->guest_ia32_perf_global_ctrl)) +return -EINVAL ; +/* * If the load IA32_EFER VM-entry control is 1, the following checks * are performed on the field for the IA32_EFER MSR: Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [PATCH v4 4/9] KVM: nVMX: check GUEST_IA32_PERF_GLOBAL_CTRL on VM-Entry
Quoted 30 lines · Sean Christopherson
Quoted 29 lines · Oliver Upton
Add condition to
nested_vmx_check_guest_state()to check the validity ofGUEST_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 theIA32_PERF_GLOBAL_CTRLMSR must be 0 in the field for that register.Suggested-by Jim Mattson <[email protected]>Co-developed-by Krish Sadhukhan <[email protected]>Signed-off-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>Reviewed-by Jim Mattson <[email protected]>Reviewed-by Peter Shier <[email protected]>--- arch/x86/kvm/vmx/nested.c | 7 +++++++ 1 file changed, 7 insertions(+)arch/x86/kvm/vmx/nested.c +1
-0@@ -10,6 +10,7 @@#include "hyperv.h" #include "mmu.h" #include "nested.h" +#include "pmu.h" #include "trace.h" #include "x86.h"
Quoted 9 lines
arch/x86/kvm/vmx/nested.c static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu, · line 2736
Quoted 5 lines
arch/x86/kvm/vmx/nested.c +1
-0@@ -2732,6 +2733,7 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu, u32 *exit_qual) {bool ia32e; +struct kvm_pmu *pmu =vcpu_to_pmu (vcpu);Nit: I wouldn't bother with a local variable, just call
vcpu_to_pmu()when invokingkvm_is_valid_perf_global_ctrl(), especially since you need a line break anyways.
Ack to both (here and on 5/9).
Quoted 18 lines
Quoted 18 lines
arch/x86/kvm/vmx/nested.c +5
-0*exit_qual =ENTRY_FAIL_DEFAULT ;@@ -2748,6 +2750,11 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu,return -EINVAL ; } +if (vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL && + !kvm_is_valid_perf_global_ctrl (pmu, + vmcs12->guest_ia32_perf_global_ctrl)) +return -EINVAL ; +/* * If the load IA32_EFER VM-entry control is 1, the following checks * are performed on the field for the IA32_EFER MSR: Signature · 1 line
2.23.0.187.g17f5b7556c-goog
PATCH v4 5/9 KVM: nVMX: Check HOST_IA32_PERF_GLOBAL_CTRL on VM-entry
In reply to Oliver UptonAdd a consistency check on nested vm-entry for host's IA32_PERF_GLOBAL_CTRL from vmcs12. Per Intel's SDM Vol 3 26.2.2:
If the "load IA32_PERF_GLOBAL_CTRL"
VM-exit control is 1, bits reserved in the IA32_PERF_GLOBAL_CTRL MSR must be 0 in the field for that register"
--- arch/x86/kvm/vmx/nested.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/kvm/vmx/nested.c +6 -0
@@ -2636,6 +2636,7 @@ static int nested_vmx_check_host_state(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) {bool ia32e; +struct kvm_pmu *pmu =vcpu_to_pmu (vcpu); if (!nested_host_cr0_valid(vcpu, vmcs12->host_cr0) || !nested_host_cr4_valid(vcpu, vmcs12->host_cr4) ||
@@ -2650,6 +2651,11 @@ static int nested_vmx_check_host_state(struct kvm_vcpu *vcpu, !kvm_pat_valid(vmcs12->host_ia32_pat))return -EINVAL ; +if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL && + !kvm_is_valid_perf_global_ctrl (pmu, + vmcs12->host_ia32_perf_global_ctrl)) +return -EINVAL ; + ia32e = (vmcs12->vm_exit_controls &VM_EXIT_HOST_ADDR_SPACE_SIZE ) !=0 ;
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [PATCH v4 5/9] KVM: nVMX: Check HOST_IA32_PERF_GLOBAL_CTRL on VM-entry
Quoted 22 lines · Oliver Upton
Add a consistency check on nested vm-entry for host's
IA32_PERF_GLOBAL_CTRLfrom vmcs12. Per Intel's SDM Vol 3 26.2.2:If the "load
IA32_PERF_GLOBAL_CTRL"
VM-exit control is 1, bits reserved in theIA32_PERF_GLOBAL_CTRLMSR must be 0 in the field for that register"Suggested-by Jim Mattson <[email protected]>Co-developed-by Krish Sadhukhan <[email protected]>Signed-off-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>Reviewed-by Jim Mattson <[email protected]>Reviewed-by Peter Shier <[email protected]>--- arch/x86/kvm/vmx/nested.c | 6 ++++++ 1 file changed, 6 insertions(+)arch/x86/kvm/vmx/nested.c +0
-0
arch/x86/kvm/vmx/nested.c static int nested_vmx_check_host_state(struct kvm_vcpu *vcpu, · line 2639
Quoted 4 lines
arch/x86/kvm/vmx/nested.c +1
-0@@ -2636,6 +2636,7 @@ static int nested_vmx_check_host_state(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) {bool ia32e; +struct kvm_pmu *pmu =vcpu_to_pmu (vcpu);
Same nit on the local variable.
Quoted 18 lines
arch/x86/kvm/vmx/nested.c +5
-0if (!nested_host_cr0_valid(vcpu, vmcs12->host_cr0) || !nested_host_cr4_valid(vcpu, vmcs12->host_cr4) ||@@ -2650,6 +2651,11 @@ static int nested_vmx_check_host_state(struct kvm_vcpu *vcpu, !kvm_pat_valid(vmcs12->host_ia32_pat))return -EINVAL ; +if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL && + !kvm_is_valid_perf_global_ctrl (pmu, + vmcs12->host_ia32_perf_global_ctrl)) +return -EINVAL ; + ia32e = (vmcs12->vm_exit_controls &VM_EXIT_HOST_ADDR_SPACE_SIZE ) !=0 ;Signature · 1 line
2.23.0.187.g17f5b7556c-goog
PATCH v4 6/9 KVM: nVMX: Expose load IA32_PERF_GLOBAL_CTRL vm control if supported
In reply to Oliver UptonThe "load IA32_PERF_GLOBAL_CTRL" bit for VM-entry and VM-exit should only be exposed to the guest if IA32_PERF_GLOBAL_CTRL is a valid MSR. Create a new helper to allow pmu_refresh() to update the VM-entry and VM-exit controls to ensure PMU values are initialized when performing the is_valid_msr() check.
--- arch/x86/kvm/vmx/pmu_intel.c | 3 +++ arch/x86/kvm/vmx/vmx.c | 21 +++++++++++++++++++++ arch/x86/kvm/vmx/vmx.h | 1 + 3 files changed, 25 insertions(+)
arch/x86/kvm/vmx/pmu_intel.c +3 -0
@@ -16,6 +16,7 @@#include "cpuid.h" #include "lapic.h" #include "pmu.h" +#include "vmx.h" static struct kvm_event_hw_type_mapping intel_arch_events[] = {/* Index must match CPUID 0x0A.EBX bit vector */
@@ -314,6 +315,8 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) (boot_cpu_has (X86_FEATURE_HLE ) ||boot_cpu_has (X86_FEATURE_RTM )) && (entry->ebx & (X86_FEATURE_HLE|X86_FEATURE_RTM))) pmu->reserved_bits ^= HSW_IN_TX|HSW_IN_TX_CHECKPOINTED; + +nested_vmx_pmu_entry_exit_ctls_update (vcpu); }static void intel_pmu_init (struct kvm_vcpu *vcpu)
arch/x86/kvm/vmx/vmx.c +21 -0
@@ -6417,6 +6417,27 @@ void vmx_update_host_rsp(struct vcpu_vmx *vmx, unsigned long host_rsp) } } +void nested_vmx_pmu_entry_exit_ctls_update (struct kvm_vcpu *vcpu) +{ +struct vcpu_vmx *vmx; + +if (!nested_vmx_allowed (vcpu)) +return ; + + vmx =to_vmx (vcpu); +if (intel_pmu_ops.is_valid_msr (vcpu,MSR_CORE_PERF_GLOBAL_CTRL )) { + vmx->nested.msrs.entry_ctls_high |= +VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ; + vmx->nested.msrs.exit_ctls_high |= +VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ; + }else { + vmx->nested.msrs.entry_ctls_high &= + ~VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ; + vmx->nested.msrs.exit_ctls_high &= + ~VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ; + } +} +bool __vmx_vcpu_run (struct vcpu_vmx *vmx,unsigned long *regs,bool launched);static void vmx_vcpu_run (struct kvm_vcpu *vcpu)
arch/x86/kvm/vmx/vmx.h +1 -0
@@ -331,6 +331,7 @@ void vmx_set_virtual_apic_mode(struct kvm_vcpu *vcpu);struct shared_msr_entry *find_msr_entry (struct vcpu_vmx *vmx,u32 msr);void pt_update_intercept_for_msr (struct vcpu_vmx *vmx);void vmx_update_host_rsp (struct vcpu_vmx *vmx,unsigned long host_rsp); +void nested_vmx_pmu_entry_exit_ctls_update (struct kvm_vcpu *vcpu);#define POSTED_INTR_ON 0#define POSTED_INTR_SN 1
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [PATCH v4 6/9] KVM: nVMX: Expose load IA32_PERF_GLOBAL_CTRL vm control if supported
Quoted 5 lines · Oliver Upton
The "load
IA32_PERF_GLOBAL_CTRL" bit for VM-entry and VM-exit should only be exposed to the guest ifIA32_PERF_GLOBAL_CTRLis a valid MSR. Create a new helper to allowpmu_refresh()to update the VM-entry and VM-exit controls to ensure PMU values are initialized when performing theis_valid_msr()check.
Can you describe how this is functionally correct? At a glance, it looks like KVM already handles PERF_GLOBAL_CTRL, this is just allowing it to be loaded via VMX transitions? Assuming that's true, including such info in the changelog is extremely helpful, e.g. to differentiate between a minor enhancement and a significant addition to what KVM virtualizes.
Quoted 10 lines
Suggested-by Jim Mattson <[email protected]>Co-developed-by Krish Sadhukhan <[email protected]>Signed-off-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>Reviewed-by Jim Mattson <[email protected]>Reviewed-by Peter Shier <[email protected]>--- arch/x86/kvm/vmx/pmu_intel.c | 3 +++ arch/x86/kvm/vmx/vmx.c | 21 +++++++++++++++++++++ arch/x86/kvm/vmx/vmx.h | 1 +
Can the helper be placed in nested.{c.h} instead of vmx.{c,h}?
Quoted 70 lines
3 files changed, 25 insertions(+)arch/x86/kvm/vmx/pmu_intel.c +3
-0@@ -16,6 +16,7 @@#include "cpuid.h" #include "lapic.h" #include "pmu.h" +#include "vmx.h" static struct kvm_event_hw_type_mapping intel_arch_events[] = {/* Index must match CPUID 0x0A.EBX bit vector */ @@ -314,6 +315,8 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) (boot_cpu_has (X86_FEATURE_HLE ) ||boot_cpu_has (X86_FEATURE_RTM )) && (entry->ebx & (X86_FEATURE_HLE|X86_FEATURE_RTM))) pmu->reserved_bits ^= HSW_IN_TX|HSW_IN_TX_CHECKPOINTED; + +nested_vmx_pmu_entry_exit_ctls_update (vcpu); }static void intel_pmu_init (struct kvm_vcpu *vcpu)arch/x86/kvm/vmx/vmx.c +21
-0@@ -6417,6 +6417,27 @@ void vmx_update_host_rsp(struct vcpu_vmx *vmx, unsigned long host_rsp) } } +void nested_vmx_pmu_entry_exit_ctls_update (struct kvm_vcpu *vcpu) +{ +struct vcpu_vmx *vmx; + +if (!nested_vmx_allowed (vcpu)) +return ; + + vmx =to_vmx (vcpu); +if (intel_pmu_ops.is_valid_msr (vcpu,MSR_CORE_PERF_GLOBAL_CTRL )) { + vmx->nested.msrs.entry_ctls_high |= +VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ; + vmx->nested.msrs.exit_ctls_high |= +VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ; + }else { + vmx->nested.msrs.entry_ctls_high &= + ~VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ; + vmx->nested.msrs.exit_ctls_high &= + ~VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ; + } +} +bool __vmx_vcpu_run (struct vcpu_vmx *vmx,unsigned long *regs,bool launched);static void vmx_vcpu_run (struct kvm_vcpu *vcpu)arch/x86/kvm/vmx/vmx.h +1
-0@@ -331,6 +331,7 @@ void vmx_set_virtual_apic_mode(struct kvm_vcpu *vcpu);struct shared_msr_entry *find_msr_entry (struct vcpu_vmx *vmx,u32 msr);void pt_update_intercept_for_msr (struct vcpu_vmx *vmx);void vmx_update_host_rsp (struct vcpu_vmx *vmx,unsigned long host_rsp); +void nested_vmx_pmu_entry_exit_ctls_update (struct kvm_vcpu *vcpu);#define POSTED_INTR_ON 0#define POSTED_INTR_SN 1Signature · 1 line
2.23.0.187.g17f5b7556c-goog
PATCH v4 7/9 vmx: Allow vmx_tests to reset the test_guest_func
In reply to Oliver UptonThe guest state tests are to be grouped together under a single vmx_test, vmx_guest_state_area_test(). However, each sub-test is an independent test that sets up its guest. test_set_guest() only allows a guest function to be set once in the lifetime of a vmx_test.
Add a new helper, vmx_reset_guest(), which the guest state tests may use to set the guest function more than once. Also, this function will reset the VMCS as if running another independent test.
--- x86/vmx.c | 13 +++++++++++++ x86/vmx.h | 1 + x86/vmx_tests.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-)
x86/vmx.c +13 -0
@@ -1772,6 +1772,19 @@ void test_set_guest(test_guest_func func) v2_guest_main = func; } +/* +* Reset the target for the enter_guest call, re-initialize VMCS. For tests +* that wish to run multiple sub-tests under the same vmx_test parent function +*/ +void test_reset_guest (test_guest_func func) +{ +assert (current->v2); +init_vmcs (&(current->vmcs)); + v2_guest_main = func; + launched =0 ; + guest_finished =0 ; +} +static void check_for_guest_termination (void ) {if (is_hypercall ()) {
x86/vmx.h +1 -0
@@ -824,6 +824,7 @@ void enter_guest_with_invalid_guest_state(void);typedef void (*test_guest_func )(void );typedef void (*test_teardown_func )(void *data);void test_set_guest (test_guest_func func); +void test_reset_guest (test_guest_func func);void test_add_teardown (test_teardown_func func,void *data);void test_skip (const char *msg);
x86/vmx_tests.c +1 -1
@@ -6858,7 +6858,7 @@ static void test_pat(u32 field, const char * field_name, u32 ctrl_field,vmcs_clear_bits (ctrl_field, ctrl_bit);if (field ==GUEST_PAT ) {vmx_set_test_stage (1 ); -test_set_guest (guest_state_test_main); +test_reset_guest (guest_state_test_main); }for (i =0 ; i <256 ; i = (i <PAT_VAL_LIMIT ) ? i +1 : i *2 ) {
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [kvm-unit-test PATCH v4 7/9] vmx: Allow vmx_tests to reset the test_guest_func
Quoted 8 lines · Oliver Upton
The guest state tests are to be grouped together under a single
vmx_test,vmx_guest_state_area_test(). However, each sub-test is an independent test that sets up its guest.test_set_guest()only allows a guest function to be set once in the lifetime of avmx_test.Add a new helper,
vmx_reset_guest(), which the guest state tests may use to set the guest function more than once. Also, this function will reset the VMCS as if running another independent test.
The commit header should have "nVMX" instead of "vmx".
Quoted 50 lines
Suggested-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>--- x86/vmx.c | 13 +++++++++++++ x86/vmx.h | 1 + x86/vmx_tests.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-)x86/vmx.c +13
-0@@ -1772,6 +1772,19 @@ void test_set_guest(test_guest_func func) v2_guest_main = func; } +/* +* Reset the target for the enter_guest call, re-initialize VMCS. For tests +* that wish to run multiple sub-tests under the same vmx_test parent function +*/ +void test_reset_guest (test_guest_func func) +{ +assert (current->v2); +init_vmcs (&(current->vmcs)); + v2_guest_main = func; + launched =0 ; + guest_finished =0 ; +} +static void check_for_guest_termination (void ) {if (is_hypercall ()) {x86/vmx.h +1
-0@@ -824,6 +824,7 @@ void enter_guest_with_invalid_guest_state(void);typedef void (*test_guest_func )(void );typedef void (*test_teardown_func )(void *data);void test_set_guest (test_guest_func func); +void test_reset_guest (test_guest_func func);void test_add_teardown (test_teardown_func func,void *data);void test_skip (const char *msg);x86/vmx_tests.c +0
-0
x86/vmx_tests.c static void test_pat(u32 field, const char * field_name, u32 ctrl_field, · line 6864
Quoted 8 lines
x86/vmx_tests.c +1
-1@@ -6858,7 +6858,7 @@ static void test_pat(u32 field, const char * field_name, u32 ctrl_field,vmcs_clear_bits (ctrl_field, ctrl_bit);if (field ==GUEST_PAT ) {vmx_set_test_stage (1 ); -test_set_guest (guest_state_test_main); +test_reset_guest (guest_state_test_main); }for (i =0 ; i <256 ; i = (i <PAT_VAL_LIMIT ) ? i +1 : i *2 ) {
Except the commit header issue,
PATCH v4 8/9 x86: VMX: Make guest_state_test_main() check state from nested VM
In reply to Oliver UptonThe current tests for guest state do not yet check the validity of loaded state from within the nested VM. Introduce the load_state_test_data struct to share data with the nested VM.
--- x86/vmx_tests.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
x86/vmx_tests.c +20 -3
@@ -5017,13 +5017,28 @@ static void test_entry_msr_load(void)test_vmx_valid_controls (false); } +static struct vmx_state_area_test_data { +u32 msr; +u64 exp; +bool enabled; +} vmx_state_area_test_data; +static void guest_state_test_main (void ) { +u64 obs; +struct vmx_state_area_test_data *data = &vmx_state_area_test_data; +while (1 ) { -if (vmx_get_test_stage () !=2 ) -vmcall (); -else +if (vmx_get_test_stage () ==2 )break ; + +if (data->enabled) { + obs =rdmsr (data->msr); +report ("Guest state is 0x%lx (expected 0x%lx)" , + data->exp == obs, obs, data->exp); + } + +vmcall (); } asmvolatile ("fnop" );
@@ -6854,7 +6869,9 @@ static void test_pat(u32 field, const char * field_name, u32 ctrl_field,u64 i, val;u32 j;int error; +struct vmx_state_area_test_data *data = &vmx_state_area_test_data; + data->enabled = false;vmcs_clear_bits (ctrl_field, ctrl_bit);if (field ==GUEST_PAT ) {vmx_set_test_stage (1 );
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [kvm-unit-tests PATCH v4 8/9] x86: VMX: Make guest_state_test_main() check state from nested VM
Quoted 46 lines · Oliver Upton
The current tests for guest state do not yet check the validity of loaded state from within the nested VM. Introduce the
load_state_test_datastruct to share data with the nested VM.Signed-off-by Oliver Upton <[email protected]>--- x86/vmx_tests.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)x86/vmx_tests.c +18
-3@@ -5017,13 +5017,28 @@ static void test_entry_msr_load(void)test_vmx_valid_controls (false); } +static struct vmx_state_area_test_data { +u32 msr; +u64 exp; +bool enabled; +} vmx_state_area_test_data; +static void guest_state_test_main (void ) { +u64 obs; +struct vmx_state_area_test_data *data = &vmx_state_area_test_data; +while (1 ) { -if (vmx_get_test_stage () !=2 ) -vmcall (); -else +if (vmx_get_test_stage () ==2 )break ; + +if (data->enabled) { + obs =rdmsr (data->msr); +report ("Guest state is 0x%lx (expected 0x%lx)" , + data->exp == obs, obs, data->exp); + } + +vmcall (); } asmvolatile ("fnop" );
x86/vmx_tests.c static void test_pat(u32 field, const char * field_name, u32 ctrl_field, · line 6877
Quoted 9 lines
x86/vmx_tests.c +2
-0@@ -6854,7 +6869,9 @@ static void test_pat(u32 field, const char * field_name, u32 ctrl_field,u64 i, val;u32 j;int error; +struct vmx_state_area_test_data *data = &vmx_state_area_test_data; + data->enabled = false;vmcs_clear_bits (ctrl_field, ctrl_bit);if (field ==GUEST_PAT ) {vmx_set_test_stage (1 );
PATCH v4 9/9 x86: VMX: Add tests for nested "load IA32_PERF_GLOBAL_CTRL"
In reply to Oliver UptonTests to verify that KVM performs the correct checks on Host/Guest state at VM-entry, as described in SDM 26.3.1.1 "Checks on Guest Control Registers, Debug Registers, and MSRs" and SDM 26.2.2 "Checks on Host Control Registers and MSRs".
Test that KVM does the following:
If the "load IA32_PERF_GLOBAL_CTRL" VM-entry control is 1, the reserved bits of the IA32_PERF_GLOBAL_CTRL MSR must be 0 in the GUEST_IA32_PERF_GLOBAL_CTRL VMCS field. Otherwise, the VM-entry should fail with an exit reason of "VM-entry failure due to invalid guest state" (33). On a successful VM-entry, the correct value should be observed when the nested VM performs an RDMSR on IA32_PERF_GLOBAL_CTRL.
If the "load IA32_PERF_GLOBAL_CTRL" VM-exit control is 1, the reserved bits of the IA32_PERF_GLOBAL_CTRL MSR must be 0 in the HOST_IA32_PERF_GLOBAL_CTRL VMCS field. Otherwise, the VM-entry should fail with a VM-instruction error of "VM entry with invalid host-state field(s)" (8). On a successful VM-exit, the correct value should be observed when L1 performs an RDMSR on IA32_PERF_GLOBAL_CTRL.
--- x86/vmx_tests.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+)
x86/vmx_tests.c +172 -0
@@ -6854,6 +6854,176 @@ static void test_host_efer(void)test_efer (HOST_EFER ,"HOST_EFER" ,EXI_CONTROLS ,EXI_LOAD_EFER ); } +union cpuidA_eax { +struct { +unsigned int version_id:8 ; +unsigned int num_counters_gp:8 ; +unsigned int bit_width:8 ; +unsigned int mask_length:8 ; + } split; +unsigned int full; +}; + +union cpuidA_edx { +struct { +unsigned int num_counters_fixed:5 ; +unsigned int bit_width_fixed:8 ; +unsigned int reserved:19 ; + } split; +unsigned int full; +}; + +static bool valid_pgc (u64 val) +{ +struct cpuid id; +union cpuidA_eax eax; +union cpuidA_edx edx; +u64 mask; + + id =cpuid (0xA ); + eax.full = id.a; + edx.full = id.d; + mask = ~(((1ull << eax.split.num_counters_gp) -1 ) | + (((1ull << edx.split.num_counters_fixed) -1 ) <<32 )); + +return !(val & mask); +} + +static void test_pgc_vmlaunch (u32 xerror,u32 xreason,bool xfail,bool host) +{ +u32 inst_err; +u64 obs; +bool success; +struct vmx_state_area_test_data *data = &vmx_state_area_test_data; + +if (host) { + success =vmlaunch_succeeds (); + obs =rdmsr (data->msr); +if (!success) { + inst_err =vmcs_read (VMX_INST_ERROR ); +report ("vmlaunch failed, VMX Inst Error is %d (expected %d)" , + xerror == inst_err, inst_err, xerror); + }else { +report ("Host state is 0x%lx (expected 0x%lx)" , + !data->enabled || data->exp == obs, obs, data->exp); +report ("vmlaunch succeeded" , success != xfail); + } + }else { +if (xfail) { +enter_guest_with_invalid_guest_state (); + }else { +enter_guest (); + } +report_guest_state_test ("load GUEST_PERF_GLOBAL_CTRL" , + xreason,GUEST_PERF_GLOBAL_CTRL , +"GUEST_PERF_GLOBAL_CTRL" ); + } +} + +/* +* test_load_perf_global_ctrl is a generic function for testing the +* "load IA32_PERF_GLOBAL_CTRL" VM-{entry,exit} control. This test function +* will test the provided ctrl_val disabled and enabled. +* +* @nr - VMCS field number corresponding to the Host/Guest state field +* @name - Name of the above VMCS field for printing in test report +* @ctrl_nr - VMCS field number corresponding to the VM-{entry,exit} control +* @ctrl_val - Bit to set on the ctrl field. +*/ +static void test_load_perf_global_ctrl (u32 nr,const char *name,u32 ctrl_nr, +const char *ctrl_name,u64 ctrl_val) +{ +u64 ctrl_saved =vmcs_read (ctrl_nr); +u64 pgc_saved =vmcs_read (nr); +u64 i, val; +bool host = nr ==HOST_PERF_GLOBAL_CTRL ; +struct vmx_state_area_test_data *data = &vmx_state_area_test_data; + +if (!host) { +vmx_set_test_stage (1 ); +test_reset_guest (guest_state_test_main); + } + data->msr =MSR_CORE_PERF_GLOBAL_CTRL ; +msr_bmp_init (); +vmcs_write (ctrl_nr, ctrl_saved & ~ctrl_val); + data->enabled = false; +report_prefix_pushf ("\"load IA32_PERF_GLOBAL_CTRL\"=0 on %s" , + ctrl_name); +for (i =0 ; i <64 ; i++) { + val =1ull << i; +vmcs_write (nr, val); +report_prefix_pushf ("%s = 0x%lx" , name, val); +test_pgc_vmlaunch (0 ,VMX_VMCALL , false, host); +report_prefix_pop (); + } +report_prefix_pop (); + +vmcs_write (ctrl_nr, ctrl_saved | ctrl_val); + data->enabled = true; +report_prefix_pushf ("\"load IA32_PERF_GLOBAL_CTRL\"=1 on %s" , + ctrl_name); +for (i =0 ; i <64 ; i++) { + val =1ull << i; + data->exp = val; +vmcs_write (nr, val); +report_prefix_pushf ("%s = 0x%lx" , name, val); +if (valid_pgc (val)) { +test_pgc_vmlaunch (0 ,VMX_VMCALL , false, host); + }else { +if (host) +test_pgc_vmlaunch ( +VMXERR_ENTRY_INVALID_HOST_STATE_FIELD , +0 , + true, host); +else +test_pgc_vmlaunch ( +0 , +VMX_ENTRY_FAILURE |VMX_FAIL_STATE , + true, host); + } +report_prefix_pop (); + } + +report_prefix_pop (); + +if (nr ==GUEST_PERF_GLOBAL_CTRL ) { +/* +* Let the guest finish execution +*/ +vmx_set_test_stage (2 ); +vmcs_write (ctrl_nr, ctrl_saved); +vmcs_write (nr, pgc_saved); +enter_guest (); + } + +vmcs_write (ctrl_nr, ctrl_saved); +vmcs_write (nr, pgc_saved); +} + +static void test_load_host_perf_global_ctrl (void ) +{ +if (!(ctrl_exit_rev.clr &EXI_LOAD_PERF )) { +printf ("\"load IA32_PERF_GLOBAL_CTRL\" " +"exit control not supported\n" ); +return ; + } + +test_load_perf_global_ctrl (HOST_PERF_GLOBAL_CTRL ,"HOST_PERF_GLOBAL_CTRL" , +EXI_CONTROLS ,"EXI_CONTROLS" ,EXI_LOAD_PERF ); +} + + +static void test_load_guest_perf_global_ctrl (void ) +{ +if (!(ctrl_enter_rev.clr &ENT_LOAD_PERF )) { +printf ("\"load IA32_PERF_GLOBAL_CTRL\" " +"entry control not supported\n" ); + } + +test_load_perf_global_ctrl (GUEST_PERF_GLOBAL_CTRL ,"GUEST_PERF_GLOBAL_CTRL" , +ENT_CONTROLS ,"ENT_CONTROLS" ,ENT_LOAD_PERF ); +} +/* * PAT values higher than 8 are uninteresting since they're likely lumped * in with "8". We only test values above 8 one bit at a time,
@@ -7147,6 +7317,7 @@ static void vmx_host_state_area_test(void)test_sysenter_field (HOST_SYSENTER_EIP ,"HOST_SYSENTER_EIP" );test_host_efer (); +test_load_host_perf_global_ctrl ();test_load_host_pat ();test_host_segment_regs ();test_host_desc_tables ();
@@ -7181,6 +7352,7 @@ static void test_load_guest_pat(void)static void vmx_guest_state_area_test (void ) {test_load_guest_pat (); +test_load_guest_perf_global_ctrl (); }static bool valid_vmcs_for_vmentry (void )
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Re: [kvm-unit-tests PATCH v4 9/9] x86: VMX: Add tests for nested "load IA32_PERF_GLOBAL_CTRL"
Quoted 221 lines · Oliver Upton
Tests to verify that KVM performs the correct checks on Host/Guest state at VM-entry, as described in SDM 26.3.1.1 "Checks on Guest Control Registers, Debug Registers, and MSRs" and SDM 26.2.2 "Checks on Host Control Registers and MSRs".
Test that KVM does the following:
If the "load
IA32_PERF_GLOBAL_CTRL" VM-entry control is 1, the reserved bits of theIA32_PERF_GLOBAL_CTRLMSR must be 0 in theGUEST_IA32_PERF_GLOBAL_CTRLVMCS field. Otherwise, the VM-entry should fail with an exit reason of "VM-entry failure due to invalid guest state" (33). On a successful VM-entry, the correct value should be observed when the nested VM performs an RDMSR onIA32_PERF_GLOBAL_CTRL.If the "load
IA32_PERF_GLOBAL_CTRL" VM-exit control is 1, the reserved bits of theIA32_PERF_GLOBAL_CTRLMSR must be 0 in theHOST_IA32_PERF_GLOBAL_CTRLVMCS field. Otherwise, the VM-entry should fail with a VM-instruction error of "VM entry with invalid host-state field(s)" (8). On a successful VM-exit, the correct value should be observed when L1 performs an RDMSR onIA32_PERF_GLOBAL_CTRL.Suggested-by Jim Mattson <[email protected]>Co-developed-by Krish Sadhukhan <[email protected]>Signed-off-by Krish Sadhukhan <[email protected]>Signed-off-by Oliver Upton <[email protected]>--- x86/vmx_tests.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+)x86/vmx_tests.c +171
-0@@ -6854,6 +6854,176 @@ static void test_host_efer(void)test_efer (HOST_EFER ,"HOST_EFER" ,EXI_CONTROLS ,EXI_LOAD_EFER ); } +union cpuidA_eax { +struct { +unsigned int version_id:8 ; +unsigned int num_counters_gp:8 ; +unsigned int bit_width:8 ; +unsigned int mask_length:8 ; + } split; +unsigned int full; +}; + +union cpuidA_edx { +struct { +unsigned int num_counters_fixed:5 ; +unsigned int bit_width_fixed:8 ; +unsigned int reserved:19 ; + } split; +unsigned int full; +}; + +static bool valid_pgc (u64 val) +{ +struct cpuid id; +union cpuidA_eax eax; +union cpuidA_edx edx; +u64 mask; + + id =cpuid (0xA ); + eax.full = id.a; + edx.full = id.d; + mask = ~(((1ull << eax.split.num_counters_gp) -1 ) | + (((1ull << edx.split.num_counters_fixed) -1 ) <<32 )); + +return !(val & mask); +} + +static void test_pgc_vmlaunch (u32 xerror,u32 xreason,bool xfail,bool host) +{ +u32 inst_err; +u64 obs; +bool success; +struct vmx_state_area_test_data *data = &vmx_state_area_test_data; + +if (host) { + success =vmlaunch_succeeds (); + obs =rdmsr (data->msr); +if (!success) { + inst_err =vmcs_read (VMX_INST_ERROR ); +report ("vmlaunch failed, VMX Inst Error is %d (expected %d)" , + xerror == inst_err, inst_err, xerror); + }else { +report ("Host state is 0x%lx (expected 0x%lx)" , + !data->enabled || data->exp == obs, obs, data->exp); +report ("vmlaunch succeeded" , success != xfail); + } + }else { +if (xfail) { +enter_guest_with_invalid_guest_state (); + }else { +enter_guest (); + } +report_guest_state_test ("load GUEST_PERF_GLOBAL_CTRL" , + xreason,GUEST_PERF_GLOBAL_CTRL , +"GUEST_PERF_GLOBAL_CTRL" ); + } +} + +/* +* test_load_perf_global_ctrl is a generic function for testing the +* "load IA32_PERF_GLOBAL_CTRL" VM-{entry,exit} control. This test function +* will test the provided ctrl_val disabled and enabled. +* +* @nr - VMCS field number corresponding to the Host/Guest state field +* @name - Name of the above VMCS field for printing in test report +* @ctrl_nr - VMCS field number corresponding to the VM-{entry,exit} control +* @ctrl_val - Bit to set on the ctrl field. +*/ +static void test_load_perf_global_ctrl (u32 nr,const char *name,u32 ctrl_nr, +const char *ctrl_name,u64 ctrl_val) +{ +u64 ctrl_saved =vmcs_read (ctrl_nr); +u64 pgc_saved =vmcs_read (nr); +u64 i, val; +bool host = nr ==HOST_PERF_GLOBAL_CTRL ; +struct vmx_state_area_test_data *data = &vmx_state_area_test_data; + +if (!host) { +vmx_set_test_stage (1 ); +test_reset_guest (guest_state_test_main); + } + data->msr =MSR_CORE_PERF_GLOBAL_CTRL ; +msr_bmp_init (); +vmcs_write (ctrl_nr, ctrl_saved & ~ctrl_val); + data->enabled = false; +report_prefix_pushf ("\"load IA32_PERF_GLOBAL_CTRL\"=0 on %s" , + ctrl_name); +for (i =0 ; i <64 ; i++) { + val =1ull << i; +vmcs_write (nr, val); +report_prefix_pushf ("%s = 0x%lx" , name, val); +test_pgc_vmlaunch (0 ,VMX_VMCALL , false, host); +report_prefix_pop (); + } +report_prefix_pop (); + +vmcs_write (ctrl_nr, ctrl_saved | ctrl_val); + data->enabled = true; +report_prefix_pushf ("\"load IA32_PERF_GLOBAL_CTRL\"=1 on %s" , + ctrl_name); +for (i =0 ; i <64 ; i++) { + val =1ull << i; + data->exp = val; +vmcs_write (nr, val); +report_prefix_pushf ("%s = 0x%lx" , name, val); +if (valid_pgc (val)) { +test_pgc_vmlaunch (0 ,VMX_VMCALL , false, host); + }else { +if (host) +test_pgc_vmlaunch ( +VMXERR_ENTRY_INVALID_HOST_STATE_FIELD , +0 , + true, host); +else +test_pgc_vmlaunch ( +0 , +VMX_ENTRY_FAILURE |VMX_FAIL_STATE , + true, host); + } +report_prefix_pop (); + } + +report_prefix_pop (); + +if (nr ==GUEST_PERF_GLOBAL_CTRL ) { +/* +* Let the guest finish execution +*/ +vmx_set_test_stage (2 ); +vmcs_write (ctrl_nr, ctrl_saved); +vmcs_write (nr, pgc_saved); +enter_guest (); + } + +vmcs_write (ctrl_nr, ctrl_saved); +vmcs_write (nr, pgc_saved); +} + +static void test_load_host_perf_global_ctrl (void ) +{ +if (!(ctrl_exit_rev.clr &EXI_LOAD_PERF )) { +printf ("\"load IA32_PERF_GLOBAL_CTRL\" " +"exit control not supported\n" ); +return ; + } + +test_load_perf_global_ctrl (HOST_PERF_GLOBAL_CTRL ,"HOST_PERF_GLOBAL_CTRL" , +EXI_CONTROLS ,"EXI_CONTROLS" ,EXI_LOAD_PERF ); +} + + +static void test_load_guest_perf_global_ctrl (void ) +{ +if (!(ctrl_enter_rev.clr &ENT_LOAD_PERF )) { +printf ("\"load IA32_PERF_GLOBAL_CTRL\" " +"entry control not supported\n" ); + } + +test_load_perf_global_ctrl (GUEST_PERF_GLOBAL_CTRL ,"GUEST_PERF_GLOBAL_CTRL" , +ENT_CONTROLS ,"ENT_CONTROLS" ,ENT_LOAD_PERF ); +} +/* * PAT values higher than 8 are uninteresting since they're likely lumped * in with "8". We only test values above 8 one bit at a time, @@ -7147,6 +7317,7 @@ static void vmx_host_state_area_test(void)test_sysenter_field (HOST_SYSENTER_EIP ,"HOST_SYSENTER_EIP" );test_host_efer (); +test_load_host_perf_global_ctrl ();test_load_host_pat ();test_host_segment_regs ();test_host_desc_tables ();
x86/vmx_tests.c static void test_load_guest_pat(void) · line 7358
Quoted 7 lines
x86/vmx_tests.c +1
-0@@ -7181,6 +7352,7 @@ static void test_load_guest_pat(void)static void vmx_guest_state_area_test (void ) {test_load_guest_pat (); +test_load_guest_perf_global_ctrl (); }static bool valid_vmcs_for_vmentry (void )