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

Commit 58c2dde1 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: APIC: get rid of deliver_bitmask 



Deliver interrupt during destination matching loop.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Acked-by: default avatarXiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent e1035715

arch/ia64/kvm/kvm-ia64.c

+19 −14
Original line number Diff line number Diff line
@@ -283,6 +283,18 @@ static int handle_sal_call(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 


}



static int __apic_accept_irq(struct kvm_vcpu *vcpu, uint64_t vector)

{

	struct vpd *vpd = to_host(vcpu->kvm, vcpu->arch.vpd);



	if (!test_and_set_bit(vector, &vpd->irr[0])) {

		vcpu->arch.irq_new_pending = 1;

		kvm_vcpu_kick(vcpu);

		return 1;

	}

	return 0;

}



/*

 *  offset: address offset to IPI space.

 *  value:  deliver value.
@@ -292,20 +304,20 @@ static void vcpu_deliver_ipi(struct kvm_vcpu *vcpu, uint64_t dm, 
{

	switch (dm) {

	case SAPIC_FIXED:

		kvm_apic_set_irq(vcpu, vector, dm, 0);

		break;

	case SAPIC_NMI:

		kvm_apic_set_irq(vcpu, 2, dm, 0);

		vector = 2;

		break;

	case SAPIC_EXTINT:

		kvm_apic_set_irq(vcpu, 0, dm, 0);

		vector = 0;

		break;

	case SAPIC_INIT:

	case SAPIC_PMI:

	default:

		printk(KERN_ERR"kvm: Unimplemented Deliver reserved IPI!\n");

		break;

		return;

	}

	__apic_accept_irq(vcpu, vector);

}



static struct kvm_vcpu *lid_to_vcpu(struct kvm *kvm, unsigned long id,
@@ -1813,17 +1825,9 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) 
	put_cpu();

}



int kvm_apic_set_irq(struct kvm_vcpu *vcpu, u8 vec, u8 dmode, u8 trig)

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

{



	struct vpd *vpd = to_host(vcpu->kvm, vcpu->arch.vpd);



	if (!test_and_set_bit(vec, &vpd->irr[0])) {

		vcpu->arch.irq_new_pending = 1;

		kvm_vcpu_kick(vcpu);

		return 1;

	}

	return 0;

	return __apic_accept_irq(vcpu, irq->vector);

}



int kvm_apic_match_physical_addr(struct kvm_lapic *apic, u16 dest)
@@ -1844,6 +1848,7 @@ int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2) 
int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

		int short_hand, int dest, int dest_mode)

{

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

	return (dest_mode == 0) ?

		kvm_apic_match_physical_addr(target, dest) :

		kvm_apic_match_logical_addr(target, dest);

arch/ia64/kvm/lapic.h

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u8 mda); 
int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

		int short_hand, int dest, int dest_mode);

int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2);

bool kvm_apic_present(struct kvm_vcpu *vcpu);

int kvm_apic_set_irq(struct kvm_vcpu *vcpu, u8 vec, u8 dmode, u8 trig);

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

#define kvm_apic_present(x) (true)



#endif

arch/x86/kvm/lapic.c

+16 −43
Original line number Diff line number Diff line
@@ -199,27 +199,12 @@ EXPORT_SYMBOL_GPL(kvm_lapic_find_highest_irr); 
static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,

			     int vector, int level, int trig_mode);



int kvm_apic_set_irq(struct kvm_vcpu *vcpu, u8 vec, u8 dmode, u8 trig)

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

{

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

	int lapic_dmode;



	switch (dmode) {

	case IOAPIC_LOWEST_PRIORITY:

		lapic_dmode = APIC_DM_LOWEST;

		break;

	case IOAPIC_FIXED:

		lapic_dmode = APIC_DM_FIXED;

		break;

	case IOAPIC_NMI:

		lapic_dmode = APIC_DM_NMI;

		break;

	default:

		printk(KERN_DEBUG"Ignoring delivery mode %d\n", dmode);

		return 0;

		break;

	}

	return __apic_accept_irq(apic, lapic_dmode, vec, 1, trig);

	return __apic_accept_irq(apic, irq->delivery_mode, irq->vector,

			irq->level, irq->trig_mode);

}



static inline int apic_find_highest_isr(struct kvm_lapic *apic)
@@ -447,36 +432,24 @@ static void apic_send_ipi(struct kvm_lapic *apic) 
{

	u32 icr_low = apic_get_reg(apic, APIC_ICR);

	u32 icr_high = apic_get_reg(apic, APIC_ICR2);

	struct kvm_lapic_irq irq;



	unsigned int dest = GET_APIC_DEST_FIELD(icr_high);

	unsigned int short_hand = icr_low & APIC_SHORT_MASK;

	unsigned int trig_mode = icr_low & APIC_INT_LEVELTRIG;

	unsigned int level = icr_low & APIC_INT_ASSERT;

	unsigned int dest_mode = icr_low & APIC_DEST_MASK;

	unsigned int delivery_mode = icr_low & APIC_MODE_MASK;

	unsigned int vector = icr_low & APIC_VECTOR_MASK;



	DECLARE_BITMAP(deliver_bitmask, KVM_MAX_VCPUS);

	int i;

	irq.vector = icr_low & APIC_VECTOR_MASK;

	irq.delivery_mode = icr_low & APIC_MODE_MASK;

	irq.dest_mode = icr_low & APIC_DEST_MASK;

	irq.level = icr_low & APIC_INT_ASSERT;

	irq.trig_mode = icr_low & APIC_INT_LEVELTRIG;

	irq.shorthand = icr_low & APIC_SHORT_MASK;

	irq.dest_id = GET_APIC_DEST_FIELD(icr_high);



	apic_debug("icr_high 0x%x, icr_low 0x%x, "

		   "short_hand 0x%x, dest 0x%x, trig_mode 0x%x, level 0x%x, "

		   "dest_mode 0x%x, delivery_mode 0x%x, vector 0x%x\n",

		   icr_high, icr_low, short_hand, dest,

		   trig_mode, level, dest_mode, delivery_mode, vector);

		   icr_high, icr_low, irq.shorthand, irq.dest,

		   irq.trig_mode, irq.level, irq.dest_mode, irq.delivery_mode,

		   irq.vector);



	kvm_get_intr_delivery_bitmask(apic->vcpu->kvm, apic, dest, dest_mode,

			delivery_mode == APIC_DM_LOWEST, short_hand,

			deliver_bitmask);



	while ((i = find_first_bit(deliver_bitmask, KVM_MAX_VCPUS))

			< KVM_MAX_VCPUS) {

		struct kvm_vcpu *vcpu = apic->vcpu->kvm->vcpus[i];

		__clear_bit(i, deliver_bitmask);

		if (vcpu)

			__apic_accept_irq(vcpu->arch.apic, delivery_mode,

					vector, level, trig_mode);

	}

	kvm_irq_delivery_to_apic(apic->vcpu->kvm, apic, &irq);

}



static u32 apic_get_tmcct(struct kvm_lapic *apic)

arch/x86/kvm/lapic.h

+1 −2
Original line number Diff line number Diff line
@@ -31,14 +31,13 @@ u64 kvm_lapic_get_base(struct kvm_vcpu *vcpu); 


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, u8 vec, u8 dmode, u8 trig);

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



u64 kvm_get_apic_base(struct kvm_vcpu *vcpu);

void kvm_set_apic_base(struct kvm_vcpu *vcpu, u64 data);

void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu);

int kvm_lapic_enabled(struct kvm_vcpu *vcpu);

bool kvm_apic_present(struct kvm_vcpu *vcpu);

bool kvm_lapic_present(struct kvm_vcpu *vcpu);

int kvm_lapic_find_highest_irr(struct kvm_vcpu *vcpu);



void kvm_lapic_set_vapic_addr(struct kvm_vcpu *vcpu, gpa_t vapic_addr);

include/linux/kvm_types.h

+10 −0
Original line number Diff line number Diff line
@@ -57,4 +57,14 @@ union kvm_ioapic_redirect_entry { 
	} fields;

};



struct kvm_lapic_irq {

	u32 vector;

	u32 delivery_mode;

	u32 dest_mode;

	u32 level;

	u32 trig_mode;

	u32 shorthand;

	u32 dest_id;

};



#endif /* __KVM_TYPES_H__ */