Commit 185c8f33 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Dave Hansen
Browse files

x86/apic: Remove pointless arguments from [native_]eoi_write() 



Every callsite hands in the same constants which is a pointless exercise
and cannot be optimized by the compiler due to the indirect calls.

Use the constants in the eoi() callbacks and remove the arguments.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: default avatarWei Liu <wei.liu@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)
parent 3600ceb0

arch/x86/hyperv/hv_apic.c

+3 −3
Original line number Diff line number Diff line
@@ -86,14 +86,14 @@ static void hv_apic_write(u32 reg, u32 val) 
	}

}



static void hv_apic_eoi_write(u32 reg, u32 val)

static void hv_apic_eoi_write(void)

{

	struct hv_vp_assist_page *hvp = hv_vp_assist_page[smp_processor_id()];



	if (hvp && (xchg(&hvp->apic_assist, 0) & 0x1))

		return;



	wrmsr(HV_X64_MSR_EOI, val, 0);

	wrmsr(HV_X64_MSR_EOI, APIC_EOI_ACK, 0);

}



static bool cpu_is_self(int cpu)
@@ -310,7 +310,7 @@ void __init hv_apic_init(void) 
		 * lazy EOI when available, but the same accessor works for

		 * both xapic and x2apic because the field layout is the same.

		 */

		apic_set_eoi_write(hv_apic_eoi_write);

		apic_set_eoi_cb(hv_apic_eoi_write);

		if (!x2apic_enabled()) {

			apic->read      = hv_apic_read;

			apic->write     = hv_apic_write;

arch/x86/include/asm/apic.h

+11 −6
Original line number Diff line number Diff line
@@ -98,6 +98,11 @@ static inline u32 native_apic_mem_read(u32 reg) 
	return *((volatile u32 *)(APIC_BASE + reg));

}



static inline void native_apic_mem_eoi(void)

{

	native_apic_mem_write(APIC_EOI, APIC_EOI_ACK);

}



extern void native_apic_icr_write(u32 low, u32 id);

extern u64 native_apic_icr_read(void);
@@ -189,7 +194,7 @@ static inline void native_apic_msr_write(u32 reg, u32 v) 
	wrmsr(APIC_BASE_MSR + (reg >> 4), v, 0);

}



static inline void native_apic_msr_eoi_write(u32 reg, u32 v)

static inline void native_apic_msr_eoi(void)

{

	__wrmsr(APIC_BASE_MSR + (APIC_EOI >> 4), APIC_EOI_ACK, 0);

}
@@ -250,8 +255,8 @@ struct irq_data; 
 */

struct apic {

	/* Hotpath functions first */

	void	(*eoi_write)(u32 reg, u32 v);

	void	(*native_eoi_write)(u32 reg, u32 v);

	void	(*eoi)(void);

	void	(*native_eoi)(void);

	void	(*write)(u32 reg, u32 v);

	u32	(*read)(u32 reg);
@@ -351,7 +356,7 @@ static inline void apic_write(u32 reg, u32 val) 


static inline void apic_eoi(void)

{

	apic->eoi_write(APIC_EOI, APIC_EOI_ACK);

	apic->eoi();

}



static inline u64 apic_icr_read(void)
@@ -380,7 +385,7 @@ static inline bool apic_id_valid(u32 apic_id) 
	return apic_id <= apic->max_apic_id;

}



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

extern void __init apic_set_eoi_cb(void (*eoi)(void));



#else /* CONFIG_X86_LOCAL_APIC */
@@ -391,7 +396,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)) {}

static inline void apic_set_eoi_cb(void (*eoi)(void)) {}



#endif /* CONFIG_X86_LOCAL_APIC */

arch/x86/kernel/apic/apic.c

+4 −4
Original line number Diff line number Diff line
@@ -2502,15 +2502,15 @@ void __init acpi_wake_cpu_handler_update(wakeup_cpu_handler handler) 
 * 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))

void __init apic_set_eoi_cb(void (*eoi)(void))

{

	struct apic **drv;



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

		/* Should happen once for each apic */

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

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

		(*drv)->eoi_write = eoi_write;

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

		(*drv)->native_eoi = (*drv)->eoi;

		(*drv)->eoi = eoi;

	}

}

arch/x86/kernel/apic/apic_flat_64.c

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static struct apic apic_flat __ro_after_init = { 


	.read				= native_apic_mem_read,

	.write				= native_apic_mem_write,

	.eoi_write			= native_apic_mem_write,

	.eoi				= native_apic_mem_eoi,

	.icr_read			= native_apic_icr_read,

	.icr_write			= native_apic_icr_write,

	.wait_icr_idle			= apic_mem_wait_icr_idle,
@@ -182,7 +182,7 @@ static struct apic apic_physflat __ro_after_init = { 


	.read				= native_apic_mem_read,

	.write				= native_apic_mem_write,

	.eoi_write			= native_apic_mem_write,

	.eoi				= native_apic_mem_eoi,

	.icr_read			= native_apic_icr_read,

	.icr_write			= native_apic_icr_write,

	.wait_icr_idle			= apic_mem_wait_icr_idle,

arch/x86/kernel/apic/apic_noop.c

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ static int noop_wakeup_secondary_cpu(int apicid, unsigned long start_eip) { retu 
static u64 noop_apic_icr_read(void) { return 0; }

static int noop_phys_pkg_id(int cpuid_apic, int index_msb) { return 0; }

static unsigned int noop_get_apic_id(unsigned long x) { return 0; }

static void noop_apic_eoi(void) { }



static u32 noop_apic_read(u32 reg)

{
@@ -71,7 +72,7 @@ struct apic apic_noop __ro_after_init = { 


	.read				= noop_apic_read,

	.write				= noop_apic_write,

	.eoi_write			= noop_apic_write,

	.eoi				= noop_apic_eoi,

	.icr_read			= noop_apic_icr_read,

	.icr_write			= noop_apic_icr_write,

};