Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7e872e7 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

lockdep: i386: connect the sysexit hook 



Run the lockdep_sys_exit hook after all other C code on the syscall
return path.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b351d164

arch/x86/kernel/entry_32.S

+4 −0
Original line number Diff line number Diff line
@@ -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

include/asm-x86/irqflags_32.h

+13 −0
Original line number Diff line number Diff line
@@ -160,4 +160,17 @@ static inline int raw_irqs_disabled(void) 
# define TRACE_IRQS_OFF

#endif



#ifdef CONFIG_DEBUG_LOCK_ALLOC

# define LOCKDEP_SYS_EXIT			\

	pushl %eax;				\

	pushl %ecx;				\

	pushl %edx;				\

	call lockdep_sys_exit;			\

	popl %edx;				\

	popl %ecx;				\

	popl %eax;

#else

# define LOCKDEP_SYS_EXIT

#endif



#endif