KVM: nVMX: Handle split-lock #AC exceptions that happen in L2
Sean Christopherson
maintainerPATCH 1/1 KVM: nVMX: Handle split-lock #AC exceptions that happen in L2
Mark #ACs that won't be reinjected to the guest as wanted by L0 so that KVM handles split-lock #AC from L2 instead of forwarding the exception to L1. Split-lock #AC isn't yet virtualized, i.e. L1 will treat it like a regular #AC and do the wrong thing, e.g. reinject it into L2.
--- arch/x86/kvm/vmx/nested.c | 3 +++ arch/x86/kvm/vmx/vmcs.h | 5 +++++ arch/x86/kvm/vmx/vmx.c | 4 ++-- arch/x86/kvm/vmx/vmx.h | 1 + 4 files changed, 11 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/nested.c +3 -0
@@ -5833,6 +5833,9 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu,else if (is_breakpoint (intr_info) && vcpu->guest_debug &KVM_GUESTDBG_USE_SW_BP )return true; +else if (is_alignment_check (intr_info) && + !vmx_guest_inject_ac (vcpu)) +return true;return false;case EXIT_REASON_EXTERNAL_INTERRUPT :return true;
arch/x86/kvm/vmx/vmcs.h +5 -0
@@ -117,6 +117,11 @@ static inline bool is_gp_fault(u32 intr_info)return is_exception_n (intr_info,GP_VECTOR ); } +static inline bool is_alignment_check (u32 intr_info) +{ +return is_exception_n (intr_info,AC_VECTOR ); +} +static inline bool is_machine_check (u32 intr_info) {return is_exception_n (intr_info,MC_VECTOR );
arch/x86/kvm/vmx/vmx.c +2 -2
@@ -4743,7 +4743,7 @@ static int handle_machine_check(struct kvm_vcpu *vcpu)* - Guest has #AC detection enabled in CR0 * - Guest EFLAGS has AC bit set */ -static inline bool guest_inject_ac (struct kvm_vcpu *vcpu) +bool vmx_guest_inject_ac (struct kvm_vcpu *vcpu) {if (!boot_cpu_has (X86_FEATURE_SPLIT_LOCK_DETECT ))return true;
@@ -4851,7 +4851,7 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu) kvm_run->debug.arch.exception = ex_no;break ;case AC_VECTOR : -if (guest_inject_ac (vcpu)) { +if (vmx_guest_inject_ac (vcpu)) {kvm_queue_exception_e (vcpu,AC_VECTOR , error_code);return 1 ; }
arch/x86/kvm/vmx/vmx.h +1 -0
@@ -376,6 +376,7 @@ void vmx_get_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg);void vmx_set_segment (struct kvm_vcpu *vcpu,struct kvm_segment *var,int seg);u64 construct_eptp (struct kvm_vcpu *vcpu,hpa_t root_hpa,int root_level); +bool vmx_guest_inject_ac (struct kvm_vcpu *vcpu);void vmx_update_exception_bitmap (struct kvm_vcpu *vcpu);void vmx_update_msr_bitmap (struct kvm_vcpu *vcpu);bool vmx_nmi_blocked (struct kvm_vcpu *vcpu);
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Quoted 20 lines · Sean Christopherson
Mark #ACs that won't be reinjected to the guest as wanted by L0 so that KVM handles split-lock #AC from L2 instead of forwarding the exception to L1. Split-lock #AC isn't yet virtualized, i.e. L1 will treat it like a regular #AC and do the wrong thing, e.g. reinject it into L2.
Fixes e6f8b6c12f03 ("KVM: VMX: Extend VMXs #AC interceptor to handle split lock #AC in guest")Cc Xiaoyao Li <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/vmx/nested.c | 3 +++ arch/x86/kvm/vmx/vmcs.h | 5 +++++ arch/x86/kvm/vmx/vmx.c | 4 ++-- arch/x86/kvm/vmx/vmx.h | 1 + 4 files changed, 11 insertions(+), 2 deletions(-)arch/x86/kvm/vmx/nested.c +0
-0
arch/x86/kvm/vmx/nested.c static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu, · line 5838
Quoted 6 lines
arch/x86/kvm/vmx/nested.c +3
-0@@ -5833,6 +5833,9 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu,else if (is_breakpoint (intr_info) && vcpu->guest_debug &KVM_GUESTDBG_USE_SW_BP )return true; +else if (is_alignment_check (intr_info) && + !vmx_guest_inject_ac (vcpu)) +return true;
Why choose to check in nested_vmx_l0_wants_exit, not in nested_vmx_l1_wants_exit()?
Quoted 3 lines
arch/x86/kvm/vmx/nested.c +0
-0return false;case EXIT_REASON_EXTERNAL_INTERRUPT :return true;
Paolo Bonzini
maintainerQuoted 6 lines · Xiaoyao Li
Quoted 4 lines
+ else if (
is_alignment_check(intr_info)&& + !vmx_guest_inject_ac(vcpu)) + return true;Why choose to check in
nested_vmx_l0_wants_exit, not innested_vmx_l1_wants_exit()?
nested_vmx_l0_wants_exit() == true means "this is a vmexit that needs some transformation before being injected into L1". Instead, nested_vmx_l1_wants_exit() == true means "this is an event that should either be processed directly by L0, or cause a vmexit in L1"
Typically, nested_vmx_l1_wants_exit() checks the controls in vmcs12, while nested_vmx_l0_wants_exit() returns true unconditionally for most vmexits; for others it checks processor state, or other state set up by userspace with ioctls such as vcpu->guest_debug.
In this case it's *L0* that wants that vmexit, in order to either disable split-lock detection or inject a SIGBUS, so nested_vmx_l0_wants_exit() is the right one to test.
Paolo
Quoted 73 lines · Sean Christopherson
Mark #ACs that won't be reinjected to the guest as wanted by L0 so that KVM handles split-lock #AC from L2 instead of forwarding the exception to L1. Split-lock #AC isn't yet virtualized, i.e. L1 will treat it like a regular #AC and do the wrong thing, e.g. reinject it into L2.
Fixes e6f8b6c12f03 ("KVM: VMX: Extend VMXs #AC interceptor to handle split lock #AC in guest")Cc Xiaoyao Li <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/vmx/nested.c | 3 +++ arch/x86/kvm/vmx/vmcs.h | 5 +++++ arch/x86/kvm/vmx/vmx.c | 4 ++-- arch/x86/kvm/vmx/vmx.h | 1 + 4 files changed, 11 insertions(+), 2 deletions(-)arch/x86/kvm/vmx/nested.c +3
-0@@ -5833,6 +5833,9 @@ static bool nested_vmx_l0_wants_exit(struct kvm_vcpu *vcpu,else if (is_breakpoint (intr_info) && vcpu->guest_debug &KVM_GUESTDBG_USE_SW_BP )return true; +else if (is_alignment_check (intr_info) && + !vmx_guest_inject_ac (vcpu)) +return true;return false;case EXIT_REASON_EXTERNAL_INTERRUPT :return true;arch/x86/kvm/vmx/vmcs.h +5
-0@@ -117,6 +117,11 @@ static inline bool is_gp_fault(u32 intr_info)return is_exception_n (intr_info,GP_VECTOR ); } +static inline bool is_alignment_check (u32 intr_info) +{ +return is_exception_n (intr_info,AC_VECTOR ); +} +static inline bool is_machine_check (u32 intr_info) {return is_exception_n (intr_info,MC_VECTOR );arch/x86/kvm/vmx/vmx.c +2
-2@@ -4743,7 +4743,7 @@ static int handle_machine_check(struct kvm_vcpu *vcpu)* - Guest has #AC detection enabled in CR0 * - Guest EFLAGS has AC bit set */ -static inline bool guest_inject_ac (struct kvm_vcpu *vcpu) +bool vmx_guest_inject_ac (struct kvm_vcpu *vcpu) {if (!boot_cpu_has (X86_FEATURE_SPLIT_LOCK_DETECT ))return true;@@ -4851,7 +4851,7 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu) kvm_run->debug.arch.exception = ex_no;break ;case AC_VECTOR : -if (guest_inject_ac (vcpu)) { +if (vmx_guest_inject_ac (vcpu)) {kvm_queue_exception_e (vcpu,AC_VECTOR , error_code);return 1 ; }arch/x86/kvm/vmx/vmx.h +0
-0
arch/x86/kvm/vmx/vmx.h void vmx_get_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg); · line 382
Quoted 7 lines
arch/x86/kvm/vmx/vmx.h +1
-0@@ -376,6 +376,7 @@ void vmx_get_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg);void vmx_set_segment (struct kvm_vcpu *vcpu,struct kvm_segment *var,int seg);u64 construct_eptp (struct kvm_vcpu *vcpu,hpa_t root_hpa,int root_level); +bool vmx_guest_inject_ac (struct kvm_vcpu *vcpu);void vmx_update_exception_bitmap (struct kvm_vcpu *vcpu);void vmx_update_msr_bitmap (struct kvm_vcpu *vcpu);bool vmx_nmi_blocked (struct kvm_vcpu *vcpu);
Queued with Cc to stable, thanks.
Paolo