Skip to contentSkip to conversation

Move locking primitives into kernel/locking/

RFC In review Peter Zijlstra 6 participants 23 messages Nov 5, 2013 – Nov 8, 2013

Subsystems (3)
lore
Share & tools
lore

Peter Zijlstra

author maintainer
#0 lore raw

cover Move locking primitives into kernel/locking/

Hi all,

During Kernel Summit Dave mentioned that there wasn't a clear maintainer for locking bits.

To remedy this Ingo suggested gathering all the various locking primitives and lockdep into a single place: kernel/locking/.

I would further like to propose a MAINTAINERS entry like:

LOCKING

M:      Ingo Molnar <[email protected]>
M:      Peter Zijlstra <[email protected]>
M:	Oleg Nesterov <[email protected]>
M:	"Paul E. McKenney" <[email protected]>
M:	Linus Torvalds <[email protected]>
T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S:      Maintained
F:      kernel/locking/

Because for most 'fun' locking discussions we usually end up with at least those people anyway :-)

Comments?

---
 kernel/lglock.c                    |   89 
 kernel/lockdep.c                   | 4257 -----------------------------------
 kernel/lockdep_internals.h         |  170 -
 kernel/lockdep_proc.c              |  683 -----
 kernel/lockdep_states.h            |    9 
 kernel/mutex-debug.c               |  110 
 kernel/mutex-debug.h               |   55 
 kernel/mutex.c                     |  960 -------
 kernel/mutex.h                     |   48 
 kernel/rtmutex-debug.c             |  187 -
 kernel/rtmutex-debug.h             |   33 
 kernel/rtmutex-tester.c            |  420 ---
 kernel/rtmutex.c                   | 1060 --------
 kernel/rtmutex.h                   |   26 
 kernel/rtmutex_common.h            |  126 -
 kernel/rwsem.c                     |  157 -
 kernel/semaphore.c                 |  263 --
 kernel/spinlock.c                  |  399 ---
 lib/percpu-rwsem.c                 |  165 -
 lib/rwsem-spinlock.c               |  296 --
 lib/rwsem.c                        |  293 --
 lib/spinlock_debug.c               |  302 --
 kernel/locking/Makefile            |   25 
 kernel/locking/lglock.c            |   89 
 kernel/locking/lockdep.c           | 4257 +++++++++++++++++++++++++++++++++++
 kernel/locking/lockdep_internals.h |  170 +
 kernel/locking/lockdep_proc.c      |  683 +++++
 kernel/locking/lockdep_states.h    |    9 
 kernel/locking/mutex-debug.c       |  110 
 kernel/locking/mutex-debug.h       |   55 
 kernel/locking/mutex.c             |  960 +++++++
 kernel/locking/mutex.h             |   48 
 kernel/locking/percpu-rwsem.c      |  165 +
 kernel/locking/rtmutex-debug.c     |  187 +
 kernel/locking/rtmutex-debug.h     |   33 
 kernel/locking/rtmutex-tester.c    |  420 +++
 kernel/locking/rtmutex.c           | 1060 ++++++++
 kernel/locking/rtmutex.h           |   26 
 kernel/locking/rtmutex_common.h    |  126 +
 kernel/locking/rwsem-spinlock.c    |  296 ++
 kernel/locking/rwsem-xadd.c        |  293 ++
 kernel/locking/rwsem.c             |  157 +
 kernel/locking/semaphore.c         |  263 ++
 kernel/locking/spinlock.c          |  399 +++
 kernel/locking/spinlock_debug.c    |  302 ++
 kernel/Makefile                    |   22 
 kernel/futex.c                     |    2 
 lib/Makefile                       |    4 
 48 files changed, 10138 insertions(+), 10131 deletions(-)
author maintainer
#1 lore raw

RFC 1/8 locking: Move mutex into kernel/locking/

---
 kernel/Makefile              |    6 
 kernel/locking/Makefile      |    9 
 kernel/locking/mutex-debug.c |  110 ++++
 kernel/locking/mutex-debug.h |   55 ++
 kernel/locking/mutex.c       |  960 +++++++++++++++++++++++++++++++++++++++++++
 kernel/locking/mutex.h       |   48 ++
 kernel/mutex-debug.c         |  110 ----
 kernel/mutex-debug.h         |   55 --
 kernel/mutex.c               |  960 -------------------------------------------
 kernel/mutex.h               |   48 --
 10 files changed, 1184 insertions(+), 1177 deletions(-)
kernel/Makefile +2 -4
Index: linux-2.6/kernel/Makefile
===================================================================
@@ -7,7 +7,7 @@ obj-y     = fork.o exec_domain.o panic.o
 	    sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \
 	    signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
 	    extable.o params.o posix-timers.o \
-	    kthread.o sys_ni.o posix-cpu-timers.o mutex.o \
+	    kthread.o sys_ni.o posix-cpu-timers.o \
 	    hrtimer.o rwsem.o nsproxy.o semaphore.o \
 	    notifier.o ksysfs.o cred.o reboot.o \
 	    async.o range.o groups.o lglock.o smpboot.o
@@ -16,13 +16,12 @@ ifdef CONFIG_FUNCTION_TRACER
 # Do not trace debug files and internal ftrace files
 CFLAGS_REMOVE_lockdep.o = -pg
 CFLAGS_REMOVE_lockdep_proc.o = -pg
-CFLAGS_REMOVE_mutex-debug.o = -pg
-CFLAGS_REMOVE_rtmutex-debug.o = -pg
 CFLAGS_REMOVE_cgroup-debug.o = -pg
 CFLAGS_REMOVE_irq_work.o = -pg
 endif
 
 obj-y += sched/
+obj-y += locking/
 obj-y += power/
 obj-y += printk/
 obj-y += cpu/
@@ -34,7 +33,6 @@ obj-$(CONFIG_FREEZER) += freezer.o
 obj-$(CONFIG_PROFILING) += profile.o
 obj-$(CONFIG_STACKTRACE) += stacktrace.o
 obj-y += time/
-obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
 obj-$(CONFIG_LOCKDEP) += lockdep.o
 ifeq ($(CONFIG_PROC_FS),y)
 obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
kernel/locking/Makefile new file +9 -0
Index: linux-2.6/kernel/locking/Makefile
===================================================================
@@ -0,0 +1,9 @@
+
+obj-y += mutex.o
+
+ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_mutex-debug.o = -pg
+CFLAGS_REMOVE_rtmutex-debug.o = -pg
+endif
+
+obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
kernel/locking/mutex-debug.c new file +110 -0

110 lines not on this page · raw message

kernel/locking/mutex-debug.h new file +55 -0

55 lines not on this page · raw message

kernel/locking/mutex.c new file +960 -0

960 lines not on this page · raw message

kernel/locking/mutex.h new file +48 -0

48 lines not on this page · raw message

kernel/mutex-debug.c deleted +0 -110

110 lines not on this page · raw message

kernel/mutex-debug.h deleted +0 -55

55 lines not on this page · raw message

kernel/mutex.c deleted +0 -960

960 lines not on this page · raw message

kernel/mutex.h deleted +0 -48

48 lines not on this page · raw message

#2 lore raw

Re: [RFC 1/8] locking: Move mutex into kernel/locking/

kernel/Makefile obj-y = fork.o exec_domain.o panic.o · line 13

Quoted 13 lines · Peter Zijlstra

Index: linux-2.6/kernel/Makefile
===================================================================

kernel/Makefile +1 -1
@@ -7,7 +7,7 @@ obj-y     = fork.o exec_domain.o panic.o
            sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \
            signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
            extable.o params.o posix-timers.o \
-           kthread.o sys_ni.o posix-cpu-timers.o mutex.o \
+           kthread.o sys_ni.o posix-cpu-timers.o \
            hrtimer.o rwsem.o nsproxy.o semaphore.o \
            notifier.o ksysfs.o cred.o reboot.o \
            async.o range.o groups.o lglock.o smpboot.o

This is probably a stupid question, but I haven't been able to find one kernel version that this applies cleanly over ???

Signature · 2 lines
Michel "Walken" Lespinasse
A program is never fully debugged until the last user dies.
author maintainer
#3 lore raw

Re: [RFC 1/8] locking: Move mutex into kernel/locking/

Quoted 17 lines · Michel Lespinasse

kernel/Makefile obj-y = fork.o exec_domain.o panic.o · line 13

Quoted 13 lines · Peter Zijlstra

Index: linux-2.6/kernel/Makefile
===================================================================

kernel/Makefile +1 -1
@@ -7,7 +7,7 @@ obj-y     = fork.o exec_domain.o panic.o
            sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \
            signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
            extable.o params.o posix-timers.o \
-           kthread.o sys_ni.o posix-cpu-timers.o mutex.o \
+           kthread.o sys_ni.o posix-cpu-timers.o \
            hrtimer.o rwsem.o nsproxy.o semaphore.o \
            notifier.o ksysfs.o cred.o reboot.o \
            async.o range.o groups.o lglock.o smpboot.o

This is probably a stupid question, but I haven't been able to find one kernel version that this applies cleanly over ???

Oh my bad, it appears I made it against a working tree, not an actual published tree. That said, I don't think the rejects should be super hard to fix.

If people don't object to the idea I'll respin against something published and testable.

#4 lore raw

Re: [RFC 1/8] locking: Move mutex into kernel/locking/

Quoted 9 lines · Peter Zijlstra
Quoted 2 lines

This is probably a stupid question, but I haven't been able to find one kernel version that this applies cleanly over ???

Oh my bad, it appears I made it against a working tree, not an actual published tree. That said, I don't think the rejects should be super hard to fix.

If people don't object to the idea I'll respin against something published and testable.

Yes please.

The reason I want to apply this is because code moves cause noisy patches, and the easiest way I know to fully figure them out is to diff them against a private tree where I have moved the same files (yeah, there really ought to be a better way, ....)

Signature · 2 lines
Michel "Walken" Lespinasse
A program is never fully debugged until the last user dies.
#5 lore raw

Re: [RFC 1/8] locking: Move mutex into kernel/locking/

In reply to Peter Zijlstra
Quoted 19 lines · Peter Zijlstra
Quoted 17 lines · Michel Lespinasse

kernel/Makefile obj-y = fork.o exec_domain.o panic.o · line 13

Quoted 13 lines · Peter Zijlstra

Index: linux-2.6/kernel/Makefile
===================================================================

kernel/Makefile +1 -1
@@ -7,7 +7,7 @@ obj-y     = fork.o exec_domain.o panic.o
            sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \
            signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
            extable.o params.o posix-timers.o \
-           kthread.o sys_ni.o posix-cpu-timers.o mutex.o \
+           kthread.o sys_ni.o posix-cpu-timers.o \
            hrtimer.o rwsem.o nsproxy.o semaphore.o \
            notifier.o ksysfs.o cred.o reboot.o \
            async.o range.o groups.o lglock.o smpboot.o

This is probably a stupid question, but I haven't been able to find one kernel version that this applies cleanly over ???

Quoted 6 lines

Oh my bad, it appears I made it against a working tree, not an actual published tree. That said, I don't think the rejects should be super hard to fix.

If people don't object to the idea I'll respin against something published and testable.

Please do it against the locking tree (tip:core/locking), it has pending changes plus v3.12 as well.

Thanks,

Ingo

#6 lore raw

Re: [RFC 1/8] locking: Move mutex into kernel/locking/

Quoted 25 lines · Ingo Molnar
Quoted 23 lines · Peter Zijlstra
Quoted 17 lines · Michel Lespinasse

kernel/Makefile obj-y = fork.o exec_domain.o panic.o · line 13

Quoted 13 lines · Peter Zijlstra

Index: linux-2.6/kernel/Makefile
===================================================================

kernel/Makefile +1 -1
@@ -7,7 +7,7 @@ obj-y     = fork.o exec_domain.o panic.o
            sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \
            signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
            extable.o params.o posix-timers.o \
-           kthread.o sys_ni.o posix-cpu-timers.o mutex.o \
+           kthread.o sys_ni.o posix-cpu-timers.o \
            hrtimer.o rwsem.o nsproxy.o semaphore.o \
            notifier.o ksysfs.o cred.o reboot.o \
            async.o range.o groups.o lglock.o smpboot.o

This is probably a stupid question, but I haven't been able to find one kernel version that this applies cleanly over ???

Oh my bad, it appears I made it against a working tree, not an actual published tree. That said, I don't think the rejects should be super hard to fix.

Quoted 5 lines
Quoted 2 lines

If people don't object to the idea I'll respin against something published and testable.

Please do it against the locking tree (tip:core/locking), it has pending changes plus v3.12 as well.

Note, I pushed out the movement patches to tip:core/locking, anyone interested in testing it can pick them up from there.

Thanks,

Ingo

author maintainer
#7 lore raw

RFC 2/8 locking: Move lockdep into kernel/locking/

In reply to Peter Zijlstra
---
 kernel/Makefile                    |    6 
 kernel/lockdep.c                   | 4257 -------------------------------------
 kernel/lockdep_internals.h         |  170 -
 kernel/lockdep_proc.c              |  683 -----
 kernel/lockdep_states.h            |    9 
 kernel/locking/Makefile            |    6 
 kernel/locking/lockdep.c           | 4257 +++++++++++++++++++++++++++++++++++++
 kernel/locking/lockdep_internals.h |  170 +
 kernel/locking/lockdep_proc.c      |  683 +++++
 kernel/locking/lockdep_states.h    |    9 
 10 files changed, 5125 insertions(+), 5125 deletions(-)
kernel/Makefile +0 -6
Index: linux-2.6/kernel/Makefile
===================================================================
@@ -14,8 +14,6 @@ obj-y     = fork.o exec_domain.o panic.o
 
 ifdef CONFIG_FUNCTION_TRACER
 # Do not trace debug files and internal ftrace files
-CFLAGS_REMOVE_lockdep.o = -pg
-CFLAGS_REMOVE_lockdep_proc.o = -pg
 CFLAGS_REMOVE_cgroup-debug.o = -pg
 CFLAGS_REMOVE_irq_work.o = -pg
 endif
@@ -33,10 +31,6 @@ obj-$(CONFIG_FREEZER) += freezer.o
 obj-$(CONFIG_PROFILING) += profile.o
 obj-$(CONFIG_STACKTRACE) += stacktrace.o
 obj-y += time/
-obj-$(CONFIG_LOCKDEP) += lockdep.o
-ifeq ($(CONFIG_PROC_FS),y)
-obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
-endif
 obj-$(CONFIG_FUTEX) += futex.o
 ifeq ($(CONFIG_COMPAT),y)
 obj-$(CONFIG_FUTEX) += futex_compat.o
kernel/lockdep.c deleted +0 -4257

2,982 lines not on this page · raw message

kernel/lockdep_internals.h deleted +0 -170

170 lines not on this page · raw message

kernel/lockdep_proc.c deleted +0 -683

683 lines not on this page · raw message

kernel/lockdep_states.h deleted +0 -9
Index: linux-2.6/kernel/lockdep_states.h
===================================================================

Lines of this file are not shown. View the raw message.

kernel/locking/Makefile +6 -0
Index: linux-2.6/kernel/locking/Makefile
===================================================================

Lines of this file are not shown. View the raw message.

kernel/locking/lockdep.c new file +4257 -0

4,257 lines not on this page · raw message

kernel/locking/lockdep_internals.h new file +170 -0

170 lines not on this page · raw message

kernel/locking/lockdep_proc.c new file +683 -0

683 lines not on this page · raw message

kernel/locking/lockdep_states.h new file +9 -0
Index: linux-2.6/kernel/locking/lockdep_states.h
===================================================================

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

author maintainer
#8 lore raw

RFC 3/8 locking: Move spinlock into kernel/locking/

In reply to Peter Zijlstra
---
 kernel/Makefile                 |    3 
 kernel/locking/Makefile         |    4 
 kernel/locking/spinlock.c       |  399 ++++++++++++++++++++++++++++++++++++++++
 kernel/locking/spinlock_debug.c |  302 ++++++++++++++++++++++++++++++
 kernel/spinlock.c               |  399 ----------------------------------------
 lib/Makefile                    |    1 
 lib/spinlock_debug.c            |  302 ------------------------------
 7 files changed, 705 insertions(+), 705 deletions(-)
kernel/Makefile +0 -3
@@ -43,9 +43,6 @@ obj-$(CONFIG_SMP) += smp.o
 ifneq ($(CONFIG_SMP),y)
 obj-y += up.o
 endif
-obj-$(CONFIG_SMP) += spinlock.o
-obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
-obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
 obj-$(CONFIG_UID16) += uid16.o
 obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o
 obj-$(CONFIG_MODULES) += module.o
kernel/locking/Makefile +4 -0
@@ -13,3 +13,7 @@ obj-$(CONFIG_LOCKDEP) += lockdep.o
 ifeq ($(CONFIG_PROC_FS),y)
 obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
 endif
+obj-$(CONFIG_SMP) += spinlock.o
+obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
+obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
+obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
kernel/locking/spinlock.c new file +399 -0

399 lines not on this page · raw message

kernel/locking/spinlock_debug.c new file +302 -0

302 lines not on this page · raw message

kernel/spinlock.c deleted +0 -399

399 lines not on this page · raw message

lib/Makefile +0 -1
@@ -42,7 +42,6 @@ obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_i
 obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
 obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o
 obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o
-obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
 lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
 lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
 lib-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o
lib/spinlock_debug.c deleted +0 -302

302 lines not on this page · raw message

author maintainer
#9 lore raw

RFC 4/8 locking: Move semaphore into kernel/locking/

In reply to Peter Zijlstra
---
 kernel/Makefile            |    2 
 kernel/locking/Makefile    |    2 
 kernel/locking/semaphore.c |  263 +++++++++++++++++++++++++++++++++++++++++++++
 kernel/semaphore.c         |  263 ---------------------------------------------
 4 files changed, 265 insertions(+), 265 deletions(-)
kernel/Makefile +1 -1
Index: linux-2.6/kernel/Makefile
===================================================================
@@ -8,7 +8,7 @@ obj-y     = fork.o exec_domain.o panic.o
 	    signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
 	    extable.o params.o posix-timers.o \
 	    kthread.o sys_ni.o posix-cpu-timers.o \
-	    hrtimer.o rwsem.o nsproxy.o semaphore.o \
+	    hrtimer.o rwsem.o nsproxy.o \
 	    notifier.o ksysfs.o cred.o reboot.o \
 	    async.o range.o groups.o lglock.o smpboot.o
 
kernel/locking/Makefile +1 -1
Index: linux-2.6/kernel/locking/Makefile
===================================================================
@@ -1,5 +1,5 @@
 
-obj-y += mutex.o
+obj-y += mutex.o semaphore.o
 
 ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_lockdep.o = -pg
kernel/locking/semaphore.c new file +263 -0

263 lines not on this page · raw message

kernel/semaphore.c deleted +0 -263

263 lines not on this page · raw message

author maintainer
#10 lore raw

RFC 5/8 locking: Move rtmutex into kernel/locking/

In reply to Peter Zijlstra
---
 kernel/Makefile                 |    3 
 kernel/futex.c                  |    2 
 kernel/locking/Makefile         |    3 
 kernel/locking/rtmutex-debug.c  |  187 +++++++
 kernel/locking/rtmutex-debug.h  |   33 +
 kernel/locking/rtmutex-tester.c |  420 +++++++++++++++
 kernel/locking/rtmutex.c        | 1060 ++++++++++++++++++++++++++++++++++++++++
 kernel/locking/rtmutex.h        |   26 
 kernel/locking/rtmutex_common.h |  126 ++++
 kernel/rtmutex-debug.c          |  187 -------
 kernel/rtmutex-debug.h          |   33 -
 kernel/rtmutex-tester.c         |  420 ---------------
 kernel/rtmutex.c                | 1060 ----------------------------------------
 kernel/rtmutex.h                |   26 
 kernel/rtmutex_common.h         |  126 ----
 15 files changed, 1856 insertions(+), 1856 deletions(-)
kernel/Makefile +0 -3
@@ -35,9 +35,6 @@ obj-$(CONFIG_FUTEX) += futex.o
 ifeq ($(CONFIG_COMPAT),y)
 obj-$(CONFIG_FUTEX) += futex_compat.o
 endif
-obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
-obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
-obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o
 obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
 obj-$(CONFIG_SMP) += smp.o
 ifneq ($(CONFIG_SMP),y)
kernel/futex.c +1 -1
@@ -66,7 +66,7 @@
 
 #include <asm/futex.h>
 
-#include "rtmutex_common.h"
+#include "locking/rtmutex_common.h"
 
 int __read_mostly futex_cmpxchg_enabled;
 
kernel/locking/Makefile +3 -0
@@ -15,5 +15,8 @@ obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
 endif
 obj-$(CONFIG_SMP) += spinlock.o
 obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
+obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
+obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
+obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
kernel/locking/rtmutex-debug.c new file +187 -0

187 lines not on this page · raw message

kernel/locking/rtmutex-debug.h new file +33 -0
@@ -0,0 +1,33 @@
+/*
+ * RT-Mutexes: blocking mutual exclusion locks with PI support
+ *
+ * started by Ingo Molnar and Thomas Gleixner:
+ *
+ *  Copyright (C) 2004-2006 Red Hat, Inc., Ingo Molnar <[email protected]>
+ *  Copyright (C) 2006, Timesys Corp., Thomas Gleixner <[email protected]>
+ *
+ * This file contains macros used solely by rtmutex.c. Debug version.
+ */
+
+extern void
+rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task);
+extern void rt_mutex_deadlock_account_unlock(struct task_struct *task);
+extern void debug_rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);
+extern void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter);
+extern void debug_rt_mutex_init(struct rt_mutex *lock, const char *name);
+extern void debug_rt_mutex_lock(struct rt_mutex *lock);
+extern void debug_rt_mutex_unlock(struct rt_mutex *lock);
+extern void debug_rt_mutex_proxy_lock(struct rt_mutex *lock,
+				      struct task_struct *powner);
+extern void debug_rt_mutex_proxy_unlock(struct rt_mutex *lock);
+extern void debug_rt_mutex_deadlock(int detect, struct rt_mutex_waiter *waiter,
+				    struct rt_mutex *lock);
+extern void debug_rt_mutex_print_deadlock(struct rt_mutex_waiter *waiter);
+# define debug_rt_mutex_reset_waiter(w)			\
+	do { (w)->deadlock_lock = NULL; } while (0)
+
+static inline int debug_rt_mutex_detect_deadlock(struct rt_mutex_waiter *waiter,
+						 int detect)
+{
+	return (waiter != NULL);
+}
kernel/locking/rtmutex-tester.c new file +420 -0

420 lines not on this page · raw message

kernel/locking/rtmutex.c new file +1060 -0

1,060 lines not on this page · raw message

kernel/locking/rtmutex.h new file +26 -0
@@ -0,0 +1,26 @@
+/*
+ * RT-Mutexes: blocking mutual exclusion locks with PI support
+ *
+ * started by Ingo Molnar and Thomas Gleixner:
+ *
+ *  Copyright (C) 2004-2006 Red Hat, Inc., Ingo Molnar <[email protected]>
+ *  Copyright (C) 2006, Timesys Corp., Thomas Gleixner <[email protected]>
+ *
+ * This file contains macros used solely by rtmutex.c.
+ * Non-debug version.
+ */
+
+#define rt_mutex_deadlock_check(l)			(0)
+#define rt_mutex_deadlock_account_lock(m, t)		do { } while (0)
+#define rt_mutex_deadlock_account_unlock(l)		do { } while (0)
+#define debug_rt_mutex_init_waiter(w)			do { } while (0)
+#define debug_rt_mutex_free_waiter(w)			do { } while (0)
+#define debug_rt_mutex_lock(l)				do { } while (0)
+#define debug_rt_mutex_proxy_lock(l,p)			do { } while (0)
+#define debug_rt_mutex_proxy_unlock(l)			do { } while (0)
+#define debug_rt_mutex_unlock(l)			do { } while (0)
+#define debug_rt_mutex_init(m, n)			do { } while (0)
+#define debug_rt_mutex_deadlock(d, a ,l)		do { } while (0)
+#define debug_rt_mutex_print_deadlock(w)		do { } while (0)
+#define debug_rt_mutex_detect_deadlock(w,d)		(d)
+#define debug_rt_mutex_reset_waiter(w)			do { } while (0)
kernel/locking/rtmutex_common.h new file +126 -0

126 lines not on this page · raw message

kernel/rtmutex-debug.c deleted +0 -187

187 lines not on this page · raw message

kernel/rtmutex-debug.h deleted +0 -33
@@ -1,33 +0,0 @@
-/*
- * RT-Mutexes: blocking mutual exclusion locks with PI support
- *
- * started by Ingo Molnar and Thomas Gleixner:
- *
- *  Copyright (C) 2004-2006 Red Hat, Inc., Ingo Molnar <[email protected]>
- *  Copyright (C) 2006, Timesys Corp., Thomas Gleixner <[email protected]>
- *
- * This file contains macros used solely by rtmutex.c. Debug version.
- */
-
-extern void
-rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task);
-extern void rt_mutex_deadlock_account_unlock(struct task_struct *task);
-extern void debug_rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);
-extern void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter);
-extern void debug_rt_mutex_init(struct rt_mutex *lock, const char *name);
-extern void debug_rt_mutex_lock(struct rt_mutex *lock);
-extern void debug_rt_mutex_unlock(struct rt_mutex *lock);
-extern void debug_rt_mutex_proxy_lock(struct rt_mutex *lock,
-				      struct task_struct *powner);
-extern void debug_rt_mutex_proxy_unlock(struct rt_mutex *lock);
-extern void debug_rt_mutex_deadlock(int detect, struct rt_mutex_waiter *waiter,
-				    struct rt_mutex *lock);
-extern void debug_rt_mutex_print_deadlock(struct rt_mutex_waiter *waiter);
-# define debug_rt_mutex_reset_waiter(w)			\
-	do { (w)->deadlock_lock = NULL; } while (0)
-
-static inline int debug_rt_mutex_detect_deadlock(struct rt_mutex_waiter *waiter,
-						 int detect)
-{
-	return (waiter != NULL);
-}
kernel/rtmutex-tester.c deleted +0 -420

420 lines not on this page · raw message

kernel/rtmutex.c deleted +0 -1060

483 lines not on this page · raw message

kernel/rtmutex.h deleted +0 -26

Lines of this file are not shown. View the raw message.

kernel/rtmutex_common.h deleted +0 -126

126 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

author maintainer
#11 lore raw

RFC 6/8 locking: Move rwsem into kernel/locking/

In reply to Peter Zijlstra

Notably: changed lib/rwsem* targets from lib- to obj-, no idea about the ramifications of that.

---
 kernel/Makefile                 |    2 
 kernel/locking/Makefile         |    4 
 kernel/locking/rwsem-spinlock.c |  296 ++++++++++++++++++++++++++++++++++++++++
 kernel/locking/rwsem-xadd.c     |  293 +++++++++++++++++++++++++++++++++++++++
 kernel/locking/rwsem.c          |  157 +++++++++++++++++++++
 kernel/rwsem.c                  |  157 ---------------------
 lib/Makefile                    |    2 
 lib/rwsem-spinlock.c            |  296 ----------------------------------------
 lib/rwsem.c                     |  293 ---------------------------------------
 9 files changed, 750 insertions(+), 750 deletions(-)
kernel/Makefile +1 -1
@@ -8,7 +8,7 @@ obj-y     = fork.o exec_domain.o panic.o
 	    signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
 	    extable.o params.o posix-timers.o \
 	    kthread.o sys_ni.o posix-cpu-timers.o \
-	    hrtimer.o rwsem.o nsproxy.o \
+	    hrtimer.o nsproxy.o \
 	    notifier.o ksysfs.o cred.o reboot.o \
 	    async.o range.o groups.o lglock.o smpboot.o
 
kernel/locking/Makefile +3 -1
@@ -1,5 +1,5 @@
 
-obj-y += mutex.o semaphore.o
+obj-y += mutex.o semaphore.o rwsem.o
 
 ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_lockdep.o = -pg
@@ -20,3 +20,5 @@ obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmute
 obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
+obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
+obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
\ No newline at end of file
kernel/locking/rwsem-spinlock.c new file +296 -0

296 lines not on this page · raw message

kernel/locking/rwsem-xadd.c new file +293 -0

293 lines not on this page · raw message

kernel/locking/rwsem.c new file +157 -0

157 lines not on this page · raw message

kernel/rwsem.c deleted +0 -157

157 lines not on this page · raw message

lib/Makefile +0 -2
@@ -42,8 +42,6 @@ obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_i
 obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
 obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o
 obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o
-lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
-lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
 lib-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o
 
 CFLAGS_hweight.o = $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
lib/rwsem-spinlock.c deleted +0 -296

296 lines not on this page · raw message

lib/rwsem.c deleted +0 -293

293 lines not on this page · raw message

author maintainer
#12 lore raw

RFC 7/8 locking: Move lglocks into kernel/locking/

In reply to Peter Zijlstra
---
 kernel/Makefile         |    2 -
 kernel/lglock.c         |   89 ------------------------------------------------
 kernel/locking/Makefile |    2 -
 kernel/locking/lglock.c |   89 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 91 deletions(-)
kernel/Makefile +1 -1
@@ -10,7 +10,7 @@ obj-y     = fork.o exec_domain.o panic.o
 	    kthread.o sys_ni.o posix-cpu-timers.o \
 	    hrtimer.o nsproxy.o \
 	    notifier.o ksysfs.o cred.o reboot.o \
-	    async.o range.o groups.o lglock.o smpboot.o
+	    async.o range.o groups.o smpboot.o
 
 ifdef CONFIG_FUNCTION_TRACER
 # Do not trace debug files and internal ftrace files
kernel/lglock.c deleted +0 -89

89 lines not on this page · raw message

kernel/locking/Makefile +1 -1
@@ -1,5 +1,5 @@
 
-obj-y += mutex.o semaphore.o rwsem.o
+obj-y += mutex.o semaphore.o rwsem.o lglock.o
 
 ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_lockdep.o = -pg
kernel/locking/lglock.c new file +89 -0

89 lines not on this page · raw message

author maintainer
#13 lore raw

RFC 8/8 locking: Move percpu-rwsem into kernel/locking/

In reply to Peter Zijlstra
---
 kernel/locking/Makefile       |    3 
 kernel/locking/percpu-rwsem.c |  165 ++++++++++++++++++++++++++++++++++++++++++
 lib/Makefile                  |    1 
 lib/percpu-rwsem.c            |  165 ------------------------------------------
 4 files changed, 167 insertions(+), 167 deletions(-)
kernel/locking/Makefile +2 -1
@@ -21,4 +21,5 @@ obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
 obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
-obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
\ No newline at end of file
+obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
+obj-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o
kernel/locking/percpu-rwsem.c new file +165 -0

165 lines not on this page · raw message

lib/Makefile +0 -1
@@ -42,7 +42,6 @@ obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_i
 obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
 obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o
 obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o
-lib-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o
 
 CFLAGS_hweight.o = $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
 obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
lib/percpu-rwsem.c deleted +0 -165

165 lines not on this page · raw message

#14 lore raw
In reply to Peter Zijlstra
Quoted 11 lines · On Tue, 05 Nov 2013 13:10:44 +0100 Peter Zijlstra <[email protected]> wrote:

Hi all,

During Kernel Summit Dave mentioned that there wasn't a clear maintainer for locking bits.

To remedy this Ingo suggested gathering all the various locking primitives and lockdep into a single place: kernel/locking/.

I would further like to propose a MAINTAINERS entry like:

LOCKING

Quoted 8 lines
M:      Ingo Molnar <[email protected]>
M:      Peter Zijlstra <[email protected]>
M:	Oleg Nesterov <[email protected]>
M:	"Paul E. McKenney" <[email protected]>
M:	Linus Torvalds <[email protected]>
T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S:      Maintained
F:      kernel/locking/

I wonder if it should be called kernel/locks, as that's less to type, smaller path names, and tastes good on bagels.

-- Steve

Quoted 4 lines

Because for most 'fun' locking discussions we usually end up with at least those people anyway :-)

#15 lore raw

op 05-11-13 14:18, Steven Rostedt schreef:

Quoted 22 lines
Quoted 11 lines · On Tue, 05 Nov 2013 13:10:44 +0100 Peter Zijlstra <[email protected]> wrote:

Hi all,

During Kernel Summit Dave mentioned that there wasn't a clear maintainer for locking bits.

To remedy this Ingo suggested gathering all the various locking primitives and lockdep into a single place: kernel/locking/.

I would further like to propose a MAINTAINERS entry like:

LOCKING

Quoted 8 lines
M:      Ingo Molnar <[email protected]>
M:      Peter Zijlstra <[email protected]>
M:	Oleg Nesterov <[email protected]>
M:	"Paul E. McKenney" <[email protected]>
M:	Linus Torvalds <[email protected]>
T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S:      Maintained
F:      kernel/locking/
Quoted 5 lines

I wonder if it should be called kernel/locks, as that's less to type, smaller path names, and tastes good on bagels.

-- Steve

Congratulations! You're our early bikeshed winner for today. Please pick your favorite color at http://bikeshed.com

#16 lore raw
Quoted 1 line · On Tue, 05 Nov 2013 14:21:38 +0100 Maarten Lankhorst…

Congratulations! You're our early bikeshed winner for today. Please pick your favorite color at http://bikeshed.com

Has nothing to do with bikesheds, but more to do with bagel shops!

-- Steve

#17 lore raw
In reply to Steven Rostedt
Quoted 23 lines · Steven Rostedt
Quoted 11 lines · On Tue, 05 Nov 2013 13:10:44 +0100 Peter Zijlstra <[email protected]> wrote:

Hi all,

During Kernel Summit Dave mentioned that there wasn't a clear maintainer for locking bits.

To remedy this Ingo suggested gathering all the various locking primitives and lockdep into a single place: kernel/locking/.

I would further like to propose a MAINTAINERS entry like:

LOCKING

Quoted 8 lines
M:      Ingo Molnar <[email protected]>
M:      Peter Zijlstra <[email protected]>
M:	Oleg Nesterov <[email protected]>
M:	"Paul E. McKenney" <[email protected]>
M:	Linus Torvalds <[email protected]>
T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S:      Maintained
F:      kernel/locking/
Quoted 2 lines

I wonder if it should be called kernel/locks, as that's less to type, smaller path names, and tastes good on bagels.

The subsystem and topic is generally called 'kernel locking' though, and that's what the tree branches have been called for the past couple of years as well.

Also, 'kernel lock' brings me back memories of the 'big kernel lock' - while 'kernel locks' brings verb/noun ambiguity and visuals of 'kernel locks up'.

As for typing legth: kernel/lo<Tab> autocompletion is your friend! :-)

All in one, I think kernel/locking/ is a better name.

Thanks,

Ingo

#18 lore raw
Quoted 7 lines · On Tue, 5 Nov 2013 14:26:09 +0100 Ingo Molnar <[email protected]> wrote:

* Steven Rostedt <[email protected]> wrote:

Also, 'kernel lock' brings me back memories of the 'big kernel lock' - while 'kernel locks' brings verb/noun ambiguity and visuals of 'kernel locks up'.

Of course "locking" is only a verb, and we get "kernel locking up" too ;-)

Quoted 4 lines

As for typing legth: kernel/lo<Tab> autocompletion is your friend! :-)

All in one, I think kernel/locking/ is a better name.

Fine, but I just love the idea of having the choice between a bagel and cream cheese or with kernel lox.

-- Steve

#19 lore raw
In reply to Peter Zijlstra
Quoted 7 lines · Peter Zijlstra

Hi all,

During Kernel Summit Dave mentioned that there wasn't a clear maintainer for locking bits.

To remedy this Ingo suggested gathering all the various locking primitives and lockdep into a single place: kernel/locking/.

I quite like the idea.

Quoted 12 lines

I would further like to propose a MAINTAINERS entry like:

LOCKING

M:      Ingo Molnar <[email protected]>
M:      Peter Zijlstra <[email protected]>
M:      Oleg Nesterov <[email protected]>
M:      "Paul E. McKenney" <[email protected]>
M:      Linus Torvalds <[email protected]>
T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S:      Maintained
F:      kernel/locking/
Quoted 2 lines

Because for most 'fun' locking discussions we usually end up with at least those people anyway :-)

Agree :)

While I don't think I carry as much weight as these people, I was going to ask to be included here for the fun discussions - and then I realized that having a separate directory for these files makes it super easy to set up a mail filter anyway :)

Signature · 2 lines
Michel "Walken" Lespinasse
A program is never fully debugged until the last user dies.
#20 lore raw
In reply to Peter Zijlstra
Quoted 20 lines · Peter Zijlstra

Hi all,

During Kernel Summit Dave mentioned that there wasn't a clear maintainer for locking bits.

To remedy this Ingo suggested gathering all the various locking primitives and lockdep into a single place: kernel/locking/.

I would further like to propose a MAINTAINERS entry like:

LOCKING

M:      Ingo Molnar <[email protected]>
M:      Peter Zijlstra <[email protected]>
M:	Oleg Nesterov <[email protected]>
M:	"Paul E. McKenney" <[email protected]>
M:	Linus Torvalds <[email protected]>
T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S:      Maintained
F:      kernel/locking/
Quoted 4 lines

Because for most 'fun' locking discussions we usually end up with at least those people anyway :-)

Comments?

OK, I am in.

How are we organizing this? I could imagine divvying up the various types of locks, having a minimum number of reviews or acks coupled with a maximum review time, or just requiring the full set of reviews and acks given the criticality of locking code. Other approaches?

Thanx, Paul

Quoted 53 lines
---
 kernel/lglock.c                    |   89 
 kernel/lockdep.c                   | 4257 -----------------------------------
 kernel/lockdep_internals.h         |  170 -
 kernel/lockdep_proc.c              |  683 -----
 kernel/lockdep_states.h            |    9 
 kernel/mutex-debug.c               |  110 
 kernel/mutex-debug.h               |   55 
 kernel/mutex.c                     |  960 -------
 kernel/mutex.h                     |   48 
 kernel/rtmutex-debug.c             |  187 -
 kernel/rtmutex-debug.h             |   33 
 kernel/rtmutex-tester.c            |  420 ---
 kernel/rtmutex.c                   | 1060 --------
 kernel/rtmutex.h                   |   26 
 kernel/rtmutex_common.h            |  126 -
 kernel/rwsem.c                     |  157 -
 kernel/semaphore.c                 |  263 --
 kernel/spinlock.c                  |  399 ---
 lib/percpu-rwsem.c                 |  165 -
 lib/rwsem-spinlock.c               |  296 --
 lib/rwsem.c                        |  293 --
 lib/spinlock_debug.c               |  302 --
 kernel/locking/Makefile            |   25 
 kernel/locking/lglock.c            |   89 
 kernel/locking/lockdep.c           | 4257 +++++++++++++++++++++++++++++++++++
 kernel/locking/lockdep_internals.h |  170 +
 kernel/locking/lockdep_proc.c      |  683 +++++
 kernel/locking/lockdep_states.h    |    9 
 kernel/locking/mutex-debug.c       |  110 
 kernel/locking/mutex-debug.h       |   55 
 kernel/locking/mutex.c             |  960 +++++++
 kernel/locking/mutex.h             |   48 
 kernel/locking/percpu-rwsem.c      |  165 +
 kernel/locking/rtmutex-debug.c     |  187 +
 kernel/locking/rtmutex-debug.h     |   33 
 kernel/locking/rtmutex-tester.c    |  420 +++
 kernel/locking/rtmutex.c           | 1060 ++++++++
 kernel/locking/rtmutex.h           |   26 
 kernel/locking/rtmutex_common.h    |  126 +
 kernel/locking/rwsem-spinlock.c    |  296 ++
 kernel/locking/rwsem-xadd.c        |  293 ++
 kernel/locking/rwsem.c             |  157 +
 kernel/locking/semaphore.c         |  263 ++
 kernel/locking/spinlock.c          |  399 +++
 kernel/locking/spinlock_debug.c    |  302 ++
 kernel/Makefile                    |   22 
 kernel/futex.c                     |    2 
 lib/Makefile                       |    4 
 48 files changed, 10138 insertions(+), 10131 deletions(-)
author maintainer
#21 lore raw
Quoted 24 lines · Paul E. McKenney
Quoted 23 lines · Peter Zijlstra

Hi all,

During Kernel Summit Dave mentioned that there wasn't a clear maintainer for locking bits.

To remedy this Ingo suggested gathering all the various locking primitives and lockdep into a single place: kernel/locking/.

I would further like to propose a MAINTAINERS entry like:

LOCKING

M:      Ingo Molnar <[email protected]>
M:      Peter Zijlstra <[email protected]>
M:	Oleg Nesterov <[email protected]>
M:	"Paul E. McKenney" <[email protected]>
M:	Linus Torvalds <[email protected]>
T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S:      Maintained
F:      kernel/locking/

Because for most 'fun' locking discussions we usually end up with at least those people anyway :-)

Quoted 8 lines
Quoted 1 line

Comments?

OK, I am in.

How are we organizing this? I could imagine divvying up the various types of locks, having a minimum number of reviews or acks coupled with a maximum review time, or just requiring the full set of reviews and acks given the criticality of locking code. Other approaches?

I would suggest something like an ack/review of at least 3/5, no hard deadline, because as you say, its better to get locking right :-)

#22 lore raw
Quoted 29 lines · Peter Zijlstra
Quoted 28 lines · Paul E. McKenney
Quoted 20 lines · Peter Zijlstra

Hi all,

During Kernel Summit Dave mentioned that there wasn't a clear maintainer for locking bits.

To remedy this Ingo suggested gathering all the various locking primitives and lockdep into a single place: kernel/locking/.

I would further like to propose a MAINTAINERS entry like:

LOCKING

M:      Ingo Molnar <[email protected]>
M:      Peter Zijlstra <[email protected]>
M:	Oleg Nesterov <[email protected]>
M:	"Paul E. McKenney" <[email protected]>
M:	Linus Torvalds <[email protected]>
T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S:      Maintained
F:      kernel/locking/
Quoted 4 lines

Because for most 'fun' locking discussions we usually end up with at least those people anyway :-)

Comments?

OK, I am in.

Quoted 7 lines
Quoted 4 lines

How are we organizing this? I could imagine divvying up the various types of locks, having a minimum number of reviews or acks coupled with a maximum review time, or just requiring the full set of reviews and acks given the criticality of locking code. Other approaches?

I would suggest something like an ack/review of at least 3/5, no hard deadline, because as you say, its better to get locking right :-)

Works for me!

Thanx, Paul