5 files changed, 33 insertions, 12 deletions

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 290b7bc82d..8099fea0a7 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -251,6 +251,7 @@ check_userspace:
         jb resume_kernel                # not returning to v8086 or userspace
 
 ENTRY(resume_userspace)
+        LOCKDEP_SYS_EXIT
         DISABLE_INTERRUPTS(CLBR_ANY)    # make sure we don't miss an interrupt
                                         # setting need_resched or sigpending
                                         # between sampling and the iret
@@ -338,6 +339,7 @@ sysenter_past_esp:
         jae syscall_badsys
         call *sys_call_table(,%eax,4)
         movl %eax,PT_EAX(%esp)
+        LOCKDEP_SYS_EXIT
         DISABLE_INTERRUPTS(CLBR_ANY)
         TRACE_IRQS_OFF
         movl TI_flags(%ebp), %ecx
@@ -377,6 +379,7 @@ syscall_call:
         call *sys_call_table(,%eax,4)
         movl %eax,PT_EAX(%esp)          # store the return value
 syscall_exit:
+        LOCKDEP_SYS_EXIT
         DISABLE_INTERRUPTS(CLBR_ANY)    # make sure we don't miss an interrupt
                                         # setting need_resched or sigpending
                                         # between sampling and the iret
@@ -467,6 +470,7 @@ work_pending:
         jz work_notifysig
 work_resched:
         call schedule
+        LOCKDEP_SYS_EXIT
         DISABLE_INTERRUPTS(CLBR_ANY)    # make sure we don't miss an interrupt
                                         # setting need_resched or sigpending
                                         # between sampling and the iret
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 1d232e5f56..f1cacd4897 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -244,6 +244,7 @@ ret_from_sys_call:
         movl $_TIF_ALLWORK_MASK,%edi
         /* edi: flagmask */
 sysret_check:           
+        LOCKDEP_SYS_EXIT
         GET_THREAD_INFO(%rcx)
         cli
         TRACE_IRQS_OFF
@@ -333,6 +334,7 @@ int_ret_from_sys_call:
         movl $_TIF_ALLWORK_MASK,%edi
         /* edi: mask to check */
 int_with_check:
+        LOCKDEP_SYS_EXIT_IRQ
         GET_THREAD_INFO(%rcx)
         movl threadinfo_flags(%rcx),%edx
         andl %edi,%edx
@@ -544,11 +546,13 @@ exit_intr:
 retint_with_reschedule:
         movl $_TIF_WORK_MASK,%edi
 retint_check:
+        LOCKDEP_SYS_EXIT_IRQ
         movl threadinfo_flags(%rcx),%edx
         andl %edi,%edx
         CFI_REMEMBER_STATE
         jnz  retint_careful
-retint_swapgs:          
+
+retint_swapgs:          /* return to user-space */
         /*
          * The iretq could re-enable interrupts:
          */
@@ -557,7 +561,7 @@ retint_swapgs:
         swapgs 
         jmp restore_args
 
-retint_restore_args:                            
+retint_restore_args:    /* return to kernel space */
         cli
         /*
          * The iretq could re-enable interrupts:
@@ -866,26 +870,21 @@ error_sti:
         movq ORIG_RAX(%rsp),%rsi        /* get error code */ 
         movq $-1,ORIG_RAX(%rsp)
         call *%rax
-        /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */     
-error_exit:             
-        movl %ebx,%eax          
+        /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
+error_exit:
+        movl %ebx,%eax
         RESTORE_REST
         cli
         TRACE_IRQS_OFF
         GET_THREAD_INFO(%rcx)   
         testl %eax,%eax
         jne  retint_kernel
+        LOCKDEP_SYS_EXIT_IRQ
         movl  threadinfo_flags(%rcx),%edx
         movl  $_TIF_WORK_MASK,%edi
         andl  %edi,%edx
         jnz  retint_careful
-        /*
-         * The iret might restore flags:
-         */
-        TRACE_IRQS_IRETQ
-        swapgs 
-        RESTORE_ARGS 0,8,0                                              
-        jmp iret_label
+        jmp retint_swapgs
         CFI_ENDPROC
 
 error_kernelspace:
diff --git a/arch/x86/kernel/kprobes_32.c b/arch/x86/kernel/kprobes_32.c
index c2d03e96ae..e7d0d3c2ef 100644
--- a/arch/x86/kernel/kprobes_32.c
+++ b/arch/x86/kernel/kprobes_32.c
@@ -557,6 +557,12 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs)
 
         resume_execution(cur, regs, kcb);
         regs->eflags |= kcb->kprobe_saved_eflags;
+#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
+        if (raw_irqs_disabled_flags(regs->eflags))
+                trace_hardirqs_off();
+        else
+                trace_hardirqs_on();
+#endif
 
         /*Restore back the original saved kprobes variables and continue. */
         if (kcb->kprobe_status == KPROBE_REENTER) {
@@ -694,6 +700,7 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         memcpy(kcb->jprobes_stack, (kprobe_opcode_t *)addr,
                         MIN_STACK_SIZE(addr));
         regs->eflags &= ~IF_MASK;
+        trace_hardirqs_off();
         regs->eip = (unsigned long)(jp->entry);
         return 1;
 }
diff --git a/arch/x86/kernel/kprobes_64.c b/arch/x86/kernel/kprobes_64.c
index 1df17a0ec0..62e28e52d7 100644
--- a/arch/x86/kernel/kprobes_64.c
+++ b/arch/x86/kernel/kprobes_64.c
@@ -544,6 +544,12 @@ int __kprobes post_kprobe_handler(struct pt_regs *regs)
 
         resume_execution(cur, regs, kcb);
         regs->eflags |= kcb->kprobe_saved_rflags;
+#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
+        if (raw_irqs_disabled_flags(regs->eflags))
+                trace_hardirqs_off();
+        else
+                trace_hardirqs_on();
+#endif
 
         /* Restore the original saved kprobes variables and continue. */
         if (kcb->kprobe_status == KPROBE_REENTER) {
@@ -684,6 +690,7 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         memcpy(kcb->jprobes_stack, (kprobe_opcode_t *)addr,
                         MIN_STACK_SIZE(addr));
         regs->eflags &= ~IF_MASK;
+        trace_hardirqs_off();
         regs->rip = (unsigned long)(jp->entry);
         return 1;
 }
diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
index 55e586d352..6ea73f3de5 100644
--- a/arch/x86/lib/thunk_64.S
+++ b/arch/x86/lib/thunk_64.S
@@ -50,6 +50,10 @@
         thunk trace_hardirqs_on_thunk,trace_hardirqs_on
         thunk trace_hardirqs_off_thunk,trace_hardirqs_off
 #endif
+
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+        thunk lockdep_sys_exit_thunk,lockdep_sys_exit
+#endif
         
         /* SAVE_ARGS below is used only for the .cfi directives it contains. */
         CFI_STARTPROC