KVM: VMX: Unionize vcpu_vmx.exit_reason
v3 cover KVM: VMX: Unionize vcpu_vmx.exit_reason
Minor fixup patch for a mishandled conflict between the vmcs.INTR_INFO caching series and the union series, plus the actual unionization patch rebased onto kvm/queue, commit 604e8bba0dc5 ("KVM: Remove redundant ...").
Sean Christopherson (2):
KVM: nVMX: Drop a redundant call to vmx_get_intr_info()
KVM: VMX: Convert vcpu_vmx.exit_reason to a union
arch/x86/kvm/vmx/nested.c | 39 ++++++++++++++--------- arch/x86/kvm/vmx/vmx.c | 65 ++++++++++++++++++++------------------- arch/x86/kvm/vmx/vmx.h | 25 ++++++++++++++- 3 files changed, 83 insertions(+), 46 deletions(-)
Signature · 1 line
2.26.0
PATCH v3 1/2 KVM: nVMX: Drop a redundant call to vmx_get_intr_info()
Drop nested_vmx_l1_wants_exit()'s initialization of intr_info from vmx_get_intr_info() that was inadvertantly introduced along with the caching mechanism. EXIT_REASON_EXCEPTION_NMI, the only consumer of intr_info, populates the variable before using it.
--- arch/x86/kvm/vmx/nested.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/vmx/nested.c +1 -1
@@ -5691,8 +5691,8 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu, u32 exit_reason)*/ static bool nested_vmx_l1_wants_exit (struct kvm_vcpu *vcpu,u32 exit_reason) { -u32 intr_info =vmx_get_intr_info (vcpu);struct vmcs12 *vmcs12 =get_vmcs12 (vcpu); +u32 intr_info;switch (exit_reason) {case EXIT_REASON_EXCEPTION_NMI :
Signature · 1 line
2.26.0
PATCH v3 2/2 KVM: VMX: Convert vcpu_vmx.exit_reason to a union
In reply to Sean ChristophersonConvert vcpu_vmx.exit_reason from a u32 to a union (of size u32). The full VM_EXIT_REASON field is comprised of a 16-bit basic exit reason in bits 15:0, and single-bit modifiers in bits 31:16.
Historically, KVM has only had to worry about handling the "failed VM-Entry" modifier, which could only be set in very specific flows and required dedicated handling. I.e. manually stripping the FAILED_VMENTRY bit was a somewhat viable approach. But even with only a single bit to worry about, KVM has had several bugs related to comparing a basic exit reason against the full exit reason store in vcpu_vmx.
Upcoming Intel features, e.g. SGX, will add new modifier bits that can be set on more or less any VM-Exit, as opposed to the significantly more restricted FAILED_VMENTRY, i.e. correctly handling everything in one-off flows isn't scalable. Tracking exit reason in a union forces code to explicitly choose between consuming the full exit reason and the basic exit, and is a convenient way to document and access the modifiers.
No functional change intended.
--- arch/x86/kvm/vmx/nested.c | 37 ++++++++++++++-------- arch/x86/kvm/vmx/vmx.c | 65 ++++++++++++++++++++------------------- arch/x86/kvm/vmx/vmx.h | 25 ++++++++++++++- 3 files changed, 82 insertions(+), 45 deletions(-)
arch/x86/kvm/vmx/nested.c +24 -13
@@ -3247,7 +3247,10 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,struct vcpu_vmx *vmx =to_vmx (vcpu);struct vmcs12 *vmcs12 =get_vmcs12 (vcpu);bool evaluate_pending_interrupts; -u32 exit_reason =EXIT_REASON_INVALID_STATE ; +union vmx_exit_reason exit_reason = { + .basic =EXIT_REASON_INVALID_STATE , + .failed_vmentry =1 , + };u32 exit_qual;if (kvm_check_request (KVM_REQ_TLB_FLUSH_CURRENT , vcpu))
@@ -3308,7 +3311,7 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, goto vmentry_fail_vmexit_guest_mode;if (from_vmentry) { - exit_reason =EXIT_REASON_MSR_LOAD_FAIL ; + exit_reason.basic =EXIT_REASON_MSR_LOAD_FAIL ; exit_qual =nested_vmx_load_msr (vcpu, vmcs12->vm_entry_msr_load_addr, vmcs12->vm_entry_msr_load_count);
@@ -3376,7 +3379,7 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,return NVMX_VMENTRY_VMEXIT ;load_vmcs12_host_state (vcpu, vmcs12); - vmcs12->vm_exit_reason = exit_reason |VMX_EXIT_REASONS_FAILED_VMENTRY ; + vmcs12->vm_exit_reason = exit_reason.full; vmcs12->exit_qualification = exit_qual;if (enable_shadow_vmcs || vmx->nested.hv_evmcs) vmx->nested.need_vmcs12_to_shadow_sync = true;
@@ -5410,7 +5413,12 @@ static int handle_vmfunc(struct kvm_vcpu *vcpu)return kvm_skip_emulated_instruction (vcpu); fail: -nested_vmx_vmexit (vcpu, vmx->exit_reason, +/* +* This is effectively a reflected VM-Exit, as opposed to a synthesized +* nested VM-Exit. Pass the original exit reason, i.e. don't hardcode +* EXIT_REASON_VMFUNC as the exit reason. +*/ +nested_vmx_vmexit (vcpu, vmx->exit_reason.full,vmx_get_intr_info (vcpu),vmx_get_exit_qual (vcpu));return 1 ;
@@ -5478,7 +5486,8 @@ static bool nested_vmx_exit_handled_io(struct kvm_vcpu *vcpu,* MSR bitmap. This may be the case even when L0 doesn't use MSR bitmaps. */ static bool nested_vmx_exit_handled_msr (struct kvm_vcpu *vcpu, -struct vmcs12 *vmcs12,u32 exit_reason) +struct vmcs12 *vmcs12, +union vmx_exit_reason exit_reason) {u32 msr_index =kvm_rcx_read (vcpu);gpa_t bitmap;
@@ -5492,7 +5501,7 @@ static bool nested_vmx_exit_handled_msr(struct kvm_vcpu *vcpu,* First we need to figure out which of the four to use: */ bitmap = vmcs12->msr_bitmap; -if (exit_reason ==EXIT_REASON_MSR_WRITE ) +if (exit_reason.basic ==EXIT_REASON_MSR_WRITE ) bitmap +=2048 ;if (msr_index >=0xc0000000 ) { msr_index -=0xc0000000 ;
@@ -5629,11 +5638,12 @@ static bool nested_vmx_exit_handled_mtf(struct vmcs12 *vmcs12)* Return true if L0 wants to handle an exit from L2 regardless of whether or not * L1 wants the exit. Only call this when in is_guest_mode (L2). */ -static bool nested_vmx_l0_wants_exit (struct kvm_vcpu *vcpu,u32 exit_reason) +static bool nested_vmx_l0_wants_exit (struct kvm_vcpu *vcpu, +union vmx_exit_reason exit_reason) {u32 intr_info; -switch (exit_reason) { +switch (exit_reason.basic) {case EXIT_REASON_EXCEPTION_NMI : intr_info =vmx_get_intr_info (vcpu);if (is_nmi (intr_info))
@@ -5689,12 +5699,13 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu, u32 exit_reason)* Return 1 if L1 wants to intercept an exit from L2. Only call this when in * is_guest_mode (L2). */ -static bool nested_vmx_l1_wants_exit (struct kvm_vcpu *vcpu,u32 exit_reason) +static bool nested_vmx_l1_wants_exit (struct kvm_vcpu *vcpu, +union vmx_exit_reason exit_reason) {struct vmcs12 *vmcs12 =get_vmcs12 (vcpu);u32 intr_info; -switch (exit_reason) { +switch (exit_reason.basic) {case EXIT_REASON_EXCEPTION_NMI : intr_info =vmx_get_intr_info (vcpu);if (is_nmi (intr_info))
@@ -5813,7 +5824,7 @@ static bool nested_vmx_l1_wants_exit(struct kvm_vcpu *vcpu, u32 exit_reason)bool nested_vmx_reflect_vmexit (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu); -u32 exit_reason = vmx->exit_reason; +union vmx_exit_reason exit_reason = vmx->exit_reason;u32 exit_intr_info, exit_qual;WARN_ON_ONCE (vmx->nested.nested_run_pending);
@@ -5834,7 +5845,7 @@ bool nested_vmx_reflect_vmexit(struct kvm_vcpu *vcpu) exit_intr_info =vmx_get_intr_info (vcpu); exit_qual =vmx_get_exit_qual (vcpu); -trace_kvm_nested_vmexit (kvm_rip_read (vcpu), exit_reason, exit_qual, +trace_kvm_nested_vmexit (kvm_rip_read (vcpu), exit_reason.full, exit_qual, vmx->idt_vectoring_info, exit_intr_info,vmcs_read32 (VM_EXIT_INTR_ERROR_CODE ),KVM_ISA_VMX );
@@ -5863,7 +5874,7 @@ bool nested_vmx_reflect_vmexit(struct kvm_vcpu *vcpu) } reflect_vmexit: -nested_vmx_vmexit (vcpu, exit_reason, exit_intr_info, exit_qual); +nested_vmx_vmexit (vcpu, exit_reason.full, exit_intr_info, exit_qual);return true; }
arch/x86/kvm/vmx/vmx.c +34 -31
144 lines not on this page · raw message
arch/x86/kvm/vmx/vmx.h +24 -1
@@ -91,6 +91,29 @@ struct pt_desc {struct pt_ctx guest; }; +union vmx_exit_reason { +struct { +u32 basic :16 ; +u32 reserved16 :1 ; +u32 reserved17 :1 ; +u32 reserved18 :1 ; +u32 reserved19 :1 ; +u32 reserved20 :1 ; +u32 reserved21 :1 ; +u32 reserved22 :1 ; +u32 reserved23 :1 ; +u32 reserved24 :1 ; +u32 reserved25 :1 ; +u32 reserved26 :1 ; +u32 enclave_mode :1 ; +u32 smi_pending_mtf :1 ; +u32 smi_from_vmx_root :1 ; +u32 reserved30 :1 ; +u32 failed_vmentry :1 ; + }; +u32 full; +}; +/* * The nested_vmx structure is part of vcpu_vmx, and holds information we need * for correct emulation of VMX (i.e., nested VMX) on this vcpu.
@@ -263,7 +286,7 @@ struct vcpu_vmx {int vpid;bool emulation_required; -u32 exit_reason; +union vmx_exit_reason exit_reason;/* Posted interrupt descriptor */ struct pi_desc pi_desc;
Signature · 1 line
2.26.0
Paolo Bonzini
maintainerQuoted 4 lines · Sean Christopherson
Minor fixup patch for a mishandled conflict between the vmcs.INTR_INFO caching series and the union series, plus the actual unionization patch rebased onto kvm/queue, commit
604e8bba0dc5("KVM: Remove redundant ...").
Quoted 9 lines
Sean Christopherson (2):
KVM: nVMX: Drop a redundant call tovmx_get_intr_info()
KVM: VMX: Convert vcpu_vmx.exit_reason to a unionarch/x86/kvm/vmx/nested.c | 39 ++++++++++++++--------- arch/x86/kvm/vmx/vmx.c | 65 ++++++++++++++++++++------------------- arch/x86/kvm/vmx/vmx.h | 25 ++++++++++++++- 3 files changed, 83 insertions(+), 46 deletions(-)
Thanks, I queued patch 1. I am not too enthusiastic about patch 2, but when SGX comes around it may be a better idea.
Paolo
Quoted 9 lines · Paolo Bonzini
Quoted 8 lines · Sean Christopherson
Minor fixup patch for a mishandled conflict between the vmcs.INTR_INFO caching series and the union series, plus the actual unionization patch rebased onto kvm/queue, commit
604e8bba0dc5("KVM: Remove redundant ...").Sean Christopherson (2):
KVM: nVMX: Drop a redundant call tovmx_get_intr_info()
KVM: VMX: Convert vcpu_vmx.exit_reason to a union
Quoted 8 lines
Quoted 5 lines
arch/x86/kvm/vmx/nested.c | 39 ++++++++++++++--------- arch/x86/kvm/vmx/vmx.c | 65 ++++++++++++++++++++------------------- arch/x86/kvm/vmx/vmx.h | 25 ++++++++++++++- 3 files changed, 83 insertions(+), 46 deletions(-)Thanks, I queued patch 1. I am not too enthusiastic about patch 2, but when SGX comes around it may be a better idea.
And maybe it'll grow on you by the time I figure out how to send a pull request ;-).