diff options
Diffstat (limited to 'arch/x86/include/asm/trace')
| -rw-r--r-- | arch/x86/include/asm/trace/common.h | 15 | ||||
| -rw-r--r-- | arch/x86/include/asm/trace/exceptions.h | 6 | ||||
| -rw-r--r-- | arch/x86/include/asm/trace/irq_vectors.h | 29 |
3 files changed, 35 insertions, 15 deletions
diff --git a/arch/x86/include/asm/trace/common.h b/arch/x86/include/asm/trace/common.h index b1eb7b18ee8a..57c8da027d99 100644 --- a/arch/x86/include/asm/trace/common.h +++ b/arch/x86/include/asm/trace/common.h @@ -1,15 +1,16 @@ #ifndef _ASM_TRACE_COMMON_H #define _ASM_TRACE_COMMON_H -extern int trace_irq_vector_regfunc(void); -extern void trace_irq_vector_unregfunc(void); - #ifdef CONFIG_TRACING -DECLARE_STATIC_KEY_FALSE(trace_irqvectors_key); -#define trace_irqvectors_enabled() \ - static_branch_unlikely(&trace_irqvectors_key) +DECLARE_STATIC_KEY_FALSE(trace_pagefault_key); +#define trace_pagefault_enabled() \ + static_branch_unlikely(&trace_pagefault_key) +DECLARE_STATIC_KEY_FALSE(trace_resched_ipi_key); +#define trace_resched_ipi_enabled() \ + static_branch_unlikely(&trace_resched_ipi_key) #else -static inline bool trace_irqvectors_enabled(void) { return false; } +static inline bool trace_pagefault_enabled(void) { return false; } +static inline bool trace_resched_ipi_enabled(void) { return false; } #endif #endif diff --git a/arch/x86/include/asm/trace/exceptions.h b/arch/x86/include/asm/trace/exceptions.h index 960a5b50ac3b..5665bf205b8d 100644 --- a/arch/x86/include/asm/trace/exceptions.h +++ b/arch/x86/include/asm/trace/exceptions.h @@ -7,6 +7,9 @@ #include <linux/tracepoint.h> #include <asm/trace/common.h> +extern int trace_pagefault_reg(void); +extern void trace_pagefault_unreg(void); + DECLARE_EVENT_CLASS(x86_exceptions, TP_PROTO(unsigned long address, struct pt_regs *regs, @@ -35,8 +38,7 @@ DEFINE_EVENT_FN(x86_exceptions, name, \ TP_PROTO(unsigned long address, struct pt_regs *regs, \ unsigned long error_code), \ TP_ARGS(address, regs, error_code), \ - trace_irq_vector_regfunc, \ - trace_irq_vector_unregfunc); + trace_pagefault_reg, trace_pagefault_unreg); DEFINE_PAGE_FAULT_EVENT(page_fault_user); DEFINE_PAGE_FAULT_EVENT(page_fault_kernel); diff --git a/arch/x86/include/asm/trace/irq_vectors.h b/arch/x86/include/asm/trace/irq_vectors.h index 7825b4426e7e..a1bdc25b6507 100644 --- a/arch/x86/include/asm/trace/irq_vectors.h +++ b/arch/x86/include/asm/trace/irq_vectors.h @@ -7,6 +7,9 @@ #include <linux/tracepoint.h> #include <asm/trace/common.h> +extern int trace_resched_ipi_reg(void); +extern void trace_resched_ipi_unreg(void); + DECLARE_EVENT_CLASS(x86_irq_vector, TP_PROTO(int vector), @@ -26,15 +29,22 @@ DECLARE_EVENT_CLASS(x86_irq_vector, #define DEFINE_IRQ_VECTOR_EVENT(name) \ DEFINE_EVENT_FN(x86_irq_vector, name##_entry, \ TP_PROTO(int vector), \ + TP_ARGS(vector), NULL, NULL); \ +DEFINE_EVENT_FN(x86_irq_vector, name##_exit, \ + TP_PROTO(int vector), \ + TP_ARGS(vector), NULL, NULL); + +#define DEFINE_RESCHED_IPI_EVENT(name) \ +DEFINE_EVENT_FN(x86_irq_vector, name##_entry, \ + TP_PROTO(int vector), \ TP_ARGS(vector), \ - trace_irq_vector_regfunc, \ - trace_irq_vector_unregfunc); \ + trace_resched_ipi_reg, \ + trace_resched_ipi_unreg); \ DEFINE_EVENT_FN(x86_irq_vector, name##_exit, \ TP_PROTO(int vector), \ TP_ARGS(vector), \ - trace_irq_vector_regfunc, \ - trace_irq_vector_unregfunc); - + trace_resched_ipi_reg, \ + trace_resched_ipi_unreg); /* * local_timer - called when entering/exiting a local timer interrupt @@ -43,9 +53,16 @@ DEFINE_EVENT_FN(x86_irq_vector, name##_exit, \ DEFINE_IRQ_VECTOR_EVENT(local_timer); /* + * The ifdef is required because that tracepoint macro hell emits tracepoint + * code in files which include this header even if the tracepoint is not + * enabled. Brilliant stuff that. + */ +#ifdef CONFIG_SMP +/* * reschedule - called when entering/exiting a reschedule vector handler */ -DEFINE_IRQ_VECTOR_EVENT(reschedule); +DEFINE_RESCHED_IPI_EVENT(reschedule); +#endif /* * spurious_apic - called when entering/exiting a spurious apic vector handler |