From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] KVM: VMX: Move bus lock handler from main.c => common.h
Date: Mon, 21 Sep 2026 17:01:52 -0700 [thread overview]
Message-ID: <20260922000152.1113202-1-seanjc@google.com> (raw)
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.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
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(-)
diff --git a/arch/x86/kvm/vmx/common.h b/arch/x86/kvm/vmx/common.h
index e22c159c3b84..b2905335a2d2 100644
--- a/arch/x86/kvm/vmx/common.h
+++ b/arch/x86/kvm/vmx/common.h
@@ -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 */
diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c
index c11732cfadf0..2985742e20f1 100644
--- a/arch/x86/kvm/vmx/main.c
+++ b/arch/x86/kvm/vmx/main.c
@@ -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
--
2.55.0.1082.g2b9226bbc0-goog
next reply other threads:[~2026-09-22 0:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-22 0:01 Sean Christopherson [this message]
2026-09-22 2:35 ` [PATCH] KVM: VMX: Move bus lock handler from main.c => common.h Xiaoyao Li
2026-09-22 13:36 ` Sean Christopherson
2026-09-22 3:29 ` Binbin Wu
2026-09-24 21:52 ` Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260922000152.1113202-1-seanjc@google.com \
--to=seanjc@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.