Commit 73473f31 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: x86: Make "lowest priority" helpers local to lapic.c 

Make various helpers for resolving lowest priority IRQs local to lapic.c
now that kvm_irq_delivery_to_apic() lives in lapic.c as well.

No functional change intended.

Link: https://lore.kernel.org/r/20250821214209.3463350-3-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent cbf5d945

arch/x86/kvm/lapic.c

+12 −7
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source, 
}

EXPORT_SYMBOL_GPL(kvm_apic_match_dest);



int kvm_vector_to_index(u32 vector, u32 dest_vcpus,

static int kvm_vector_to_index(u32 vector, u32 dest_vcpus,

			       const unsigned long *bitmap, u32 bitmap_size)

{

	int idx = find_nth_bit(bitmap, bitmap_size, vector % dest_vcpus);
@@ -1097,6 +1097,16 @@ static bool kvm_apic_is_broadcast_dest(struct kvm *kvm, struct kvm_lapic **src, 
	return false;

}



static bool kvm_lowest_prio_delivery(struct kvm_lapic_irq *irq)

{

	return (irq->delivery_mode == APIC_DM_LOWEST || irq->msi_redir_hint);

}



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

{

	return vcpu1->arch.apic_arb_prio - vcpu2->arch.apic_arb_prio;

}



/* Return true if the interrupt can be handled by using *bitmap as index mask

 * for valid destinations in *dst array.

 * Return false if kvm_apic_map_get_dest_lapic did nothing useful.
@@ -1449,11 +1459,6 @@ void kvm_bitmap_or_dest_vcpus(struct kvm *kvm, struct kvm_lapic_irq *irq, 
	rcu_read_unlock();

}



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

{

	return vcpu1->arch.apic_arb_prio - vcpu2->arch.apic_arb_prio;

}



static bool kvm_ioapic_handles_vector(struct kvm_lapic *apic, int vector)

{

	return test_bit(vector, apic->vcpu->arch.ioapic_handled_vectors);

arch/x86/kvm/lapic.h

+0 −9
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ void kvm_apic_set_version(struct kvm_vcpu *vcpu); 
void kvm_apic_after_set_mcg_cap(struct kvm_vcpu *vcpu);

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

			   int shorthand, unsigned int dest, int dest_mode);

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

void kvm_apic_clear_irr(struct kvm_vcpu *vcpu, int vec);

bool __kvm_apic_update_irr(unsigned long *pir, void *regs, int *max_irr);

bool kvm_apic_update_irr(struct kvm_vcpu *vcpu, unsigned long *pir, int *max_irr);
@@ -225,12 +224,6 @@ static inline bool kvm_apic_init_sipi_allowed(struct kvm_vcpu *vcpu) 
	       !kvm_x86_call(apic_init_signal_blocked)(vcpu);

}



static inline bool kvm_lowest_prio_delivery(struct kvm_lapic_irq *irq)

{

	return (irq->delivery_mode == APIC_DM_LOWEST ||

			irq->msi_redir_hint);

}



static inline int kvm_lapic_latched_init(struct kvm_vcpu *vcpu)

{

	return lapic_in_kernel(vcpu) && test_bit(KVM_APIC_INIT, &vcpu->arch.apic->pending_events);
@@ -245,8 +238,6 @@ void kvm_bitmap_or_dest_vcpus(struct kvm *kvm, struct kvm_lapic_irq *irq, 


bool kvm_intr_is_single_vcpu_fast(struct kvm *kvm, struct kvm_lapic_irq *irq,

			struct kvm_vcpu **dest_vcpu);

int kvm_vector_to_index(u32 vector, u32 dest_vcpus,

			const unsigned long *bitmap, u32 bitmap_size);

void kvm_lapic_switch_to_sw_timer(struct kvm_vcpu *vcpu);

void kvm_lapic_switch_to_hv_timer(struct kvm_vcpu *vcpu);

void kvm_lapic_expired_hv_timer(struct kvm_vcpu *vcpu);