KVM: VMX: Move bus lock handler from main.c => common.h
Sean Christopherson
maintainerPATCH 1/1 KVM: VMX: Move bus lock handler from main.c => common.h
Move the bus lock VM-Exit handler, which is basically a one-liner, from main.c to vmx.h now that to_vt() is usable in common.h.
No functional change intended.
---
This applies on top of kvm-x86/next + Xiayao's series. I.e. actually applying it will be painful for anyone but me at this point, but I'm really just posting for posterity.
arch/x86/kvm/vmx/common.h | 11 ++++++++++- arch/x86/kvm/vmx/main.c | 11 ----------- 2 files changed, 10 insertions(+), 12 deletions(-)
arch/x86/kvm/vmx/common.h +10 -1
@@ -254,6 +254,15 @@ static inline int __vt_handle_notify(struct kvm_vcpu *vcpu, return 1; } -int vt_handle_bus_lock_vmexit (struct kvm_vcpu *vcpu); +static inline int vt_handle_bus_lock_vmexit (struct kvm_vcpu *vcpu) +{ +/* +* Hardware may or may not set the BUS_LOCK_DETECTED flag on BUS_LOCK +* VM-Exits. Unconditionally set the flag here and leave the handling +* to .handle_exit() callback. +*/ +to_vt (vcpu)->exit_reason.bus_lock_detected = true; +return 1 ; +}#endif /* __KVM_X86_VMX_COMMON_H */
arch/x86/kvm/vmx/main.c +0 -11
@@ -872,17 +872,6 @@ static int vt_gmem_max_mapping_level(struct kvm *kvm, kvm_pfn_t pfn,#define vt_op_tdx_only (name) NULL#endif /* CONFIG_KVM_INTEL_TDX */ -int vt_handle_bus_lock_vmexit (struct kvm_vcpu *vcpu) -{ -/* -* Hardware may or may not set the BUS_LOCK_DETECTED flag on BUS_LOCK -* VM-Exits. Unconditionally set the flag here and leave the handling -* to .handle_exit() callback. -*/ -to_vt (vcpu)->exit_reason.bus_lock_detected = true; -return 1 ; -} - noinstr void vt_handle_nmi(struct kvm_vcpu *vcpu) { if ((u16)vt_get_exit_reason(vcpu).basic != EXIT_REASON_EXCEPTION_NMI ||
base-commit: e1d8e13452eea815042f79244bb649536e3689f5
Signature · 1 line
2.55.0.1082.g2b9226bbc0-goog
Quoted 11 lines · Sean Christopherson
Move the bus lock VM-Exit handler, which is basically a one-liner, from
main.ctovmx.hnow thatto_vt()is usable incommon.h.No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>---
This applies on top of kvm-x86/next + Xiayao's series. I.e. actually applying it will be painful for anyone but me at this point, but I'm really just posting for posterity.
It seems like squashing it into patch 7 of my series would be OK as well. I guess you intended to avoid changing my series since it might require a new version.
Anyway,
Quoted 49 lines
arch/x86/kvm/vmx/common.h | 11 ++++++++++- arch/x86/kvm/vmx/main.c | 11 ----------- 2 files changed, 10 insertions(+), 12 deletions(-)arch/x86/kvm/vmx/common.h +10
-1@@ -254,6 +254,15 @@ static inline int __vt_handle_notify(struct kvm_vcpu *vcpu, return 1; } -int vt_handle_bus_lock_vmexit (struct kvm_vcpu *vcpu); +static inline int vt_handle_bus_lock_vmexit (struct kvm_vcpu *vcpu) +{ +/* +* Hardware may or may not set the BUS_LOCK_DETECTED flag on BUS_LOCK +* VM-Exits. Unconditionally set the flag here and leave the handling +* to .handle_exit() callback. +*/ +to_vt (vcpu)->exit_reason.bus_lock_detected = true; +return 1 ; +}#endif /* __KVM_X86_VMX_COMMON_H */ arch/x86/kvm/vmx/main.c +0
-11@@ -872,17 +872,6 @@ static int vt_gmem_max_mapping_level(struct kvm *kvm, kvm_pfn_t pfn,#define vt_op_tdx_only (name) NULL#endif /* CONFIG_KVM_INTEL_TDX */ -int vt_handle_bus_lock_vmexit (struct kvm_vcpu *vcpu) -{ -/* -* Hardware may or may not set the BUS_LOCK_DETECTED flag on BUS_LOCK -* VM-Exits. Unconditionally set the flag here and leave the handling -* to .handle_exit() callback. -*/ -to_vt (vcpu)->exit_reason.bus_lock_detected = true; -return 1 ; -} - noinstr void vt_handle_nmi(struct kvm_vcpu *vcpu) { if ((u16)vt_get_exit_reason(vcpu).basic != EXIT_REASON_EXCEPTION_NMI ||base-commit:
e1d8e13452eea815042f79244bb649536e3689f5
Sean Christopherson
maintainerQuoted 9 lines · Xiaoyao Li
Quoted 8 lines · Sean Christopherson
Move the bus lock VM-Exit handler, which is basically a one-liner, from
main.ctovmx.hnow thatto_vt()is usable incommon.h.No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>---
Quoted 7 lines
Quoted 3 lines
This applies on top of kvm-x86/next + Xiayao's series. I.e. actually applying it will be painful for anyone but me at this point, but I'm really just posting for posterity.
It seems like squashing it into patch 7 of my series would be OK as well. I guess you intended to avoid changing my series since it might require a new version.
Heh, I would have happily squashed, and tried to. The problem is that I want to land your series before "Move common VT getters/converters to common.h".
Quoted 6 lines · Sean Christopherson
Move the bus lock VM-Exit handler, which is basically a one-liner, from
main.ctovmx.hnow thatto_vt()is usable incommon.h.No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>
Quoted 6 lines · Sean Christopherson
Move the bus lock VM-Exit handler, which is basically a one-liner, from
main.ctovmx.hnow thatto_vt()is usable incommon.h.No functional change intended.
Applied to kvm-x86 vmx, thanks!
[1/1] KVM: VMX: Move bus lock handler from main.c => common.h
https://github.com/kvm-x86/linux/commit/6088c9a22012