3 files changed, 67 insertions, 0 deletions

diff --git a/arch/x86/include/asm/trace/exceptions.h b/arch/x86/include/asm/trace/exceptions.h
new file mode 100644
index 000000000000..86540c094ecc
--- /dev/null
+++ b/arch/x86/include/asm/trace/exceptions.h
@@ -0,0 +1,52 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM exceptions
+
+#if !defined(_TRACE_PAGE_FAULT_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_PAGE_FAULT_H
+
+#include <linux/tracepoint.h>
+
+extern void trace_irq_vector_regfunc(void);
+extern void trace_irq_vector_unregfunc(void);
+
+DECLARE_EVENT_CLASS(x86_exceptions,
+
+        TP_PROTO(unsigned long address, struct pt_regs *regs,
+                 unsigned long error_code),
+
+        TP_ARGS(address, regs, error_code),
+
+        TP_STRUCT__entry(
+                __field(                unsigned long, address  )
+                __field(                unsigned long, ip       )
+                __field(                unsigned long, error_code )
+        ),
+
+        TP_fast_assign(
+                __entry->address = address;
+                __entry->ip = regs->ip;
+                __entry->error_code = error_code;
+        ),
+
+        TP_printk("address=%pf ip=%pf error_code=0x%lx",
+                  (void *)__entry->address, (void *)__entry->ip,
+                  __entry->error_code) );
+
+#define DEFINE_PAGE_FAULT_EVENT(name)                           \
+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);
+
+DEFINE_PAGE_FAULT_EVENT(user_page_fault);
+DEFINE_PAGE_FAULT_EVENT(kernel_page_fault);
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE exceptions
+#endif /*  _TRACE_PAGE_FAULT_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 23d8e5fecf76..6a19ad9f370d 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -6,6 +6,8 @@ nostackp := $(call cc-option, -fno-stack-protector)
 CFLAGS_physaddr.o               := $(nostackp)
 CFLAGS_setup_nx.o               := $(nostackp)
 
+CFLAGS_fault.o := -I$(src)/../include/asm/trace
+
 obj-$(CONFIG_X86_PAT)           += pat_rbtree.o
 obj-$(CONFIG_SMP)               += tlb.o
 
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index fd3e281fbc70..f2730cbce0b5 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -20,6 +20,9 @@
 #include <asm/kmemcheck.h>              /* kmemcheck_*(), ...           */
 #include <asm/fixmap.h>                 /* VSYSCALL_START               */
 
+#define CREATE_TRACE_POINTS
+#include <asm/trace/exceptions.h>
+
 /*
  * Page fault error code bits:
  *
@@ -1232,12 +1235,22 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
         exception_exit(prev_state);
 }
 
+static void trace_page_fault_entries(struct pt_regs *regs,
+                                     unsigned long error_code)
+{
+        if (user_mode(regs))
+                trace_user_page_fault(read_cr2(), regs, error_code);
+        else
+                trace_kernel_page_fault(read_cr2(), regs, error_code);
+}
+
 dotraplinkage void __kprobes
 trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
 {
         enum ctx_state prev_state;
 
         prev_state = exception_enter();
+        trace_page_fault_entries(regs, error_code);
         __do_page_fault(regs, error_code);
         exception_exit(prev_state);
 }