Skip to content

Commit 73473f3

Browse files
committed
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: Sean Christopherson <seanjc@google.com>
1 parent cbf5d94 commit 73473f3

2 files changed

Lines changed: 12 additions & 16 deletions

File tree

arch/x86/kvm/lapic.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,8 +1061,8 @@ bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,
10611061
}
10621062
EXPORT_SYMBOL_GPL(kvm_apic_match_dest);
10631063

1064-
int kvm_vector_to_index(u32 vector, u32 dest_vcpus,
1065-
const unsigned long *bitmap, u32 bitmap_size)
1064+
static int kvm_vector_to_index(u32 vector, u32 dest_vcpus,
1065+
const unsigned long *bitmap, u32 bitmap_size)
10661066
{
10671067
int idx = find_nth_bit(bitmap, bitmap_size, vector % dest_vcpus);
10681068

@@ -1097,6 +1097,16 @@ static bool kvm_apic_is_broadcast_dest(struct kvm *kvm, struct kvm_lapic **src,
10971097
return false;
10981098
}
10991099

1100+
static bool kvm_lowest_prio_delivery(struct kvm_lapic_irq *irq)
1101+
{
1102+
return (irq->delivery_mode == APIC_DM_LOWEST || irq->msi_redir_hint);
1103+
}
1104+
1105+
static int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2)
1106+
{
1107+
return vcpu1->arch.apic_arb_prio - vcpu2->arch.apic_arb_prio;
1108+
}
1109+
11001110
/* Return true if the interrupt can be handled by using *bitmap as index mask
11011111
* for valid destinations in *dst array.
11021112
* 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,
14491459
rcu_read_unlock();
14501460
}
14511461

1452-
int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2)
1453-
{
1454-
return vcpu1->arch.apic_arb_prio - vcpu2->arch.apic_arb_prio;
1455-
}
1456-
14571462
static bool kvm_ioapic_handles_vector(struct kvm_lapic *apic, int vector)
14581463
{
14591464
return test_bit(vector, apic->vcpu->arch.ioapic_handled_vectors);

arch/x86/kvm/lapic.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ void kvm_apic_set_version(struct kvm_vcpu *vcpu);
105105
void kvm_apic_after_set_mcg_cap(struct kvm_vcpu *vcpu);
106106
bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,
107107
int shorthand, unsigned int dest, int dest_mode);
108-
int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2);
109108
void kvm_apic_clear_irr(struct kvm_vcpu *vcpu, int vec);
110109
bool __kvm_apic_update_irr(unsigned long *pir, void *regs, int *max_irr);
111110
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)
225224
!kvm_x86_call(apic_init_signal_blocked)(vcpu);
226225
}
227226

228-
static inline bool kvm_lowest_prio_delivery(struct kvm_lapic_irq *irq)
229-
{
230-
return (irq->delivery_mode == APIC_DM_LOWEST ||
231-
irq->msi_redir_hint);
232-
}
233-
234227
static inline int kvm_lapic_latched_init(struct kvm_vcpu *vcpu)
235228
{
236229
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,
245238

246239
bool kvm_intr_is_single_vcpu_fast(struct kvm *kvm, struct kvm_lapic_irq *irq,
247240
struct kvm_vcpu **dest_vcpu);
248-
int kvm_vector_to_index(u32 vector, u32 dest_vcpus,
249-
const unsigned long *bitmap, u32 bitmap_size);
250241
void kvm_lapic_switch_to_sw_timer(struct kvm_vcpu *vcpu);
251242
void kvm_lapic_switch_to_hv_timer(struct kvm_vcpu *vcpu);
252243
void kvm_lapic_expired_hv_timer(struct kvm_vcpu *vcpu);

0 commit comments

Comments
 (0)