github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 04:23:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

KVM: x86: Rename VEC_POS/REG_POS macro usages

Browse Source 
In preparation for moving most of the KVM's lapic helpers which
use VEC_POS/REG_POS macros to common APIC header for use in Secure
AVIC APIC driver, rename all VEC_POS/REG_POS macro usages to
APIC_VECTOR_TO_BIT_NUMBER/APIC_VECTOR_TO_REG_OFFSET and remove
VEC_POS/REG_POS.

While at it, clean up line wrap in find_highest_vector().

No functional change intended.

Signed-off-by: Neeraj Upadhyay <Neeraj.Upadhyay@amd.com>
Acked-by: Sean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20250709033242.267892-5-Neeraj.Upadhyay@amd.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
This commit is contained in:
Neeraj Upadhyay 2025-07-09 09:02:11 +05:30 committed by Sean Christopherson
parent dc98e3bd49
commit 9cbb5fd156
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/kvm/lapic.c
View File

@ -114,7 +114,7 @@ static __always_inline void kvm_lapic_set_reg64(struct kvm_lapic *apic,
static inline int apic_test_vector(int vec, void *bitmap)
{
return test_bit(VEC_POS(vec), bitmap + REG_POS(vec));
return test_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSET(vec));
}
bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector)
@ -621,9 +621,8 @@ static int find_highest_vector(void *bitmap)
int vec;
u32 *reg;
for (vec = MAX_APIC_VECTOR - APIC_VECTORS_PER_REG;
vec >= 0; vec -= APIC_VECTORS_PER_REG) {
reg = bitmap + REG_POS(vec);
for (vec = MAX_APIC_VECTOR - APIC_VECTORS_PER_REG; vec >= 0; vec -= APIC_VECTORS_PER_REG) {
reg = bitmap + APIC_VECTOR_TO_REG_OFFSET(vec);
if (*reg)
return __fls(*reg) + vec;
}
@ -638,7 +637,7 @@ static u8 count_vectors(void *bitmap)
u8 count = 0;
for (vec = 0; vec < MAX_APIC_VECTOR; vec += APIC_VECTORS_PER_REG) {
reg = bitmap + REG_POS(vec);
reg = bitmap + APIC_VECTOR_TO_REG_OFFSET(vec);
count += hweight32(*reg);
}
@ -736,12 +735,13 @@ EXPORT_SYMBOL_GPL(kvm_apic_clear_irr);
static void *apic_vector_to_isr(int vec, struct kvm_lapic *apic)
{
return apic->regs + APIC_ISR + REG_POS(vec);
return apic->regs + APIC_ISR + APIC_VECTOR_TO_REG_OFFSET(vec);
}
static inline void apic_set_isr(int vec, struct kvm_lapic *apic)
{
if (__test_and_set_bit(VEC_POS(vec), apic_vector_to_isr(vec, apic)))
if (__test_and_set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec),
apic_vector_to_isr(vec, apic)))
return;
/*
@ -784,7 +784,8 @@ static inline int apic_find_highest_isr(struct kvm_lapic *apic)
static inline void apic_clear_isr(int vec, struct kvm_lapic *apic)
{
if (!__test_and_clear_bit(VEC_POS(vec), apic_vector_to_isr(vec, apic)))
if (!__test_and_clear_bit(APIC_VECTOR_TO_BIT_NUMBER(vec),
apic_vector_to_isr(vec, apic)))
return;
/*

7
arch/x86/kvm/lapic.h
View File

@ -145,17 +145,14 @@ void kvm_lapic_exit(void);
u64 kvm_lapic_readable_reg_mask(struct kvm_lapic *apic);
#define VEC_POS(v) APIC_VECTOR_TO_BIT_NUMBER(v)
#define REG_POS(v) APIC_VECTOR_TO_REG_OFFSET(v)
static inline void kvm_lapic_clear_vector(int vec, void *bitmap)
{
clear_bit(VEC_POS(vec), bitmap + REG_POS(vec));
clear_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSET(vec));
}
static inline void kvm_lapic_set_vector(int vec, void *bitmap)
{
set_bit(VEC_POS(vec), bitmap + REG_POS(vec));
set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSET(vec));
}
static inline void kvm_lapic_set_irr(int vec, struct kvm_lapic *apic)