KVM: VMX: Remove redundant handling of bus lock vmexit
PATCH v2 1/1 KVM: VMX: Remove redundant handling of bus lock vmexit
Hardware may or may not set exit_reason.bus_lock_detected on BUS_LOCK VM-Exits. Dealing with KVM_RUN_X86_BUS_LOCK in handle_bus_lock_vmexit could be redundant when exit_reason.basic is EXIT_REASON_BUS_LOCK.
We can remove redundant handling of bus lock vmexit. Force Setting exit_reason.bus_lock_detected in handle_bus_lock_vmexit(), and deal with KVM_RUN_X86_BUS_LOCK only in vmx_handle_exit().
---
v1 -> v2: a little modifications of comments
arch/x86/kvm/vmx/vmx.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
arch/x86/kvm/vmx/vmx.c +9 -6
@@ -5562,9 +5562,13 @@ static int handle_encls(struct kvm_vcpu *vcpu)static int handle_bus_lock_vmexit (struct kvm_vcpu *vcpu) { - vcpu->run->exit_reason =KVM_EXIT_X86_BUS_LOCK ; - vcpu->run->flags |=KVM_RUN_X86_BUS_LOCK ; -return 0 ; +/* +* Hardware may or may not set the BUS_LOCK_DETECTED flag on BUS_LOCK +* VM-Exits, force setting the flag so that the logic in vmx_handle_exit() +* doesn't have to handle the flag and the basic exit reason. +*/ +to_vmx (vcpu)->exit_reason.bus_lock_detected = true; +return 1 ; }/*
@@ -6051,9 +6055,8 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)int ret =__vmx_handle_exit (vcpu, exit_fastpath);/* -* Even when current exit reason is handled by KVM internally, we -* still need to exit to user space when bus lock detected to inform -* that there is a bus lock in guest. +* Exit to user space when bus lock detected to inform that there is +* a bus lock in guest. */ if (to_vmx (vcpu)->exit_reason.bus_lock_detected) {if (ret >0 )
Signature · 1 line
1.8.3.1
Quoted 23 lines · Hao Xiang
Hardware may or may not set exit_reason.bus_lock_detected on
BUS_LOCKVM-Exits. Dealing withKVM_RUN_X86_BUS_LOCKinhandle_bus_lock_vmexitcould be redundant when exit_reason.basic isEXIT_REASON_BUS_LOCK.We can remove redundant handling of bus lock vmexit. Force Setting exit_reason.bus_lock_detected in
handle_bus_lock_vmexit(), and deal withKVM_RUN_X86_BUS_LOCKonly invmx_handle_exit().Suggested-by Sean Christopherson <[email protected]>Signed-off-by Hao Xiang <[email protected]>---
v1 -> v2: a little modifications of commentsarch/x86/kvm/vmx/vmx.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)arch/x86/kvm/vmx/vmx.c +0
-0@@ -5562,9 +5562,13 @@ static int handle_encls(struct kvm_vcpu *vcpu)static int handle_bus_lock_vmexit (struct kvm_vcpu *vcpu)
arch/x86/kvm/vmx/vmx.c static int handle_encls(struct kvm_vcpu *vcpu) · line 5570
Quoted 10 lines
arch/x86/kvm/vmx/vmx.c +4
-3{ - vcpu->run->exit_reason =KVM_EXIT_X86_BUS_LOCK ; - vcpu->run->flags |=KVM_RUN_X86_BUS_LOCK ; -return 0 ; +/* +* Hardware may or may not set the BUS_LOCK_DETECTED flag on BUS_LOCK +* VM-Exits, force setting the flag so that the logic in vmx_handle_exit() +* doesn't have to handle the flag and the basic exit reason.
The code itself looks good.
But the comment is partly incorrect. Now we rely only on the bus_lock_detected flag so vmx_handle_exit() must check the flag.
Quoted 19 lines
arch/x86/kvm/vmx/vmx.c +3
-0+*/ +to_vmx (vcpu)->exit_reason.bus_lock_detected = true; +return 1 ; }/*
arch/x86/kvm/vmx/vmx.c +2
-3@@ -6051,9 +6055,8 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)int ret =__vmx_handle_exit (vcpu, exit_fastpath);/* -* Even when current exit reason is handled by KVM internally, we -* still need to exit to user space when bus lock detected to inform -* that there is a bus lock in guest. +* Exit to user space when bus lock detected to inform that there is +* a bus lock in guest. */ if (to_vmx (vcpu)->exit_reason.bus_lock_detected) {if (ret >0 )
Quoted 32 lines · Xiaoyao Li
Quoted 30 lines · Hao Xiang
Hardware may or may not set exit_reason.bus_lock_detected on
BUS_LOCKVM-Exits. Dealing withKVM_RUN_X86_BUS_LOCKinhandle_bus_lock_vmexitcould be redundant when exit_reason.basic isEXIT_REASON_BUS_LOCK.We can remove redundant handling of bus lock vmexit. Force Setting exit_reason.bus_lock_detected in
handle_bus_lock_vmexit(), and deal withKVM_RUN_X86_BUS_LOCKonly invmx_handle_exit().Suggested-by Sean Christopherson <[email protected]>Signed-off-by Hao Xiang <[email protected]>---
v1 -> v2: a little modifications of comments
arch/x86/kvm/vmx/vmx.c| 15 +++++++++------1 file changed, 9 insertions(+), 6 deletions(-)arch/x86/kvm/vmx/vmx.c +2
-3@@ -5562,9 +5562,13 @@ static int handle_encls(struct kvm_vcpu *vcpu) static int handle_bus_lock_vmexit(struct kvm_vcpu *vcpu) { - vcpu->run->exit_reason = KVM_EXIT_X86_BUS_LOCK; - vcpu->run->flags |= KVM_RUN_X86_BUS_LOCK; - return 0; + /* +* Hardware may or may not set the BUS_LOCK_DETECTED flag on
BUS_LOCK
+ * VM-Exits, force setting the flag
Quoted 7 lines
Quoted 2 lines
so that the logic in
vmx_handle_exit()
+ * doesn't have to handle the flag and the basic exit reason.The code itself looks good.
But the comment is partly incorrect. Now we rely only on the
bus_lock_detectedflag sovmx_handle_exit()must check the flag. Thank you for you advice. Is the following comment ok?
/*
* Hardware may or may not set the BUS_LOCK_DETECTED flag on BUS_LOCK
* VM-Exits. Forcely set the flag here, then check the flag in
* vmx_handle_exit() and handle the bus lock vmexit if the flag is
* set.
*/
Quoted 18 lines
Quoted 18 lines
+ */
+ to_vmx(vcpu)->exit_reason.bus_lock_detected = true; + return 1;
}
/*arch/x86/kvm/vmx/vmx.c +2
-3@@ -6051,9 +6055,8 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath) int ret = __vmx_handle_exit(vcpu, exit_fastpath); /* - * Even when current exit reason is handled by KVM internally, we - * still need to exit to user space when bus lock detected to inform - * that there is a bus lock in guest. + * Exit to user space when bus lock detected to inform that there is + * a bus lock in guest. */ if (to_vmx(vcpu)->exit_reason.bus_lock_detected) { if (ret > 0)
Quoted 40 lines · Hao Xiang
Quoted 37 lines · Xiaoyao Li
Quoted 31 lines · Hao Xiang
Hardware may or may not set exit_reason.bus_lock_detected on
BUS_LOCKVM-Exits. Dealing withKVM_RUN_X86_BUS_LOCKinhandle_bus_lock_vmexitcould be redundant when exit_reason.basic isEXIT_REASON_BUS_LOCK.We can remove redundant handling of bus lock vmexit. Force Setting exit_reason.bus_lock_detected in
handle_bus_lock_vmexit(), and deal withKVM_RUN_X86_BUS_LOCKonly invmx_handle_exit().Suggested-by Sean Christopherson <[email protected]>Signed-off-by Hao Xiang <[email protected]>---
v1 -> v2: a little modifications of comments
arch/x86/kvm/vmx/vmx.c| 15 +++++++++------1 file changed, 9 insertions(+), 6 deletions(-)arch/x86/kvm/vmx/vmx.c +2
-3@@ -5562,9 +5562,13 @@ static int handle_encls(struct kvm_vcpu *vcpu) static int handle_bus_lock_vmexit(struct kvm_vcpu *vcpu) { - vcpu->run->exit_reason = KVM_EXIT_X86_BUS_LOCK; - vcpu->run->flags |= KVM_RUN_X86_BUS_LOCK; - return 0; + /* +* Hardware may or may not set the BUS_LOCK_DETECTED flag on
BUS_LOCK
+ * VM-Exits, force setting the flagQuoted 2 lines
so that the logic in
vmx_handle_exit()
+ * doesn't have to handle the flag and the basic exit reason.The code itself looks good.
Quoted 8 lines
Quoted 2 lines
But the comment is partly incorrect. Now we rely only on the
bus_lock_detectedflag sovmx_handle_exit()must check the flag. Thank you for you advice. Is the following comment ok?/*
* Hardware may or may not set theBUS_LOCK_DETECTEDflag onBUS_LOCK
* VM-Exits. Forcely set the flag here, then check the flag in
*vmx_handle_exit()and handle the bus lock vmexit if the flag is
* set.
*/
(I'm not sure if forcely is a valid word)
how about
/*
* Hardware may or may not set the BUS_LOCK_DETECTED flag on BUS_LOCK
* VM Exit. Unconditionally set the flag here and leave the handling to
* vmx_handle_exit().
*/
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
+ */
+ to_vmx(vcpu)->exit_reason.bus_lock_detected = true; + return 1;
}
/*arch/x86/kvm/vmx/vmx.c +0
-2@@ -6051,9 +6055,8 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath) int ret = __vmx_handle_exit(vcpu, exit_fastpath); /* -* Even when current exit reason is handled by KVM internally, we -* still need to exit to user space when bus lock detected to inform
- * that there is a bus lock in guest.
+ * Exit to user space when bus lock detected to inform that there is
+ * a bus lock in guest.
*/
if (to_vmx(vcpu)->exit_reason.bus_lock_detected) { if (ret > 0)