mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: seanjc@google.com
Subject: [PATCH v3 2/6] KVM: x86: use static_call_cond for optional callbacks
Date: Thu, 17 Feb 2022 13:08:27 -0500	[thread overview]
Message-ID: <20220217180831.288210-3-pbonzini@redhat.com> (raw)
In-Reply-To: <20220217180831.288210-1-pbonzini@redhat.com>

SVM implements neither update_emulated_instruction nor
set_apic_access_page_addr.  Remove an "if" by calling them
with static_call_cond().

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/x86.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 746f72ae2c95..8a7f32563590 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -8421,8 +8421,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
 			kvm_rip_write(vcpu, ctxt->eip);
 			if (r && (ctxt->tf || (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)))
 				r = kvm_vcpu_do_singlestep(vcpu);
-			if (kvm_x86_ops.update_emulated_instruction)
-				static_call(kvm_x86_update_emulated_instruction)(vcpu);
+			static_call_cond(kvm_x86_update_emulated_instruction)(vcpu);
 			__kvm_set_rflags(vcpu, ctxt->eflags);
 		}
 
@@ -9791,10 +9790,7 @@ static void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu)
 	if (!lapic_in_kernel(vcpu))
 		return;
 
-	if (!kvm_x86_ops.set_apic_access_page_addr)
-		return;
-
-	static_call(kvm_x86_set_apic_access_page_addr)(vcpu);
+	static_call_cond(kvm_x86_set_apic_access_page_addr)(vcpu);
 }
 
 void __kvm_request_immediate_exit(struct kvm_vcpu *vcpu)
-- 
2.31.1



  parent reply	other threads:[~2022-02-17 18:08 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-17 18:08 [PATCH v3 0/6] kvm: x86: better handling of optional kvm_x86_ops Paolo Bonzini
2022-02-17 18:08 ` [PATCH v3 1/6] KVM: x86: return 1 unconditionally for availability of KVM_CAP_VAPIC Paolo Bonzini
2022-02-18 15:44   ` Sean Christopherson
2022-02-23 13:21   ` Maxim Levitsky
2022-02-17 18:08 ` Paolo Bonzini [this message]
2022-02-18 15:46   ` [PATCH v3 2/6] KVM: x86: use static_call_cond for optional callbacks Sean Christopherson
2022-02-17 18:08 ` [PATCH v3 3/6] KVM: x86: remove KVM_X86_OP_NULL and mark optional kvm_x86_ops Paolo Bonzini
2022-02-18 15:52   ` Sean Christopherson
2022-02-17 18:08 ` [PATCH v3 4/6] KVM: x86: warn on incorrectly NULL members of kvm_x86_ops Paolo Bonzini
2022-02-18 16:18   ` Sean Christopherson
2022-02-17 18:08 ` [PATCH v3 5/6] KVM: x86: make several AVIC callbacks optional Paolo Bonzini
2022-02-18 16:23   ` Sean Christopherson
2022-02-18 17:17     ` Paolo Bonzini
2022-02-18 17:37       ` Sean Christopherson
2022-02-18 17:41         ` Paolo Bonzini
2022-02-17 18:08 ` [PATCH v3 6/6] KVM: x86: allow defining return-0 static calls Paolo Bonzini
2022-02-18 16:29   ` Sean Christopherson
2022-02-18 17:20     ` Paolo Bonzini
2022-02-18 17:33       ` Sean Christopherson
2022-03-17 17:43   ` Maxim Levitsky
2022-03-17 22:30     ` David Laight
2022-03-18 16:29     ` Paolo Bonzini
2022-03-18 17:28       ` Peter Zijlstra
2022-03-18 17:47         ` Peter Zijlstra
2022-03-18 18:02           ` Peter Zijlstra
2022-03-18 23:03             ` David Laight
2022-03-20 13:58       ` Maxim Levitsky

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=20220217180831.288210-3-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=seanjc@google.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®