Commit d50ab6c1 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: replace vm_has_apicv hook with cpu_uses_apicv 



This will avoid an unnecessary trip to ->kvm and from there to the VPIC.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3bb345f3

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ struct kvm_x86_ops { 
	void (*enable_nmi_window)(struct kvm_vcpu *vcpu);

	void (*enable_irq_window)(struct kvm_vcpu *vcpu);

	void (*update_cr8_intercept)(struct kvm_vcpu *vcpu, int tpr, int irr);

	int (*vm_has_apicv)(struct kvm *kvm);

	int (*cpu_uses_apicv)(struct kvm_vcpu *vcpu);

	void (*hwapic_irr_update)(struct kvm_vcpu *vcpu, int max_irr);

	void (*hwapic_isr_update)(struct kvm *kvm, int isr);

	void (*load_eoi_exitmap)(struct kvm_vcpu *vcpu);

arch/x86/kvm/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ int kvm_cpu_has_injectable_intr(struct kvm_vcpu *v) 
	if (kvm_cpu_has_extint(v))

		return 1;



	if (kvm_apic_vid_enabled(v->kvm))

	if (kvm_vcpu_apic_vid_enabled(v))

		return 0;



	return kvm_apic_has_interrupt(v) != -1; /* LAPIC */

arch/x86/kvm/lapic.c

+2 −2
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static inline void apic_clear_irr(int vec, struct kvm_lapic *apic) 


	vcpu = apic->vcpu;



	if (unlikely(kvm_apic_vid_enabled(vcpu->kvm))) {

	if (unlikely(kvm_vcpu_apic_vid_enabled(vcpu))) {

		/* try to update RVI */

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

		kvm_make_request(KVM_REQ_EVENT, vcpu);
@@ -1622,7 +1622,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) 
		apic_set_reg(apic, APIC_ISR + 0x10 * i, 0);

		apic_set_reg(apic, APIC_TMR + 0x10 * i, 0);

	}

	apic->irr_pending = kvm_apic_vid_enabled(vcpu->kvm);

	apic->irr_pending = kvm_vcpu_apic_vid_enabled(vcpu);

	apic->isr_count = kvm_x86_ops->hwapic_isr_update ? 1 : 0;

	apic->highest_isr_cache = -1;

	update_divide_count(apic);

arch/x86/kvm/lapic.h

+2 −2
Original line number Diff line number Diff line
@@ -143,9 +143,9 @@ static inline int apic_x2apic_mode(struct kvm_lapic *apic) 
	return apic->vcpu->arch.apic_base & X2APIC_ENABLE;

}



static inline bool kvm_apic_vid_enabled(struct kvm *kvm)

static inline bool kvm_vcpu_apic_vid_enabled(struct kvm_vcpu *vcpu)

{

	return kvm_x86_ops->vm_has_apicv(kvm);

	return kvm_x86_ops->cpu_uses_apicv(vcpu);

}



static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu)

arch/x86/kvm/svm.c

+2 −2
Original line number Diff line number Diff line
@@ -3659,7 +3659,7 @@ static void svm_set_virtual_x2apic_mode(struct kvm_vcpu *vcpu, bool set) 
	return;

}



static int svm_vm_has_apicv(struct kvm *kvm)

static int svm_cpu_uses_apicv(struct kvm_vcpu *vcpu)

{

	return 0;

}
@@ -4425,7 +4425,7 @@ static struct kvm_x86_ops svm_x86_ops = { 
	.enable_irq_window = enable_irq_window,

	.update_cr8_intercept = update_cr8_intercept,

	.set_virtual_x2apic_mode = svm_set_virtual_x2apic_mode,

	.vm_has_apicv = svm_vm_has_apicv,

	.cpu_uses_apicv = svm_cpu_uses_apicv,

	.load_eoi_exitmap = svm_load_eoi_exitmap,

	.sync_pir_to_irr = svm_sync_pir_to_irr,