Commit 1551df64 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Avi Kivity
Browse files

apic: add apic_set_eoi_write for PV use 



KVM PV EOI optimization overrides eoi_write apic op with its own
version. Add an API for this to avoid meddling with core x86 apic driver
data structures directly.

For KVM use, we don't need any guarantees about when the switch to the
new op will take place, so it could in theory use this API after SMP init,
but it currently doesn't, and restricting callers to early init makes it
clear that it's safe as it won't race with actual APIC driver use.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 64604e09

arch/x86/include/asm/apic.h

+3 −0
Original line number Diff line number Diff line
@@ -469,6 +469,8 @@ static inline u32 safe_apic_wait_icr_idle(void) 
	return apic->safe_wait_icr_idle();

}



extern void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v));



#else /* CONFIG_X86_LOCAL_APIC */



static inline u32 apic_read(u32 reg) { return 0; }
@@ -478,6 +480,7 @@ static inline u64 apic_icr_read(void) { return 0; } 
static inline void apic_icr_write(u32 low, u32 high) { }

static inline void apic_wait_icr_idle(void) { }

static inline u32 safe_apic_wait_icr_idle(void) { return 0; }

static inline void apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v)) {}



#endif /* CONFIG_X86_LOCAL_APIC */

arch/x86/kernel/apic/apic.c

+17 −0
Original line number Diff line number Diff line
@@ -2123,6 +2123,23 @@ void default_init_apic_ldr(void) 
	apic_write(APIC_LDR, val);

}



/*

 * Override the generic EOI implementation with an optimized version.

 * Only called during early boot when only one CPU is active and with

 * interrupts disabled, so we know this does not race with actual APIC driver

 * use.

 */

void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v))

{

	struct apic **drv;



	for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {

		/* Should happen once for each apic */

		WARN_ON((*drv)->eoi_write == eoi_write);

		(*drv)->eoi_write = eoi_write;

	}

}



/*

 * Power management

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE