Skip to contentSkip to conversation

x86, apic, perf - make apic_write/read noop on !APIC case

PATCH In review Cyrill Gorcunov 1 participant 5 messages Mar 17, 2010 – Mar 18, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover x86, apic, perf - make apic_write/read noop on !APIC case

This allow us to save some #ifdef's.
Please review.

Cyrill

#1 lore raw

PATCH 1/2 x86, apic: Allow to use sertain functions without APIC built-in support

In case even if the kernel is configured so that
no APIC support is built-in we still may allow
to use sertain apic functions as a dummy calls.

In particular we start using it in perf-events code.

Note that this is not that same as NOOP apic driver, the reverse -- we don't have apic code compiled at all.

CC H. Peter Anvin <[email protected]>
CC Ingo Molnar <[email protected]>
CC Thomas Gleixner <[email protected]>
CC Yinghai Lu <[email protected]>
---
 arch/x86/include/asm/apic.h |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
arch/x86/include/asm/apic.h +11 -2
Index: linux-2.6.git/arch/x86/include/asm/apic.h
=====================================================================
@@ -373,6 +373,7 @@ extern atomic_t init_deasserted;
 extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
 #endif
 
+#ifdef CONFIG_X86_LOCAL_APIC
 static inline u32 apic_read(u32 reg)
 {
 	return apic->read(reg);
@@ -403,10 +404,19 @@ static inline u32 safe_apic_wait_icr_idl
 	return apic->safe_wait_icr_idle();
 }
 
+#else /* CONFIG_X86_LOCAL_APIC */
+
+static inline u32 apic_read(u32 reg) { return 0; }
+static inline void apic_write(u32 reg, u32 val) { }
+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; }
+
+#endif /* CONFIG_X86_LOCAL_APIC */
 
 static inline void ack_APIC_irq(void)
 {
-#ifdef CONFIG_X86_LOCAL_APIC
 	/*
 	 * ack_APIC_irq() actually gets compiled as a single instruction
 	 * ... yummie.
@@ -414,7 +424,6 @@ static inline void ack_APIC_irq(void)
 
 	/* Docs say use 0 for future compatibility */
 	apic_write(APIC_EOI, 0);
-#endif
 }
 
 static inline unsigned default_get_apic_id(unsigned long x)
#2 lore raw

[tip:perf/core] x86, apic: Allow to use certain functions without APIC built-in support

Commit-ID:  d674cd1963129b70bc5f631c51fb30fb73213fb2
Gitweb:     http://git.kernel.org/tip/d674cd1963129b70bc5f631c51fb30fb73213fb2
Author:     Cyrill Gorcunov <[email protected]>
AuthorDate: Wed, 17 Mar 2010 13:37:00 +0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 18 Mar 2010 17:03:21 +0100

x86, apic: Allow to use certain functions without APIC built-in support

In case even if the kernel is configured so that
no APIC support is built-in we still may allow
to use certain apic functions as dummy calls.

In particular we start using it in perf-events code.

Note that this is not that same as NOOP apic driver (which is used if APIC support is present but no physical APIC is available), this is for the case when we don't have apic code compiled in at all.

Cc H. Peter Anvin <[email protected]>
Cc Yinghai Lu <[email protected]>
Cc Yinghai Lu <[email protected]>

LKML-Reference: <[email protected]>

---
 arch/x86/include/asm/apic.h |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
arch/x86/include/asm/apic.h +11 -2
index b4ac2cd..1fa03e0 100644
@@ -373,6 +373,7 @@ extern atomic_t init_deasserted;
 extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
 #endif
 
+#ifdef CONFIG_X86_LOCAL_APIC
 static inline u32 apic_read(u32 reg)
 {
 	return apic->read(reg);
@@ -403,10 +404,19 @@ static inline u32 safe_apic_wait_icr_idle(void)
 	return apic->safe_wait_icr_idle();
 }
 
+#else /* CONFIG_X86_LOCAL_APIC */
+
+static inline u32 apic_read(u32 reg) { return 0; }
+static inline void apic_write(u32 reg, u32 val) { }
+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; }
+
+#endif /* CONFIG_X86_LOCAL_APIC */
 
 static inline void ack_APIC_irq(void)
 {
-#ifdef CONFIG_X86_LOCAL_APIC
 	/*
 	 * ack_APIC_irq() actually gets compiled as a single instruction
 	 * ... yummie.
@@ -414,7 +424,6 @@ static inline void ack_APIC_irq(void)
 
 	/* Docs say use 0 for future compatibility */
 	apic_write(APIC_EOI, 0);
-#endif
 }
 
 static inline unsigned default_get_apic_id(unsigned long x)
#3 lore raw

PATCH 2/2 x86, perf: Use apic_write unconditionally

In reply to Cyrill Gorcunov

Since apic_write maps to a plain noop in !CONFIG_X86_LOCAL_APIC case we're safe to remove this conditional compilation and clean code a bit.

---
 arch/x86/kernel/cpu/perf_event.c    |    4 ----
 arch/x86/kernel/cpu/perf_event_p4.c |    2 --
 2 files changed, 6 deletions(-)
arch/x86/kernel/cpu/perf_event.c +0 -4
Index: linux-2.6.git/arch/x86/kernel/cpu/perf_event.c
=====================================================================
@@ -1135,7 +1135,6 @@ void set_perf_event_pending(void)
 
 void perf_events_lapic_init(void)
 {
-#ifdef CONFIG_X86_LOCAL_APIC
 	if (!x86_pmu.apic || !x86_pmu_initialized())
 		return;
 
@@ -1143,7 +1142,6 @@ void perf_events_lapic_init(void)
 	 * Always use NMI for PMU
 	 */
 	apic_write(APIC_LVTPC, APIC_DM_NMI);
-#endif
 }
 
 static int __kprobes
@@ -1167,9 +1165,7 @@ perf_event_nmi_handler(struct notifier_b
 
 	regs = args->regs;
 
-#ifdef CONFIG_X86_LOCAL_APIC
 	apic_write(APIC_LVTPC, APIC_DM_NMI);
-#endif
 	/*
 	 * Can't rely on the handled return value to say it was our NMI, two
 	 * events could trigger 'simultaneously' raising two back-to-back NMIs.
arch/x86/kernel/cpu/perf_event_p4.c +0 -2
Index: linux-2.6.git/arch/x86/kernel/cpu/perf_event_p4.c
=====================================================================
@@ -363,10 +363,8 @@ static int p4_pmu_handle_irq(struct pt_r
 	}
 
 	if (handled) {
-#ifdef CONFIG_X86_LOCAL_APIC
 		/* p4 quirk: unmask it again */
 		apic_write(APIC_LVTPC, apic_read(APIC_LVTPC) & ~APIC_LVT_MASKED);
-#endif
 		inc_irq_stat(apic_perf_irqs);
 	}
 
#4 lore raw

[tip:perf/core] x86, perf: Use apic_write unconditionally

Commit-ID:  7335f75e9ca166044e38a96abad422d8e6e364b5
Gitweb:     http://git.kernel.org/tip/7335f75e9ca166044e38a96abad422d8e6e364b5
Author:     Cyrill Gorcunov <[email protected]>
AuthorDate: Wed, 17 Mar 2010 13:37:01 +0300
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 18 Mar 2010 17:03:22 +0100

x86, perf: Use apic_write unconditionally

Since apic_write() maps to a plain noop in the !CONFIG_X86_LOCAL_APIC case we're safe to remove this conditional compilation and clean up the code a bit.

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/cpu/perf_event.c    |    4 ----
 arch/x86/kernel/cpu/perf_event_p4.c |    2 --
 2 files changed, 0 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/perf_event.c +0 -4
index c97d5b5..14eca80 100644
@@ -1136,7 +1136,6 @@ void set_perf_event_pending(void)
 
 void perf_events_lapic_init(void)
 {
-#ifdef CONFIG_X86_LOCAL_APIC
 	if (!x86_pmu.apic || !x86_pmu_initialized())
 		return;
 
@@ -1144,7 +1143,6 @@ void perf_events_lapic_init(void)
 	 * Always use NMI for PMU
 	 */
 	apic_write(APIC_LVTPC, APIC_DM_NMI);
-#endif
 }
 
 static int __kprobes
@@ -1168,9 +1166,7 @@ perf_event_nmi_handler(struct notifier_block *self,
 
 	regs = args->regs;
 
-#ifdef CONFIG_X86_LOCAL_APIC
 	apic_write(APIC_LVTPC, APIC_DM_NMI);
-#endif
 	/*
 	 * Can't rely on the handled return value to say it was our NMI, two
 	 * events could trigger 'simultaneously' raising two back-to-back NMIs.
arch/x86/kernel/cpu/perf_event_p4.c +0 -2
index a11ce73..0367889 100644
@@ -363,10 +363,8 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)
 	}
 
 	if (handled) {
-#ifdef CONFIG_X86_LOCAL_APIC
 		/* p4 quirk: unmask it again */
 		apic_write(APIC_LVTPC, apic_read(APIC_LVTPC) & ~APIC_LVT_MASKED);
-#endif
 		inc_irq_stat(apic_perf_irqs);
 	}