Merge branch 'tracing/mmiotrace' into auto-ftrace-next

1 files changed, 7 insertions, 50 deletions

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 42394b353c..0a778e3c43 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -10,6 +10,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/ptrace.h>
+#include <linux/mmiotrace.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
@@ -49,58 +50,14 @@
 #define PF_RSVD         (1<<3)
 #define PF_INSTR        (1<<4)
 
-#ifdef CONFIG_PAGE_FAULT_HANDLERS
-static HLIST_HEAD(pf_handlers); /* protected by RCU */
-static DEFINE_SPINLOCK(pf_handlers_writer);
-
-void register_page_fault_handler(struct pf_handler *new_pfh)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&pf_handlers_writer, flags);
-        hlist_add_head_rcu(&new_pfh->hlist, &pf_handlers);
-        spin_unlock_irqrestore(&pf_handlers_writer, flags);
-}
-EXPORT_SYMBOL_GPL(register_page_fault_handler);
-
-/**
- * unregister_page_fault_handler:
- * The caller must ensure @old_pfh is not in use anymore before freeing it.
- * This function does not guarantee it. The list of handlers is protected by
- * RCU, so you can do this by e.g. calling synchronize_rcu().
- */
-void unregister_page_fault_handler(struct pf_handler *old_pfh)
+static inline int kmmio_fault(struct pt_regs *regs, unsigned long addr)
 {
-        unsigned long flags;
-        spin_lock_irqsave(&pf_handlers_writer, flags);
-        hlist_del_rcu(&old_pfh->hlist);
-        spin_unlock_irqrestore(&pf_handlers_writer, flags);
-}
-EXPORT_SYMBOL_GPL(unregister_page_fault_handler);
+#ifdef CONFIG_MMIOTRACE_HOOKS
+        if (unlikely(is_kmmio_active()))
+                if (kmmio_handler(regs, addr) == 1)
+                        return -1;
 #endif
-
-/* returns non-zero if do_page_fault() should return */
-static int handle_custom_pf(struct pt_regs *regs, unsigned long error_code,
-                                                        unsigned long address)
-{
-#ifdef CONFIG_PAGE_FAULT_HANDLERS
-        int ret = 0;
-        struct pf_handler *cur;
-        struct hlist_node *ncur;
-
-        if (hlist_empty(&pf_handlers))
-                return 0;
-
-        rcu_read_lock();
-        hlist_for_each_entry_rcu(cur, ncur, &pf_handlers, hlist) {
-                ret = cur->handler(regs, error_code, address);
-                if (ret)
-                        break;
-        }
-        rcu_read_unlock();
-        return ret;
-#else
         return 0;
-#endif
 }
 
 static inline int notify_page_fault(struct pt_regs *regs)
@@ -660,7 +617,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
 
         if (notify_page_fault(regs))
                 return;
-        if (handle_custom_pf(regs, error_code, address))
+        if (unlikely(kmmio_fault(regs, address)))
                 return;
 
         /*