From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: lkml <linux-kernel@vger.kernel.org>, linux-arch@vger.kernel.org
Cc: Zach Brown <zach.brown@oracle.com>, Ingo Molnar <mingo@elte.hu>,
akpm@linux-foundation.org,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 03/12] lockdep: x86_64: connect the sysexit hook
Date: Fri, 28 Sep 2007 09:42:03 +0200 [thread overview]
Message-ID: <20070928080041.408922000@chello.nl> (raw)
In-Reply-To: 20070928074200.436463000@chello.nl
[-- Attachment #1: lockdep-x86_64-sys_exit.patch --]
[-- Type: text/plain, Size: 2205 bytes --]
Run the lockdep_sys_exit hook after all other C code on the syscall
return path.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
arch/x86_64/kernel/entry.S | 3 +++
arch/x86_64/lib/thunk.S | 4 ++++
include/asm-x86_64/irqflags.h | 9 +++++++++
3 files changed, 16 insertions(+)
Index: linux-2.6/arch/x86_64/kernel/entry.S
===================================================================
--- linux-2.6.orig/arch/x86_64/kernel/entry.S
+++ linux-2.6/arch/x86_64/kernel/entry.S
@@ -164,6 +164,7 @@ ENTRY(ret_from_fork)
testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT),threadinfo_flags(%rcx)
jnz rff_trace
rff_action:
+ LOCKDEP_SYS_EXIT
RESTORE_REST
testl $3,CS-ARGOFFSET(%rsp) # from kernel_thread?
je int_ret_from_sys_call
@@ -326,6 +327,7 @@ tracesys:
*/
.globl int_ret_from_sys_call
int_ret_from_sys_call:
+ LOCKDEP_SYS_EXIT_REST
cli
TRACE_IRQS_OFF
testl $3,CS-ARGOFFSET(%rsp)
@@ -382,6 +384,7 @@ int_signal:
call do_notify_resume
1: movl $_TIF_NEED_RESCHED,%edi
int_restore_rest:
+ LOCKDEP_SYS_EXIT
RESTORE_REST
cli
TRACE_IRQS_OFF
Index: linux-2.6/arch/x86_64/lib/thunk.S
===================================================================
--- linux-2.6.orig/arch/x86_64/lib/thunk.S
+++ linux-2.6/arch/x86_64/lib/thunk.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
Index: linux-2.6/include/asm-x86_64/irqflags.h
===================================================================
--- linux-2.6.orig/include/asm-x86_64/irqflags.h
+++ linux-2.6/include/asm-x86_64/irqflags.h
@@ -137,6 +137,15 @@ static inline void halt(void)
# define TRACE_IRQS_ON
# define TRACE_IRQS_OFF
# endif
+# ifdef CONFIG_DEBUG_LOCK_ALLOC
+# define LOCKDEP_SYS_EXIT call lockdep_sys_exit_thunk
+# define LOCKDEP_SYS_EXIT_REST SAVE_REST; \
+ LOCKDEP_SYS_EXIT; \
+ RESTORE_REST;
+# else
+# define LOCKDEP_SYS_EXIT
+# define LOCKDEP_SYS_EXIT_REST
+# endif
#endif
#endif
--
next prev parent reply other threads:[~2007-09-28 8:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-28 7:42 [PATCH 00/12] various lockdep patches Peter Zijlstra
2007-09-28 7:42 ` [PATCH 01/12] lockdep: syscall exit check Peter Zijlstra
2007-09-28 12:03 ` Heiko Carstens
2007-09-28 12:14 ` Peter Zijlstra
2007-09-28 12:21 ` Heiko Carstens
2007-09-28 7:42 ` [PATCH 02/12] lockdep: i386: connect the sysexit hook Peter Zijlstra
2007-09-28 7:42 ` Peter Zijlstra [this message]
2007-09-28 7:42 ` [PATCH 04/12] lockdep: annotate journal_start() Peter Zijlstra
2007-09-28 7:42 ` [PATCH 05/12] mm: trylock_page Peter Zijlstra
2007-09-28 3:11 ` Nick Piggin
2007-09-29 15:01 ` Peter Zijlstra
2007-10-02 8:44 ` Nick Piggin
2007-09-28 7:42 ` [PATCH 06/12] mm: remove raw SetPageLocked() usage Peter Zijlstra
2007-09-28 8:22 ` Christoph Hellwig
2007-09-28 7:42 ` [PATCH 07/12] lockdep: page lock hooks Peter Zijlstra
2007-09-28 7:42 ` [PATCH 08/12] lockdep: increase MAX_LOCK_DEPTH Peter Zijlstra
2007-09-28 7:42 ` [PATCH 09/12] lockdep: add a page lock class per filesystem type Peter Zijlstra
2007-09-28 7:42 ` [PATCH 10/12] lockdep: lock_page: handle IO-completions Peter Zijlstra
2007-09-28 7:42 ` [PATCH 11/12] mm: set_page_mapping() Peter Zijlstra
2007-09-28 7:42 ` [PATCH 12/12] lockdep: enable lock_page lockdep annotation Peter Zijlstra
2007-09-28 11:49 ` [PATCH 00/12] various lockdep patches Heiko Carstens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070928080041.408922000@chello.nl \
--to=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=zach.brown@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox