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

Commit 343f94fe authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: consolidate ioapic/ipi interrupt delivery logic 



Use kvm_apic_match_dest() in kvm_get_intr_delivery_bitmask() instead
of duplicating the same code. Use kvm_get_intr_delivery_bitmask() in
apic_send_ipi() to figure out ipi destination instead of reimplementing
the logic.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent a53c17d2

arch/ia64/kvm/kvm-ia64.c

+8 −0
Original line number Diff line number Diff line
@@ -1852,6 +1852,14 @@ struct kvm_vcpu *kvm_get_lowest_prio_vcpu(struct kvm *kvm, u8 vector, 
	return lvcpu;

}



int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

		int short_hand, int dest, int dest_mode)

{

	return (dest_mode == 0) ?

		kvm_apic_match_physical_addr(target, dest) :

		kvm_apic_match_logical_addr(target, dest);

}



static int find_highest_bits(int *dat)

{

	u32  bits, bitnum;

arch/ia64/kvm/lapic.h

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ void kvm_free_lapic(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_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

		int short_hand, int dest, int dest_mode);

bool kvm_apic_present(struct kvm_vcpu *vcpu);

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



#endif

arch/x86/kvm/lapic.c

+26 −43
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static void apic_set_tpr(struct kvm_lapic *apic, u32 tpr) 


int kvm_apic_match_physical_addr(struct kvm_lapic *apic, u16 dest)

{

	return kvm_apic_id(apic) == dest;

	return dest == 0xff || kvm_apic_id(apic) == dest;

}



int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u8 mda)
@@ -289,37 +289,34 @@ int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u8 mda) 
	return result;

}



static int apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

			   int short_hand, int dest, int dest_mode)

{

	int result = 0;

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



	apic_debug("target %p, source %p, dest 0x%x, "

		   "dest_mode 0x%x, short_hand 0x%x",

		   "dest_mode 0x%x, short_hand 0x%x\n",

		   target, source, dest, dest_mode, short_hand);



	ASSERT(!target);

	switch (short_hand) {

	case APIC_DEST_NOSHORT:

		if (dest_mode == 0) {

		if (dest_mode == 0)

			/* Physical mode. */

			if ((dest == 0xFF) || (dest == kvm_apic_id(target)))

				result = 1;

		} else

			result = kvm_apic_match_physical_addr(target, dest);

		else

			/* Logical mode. */

			result = kvm_apic_match_logical_addr(target, dest);

		break;

	case APIC_DEST_SELF:

		if (target == source)

			result = 1;

		result = (target == source);

		break;

	case APIC_DEST_ALLINC:

		result = 1;

		break;

	case APIC_DEST_ALLBUT:

		if (target != source)

			result = 1;

		result = (target != source);

		break;

	default:

		printk(KERN_WARNING "Bad dest shorthand value %x\n",
@@ -492,41 +489,29 @@ static void apic_send_ipi(struct kvm_lapic *apic) 
	unsigned int delivery_mode = icr_low & APIC_MODE_MASK;

	unsigned int vector = icr_low & APIC_VECTOR_MASK;



	struct kvm_vcpu *target;

	struct kvm_vcpu *vcpu;

	DECLARE_BITMAP(lpr_map, KVM_MAX_VCPUS);

	DECLARE_BITMAP(deliver_bitmask, KVM_MAX_VCPUS);

	int i;



	bitmap_zero(lpr_map, KVM_MAX_VCPUS);

	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);



	for (i = 0; i < KVM_MAX_VCPUS; i++) {

		vcpu = apic->vcpu->kvm->vcpus[i];

		if (!vcpu)

			continue;

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

			delivery_mode == APIC_DM_LOWEST, short_hand,

			deliver_bitmask);



		if (vcpu->arch.apic &&

		    apic_match_dest(vcpu, apic, short_hand, dest, dest_mode)) {

			if (delivery_mode == APIC_DM_LOWEST)

				__set_bit(vcpu->vcpu_id, lpr_map);

			else

	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);

	}

}



	if (delivery_mode == APIC_DM_LOWEST) {

		target = kvm_get_lowest_prio_vcpu(vcpu->kvm, vector, lpr_map);

		if (target != NULL)

			__apic_accept_irq(target->arch.apic, delivery_mode,

					  vector, level, trig_mode);

	}

}



static u32 apic_get_tmcct(struct kvm_lapic *apic)

{

	ktime_t remaining;
@@ -930,16 +915,14 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu) 
}

EXPORT_SYMBOL_GPL(kvm_lapic_reset);



int kvm_lapic_enabled(struct kvm_vcpu *vcpu)

bool kvm_apic_present(struct kvm_vcpu *vcpu)

{

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

	int ret = 0;



	if (!apic)

		return 0;

	ret = apic_enabled(apic);

	return vcpu->arch.apic && apic_hw_enabled(vcpu->arch.apic);

}



	return ret;

int kvm_lapic_enabled(struct kvm_vcpu *vcpu)

{

	return kvm_apic_present(vcpu) && apic_sw_enabled(vcpu->arch.apic);

}

EXPORT_SYMBOL_GPL(kvm_lapic_enabled);

arch/x86/kvm/lapic.h

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 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_host.h

+0 −5
Original line number Diff line number Diff line
@@ -363,11 +363,6 @@ void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq, 
				      struct kvm_irq_mask_notifier *kimn);

void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask);



#ifdef __KVM_HAVE_IOAPIC

void kvm_get_intr_delivery_bitmask(struct kvm *kvm,

				   union kvm_ioapic_redirect_entry *entry,

				   unsigned long *deliver_bitmask);

#endif

int kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);

void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);

void kvm_register_irq_ack_notifier(struct kvm *kvm,