Commit f4854bf7 authored by Wei Wang's avatar Wei Wang Committed by Paolo Bonzini
Browse files

KVM: x86: Replace static_call_cond() with static_call() 

The use of static_call_cond() is essentially the same as static_call() on
x86 (e.g. static_call() now handles a NULL pointer as a NOP), so replace
it with static_call() to simplify the code.

Link: https://lore.kernel.org/all/3916caa1dcd114301a49beafa5030eca396745c1.1679456900.git.jpoimboe@kernel.org/


Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarWei Wang <wei.w.wang@intel.com>
Link: https://lore.kernel.org/r/20240507133103.15052-2-wei.w.wang@intel.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bc9cd5a2

arch/x86/include/asm/kvm-x86-ops.h

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ BUILD_BUG_ON(1) 
 * "static_call_update()" calls.

 *

 * KVM_X86_OP_OPTIONAL() can be used for those functions that can have

 * a NULL definition, for example if "static_call_cond()" will be used

 * at the call sites.  KVM_X86_OP_OPTIONAL_RET0() can be used likewise

 * a NULL definition.  KVM_X86_OP_OPTIONAL_RET0() can be used likewise

 * to make a definition optional, but in this case the default will

 * be __static_call_return0.

 */

arch/x86/include/asm/kvm-x86-pmu-ops.h

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ BUILD_BUG_ON(1) 
 * "static_call_update()" calls.

 *

 * KVM_X86_PMU_OP_OPTIONAL() can be used for those functions that can have

 * a NULL definition, for example if "static_call_cond()" will be used

 * at the call sites.

 * a NULL definition.

 */

KVM_X86_PMU_OP(rdpmc_ecx_to_pmc)

KVM_X86_PMU_OP(msr_idx_to_pmc)

arch/x86/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -2309,12 +2309,12 @@ static inline bool kvm_irq_is_postable(struct kvm_lapic_irq *irq) 


static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu)

{

	static_call_cond(kvm_x86_vcpu_blocking)(vcpu);

	static_call(kvm_x86_vcpu_blocking)(vcpu);

}



static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu)

{

	static_call_cond(kvm_x86_vcpu_unblocking)(vcpu);

	static_call(kvm_x86_vcpu_unblocking)(vcpu);

}



static inline int kvm_cpu_get_apicid(int mps_cpu)

arch/x86/kvm/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void __kvm_migrate_timers(struct kvm_vcpu *vcpu) 
{

	__kvm_migrate_apic_timer(vcpu);

	__kvm_migrate_pit_timer(vcpu);

	static_call_cond(kvm_x86_migrate_timers)(vcpu);

	static_call(kvm_x86_migrate_timers)(vcpu);

}



bool kvm_arch_irqfd_allowed(struct kvm *kvm, struct kvm_irqfd *args)

arch/x86/kvm/lapic.c

+12 −12
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ static inline void apic_clear_irr(int vec, struct kvm_lapic *apic) 
	if (unlikely(apic->apicv_active)) {

		/* need to update RVI */

		kvm_lapic_clear_vector(vec, apic->regs + APIC_IRR);

		static_call_cond(kvm_x86_hwapic_irr_update)(apic->vcpu,

		static_call(kvm_x86_hwapic_irr_update)(apic->vcpu,

							    apic_find_highest_irr(apic));

	} else {

		apic->irr_pending = false;
@@ -765,7 +765,7 @@ static inline void apic_set_isr(int vec, struct kvm_lapic *apic) 
	 * just set SVI.

	 */

	if (unlikely(apic->apicv_active))

		static_call_cond(kvm_x86_hwapic_isr_update)(vec);

		static_call(kvm_x86_hwapic_isr_update)(vec);

	else {

		++apic->isr_count;

		BUG_ON(apic->isr_count > MAX_APIC_VECTOR);
@@ -810,7 +810,7 @@ static inline void apic_clear_isr(int vec, struct kvm_lapic *apic) 
	 * and must be left alone.

	 */

	if (unlikely(apic->apicv_active))

		static_call_cond(kvm_x86_hwapic_isr_update)(apic_find_highest_isr(apic));

		static_call(kvm_x86_hwapic_isr_update)(apic_find_highest_isr(apic));

	else {

		--apic->isr_count;

		BUG_ON(apic->isr_count < 0);
@@ -2577,7 +2577,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) 


	if ((old_value ^ value) & (MSR_IA32_APICBASE_ENABLE | X2APIC_ENABLE)) {

		kvm_make_request(KVM_REQ_APICV_UPDATE, vcpu);

		static_call_cond(kvm_x86_set_virtual_apic_mode)(vcpu);

		static_call(kvm_x86_set_virtual_apic_mode)(vcpu);

	}



	apic->base_address = apic->vcpu->arch.apic_base &
@@ -2687,7 +2687,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) 
	u64 msr_val;

	int i;



	static_call_cond(kvm_x86_apicv_pre_state_restore)(vcpu);

	static_call(kvm_x86_apicv_pre_state_restore)(vcpu);



	if (!init_event) {

		msr_val = APIC_DEFAULT_PHYS_BASE | MSR_IA32_APICBASE_ENABLE;
@@ -2742,9 +2742,9 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) 
	vcpu->arch.pv_eoi.msr_val = 0;

	apic_update_ppr(apic);

	if (apic->apicv_active) {

		static_call_cond(kvm_x86_apicv_post_state_restore)(vcpu);

		static_call_cond(kvm_x86_hwapic_irr_update)(vcpu, -1);

		static_call_cond(kvm_x86_hwapic_isr_update)(-1);

		static_call(kvm_x86_apicv_post_state_restore)(vcpu);

		static_call(kvm_x86_hwapic_irr_update)(vcpu, -1);

		static_call(kvm_x86_hwapic_isr_update)(-1);

	}



	vcpu->arch.apic_arb_prio = 0;
@@ -3019,7 +3019,7 @@ int kvm_apic_set_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s) 
	struct kvm_lapic *apic = vcpu->arch.apic;

	int r;



	static_call_cond(kvm_x86_apicv_pre_state_restore)(vcpu);

	static_call(kvm_x86_apicv_pre_state_restore)(vcpu);



	kvm_lapic_set_base(vcpu, vcpu->arch.apic_base);

	/* set SPIV separately to get count of SW disabled APICs right */
@@ -3046,9 +3046,9 @@ int kvm_apic_set_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s) 
	kvm_lapic_set_reg(apic, APIC_TMCCT, 0);

	kvm_apic_update_apicv(vcpu);

	if (apic->apicv_active) {

		static_call_cond(kvm_x86_apicv_post_state_restore)(vcpu);

		static_call_cond(kvm_x86_hwapic_irr_update)(vcpu, apic_find_highest_irr(apic));

		static_call_cond(kvm_x86_hwapic_isr_update)(apic_find_highest_isr(apic));

		static_call(kvm_x86_apicv_post_state_restore)(vcpu);

		static_call(kvm_x86_hwapic_irr_update)(vcpu, apic_find_highest_irr(apic));

		static_call(kvm_x86_hwapic_isr_update)(apic_find_highest_isr(apic));

	}

	kvm_make_request(KVM_REQ_EVENT, vcpu);

	if (ioapic_in_kernel(vcpu->kvm))