Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf9e65b7 authored by Yang Zhang's avatar Yang Zhang Committed by Marcelo Tosatti
Browse files

KVM: Set TMR when programming ioapic entry 



We already know the trigger mode of a given interrupt when programming
the ioapice entry. So it's not necessary to set it in each interrupt
delivery.

Signed-off-by: default avatarYang Zhang <yang.z.zhang@Intel.com>
Reviewed-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 3d81bc7e

arch/x86/kvm/lapic.c

+9 −6
Original line number Diff line number Diff line
@@ -468,6 +468,15 @@ static inline int apic_find_highest_isr(struct kvm_lapic *apic) 
	return result;

}



void kvm_apic_update_tmr(struct kvm_vcpu *vcpu, u32 *tmr)

{

	struct kvm_lapic *apic = vcpu->arch.apic;

	int i;



	for (i = 0; i < 8; i++)

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

}



static void apic_update_ppr(struct kvm_lapic *apic)

{

	u32 tpr, isrv, ppr, old_ppr;
@@ -661,12 +670,6 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, 
		if (dest_map)

			__set_bit(vcpu->vcpu_id, dest_map);



		if (trig_mode) {

			apic_debug("level trig mode for vector %d", vector);

			apic_set_vector(vector, apic->regs + APIC_TMR);

		} else

			apic_clear_vector(vector, apic->regs + APIC_TMR);



		result = !apic_test_and_set_irr(vector, apic);

		trace_kvm_apic_accept_irq(vcpu->vcpu_id, delivery_mode,

					  trig_mode, vector, !result);

arch/x86/kvm/lapic.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value); 
u64 kvm_lapic_get_base(struct kvm_vcpu *vcpu);

void kvm_apic_set_version(struct kvm_vcpu *vcpu);



void kvm_apic_update_tmr(struct kvm_vcpu *vcpu, u32 *tmr);

int kvm_apic_match_physical_addr(struct kvm_lapic *apic, u16 dest);

int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u8 mda);

int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq,

arch/x86/kvm/x86.c

+4 −1
Original line number Diff line number Diff line
@@ -5664,14 +5664,17 @@ static void kvm_gen_update_masterclock(struct kvm *kvm) 
static void vcpu_scan_ioapic(struct kvm_vcpu *vcpu)

{

	u64 eoi_exit_bitmap[4];

	u32 tmr[8];



	if (!kvm_apic_hw_enabled(vcpu->arch.apic))

		return;



	memset(eoi_exit_bitmap, 0, 32);

	memset(tmr, 0, 32);



	kvm_ioapic_scan_entry(vcpu, eoi_exit_bitmap);

	kvm_ioapic_scan_entry(vcpu, eoi_exit_bitmap, tmr);

	kvm_x86_ops->load_eoi_exitmap(vcpu, eoi_exit_bitmap);

	kvm_apic_update_tmr(vcpu, tmr);

}



static int vcpu_enter_guest(struct kvm_vcpu *vcpu)

virt/kvm/ioapic.c

+9 −3
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ static void update_handled_vectors(struct kvm_ioapic *ioapic) 
	smp_wmb();

}



void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap)

void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap,

			u32 *tmr)

{

	struct kvm_ioapic *ioapic = vcpu->kvm->arch.vioapic;

	union kvm_ioapic_redirect_entry *e;
@@ -207,8 +208,13 @@ void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap) 
			 kvm_irq_has_notifier(ioapic->kvm, KVM_IRQCHIP_IOAPIC,

				 index) || index == RTC_GSI)) {

			if (kvm_apic_match_dest(vcpu, NULL, 0,

				e->fields.dest_id, e->fields.dest_mode))

				__set_bit(e->fields.vector, (unsigned long *)eoi_exit_bitmap);

				e->fields.dest_id, e->fields.dest_mode)) {

				__set_bit(e->fields.vector,

					(unsigned long *)eoi_exit_bitmap);

				if (e->fields.trig_mode == IOAPIC_LEVEL_TRIG)

					__set_bit(e->fields.vector,

						(unsigned long *)tmr);

			}

		}

	}

	spin_unlock(&ioapic->lock);

virt/kvm/ioapic.h

+2 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, 
int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state);

int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state);

void kvm_vcpu_request_scan_ioapic(struct kvm *kvm);

void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap);

void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap,

			u32 *tmr);



#endif