Commit b9bd2319 authored by Neeraj Upadhyay's avatar Neeraj Upadhyay Committed by Sean Christopherson
Browse files

KVM: x86: Rename lapic get/set_reg() helpers 



In preparation for moving kvm-internal __kvm_lapic_set_reg(),
__kvm_lapic_get_reg() to apic.h for use in Secure AVIC APIC driver,
rename them as part of the APIC API.

No functional change intended.

Signed-off-by: default avatarNeeraj Upadhyay <Neeraj.Upadhyay@amd.com>
Acked-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20250709033242.267892-8-Neeraj.Upadhyay@amd.com


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

arch/x86/kvm/lapic.c

+6 −7
Original line number Diff line number Diff line
@@ -79,14 +79,14 @@ module_param(lapic_timer_advance, bool, 0444); 
static int kvm_lapic_msr_read(struct kvm_lapic *apic, u32 reg, u64 *data);

static int kvm_lapic_msr_write(struct kvm_lapic *apic, u32 reg, u64 data);



static inline void __kvm_lapic_set_reg(void *regs, int reg_off, u32 val)

static inline void apic_set_reg(void *regs, int reg_off, u32 val)

{

	*((u32 *) (regs + reg_off)) = val;

}



static inline void kvm_lapic_set_reg(struct kvm_lapic *apic, int reg_off, u32 val)

{

	__kvm_lapic_set_reg(apic->regs, reg_off, val);

	apic_set_reg(apic->regs, reg_off, val);

}



static __always_inline u64 __kvm_lapic_get_reg64(void *regs, int reg)
@@ -3080,12 +3080,12 @@ static int kvm_apic_state_fixup(struct kvm_vcpu *vcpu, 


		if (!kvm_x86_ops.x2apic_icr_is_split) {

			if (set) {

				icr = __kvm_lapic_get_reg(s->regs, APIC_ICR) |

				      (u64)__kvm_lapic_get_reg(s->regs, APIC_ICR2) << 32;

				icr = apic_get_reg(s->regs, APIC_ICR) |

				      (u64)apic_get_reg(s->regs, APIC_ICR2) << 32;

				__kvm_lapic_set_reg64(s->regs, APIC_ICR, icr);

			} else {

				icr = __kvm_lapic_get_reg64(s->regs, APIC_ICR);

				__kvm_lapic_set_reg(s->regs, APIC_ICR2, icr >> 32);

				apic_set_reg(s->regs, APIC_ICR2, icr >> 32);

			}

		}

	}
@@ -3101,8 +3101,7 @@ int kvm_apic_get_state(struct kvm_vcpu *vcpu, struct kvm_lapic_state *s) 
	 * Get calculated timer current count for remaining timer period (if

	 * any) and store it in the returned register set.

	 */

	__kvm_lapic_set_reg(s->regs, APIC_TMCCT,

			    __apic_read(vcpu->arch.apic, APIC_TMCCT));

	apic_set_reg(s->regs, APIC_TMCCT, __apic_read(vcpu->arch.apic, APIC_TMCCT));



	return kvm_apic_state_fixup(vcpu, s, false);

}

arch/x86/kvm/lapic.h

+2 −2
Original line number Diff line number Diff line
@@ -165,14 +165,14 @@ static inline void kvm_lapic_set_irr(int vec, struct kvm_lapic *apic) 
	apic->irr_pending = true;

}



static inline u32 __kvm_lapic_get_reg(void *regs, int reg_off)

static inline u32 apic_get_reg(void *regs, int reg_off)

{

	return *((u32 *) (regs + reg_off));

}



static inline u32 kvm_lapic_get_reg(struct kvm_lapic *apic, int reg_off)

{

	return __kvm_lapic_get_reg(apic->regs, reg_off);

	return apic_get_reg(apic->regs, reg_off);

}



DECLARE_STATIC_KEY_FALSE(kvm_has_noapic_vcpu);