lockdep: fixup irq tracing

Ensure we fixup the IRQ state before we hit any locking code.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 10 insertions, 0 deletions

diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index 503dfc05111b..2e542e89a3e2 100644
--- a/arch/x86/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
@@ -303,6 +303,11 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,
         int write, si_code;
         int fault;
 
+        /*
+         * We can fault from pretty much anywhere, with unknown IRQ state.
+         */
+        trace_hardirqs_fixup();
+
         /* get the address */
         address = read_cr2();
 
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c
index 644b4f7ece10..0e26230669ca 100644
--- a/arch/x86/mm/fault_64.c
+++ b/arch/x86/mm/fault_64.c
@@ -304,6 +304,11 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
         unsigned long flags;
         siginfo_t info;
 
+        /*
+         * We can fault from pretty much anywhere, with unknown IRQ state.
+         */
+        trace_hardirqs_fixup();
+
         tsk = current;
         mm = tsk->mm;
         prefetchw(&mm->mmap_sem);