Skip to contentSkip to conversation

apic: tracing IPI events

RFC In review Jiri Olsa 2 participants 5 messages Aug 5, 2010 – Aug 6, 2010

Subsystems (3)
lore
Share & tools
lore

Jiri Olsa

author
#0 lore raw

cover apic: tracing IPI events

hi,

I'm adding tracing of IPIs to the APIC code by hooking following apic callbacks:

        void (*send_IPI_mask)(const struct cpumask *mask, int vector);
        void (*send_IPI_mask_allbutself)(const struct cpumask *mask,
                                         int vector);
        void (*send_IPI_allbutself)(int vector);
        void (*send_IPI_all)(int vector);
        void (*send_IPI_self)(int vector);

attached patches:
- 1/2 apic: adding apic_send_IPI_* methods for apic's IPI callbacks
- 2/2 apic,trace: IPI sent trace event.

I'm not sure this is the best way, maybe some more general approach might be better.

please let me know what you think

wbr,
jirka

---
 arch/x86/include/asm/apic.h             |   16 +++++++++-
 arch/x86/include/asm/apic_trace.h       |   53 +++++++++++++++++++++++++++++++
 arch/x86/include/asm/ipi.h              |    4 +-
 arch/x86/kernel/apic/apic.c             |   48 +++++++++++++++++++++++++++-
 arch/x86/kernel/apic/apic_flat_64.c     |    4 +-
 arch/x86/kernel/apic/hw_nmi.c           |    2 +-
 arch/x86/kernel/apic/io_apic.c          |    9 +++--
 arch/x86/kernel/apic/nmi.c              |    2 +-
 arch/x86/kernel/apic/probe_64.c         |    2 +-
 arch/x86/kernel/cpu/mcheck/mce-inject.c |    2 +-
 arch/x86/kernel/cpu/mcheck/mce.c        |    2 +-
 arch/x86/kernel/cpu/perf_event.c        |    2 +-
 arch/x86/kernel/kgdb.c                  |    2 +-
 arch/x86/kernel/reboot.c                |    2 +-
 arch/x86/kernel/smp.c                   |   12 +++---
 arch/x86/mm/tlb.c                       |    2 +-
 16 files changed, 139 insertions(+), 25 deletions(-)
author
#1 lore raw

PATCH 1/2 apic: adding apic_send_IPI_* methods for apic's IPI callbacks

Adding global methods apic_send_IPI_* for following APIC callbacks:

        void (*send_IPI_mask)(const struct cpumask *mask, int vector);
        void (*send_IPI_mask_allbutself)(const struct cpumask *mask,
                                         int vector);
        void (*send_IPI_allbutself)(int vector);
        void (*send_IPI_all)(int vector);
        void (*send_IPI_self)(int vector);

apic_send_IPI_* calls will be used to generate the trace event.

wbr,
jirka

---
 arch/x86/include/asm/apic.h             |   16 +++++++++++++++-
 arch/x86/include/asm/ipi.h              |    4 ++--
 arch/x86/kernel/apic/apic.c             |   27 ++++++++++++++++++++++++++-
 arch/x86/kernel/apic/apic_flat_64.c     |    4 ++--
 arch/x86/kernel/apic/hw_nmi.c           |    2 +-
 arch/x86/kernel/apic/io_apic.c          |    9 +++++----
 arch/x86/kernel/apic/nmi.c              |    2 +-
 arch/x86/kernel/apic/probe_64.c         |    2 +-
 arch/x86/kernel/cpu/mcheck/mce-inject.c |    2 +-
 arch/x86/kernel/cpu/mcheck/mce.c        |    2 +-
 arch/x86/kernel/cpu/perf_event.c        |    2 +-
 arch/x86/kernel/kgdb.c                  |    2 +-
 arch/x86/kernel/reboot.c                |    2 +-
 arch/x86/kernel/smp.c                   |   12 ++++++------
 arch/x86/mm/tlb.c                       |    2 +-
 15 files changed, 65 insertions(+), 25 deletions(-)
arch/x86/include/asm/apic.h +15 -1
index 1fa03e0..d8da79f 100644
@@ -404,6 +404,12 @@ static inline u32 safe_apic_wait_icr_idle(void)
 	return apic->safe_wait_icr_idle();
 }
 
+void apic_send_IPI_mask(const struct cpumask *mask, int vector);
+void apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector);
+void apic_send_IPI_allbutself(int vector);
+void apic_send_IPI_all(int vector);
+void apic_send_IPI_self(int vector);
+
 #else /* CONFIG_X86_LOCAL_APIC */
 
 static inline u32 apic_read(u32 reg) { return 0; }
@@ -412,6 +418,14 @@ 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_send_IPI_mask(const struct cpumask *mask,
+				      int vector) { }
+static inline void apic_send_IPI_mask_allbutself(const struct cpumask *mask,
+						 int vector) { }
+static inline void apic_send_IPI_allbutself(int vector) { }
+static inline void apic_send_IPI_all(int vector) { }
+static inline void apic_send_IPI_self(int vector) { }
+
 
 #endif /* CONFIG_X86_LOCAL_APIC */
 
@@ -449,7 +463,7 @@ extern struct apic apic_x2apic_cluster;
 extern struct apic apic_x2apic_phys;
 extern int default_acpi_madt_oem_check(char *, char *);
 
-extern void apic_send_IPI_self(int vector);
+extern void apic_send_IPI_self_default(int vector);
 
 extern struct apic apic_x2apic_uv_x;
 DECLARE_PER_CPU(int, x2apic_extra_bits);
arch/x86/include/asm/ipi.h +2 -2
index 0b72282..19717cb 100644
@@ -136,7 +136,7 @@ extern int no_broadcast;
 static inline void __default_local_send_IPI_allbutself(int vector)
 {
 	if (no_broadcast || vector == NMI_VECTOR)
-		apic->send_IPI_mask_allbutself(cpu_online_mask, vector);
+		apic_send_IPI_mask_allbutself(cpu_online_mask, vector);
 	else
 		__default_send_IPI_shortcut(APIC_DEST_ALLBUT, vector, apic->dest_logical);
 }
@@ -144,7 +144,7 @@ static inline void __default_local_send_IPI_allbutself(int vector)
 static inline void __default_local_send_IPI_all(int vector)
 {
 	if (no_broadcast || vector == NMI_VECTOR)
-		apic->send_IPI_mask(cpu_online_mask, vector);
+		apic_send_IPI_mask(cpu_online_mask, vector);
 	else
 		__default_send_IPI_shortcut(APIC_DEST_ALLINC, vector, apic->dest_logical);
 }
arch/x86/kernel/apic/apic.c +26 -1
index a96489e..2ab2f26 100644
@@ -455,7 +455,7 @@ static void lapic_timer_setup(enum clock_event_mode mode,
 static void lapic_timer_broadcast(const struct cpumask *mask)
 {
 #ifdef CONFIG_SMP
-	apic->send_IPI_mask(mask, LOCAL_TIMER_VECTOR);
+	apic_send_IPI_mask(mask, LOCAL_TIMER_VECTOR);
 #endif
 }
 
@@ -2332,3 +2332,28 @@ static int __init lapic_insert_resource(void)
  * that is using request_resource
  */
 late_initcall(lapic_insert_resource);
+
+void apic_send_IPI_mask(const struct cpumask *mask, int vector)
+{
+	apic->send_IPI_mask(mask, vector);
+}
+
+void apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector)
+{
+	apic->send_IPI_mask_allbutself(mask, vector);
+}
+
+void apic_send_IPI_allbutself(int vector)
+{
+	apic->send_IPI_allbutself(vector);
+}
+
+void apic_send_IPI_all(int vector)
+{
+	apic->send_IPI_all(vector);
+}
+
+void apic_send_IPI_self(int vector)
+{
+	apic->send_IPI_self(vector);
+}
arch/x86/kernel/apic/apic_flat_64.c +2 -2
index 09d3b17..47df43f 100644
@@ -206,7 +206,7 @@ struct apic apic_flat =  {
 	.send_IPI_mask_allbutself	= flat_send_IPI_mask_allbutself,
 	.send_IPI_allbutself		= flat_send_IPI_allbutself,
 	.send_IPI_all			= flat_send_IPI_all,
-	.send_IPI_self			= apic_send_IPI_self,
+	.send_IPI_self			= apic_send_IPI_self_default,
 
 	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,
 	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,
@@ -358,7 +358,7 @@ struct apic apic_physflat =  {
 	.send_IPI_mask_allbutself	= physflat_send_IPI_mask_allbutself,
 	.send_IPI_allbutself		= physflat_send_IPI_allbutself,
 	.send_IPI_all			= physflat_send_IPI_all,
-	.send_IPI_self			= apic_send_IPI_self,
+	.send_IPI_self			= apic_send_IPI_self_default,
 
 	.trampoline_phys_low		= DEFAULT_TRAMPOLINE_PHYS_LOW,
 	.trampoline_phys_high		= DEFAULT_TRAMPOLINE_PHYS_HIGH,
arch/x86/kernel/apic/hw_nmi.c +1 -1
index cefd694..03eed85 100644
@@ -33,7 +33,7 @@ void arch_trigger_all_cpu_backtrace(void)
 	cpumask_copy(to_cpumask(backtrace_mask), cpu_online_mask);
 
 	printk(KERN_INFO "sending NMI to all CPUs:\n");
-	apic->send_IPI_all(NMI_VECTOR);
+	apic_send_IPI_all(NMI_VECTOR);
 
 	/* Wait for up to 10 seconds for all CPUs to do the backtrace */
 	for (i = 0; i < 10 * 1000; i++) {
arch/x86/kernel/apic/io_apic.c +5 -4
index e41ed24..6589f84 100644
@@ -2258,7 +2258,7 @@ static int ioapic_retrigger_irq(unsigned int irq)
 	unsigned long flags;
 
 	raw_spin_lock_irqsave(&vector_lock, flags);
-	apic->send_IPI_mask(cpumask_of(cpumask_first(cfg->domain)), cfg->vector);
+	apic_send_IPI_mask(cpumask_of(cpumask_first(cfg->domain)), cfg->vector);
 	raw_spin_unlock_irqrestore(&vector_lock, flags);
 
 	return 1;
@@ -2281,10 +2281,11 @@ void send_cleanup_vector(struct irq_cfg *cfg)
 	if (unlikely(!alloc_cpumask_var(&cleanup_mask, GFP_ATOMIC))) {
 		unsigned int i;
 		for_each_cpu_and(i, cfg->old_domain, cpu_online_mask)
-			apic->send_IPI_mask(cpumask_of(i), IRQ_MOVE_CLEANUP_VECTOR);
+			apic_send_IPI_mask(cpumask_of(i),
+					   IRQ_MOVE_CLEANUP_VECTOR);
 	} else {
 		cpumask_and(cleanup_mask, cfg->old_domain, cpu_online_mask);
-		apic->send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR);
+		apic_send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR);
 		free_cpumask_var(cleanup_mask);
 	}
 	cfg->move_in_progress = 0;
@@ -2493,7 +2494,7 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
 		 * to myself.
 		 */
 		if (irr  & (1 << (vector % 32))) {
-			apic->send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR);
+			apic_send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR);
 			goto unlock;
 		}
 		__get_cpu_var(vector_irq)[vector] = -1;
arch/x86/kernel/apic/nmi.c +1 -1
index a43f71c..b28bf24 100644
@@ -556,7 +556,7 @@ void arch_trigger_all_cpu_backtrace(void)
 	cpumask_copy(to_cpumask(backtrace_mask), cpu_online_mask);
 
 	printk(KERN_INFO "sending NMI to all CPUs:\n");
-	apic->send_IPI_all(NMI_VECTOR);
+	apic_send_IPI_all(NMI_VECTOR);
 
 	/* Wait for up to 10 seconds for all CPUs to do the backtrace */
 	for (i = 0; i < 10 * 1000; i++) {
arch/x86/kernel/apic/probe_64.c +1 -1
index 83e9be4..7328526 100644
@@ -87,7 +87,7 @@ void __init default_setup_apic_routing(void)
 
 /* Same for both flat and physical. */
 
-void apic_send_IPI_self(int vector)
+void apic_send_IPI_self_default(int vector)
 {
 	__default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
 }
arch/x86/kernel/cpu/mcheck/mce-inject.c +1 -1
index e7dbde7..3a59bbb 100644
@@ -158,7 +158,7 @@ static void raise_mce(struct mce *m)
 				cpumask_clear_cpu(cpu, mce_inject_cpumask);
 		}
 		if (!cpumask_empty(mce_inject_cpumask))
-			apic->send_IPI_mask(mce_inject_cpumask, NMI_VECTOR);
+			apic_send_IPI_mask(mce_inject_cpumask, NMI_VECTOR);
 		start = jiffies;
 		while (!cpumask_empty(mce_inject_cpumask)) {
 			if (!time_before(jiffies, start + 2*HZ)) {
arch/x86/kernel/cpu/mcheck/mce.c +1 -1
index 7a6f81e..5a00034 100644
@@ -513,7 +513,7 @@ static void mce_report_event(struct pt_regs *regs)
 	 * through the APIC to instead do the notification
 	 * after interrupts are reenabled again.
 	 */
-	apic->send_IPI_self(MCE_SELF_VECTOR);
+	apic_send_IPI_self(MCE_SELF_VECTOR);
 
 	/*
 	 * Wait for idle afterwards again so that we don't leave the
arch/x86/kernel/cpu/perf_event.c +1 -1
index f2da20f..b2971ad 100644
@@ -1185,7 +1185,7 @@ void set_perf_event_pending(void)
 	if (!x86_pmu.apic || !x86_pmu_initialized())
 		return;
 
-	apic->send_IPI_self(LOCAL_PENDING_VECTOR);
+	apic_send_IPI_self(LOCAL_PENDING_VECTOR);
 #endif
 }
 
arch/x86/kernel/kgdb.c +1 -1
index 01ab17a..a7a2660 100644
@@ -432,7 +432,7 @@ void kgdb_disable_hw_debug(struct pt_regs *regs)
  */
 void kgdb_roundup_cpus(unsigned long flags)
 {
-	apic->send_IPI_allbutself(APIC_DM_NMI);
+	apic_send_IPI_allbutself(APIC_DM_NMI);
 }
 #endif
 
arch/x86/kernel/reboot.c +1 -1
index e3af342..669df18 100644
@@ -779,7 +779,7 @@ static int crash_nmi_callback(struct notifier_block *self,
 
 static void smp_send_nmi_allbutself(void)
 {
-	apic->send_IPI_allbutself(NMI_VECTOR);
+	apic_send_IPI_allbutself(NMI_VECTOR);
 }
 
 static struct notifier_block crash_nmi_nb = {
arch/x86/kernel/smp.c +6 -6
index d801210..4dfda13 100644
@@ -118,12 +118,12 @@ static void native_smp_send_reschedule(int cpu)
 		WARN_ON(1);
 		return;
 	}
-	apic->send_IPI_mask(cpumask_of(cpu), RESCHEDULE_VECTOR);
+	apic_send_IPI_mask(cpumask_of(cpu), RESCHEDULE_VECTOR);
 }
 
 void native_send_call_func_single_ipi(int cpu)
 {
-	apic->send_IPI_mask(cpumask_of(cpu), CALL_FUNCTION_SINGLE_VECTOR);
+	apic_send_IPI_mask(cpumask_of(cpu), CALL_FUNCTION_SINGLE_VECTOR);
 }
 
 void native_send_call_func_ipi(const struct cpumask *mask)
@@ -131,7 +131,7 @@ void native_send_call_func_ipi(const struct cpumask *mask)
 	cpumask_var_t allbutself;
 
 	if (!alloc_cpumask_var(&allbutself, GFP_ATOMIC)) {
-		apic->send_IPI_mask(mask, CALL_FUNCTION_VECTOR);
+		apic_send_IPI_mask(mask, CALL_FUNCTION_VECTOR);
 		return;
 	}
 
@@ -140,9 +140,9 @@ void native_send_call_func_ipi(const struct cpumask *mask)
 
 	if (cpumask_equal(mask, allbutself) &&
 	    cpumask_equal(cpu_online_mask, cpu_callout_mask))
-		apic->send_IPI_allbutself(CALL_FUNCTION_VECTOR);
+		apic_send_IPI_allbutself(CALL_FUNCTION_VECTOR);
 	else
-		apic->send_IPI_mask(mask, CALL_FUNCTION_VECTOR);
+		apic_send_IPI_mask(mask, CALL_FUNCTION_VECTOR);
 
 	free_cpumask_var(allbutself);
 }
@@ -177,7 +177,7 @@ static void native_smp_send_stop(void)
 	 * currently)
 	 */
 	if (num_online_cpus() > 1) {
-		apic->send_IPI_allbutself(REBOOT_VECTOR);
+		apic_send_IPI_allbutself(REBOOT_VECTOR);
 
 		/* Don't wait longer than a second */
 		wait = USEC_PER_SEC;
arch/x86/mm/tlb.c +1 -1
index c03f14a..368bd20 100644
@@ -190,7 +190,7 @@ static void flush_tlb_others_ipi(const struct cpumask *cpumask,
 		 * We have to send the IPI only to
 		 * CPUs affected.
 		 */
-		apic->send_IPI_mask(to_cpumask(f->flush_cpumask),
+		apic_send_IPI_mask(to_cpumask(f->flush_cpumask),
 			      INVALIDATE_TLB_VECTOR_START + sender);
 
 		while (!cpumask_empty(to_cpumask(f->flush_cpumask)))
Signature · 1 line
1.7.2
author
#2 lore raw

PATCH 2/2 apic,trace: IPI sent trace event.

In reply to Jiri Olsa

Adding apic IPI trace event.

wbr,
jirka

---
 arch/x86/include/asm/apic_trace.h |   53 +++++++++++++++++++++++++++++++++++++
 arch/x86/kernel/apic/apic.c       |   21 ++++++++++++++
 2 files changed, 74 insertions(+), 0 deletions(-)
 create mode 100644 arch/x86/include/asm/apic_trace.h
arch/x86/include/asm/apic_trace.h new file +53 -0
new file mode 100644
index 0000000..03eea8e
@@ -0,0 +1,53 @@
+
+#if !defined(_TRACE_APIC_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_APIC_H
+
+#include <linux/tracepoint.h>
+#include <linux/cpumask.h>
+
+#define BUFSIZE (50)
+#define CPU_MASK_PRINTK() ({						\
+	const char *ret = p->buffer + p->len;				\
+	char buf[BUFSIZE];						\
+	bitmap_scnlistprintf(buf, BUFSIZE,				\
+			     __entry->mask, nr_cpumask_bits);		\
+	trace_seq_printf(p, "to cpu(s) %s\n", buf);			\
+	ret;								\
+})
+
+/**
+ * apic_send_IPI_mask - called before the IPI is send
+ * @mask: cpu mask the IPI is directed to
+ * @vector: interrupt number
+ */
+TRACE_EVENT(apic_send_IPI,
+
+	TP_PROTO(const struct cpumask *mask, int vector),
+
+	TP_ARGS(mask, vector),
+
+	TP_STRUCT__entry(
+		__array(unsigned long, mask, nr_cpumask_bits)
+		__field(int, vector)
+	),
+
+	TP_fast_assign(
+		bitmap_copy(__entry->mask, cpumask_bits(mask), nr_cpumask_bits);
+		__entry->vector = vector;
+	),
+
+	TP_printk("irq %d, %s", __entry->vector, CPU_MASK_PRINTK())
+);
+
+#endif /* _TRACE_APIC_H */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM irq
+
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE apic_trace
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH asm
+
+#include <trace/define_trace.h>
arch/x86/kernel/apic/apic.c +21 -0
index 2ab2f26..d8cddf0 100644
@@ -53,6 +53,9 @@
 #include <asm/kvm_para.h>
 #include <asm/tsc.h>
 
+#define CREATE_TRACE_POINTS
+#include <asm/apic_trace.h>
+
 unsigned int num_processors;
 
 unsigned disabled_cpus __cpuinitdata;
@@ -2335,25 +2338,43 @@ late_initcall(lapic_insert_resource);
 
 void apic_send_IPI_mask(const struct cpumask *mask, int vector)
 {
+	trace_apic_send_IPI(mask, vector);
+
 	apic->send_IPI_mask(mask, vector);
 }
 
 void apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector)
 {
+	trace_apic_send_IPI(mask, vector);
+
 	apic->send_IPI_mask_allbutself(mask, vector);
 }
 
 void apic_send_IPI_allbutself(int vector)
 {
+	struct cpumask mask;
+
+	cpumask_copy(&mask, cpu_possible_mask);
+	cpumask_clear_cpu(smp_processor_id(), &mask);
+	trace_apic_send_IPI(&mask, vector);
+
 	apic->send_IPI_allbutself(vector);
 }
 
 void apic_send_IPI_all(int vector)
 {
+	trace_apic_send_IPI(cpu_online_mask, vector);
+
 	apic->send_IPI_all(vector);
 }
 
 void apic_send_IPI_self(int vector)
 {
+	struct cpumask mask;
+
+	cpumask_clear(&mask);
+	cpumask_set_cpu(smp_processor_id(), &mask);
+	trace_apic_send_IPI(&mask, vector);
+
 	apic->send_IPI_self(vector);
 }
Signature · 1 line
1.7.2
#3 lore raw
In reply to Jiri Olsa
Quoted 2 lines · Jiri Olsa

please let me know what you think

You forgot to state why you want it?

In generall the only case that should happen anytime commonly is mask, the others only for obscure uncommon paths.

However there is already accounting for it in /proc/interrupts that can be easily sampled. Does adding additional tracing really give any value?

-Andi

Signature · 1 line
[email protected] -- Speaking for myself only.
author
#4 lore raw
Quoted 4 lines · Andi Kleen
Quoted 2 lines · Jiri Olsa

please let me know what you think

Quoted 8 lines

You forgot to state why you want it?

In generall the only case that should happen anytime commonly is mask, the others only for obscure uncommon paths.

However there is already accounting for it in /proc/interrupts that can be easily sampled. Does adding additional tracing really give any value?

As I was asked to do that for other guys, I'm not completely sure. Anyway the reason I got was, that while debuging crash it seemed some IPIs might got lost.

Also it'd be probably used as a tracepoint itself via additional code, than by ring buffer tracing.

I'll check if I can get more justifing info..

jirka

Quoted 4 lines

-Andi

Signature · 1 line
[email protected] -- Speaking for myself only.