KVM: x86: Drop redundant call to kvm_deliver_exception_payload()
PATCH 1/1 KVM: x86: Drop redundant call to kvm_deliver_exception_payload()
In kvm_check_and_inject_events(), kvm_deliver_exception_payload() is called for pending #DB exceptions. However, shortly after, the per-vendor inject_exception callbacks are made. Both vmx_inject_exception() and svm_inject_exception() unconditionally call kvm_deliver_exception_payload(), so the call in kvm_check_and_inject_events() is redundant.
Note that the extra call for pending #DB exceptions is harmless, as kvm_deliver_exception_payload() clears exception.has_payload after the first call.
The call in kvm_check_and_inject_events() was added in commit f10c729ff965 ("kvm: vmx: Defer setting of DR6 until #DB delivery"). At that point, the call was likely needed because svm_queue_exception() checked whether an exception for L2 is intercepted by L1 before calling kvm_deliver_exception_payload(), as SVM did not have a check_nested_events callback. Since DR6 is updated before the #DB intercept in SVM (unlike VMX), it was necessary to deliver the DR6 payload before calling svm_queue_exception().
After that, commit 7c86663b68ba ("KVM: nSVM: inject exceptions via svm_check_nested_events") added a check_nested_events callback for SVM, which checked for L1 intercepts for L2's exceptions, and delivered the the payload appropriately before the intercept. At that point, svm_queue_exception() started calling kvm_deliver_exception_payload() unconditionally, and the call to kvm_deliver_exception_payload() from its caller became redundant.
No functional change intended.
--- arch/x86/kvm/x86.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
arch/x86/kvm/x86.c +4 -6
@@ -10737,12 +10737,10 @@ static int kvm_check_and_inject_events(struct kvm_vcpu *vcpu,__kvm_set_rflags (vcpu,kvm_get_rflags (vcpu) |X86_EFLAGS_RF ); -if (vcpu->arch.exception.vector ==DB_VECTOR ) { -kvm_deliver_exception_payload (vcpu, &vcpu->arch.exception); -if (vcpu->arch.dr7 &DR7_GD ) { - vcpu->arch.dr7 &= ~DR7_GD ; -kvm_update_dr7 (vcpu); - } +if (vcpu->arch.exception.vector ==DB_VECTOR && + vcpu->arch.dr7 &DR7_GD ) { + vcpu->arch.dr7 &= ~DR7_GD ; +kvm_update_dr7 (vcpu); }kvm_inject_exception (vcpu);
base-commit: 183bb0ce8c77b0fd1fb25874112bc8751a461e49
Signature · 1 line
2.53.0.473.g4a7958ca14-goog
Sean Christopherson
maintainerQuoted 20 lines · Yosry Ahmed
In
kvm_check_and_inject_events(),kvm_deliver_exception_payload()is called for pending #DB exceptions. However, shortly after, the per-vendorinject_exceptioncallbacks are made. Bothvmx_inject_exception()andsvm_inject_exception()unconditionally callkvm_deliver_exception_payload(), so the call inkvm_check_and_inject_events()is redundant.Note that the extra call for pending #DB exceptions is harmless, as
kvm_deliver_exception_payload()clears exception.has_payload after the first call.The call in
kvm_check_and_inject_events()was added in commitf10c729ff965("kvm: vmx: Defer setting of DR6 until #DB delivery"). At that point, the call was likely needed becausesvm_queue_exception()checked whether an exception for L2 is intercepted by L1 before callingkvm_deliver_exception_payload(), as SVM did not have acheck_nested_eventscallback. Since DR6 is updated before the #DB intercept in SVM (unlike VMX), it was necessary to deliver the DR6 payload before callingsvm_queue_exception().
Quoted 7 lines
After that, commit
7c86663b68ba("KVM: nSVM: inject exceptions viasvm_check_nested_events") added acheck_nested_eventscallback for SVM, which checked for L1 intercepts for L2's exceptions, and delivered the the payload appropriately before the intercept. At that point,svm_queue_exception()started callingkvm_deliver_exception_payload()unconditionally, and the call tokvm_deliver_exception_payload()from its caller became redundant.
Nice! I vaguely remember staring at this code when working on 5623f751bd9c ("KVM: x86: Treat #DBs from the emulator as fault-like (code and DR7.GD=1)"), but never pieced together that it was redundant.
Quoted 30 lines · Sean Christopherson
Quoted 20 lines · Yosry Ahmed
In
kvm_check_and_inject_events(),kvm_deliver_exception_payload()is called for pending #DB exceptions. However, shortly after, the per-vendorinject_exceptioncallbacks are made. Bothvmx_inject_exception()andsvm_inject_exception()unconditionally callkvm_deliver_exception_payload(), so the call inkvm_check_and_inject_events()is redundant.Note that the extra call for pending #DB exceptions is harmless, as
kvm_deliver_exception_payload()clears exception.has_payload after the first call.The call in
kvm_check_and_inject_events()was added in commitf10c729ff965("kvm: vmx: Defer setting of DR6 until #DB delivery"). At that point, the call was likely needed becausesvm_queue_exception()checked whether an exception for L2 is intercepted by L1 before callingkvm_deliver_exception_payload(), as SVM did not have acheck_nested_eventscallback. Since DR6 is updated before the #DB intercept in SVM (unlike VMX), it was necessary to deliver the DR6 payload before callingsvm_queue_exception().Quoted 7 lines
After that, commit
7c86663b68ba("KVM: nSVM: inject exceptions viasvm_check_nested_events") added acheck_nested_eventscallback for SVM, which checked for L1 intercepts for L2's exceptions, and delivered the the payload appropriately before the intercept. At that point,svm_queue_exception()started callingkvm_deliver_exception_payload()unconditionally, and the call tokvm_deliver_exception_payload()from its caller became redundant.
Quoted 3 lines
Nice! I vaguely remember staring at this code when working on
5623f751bd9c("KVM: x86: Treat #DBs from the emulator as fault-like (code and DR7.GD=1)"), but never pieced together that it was redundant.
Yeah I was confused by that call a couple of times as well, then it recently confused an AI bot into thinking there's a bug because we call it for #DB and not #PF. At that point I thought enough is enough!
Quoted 8 lines · Yosry Ahmed
In
kvm_check_and_inject_events(),kvm_deliver_exception_payload()is called for pending #DB exceptions. However, shortly after, the per-vendorinject_exceptioncallbacks are made. Bothvmx_inject_exception()andsvm_inject_exception()unconditionally callkvm_deliver_exception_payload(), so the call inkvm_check_and_inject_events()is redundant.[...]
Applied to kvm-x86 misc, thanks!
[1/1] KVM: x86: Drop redundant call to kvm_deliver_exception_payload()
https://github.com/kvm-x86/linux/commit/43e41846ac7e