add mutex wait/wound/style style locks
Subsystems (8)
v4 cover add mutex wait/wound/style style locks
Version 4 already?
Small api changes since v3:
- Remove ww_mutex_unlock_single and ww_mutex_lock_single.
- Rename ww_mutex_trylock_single to ww_mutex_trylock.
- Remove separate implementations of ww_mutex_lock_slow*, normal functions can be used. Inline versions still exist for extra debugging, and to annotate.
- Cleanup unneeded memory barriers, add comment to the remaining smp_mb().
Thanks to Daniel Vetter, Rob Clark and Peter Zijlstra for their feedback.
---
Daniel Vetter (1):
mutex: w/w mutex slowpath debugging
Maarten Lankhorst (3):
arch: make __mutex_fastpath_lock_retval return whether fastpath succeeded or not.
mutex: add support for wound/wait style locks, v5
mutex: Add ww tests to lib/locking-selftest.c. v4
Documentation/ww-mutex-design.txt | 344 +++++++++++++++++++++++++++++++ arch/ia64/include/asm/mutex.h | 10 - arch/powerpc/include/asm/mutex.h | 10 - arch/sh/include/asm/mutex-llsc.h | 4 arch/x86/include/asm/mutex_32.h | 11 - arch/x86/include/asm/mutex_64.h | 11 - include/asm-generic/mutex-dec.h | 10 - include/asm-generic/mutex-null.h | 2 include/asm-generic/mutex-xchg.h | 10 - include/linux/mutex-debug.h | 1 include/linux/mutex.h | 363 +++++++++++++++++++++++++++++++++ kernel/mutex.c | 384 ++++++++++++++++++++++++++++++++--- lib/Kconfig.debug | 13 + lib/debug_locks.c | 2 lib/locking-selftest.c | 410 +++++++++++++++++++++++++++++++++++-- 15 files changed, 1492 insertions(+), 93 deletions(-) create mode 100644 Documentation/ww-mutex-design.txt
Signature · 1 line
~Maarten
PATCH v4 1/4 arch: make __mutex_fastpath_lock_retval return whether fastpath succeeded or not.
This will allow me to call functions that have multiple arguments if fastpath fails. This is required to support ticket mutexes, because they need to be able to pass an extra argument to the fail function.
Originally I duplicated the functions, by adding __mutex_fastpath_lock_retval_arg. This ended up being just a duplication of the existing function, so a way to test if fastpath was called ended up being better.
This also cleaned up the reservation mutex patch some by being able to call an atomic_set instead of atomic_xchg, and making it easier to detect if the wrong unlock function was previously used.
Changes since v1, pointed out by Francesco Lavra:
- fix a small comment issue in mutex_32.h
- fix the __mutex_fastpath_lock_retval macro for mutex-null.h
--- arch/ia64/include/asm/mutex.h | 10 ++++------ arch/powerpc/include/asm/mutex.h | 10 ++++------ arch/sh/include/asm/mutex-llsc.h | 4 ++-- arch/x86/include/asm/mutex_32.h | 11 ++++------- arch/x86/include/asm/mutex_64.h | 11 ++++------- include/asm-generic/mutex-dec.h | 10 ++++------ include/asm-generic/mutex-null.h | 2 +- include/asm-generic/mutex-xchg.h | 10 ++++------ kernel/mutex.c | 32 ++++++++++++++------------------ 9 files changed, 41 insertions(+), 59 deletions(-)
arch/ia64/include/asm/mutex.h +4 -6
@@ -29,17 +29,15 @@ __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))* __mutex_fastpath_lock_retval - try to take the lock by moving the count * from 1 to a 0 value * @count: pointer of type atomic_t -* @fail_fn: function to call if the original value was not 1 * -* Change the count from 1 to a value lower than 1, and call <fail_fn> if -* it wasn't 1 originally. This function returns 0 if the fastpath succeeds, -* or anything the slow path function returns. +* Change the count from 1 to a value lower than 1. This function returns 0 +* if the fastpath succeeds, or -1 otherwise. */ static inline int -__mutex_fastpath_lock_retval (atomic_t *count,int (*fail_fn)(atomic_t *)) +__mutex_fastpath_lock_retval (atomic_t *count) {if (unlikely (ia64_fetchadd4_acq (count,-1 ) !=1 )) -return fail_fn (count); +return -1 ;return 0 ; }
arch/powerpc/include/asm/mutex.h +4 -6
@@ -82,17 +82,15 @@ __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))* __mutex_fastpath_lock_retval - try to take the lock by moving the count * from 1 to a 0 value * @count: pointer of type atomic_t -* @fail_fn: function to call if the original value was not 1 * -* Change the count from 1 to a value lower than 1, and call <fail_fn> if -* it wasn't 1 originally. This function returns 0 if the fastpath succeeds, -* or anything the slow path function returns. +* Change the count from 1 to a value lower than 1. This function returns 0 +* if the fastpath succeeds, or -1 otherwise. */ static inline int -__mutex_fastpath_lock_retval (atomic_t *count,int (*fail_fn)(atomic_t *)) +__mutex_fastpath_lock_retval (atomic_t *count) {if (unlikely (__mutex_dec_return_lock (count) <0 )) -return fail_fn (count); +return -1 ;return 0 ; }
arch/sh/include/asm/mutex-llsc.h +2 -2
@@ -37,7 +37,7 @@ __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *)) }static inline int -__mutex_fastpath_lock_retval (atomic_t *count,int (*fail_fn)(atomic_t *)) +__mutex_fastpath_lock_retval (atomic_t *count) {int __done, __res;
@@ -51,7 +51,7 @@ __mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *)) : "t");if (unlikely (!__done || __res !=0 )) - __res =fail_fn (count); + __res =-1 ;return __res; }
arch/x86/include/asm/mutex_32.h +4 -7
@@ -42,17 +42,14 @@ do { \* __mutex_fastpath_lock_retval - try to take the lock by moving the count * from 1 to a 0 value * @count: pointer of type atomic_t -* @fail_fn: function to call if the original value was not 1 * -* Change the count from 1 to a value lower than 1, and call <fail_fn> if it -* wasn't 1 originally. This function returns 0 if the fastpath succeeds, -* or anything the slow path function returns +* Change the count from 1 to a value lower than 1. This function returns 0 +* if the fastpath succeeds, or -1 otherwise. */ -static inline int __mutex_fastpath_lock_retval (atomic_t *count, -int (*fail_fn)(atomic_t *)) +static inline int __mutex_fastpath_lock_retval (atomic_t *count) {if (unlikely (atomic_dec_return (count) <0 )) -return fail_fn (count); +return -1 ;else return 0 ; }
arch/x86/include/asm/mutex_64.h +4 -7
@@ -37,17 +37,14 @@ do { \* __mutex_fastpath_lock_retval - try to take the lock by moving the count * from 1 to a 0 value * @count: pointer of type atomic_t -* @fail_fn: function to call if the original value was not 1 * -* Change the count from 1 to a value lower than 1, and call <fail_fn> if -* it wasn't 1 originally. This function returns 0 if the fastpath succeeds, -* or anything the slow path function returns +* Change the count from 1 to a value lower than 1. This function returns 0 +* if the fastpath succeeds, or -1 otherwise. */ -static inline int __mutex_fastpath_lock_retval (atomic_t *count, -int (*fail_fn)(atomic_t *)) +static inline int __mutex_fastpath_lock_retval (atomic_t *count) {if (unlikely (atomic_dec_return (count) <0 )) -return fail_fn (count); +return -1 ;else return 0 ; }
include/asm-generic/mutex-dec.h +4 -6
@@ -28,17 +28,15 @@ __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))* __mutex_fastpath_lock_retval - try to take the lock by moving the count * from 1 to a 0 value * @count: pointer of type atomic_t -* @fail_fn: function to call if the original value was not 1 * -* Change the count from 1 to a value lower than 1, and call <fail_fn> if -* it wasn't 1 originally. This function returns 0 if the fastpath succeeds, -* or anything the slow path function returns. +* Change the count from 1 to a value lower than 1. This function returns 0 +* if the fastpath succeeds, or -1 otherwise. */ static inline int -__mutex_fastpath_lock_retval (atomic_t *count,int (*fail_fn)(atomic_t *)) +__mutex_fastpath_lock_retval (atomic_t *count) {if (unlikely (atomic_dec_return (count) <0 )) -return fail_fn (count); +return -1 ;return 0 ; }
include/asm-generic/mutex-null.h +1 -1
@@ -11,7 +11,7 @@#define _ASM_GENERIC_MUTEX_NULL_H#define __mutex_fastpath_lock (count, fail_fn) fail_fn(count) -#define __mutex_fastpath_lock_retval (count, fail_fn) fail_fn(count) +#define __mutex_fastpath_lock_retval (count) (-1)#define __mutex_fastpath_unlock (count, fail_fn) fail_fn(count)#define __mutex_fastpath_trylock (count, fail_fn) fail_fn(count)#define __mutex_slowpath_needs_to_unlock () 1
include/asm-generic/mutex-xchg.h +4 -6
@@ -39,18 +39,16 @@ __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))* __mutex_fastpath_lock_retval - try to take the lock by moving the count * from 1 to a 0 value * @count: pointer of type atomic_t -* @fail_fn: function to call if the original value was not 1 * -* Change the count from 1 to a value lower than 1, and call <fail_fn> if it -* wasn't 1 originally. This function returns 0 if the fastpath succeeds, -* or anything the slow path function returns +* Change the count from 1 to a value lower than 1. This function returns 0 +* if the fastpath succeeds, or -1 otherwise. */ static inline int -__mutex_fastpath_lock_retval (atomic_t *count,int (*fail_fn)(atomic_t *)) +__mutex_fastpath_lock_retval (atomic_t *count) {if (unlikely (atomic_xchg (count,0 ) !=1 ))if (likely (atomic_xchg (count,-1 ) !=1 )) -return fail_fn (count); +return -1 ;return 0 ; }
kernel/mutex.c +14 -18
@@ -351,10 +351,10 @@ __mutex_unlock_slowpath(atomic_t *lock_count)* mutex_lock_interruptible() and mutex_trylock(). */ static noinline int __sched -__mutex_lock_killable_slowpath (atomic_t *lock_count); +__mutex_lock_killable_slowpath (struct mutex *lock); static noinline int __sched -__mutex_lock_interruptible_slowpath (atomic_t *lock_count); +__mutex_lock_interruptible_slowpath (struct mutex *lock);/** * mutex_lock_interruptible - acquire the mutex, interruptible
@@ -372,12 +372,12 @@ int __sched mutex_lock_interruptible(struct mutex *lock)int ret;might_sleep (); - ret =__mutex_fastpath_lock_retval - (&lock->count, __mutex_lock_interruptible_slowpath); -if (!ret) + ret =__mutex_fastpath_lock_retval (&lock->count); +if (likely (!ret)) {mutex_set_owner (lock); - -return ret; +return 0 ; + }else +return __mutex_lock_interruptible_slowpath (lock); }EXPORT_SYMBOL (mutex_lock_interruptible);
@@ -387,12 +387,12 @@ int __sched mutex_lock_killable(struct mutex *lock)int ret;might_sleep (); - ret =__mutex_fastpath_lock_retval - (&lock->count, __mutex_lock_killable_slowpath); -if (!ret) + ret =__mutex_fastpath_lock_retval (&lock->count); +if (likely (!ret)) {mutex_set_owner (lock); - -return ret; +return 0 ; + }else +return __mutex_lock_killable_slowpath (lock); }EXPORT_SYMBOL (mutex_lock_killable);
@@ -405,18 +405,14 @@ __mutex_lock_slowpath(atomic_t *lock_count) } static noinline int __sched -__mutex_lock_killable_slowpath (atomic_t *lock_count) +__mutex_lock_killable_slowpath (struct mutex *lock) { - struct mutex *lock = container_of(lock_count, struct mutex, count); -return __mutex_lock_common (lock,TASK_KILLABLE ,0 ,NULL , _RET_IP_); } static noinline int __sched -__mutex_lock_interruptible_slowpath (atomic_t *lock_count) +__mutex_lock_interruptible_slowpath (struct mutex *lock) { - struct mutex *lock = container_of(lock_count, struct mutex, count); -return __mutex_lock_common (lock,TASK_INTERRUPTIBLE ,0 ,NULL , _RET_IP_); }#endif
PATCH v4 2/4 mutex: add support for wound/wait style locks, v5
In reply to Maarten LankhorstChanges since RFC patch v1:
- Updated to use atomic_long instead of atomic, since the reservation_id was a long.
- added mutex_reserve_lock_slow and mutex_reserve_lock_intr_slow
- removed mutex_locked_set_reservation_id (or w/e it was called)
Changes since RFC patch v2:
- remove use of __mutex_lock_retval_arg, add warnings when using wrong combination of mutex_(,reserve_)lock/unlock.
Changes since v1:
- Add __always_inline to __mutex_lock_common, otherwise reservation paths can be triggered from normal locks, because __builtin_constant_p might evaluate to false for the constant 0 in that case. Tests for this have been added in the next patch.
- Updated documentation slightly.
Changes since v2:
- Renamed everything to ww_mutex. (mlankhorst)
- Added ww_acquire_ctx and ww_class. (mlankhorst)
- Added a lot of checks for wrong api usage. (mlankhorst)
- Documentation updates. (danvet)
Changes since v3:
- Small documentation fixes (robclark)
- Memory barrier fix (danvet)
Changes since v4:
- Remove ww_mutex_unlock_single and ww_mutex_lock_single.
- Rename ww_mutex_trylock_single to ww_mutex_trylock.
- Remove separate implementations of ww_mutex_lock_slow*, normal functions can be used. Inline versions still exist for extra debugging.
- Cleanup unneeded memory barriers, add comment to the remaining smp_mb().
--- Documentation/ww-mutex-design.txt | 344 ++++++++++++++++++++++++++++++++++++ include/linux/mutex-debug.h | 1 include/linux/mutex.h | 355 +++++++++++++++++++++++++++++++++++++ kernel/mutex.c | 318 +++++++++++++++++++++++++++++++-- lib/debug_locks.c | 2 5 files changed, 1003 insertions(+), 17 deletions(-) create mode 100644 Documentation/ww-mutex-design.txt
Documentation/ww-mutex-design.txt new file +344 -0
@@ -0,0 +1,344 @@ +Wait/Wound Deadlock-Proof Mutex Design +====================================== + +Please read mutex-design.txt first, as it applies to wait/wound mutexes too. + +Motivation for WW-Mutexes +------------------------- + +GPU's do operations that commonly involve many buffers. Those buffers +can be shared across contexts/processes, exist in different memory +domains (for example VRAM vs system memory), and so on. And with +PRIME / dmabuf, they can even be shared across devices. So there are +a handful of situations where the driver needs to wait for buffers to +become ready. If you think about this in terms of waiting on a buffer +mutex for it to become available, this presents a problem because +there is no way to guarantee that buffers appear in a execbuf/batch in +the same order in all contexts. That is directly under control of +userspace, and a result of the sequence of GL calls that an application +makes. Which results in the potential for deadlock. The problem gets +more complex when you consider that the kernel may need to migrate the +buffer(s) into VRAM before the GPU operates on the buffer(s), which +may in turn require evicting some other buffers (and you don't want to +evict other buffers which are already queued up to the GPU), but for a +simplified understanding of the problem you can ignore this. + +The algorithm that TTM came up with for dealing with this problem is quite +simple. For each group of buffers (execbuf) that need to be locked, the caller +would be assigned a unique reservation id/ticket, from a global counter. In +case of deadlock while locking all the buffers associated with a execbuf, the +one with the lowest reservation ticket (i.e. the oldest task) wins, and the one +with the higher reservation id (i.e. the younger task) unlocks all of the +buffers that it has already locked, and then tries again. + +In the RDBMS literature this deadlock handling approach is called wait/wound: +The older tasks waits until it can acquire the contended lock. The younger tasks +needs to back off and drop all the locks it is currently holding, i.e. the +younger task is wounded. + +Concepts +-------- + +Compared to normal mutexes two additional concepts/objects show up in the lock +interface for w/w mutexes: + +Acquire context: To ensure eventual forward progress it is important the a task +trying to acquire locks doesn't grab a new reservation id, but keeps the one it +acquired when starting the lock acquisition. This ticket is stored in the +acquire context. Furthermore the acquire context keeps track of debugging state +to catch w/w mutex interface abuse. + +W/w class: In contrast to normal mutexes the lock class needs to be explicit for +w/w mutexes, since it is required to initialize the acquire context. + +Furthermore there are three different class of w/w lock acquire functions: + +* Normal lock acquisition with a context, using ww_mutex_lock. + +* Slowpath lock acquisition on the contending lock, used by the wounded task + after having dropped all already acquired locks. These functions have the + _slow postfix. + + From a simple semantics point-of-view the _slow functions are not strictly + required, since simply calling the normal ww_mutex_lock functions on the + contending lock (after having dropped all other already acquired locks) will + work correctly. After all if no other ww mutex has been acquired yet there's + no deadlock potential and hence the ww_mutex_lock call will block and not + prematurely return -EDEADLK. The advantage of the _slow functions is in + interface safety: + - ww_mutex_lock has a __must_check int return type, whereas ww_mutex_lock_slow + has a void return type. Note that since ww mutex code needs loops/retries + anyway the __must_check doesn't result in spurious warnings, even though the + very first lock operation can never fail. + - When full debugging is enabled ww_mutex_lock_slow checks that all acquired + ww mutex have been released (preventing deadlocks) and makes sure that we + block on the contending lock (preventing spinning through the -EDEADLK + slowpath until the contended lock can be acquired). + +* Functions to only acquire a single w/w mutex, which results in the exact same + semantics as a normal mutex. This is done by calling ww_mutex_lock with a NULL + context. + + Again this is not strictly required. But often you only want to acquire a + single lock in which case it's pointless to set up an acquire context (and so + better to avoid grabbing a deadlock avoidance ticket). + +Of course, all the usual variants for handling wake-ups due to signals are also +provided. + +Usage +----- + +Three different ways to acquire locks within the same w/w class. Common +definitions for methods #1 and #2: + +static DEFINE_WW_CLASS(ww_class); + +struct obj { + struct ww_mutex lock; + /* obj data */ +}; + +struct obj_entry { + struct list_head *list; + struct obj *obj; +}; + +Method 1, using a list in execbuf->buffers that's not allowed to be reordered. +This is useful if a list of required objects is already tracked somewhere. +Furthermore the lock helper can use propagate the -EALREADY return code back to +the caller as a signal that an object is twice on the list. This is useful if +the list is constructed from userspace input and the ABI requires userspace to +not have duplicate entries (e.g. for a gpu commandbuffer submission ioctl). + +int lock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) +{ + struct obj *res_obj = NULL; + struct obj_entry *contended_entry = NULL; + struct obj_entry *entry; + + ww_acquire_init(ctx, &ww_class); + +retry: + list_for_each_entry (list, entry) { + if (entry == res_obj) { + res_obj = NULL; + continue; + } + ret = ww_mutex_lock(&entry->obj->lock, ctx); + if (ret < 0) { + contended_obj = entry; + goto err; + } + } + + ww_acquire_done(ctx); + return 0; + +err: + list_for_each_entry_continue_reverse (list, contended_entry, entry) + ww_mutex_unlock(&entry->obj->lock); + + if (res_obj) + ww_mutex_unlock(&res_obj->lock); + + if (ret == -EDEADLK) { + /* we lost out in a seqno race, lock and retry.. */ + ww_mutex_lock_slow(&contended_entry->obj->lock, ctx); + res_obj = contended_entry->obj; + goto retry; + } + ww_acquire_fini(ctx); + + return ret; +} + +Method 2, using a list in execbuf->buffers that can be reordered. Same semantics +of duplicate entry detection using -EALREADY as method 1 above. But the +list-reordering allows for a bit more idiomatic code. + +int lock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) +{ + struct obj_entry *entry, *entry2; + + ww_acquire_init(ctx, &ww_class); + + list_for_each_entry (list, entry) { + ret = ww_mutex_lock(&entry->obj->lock, ctx); + if (ret < 0) { + entry2 = entry; + + list_for_each_entry_continue_reverse (list, entry2) + ww_mutex_unlock(&entry->obj->lock); + + if (ret != -EDEADLK) { + ww_acquire_fini(ctx); + return ret; + } + + /* we lost out in a seqno race, lock and retry.. */ + ww_mutex_lock_slow(&entry->obj->lock, ctx); + + /* + * Move buf to head of the list, this will point + * buf->next to the first unlocked entry, + * restarting the for loop. + */ + list_del(&entry->list); + list_add(&entry->list, list); + } + } + + ww_acquire_done(ctx); + return 0; +} + +Unlocking works the same way for both methods #1 and #2: + +void unlock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) +{ + struct obj_entry *entry; + + list_for_each_entry (list, entry) + ww_mutex_unlock(&entry->obj->lock); + + ww_acquire_fini(ctx); +} + +Method 3 is useful if the list of objects is constructed ad-hoc and not upfront, +e.g. when adjusting edges in a graph where each node has its own ww_mutex lock, +and edges can only be changed when holding the locks of all involved nodes. w/w +mutexes are a natural fit for such a case for two reasons: +- They can handle lock-acquisition in any order which allows us to start walking + a graph from a starting point and then iteratively discovering new edges and + locking down the nodes those edges connect to. +- Due to the -EALREADY return code signalling that a given objects is already + held there's no need for additional book-keeping to break cycles in the graph + or keep track off which looks are already held (when using more than one node + as a starting point). + +Note that this approach differs in two important ways from the above methods: +- Since the list of objects is dynamically constructed (and might very well be + different when retrying due to hitting the -EDEADLK wound condition) there's + no need to keep any object on a persistent list when it's not locked. We can + therefore move the list_head into the object itself. +- On the other hand the dynamic object list construction also means that the -EALREADY return + code can't be propagated. + +Note also that methods #1 and #2 and method #3 can be combined, e.g. to first lock a +list of starting nodes (passed in from userspace) using one of the above +methods. And then lock any additional objects affected by the operations using +method #3 below. The backoff/retry procedure will be a bit more involved, since +when the dynamic locking step hits -EDEADLK we also need to unlock all the +objects acquired with the fixed list. But the w/w mutex debug checks will catch +any interface misuse for these cases. + +Also, method 3 can't fail the lock acquisition step since it doesn't return +-EALREADY. Of course this would be different when using the _interruptible +variants, but that's outside of the scope of these examples here. + +struct obj { + struct ww_mutex ww_mutex; + struct list_head locked_list; +}; + +static DEFINE_WW_CLASS(ww_class); + +void __unlock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) +{ + struct obj entry; + + for_each_safe (list, entry) { + /* need to do that before unlocking, since only the current lock holder is + allowed to use object */ + list_del(entry->locked_list); + ww_mutex_unlock(entry->ww_mutex) + } +} + +void lock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) +{ + struct list_head locked_buffers; + struct obj obj = NULL, entry; + + ww_acquire_init(ctx, &ww_class); + +retry: + /* re-init loop start state */ + loop { + /* magic code which walks over a graph and decides which objects + * to lock */ + + ret = ww_mutex_lock(obj->ww_mutex, ctx); + if (ret == -EALREADY) { + /* we have that one already, get to the next object */ + continue; + } + if (ret == -EDEADLK) { + __unlock_objs(list, ctx); + + ww_mutex_lock_slow(obj, ctx); + list_add(locked_buffers, entry->locked_list); + goto retry; + } + + /* locked a new object, add it to the list */ + list_add(locked_buffers, entry->locked_list); + } + + ww_acquire_done(ctx); + return 0; +} + +void unlock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) +{ + __unlock_objs(list, ctx); + ww_acquire_fini(ctx); +} + +Method 4: Only lock one single objects. In that case deadlock detection and +prevention is obviously overkill, since with grabbing just one lock you can't +produce a deadlock within just one class. To simplify this case the w/w mutex +api can be used with a NULL context. + +Implementation Details +---------------------- + +Design: + ww_mutex currently encapsulates a struct mutex, this means no extra overhead for + normal mutex locks, which are far more common. As such there is only a small + increase in code size if wait/wound mutexes are not used. + + In general, not much contention is expected. The locks are typically used to + serialize access to resources for devices. The only way to make wakeups + smarter would be at the cost of adding a field to struct mutex_waiter. This + would add overhead to all cases where normal mutexes are used, and + ww_mutexes are generally less performance sensitive. + +Lockdep: + Special care has been taken to warn for as many cases of api abuse + as possible. Some common api abuses will be caught with + CONFIG_DEBUG_MUTEXES, but CONFIG_PROVE_LOCKING is recommended. + + Some of the errors which will be warned about: + - Forgetting to call ww_acquire_fini or ww_acquire_init. + - Attempting to lock more mutexes after ww_acquire_done. + - Attempting to lock the wrong mutex after -EDEADLK and + unlocking all mutexes. + - Attempting to lock the right mutex after -EDEADLK, + before unlocking all mutexes. + + - Calling ww_mutex_lock_slow before -EDEADLK was returned. + + - Unlocking mutexes with the wrong unlock function. + - Calling one of the ww_acquire_* twice on the same context. + - Using a different ww_class for the mutex than for the ww_acquire_ctx. + - Normal lockdep errors that can result in deadlocks. + + Some of the lockdep errors that can result in deadlocks: + - Calling ww_acquire_init to initialize a second ww_acquire_ctx before + having called ww_acquire_fini on the first. + - 'normal' deadlocks that can occur. + +FIXME: Update this section once we have the TASK_DEADLOCK task state flag magic +implemented.
include/linux/mutex-debug.h +1 -0
@@ -3,6 +3,7 @@#include <linux/linkage.h> #include <linux/lockdep.h> +#include <linux/debug_locks.h> /* * Mutexes - debugging helpers:
include/linux/mutex.h +354 -1
406 lines not on this page · raw message
kernel/mutex.c +302 -16
414 lines not on this page · raw message
lib/debug_locks.c +2 -0
@@ -30,6 +30,7 @@ EXPORT_SYMBOL_GPL(debug_locks);* a locking bug is detected. */ int debug_locks_silent; +EXPORT_SYMBOL_GPL (debug_locks_silent);/* * Generic 'turn off all lock debugging' function:
@@ -44,3 +45,4 @@ int debug_locks_off(void) }return 0 ; } +EXPORT_SYMBOL_GPL (debug_locks_off);
Re: [PATCH v4 2/4] mutex: add support for wound/wait style locks, v5
Hi,
Just minor comments
+Usage
Quoted 31 lines
+-----
Documentation/ww-mutex-design.txt new file +17
-0+ +Three different ways to acquire locks within the same w/w class. Common +definitions for methods #1 and #2: + +static DEFINE_WW_CLASS(ww_class); + +struct obj { + struct ww_mutex lock; + /* obj data */ +}; + +struct obj_entry { + struct list_head *list; + struct obj *obj; +}; + +Method 1, using a list in execbuf->buffers that's not allowed to bereordered.
(quoted diff) +2
-0+This is useful if a list of required objects is already tracked somewhere. +Furthermore the lock helper can use propagate the -EALREADY return codeback to
+the caller as a signal that an object is twice on the list. This is useful if
+the list is constructed from userspace input and the ABI requires userspace to
+not have duplicate entries (e.g. for a gpu commandbuffer submission ioctl).Documentation/ww-mutex-design.txt new file +2
-0+ +int lock_objs(struct list_head *list, struct ww_acquire_ctx *ctx)
Documentation/ww-mutex-design.txt line 124
Quoted 10 lines
Documentation/ww-mutex-design.txt new file +10
-0+{ + struct obj *res_obj = NULL; + struct obj_entry *contended_entry = NULL; + struct obj_entry *entry; + + ww_acquire_init(ctx, &ww_class); + +retry: + list_for_each_entry (list, entry) { + if (entry == res_obj) {
if (entry->obj == res_obj) {
Documentation/ww-mutex-design.txt line 130
Quoted 7 lines
Documentation/ww-mutex-design.txt new file +6
-0+ res_obj = NULL; + continue; + } + ret = ww_mutex_lock(&entry->obj->lock, ctx); + if (ret < 0) { + contended_obj = entry;
contended_entry = entry;
Documentation/ww-mutex-design.txt line 139
Quoted 10 lines
Documentation/ww-mutex-design.txt new file +9
-0+ goto err; + } + } + + ww_acquire_done(ctx); + return 0; + +err: + list_for_each_entry_continue_reverse (list, contended_entry, entry)
list_for_each_entry_continue_reverse(entry, list, list)?
Quoted 24 lines
Documentation/ww-mutex-design.txt new file +17
-0+ ww_mutex_unlock(&entry->obj->lock); + + if (res_obj) + ww_mutex_unlock(&res_obj->lock); + + if (ret == -EDEADLK) { + /* we lost out in a seqno race, lock and retry.. */ + ww_mutex_lock_slow(&contended_entry->obj->lock, ctx); + res_obj = contended_entry->obj; + goto retry; + } + ww_acquire_fini(ctx); + + return ret; +} + +Method 2, using a list in execbuf->buffers that can be reordered. Samesemantics
Documentation/ww-mutex-design.txt new file +5
-0+of duplicate entry detection using -EALREADY as method 1 above. But the +list-reordering allows for a bit more idiomatic code. + +int lock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) +{
Documentation/ww-mutex-design.txt line 171
Quoted 10 lines
Documentation/ww-mutex-design.txt new file +10
-0+ struct obj_entry *entry, *entry2; + + ww_acquire_init(ctx, &ww_class); + + list_for_each_entry (list, entry) { + ret = ww_mutex_lock(&entry->obj->lock, ctx); + if (ret < 0) { + entry2 = entry; + + list_for_each_entry_continue_reverse (list, entry2)
list_for_each_entry_continue_reverse(entry, list, list)?
Documentation/ww-mutex-design.txt line 180
Quoted 10 lines
Documentation/ww-mutex-design.txt new file +9
-0+ ww_mutex_unlock(&entry->obj->lock); + + if (ret != -EDEADLK) { + ww_acquire_fini(ctx); + return ret; + } + + /* we lost out in a seqno race, lock and retry.. */ + ww_mutex_lock_slow(&entry->obj->lock, ctx);
shouldn't the wounded task acquire slowpath lock to the above dead locked entry like this, ww_mutex_lock_slow(&entry2->obj->lock, ctx)?
Quoted 28 lines
Documentation/ww-mutex-design.txt new file +27
-0+ + /* + * Move buf to head of the list, this will point + * buf->next to the first unlocked entry, + * restarting the for loop. + */ + list_del(&entry->list); + list_add(&entry->list, list); + } + } + + ww_acquire_done(ctx); + return 0; +} + +Unlocking works the same way for both methods #1 and #2: + +void unlock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) +{ + struct obj_entry *entry; + + list_for_each_entry (list, entry) + ww_mutex_unlock(&entry->obj->lock); + + ww_acquire_fini(ctx); +} +
Quoted 5 lines
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v4 2/4] mutex: add support for wound/wait style locks, v5
Op 29-05-13 12:33, Inki Dae schreef:
Quoted 38 lines
Hi,
Just minor comments
+Usage
Quoted 33 lines
+-----
(quoted diff) +17
-0+ +Three different ways to acquire locks within the same w/w class. Common +definitions for methods #1 and #2: + +static DEFINE_WW_CLASS(ww_class); + +struct obj { + struct ww_mutex lock; + /* obj data */ +}; + +struct obj_entry { + struct list_head *list; + struct obj *obj; +}; + +Method 1, using a list in execbuf->buffers that's not allowed to bereordered.
(quoted diff) +2
-0+This is useful if a list of required objects is already tracked somewhere. +Furthermore the lock helper can use propagate the -EALREADY return codeback to
+the caller as a signal that an object is twice on the list. This is useful if
+the list is constructed from userspace input and the ABI requires userspace to
+not have duplicate entries (e.g. for a gpu commandbuffer submission ioctl).(quoted diff) +5
-0+ +int lock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) +{ + struct obj *res_obj = NULL; + struct obj_entry *contended_entry = NULL;
Quoted 8 lines
Review
Quoted 8 lines
(quoted diff) +7
-0+ struct obj_entry *entry; + + ww_acquire_init(ctx, &ww_class); + +retry: + list_for_each_entry (list, entry) { + if (entry == res_obj) {
Indeed, documentation was wrong. With the below diff it should almost compile now. I really don't want to know if it really does, it's meant to be documentation!
Documentation/ww-mutex-design.txt +20 -21
@@ -100,7 +100,7 @@ struct obj { }; struct obj_entry { - struct list_head *list; + struct list_head head; struct obj *obj; };
@@ -120,14 +120,14 @@ int lock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) ww_acquire_init(ctx, &ww_class); retry: - list_for_each_entry (list, entry) { - if (entry == res_obj) { + list_for_each_entry (entry, list, head) { + if (entry->obj == res_obj) { res_obj = NULL; continue; } ret = ww_mutex_lock(&entry->obj->lock, ctx); if (ret < 0) { - contended_obj = entry; + contended_entry = entry; goto err; } }
@@ -136,7 +136,7 @@ retry: return 0; err: - list_for_each_entry_continue_reverse (list, contended_entry, entry) + list_for_each_entry_continue_reverse (entry, list, head) ww_mutex_unlock(&entry->obj->lock); if (res_obj)
@@ -163,13 +163,13 @@ int lock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) ww_acquire_init(ctx, &ww_class); - list_for_each_entry (list, entry) { + list_for_each_entry (entry, list, head) { ret = ww_mutex_lock(&entry->obj->lock, ctx); if (ret < 0) { entry2 = entry; - list_for_each_entry_continue_reverse (list, entry2) - ww_mutex_unlock(&entry->obj->lock); + list_for_each_entry_continue_reverse (entry2, list, head) + ww_mutex_unlock(&entry2->obj->lock); if (ret != -EDEADLK) { ww_acquire_fini(ctx);
@@ -184,8 +184,8 @@ int lock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) * buf->next to the first unlocked entry, * restarting the for loop. */ - list_del(&entry->list); - list_add(&entry->list, list); + list_del(&entry->head); + list_add(&entry->head, list); } }
@@ -199,7 +199,7 @@ void unlock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) { struct obj_entry *entry; - list_for_each_entry (list, entry) + list_for_each_entry (entry, list, head) ww_mutex_unlock(&entry->obj->lock); ww_acquire_fini(ctx);
@@ -244,22 +244,21 @@ struct obj { static DEFINE_WW_CLASS(ww_class); -void __unlock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) +void __unlock_objs(struct list_head *list) { - struct obj entry; + struct obj *entry, *temp; - for_each_safe (list, entry) { + list_for_each_entry_safe (entry, temp, list, locked_list) { /* need to do that before unlocking, since only the current lock holder is allowed to use object */ - list_del(entry->locked_list); + list_del(&entry->locked_list); ww_mutex_unlock(entry->ww_mutex) } } void lock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) { - struct list_head locked_buffers; - struct obj obj = NULL, entry; + struct obj *obj; ww_acquire_init(ctx, &ww_class);
@@ -275,15 +274,15 @@ retry: continue; } if (ret == -EDEADLK) { - __unlock_objs(list, ctx); + __unlock_objs(list); ww_mutex_lock_slow(obj, ctx); - list_add(locked_buffers, entry->locked_list); + list_add(&entry->locked_list, list); goto retry; } /* locked a new object, add it to the list */ - list_add(locked_buffers, entry->locked_list); + list_add_tail(&entry->locked_list, list); } ww_acquire_done(ctx);
@@ -292,7 +291,7 @@ retry: void unlock_objs(struct list_head *list, struct ww_acquire_ctx *ctx) { - __unlock_objs(list, ctx); + __unlock_objs(list); ww_acquire_fini(ctx); }
PATCH v4 3/4 mutex: Add ww tests to lib/locking-selftest.c. v4
In reply to Maarten LankhorstThis stresses the lockdep code in some ways specifically useful to ww_mutexes. It adds checks for most of the common locking errors.
Changes since v1:
- Add tests to verify reservation_id is untouched.
- Use L() and U() macros where possible.
Changes since v2:
- Use the ww_mutex api directly.
- Use macros for most of the code.
Changes since v3:
- Rework tests for the api changes.
--- lib/locking-selftest.c | 405 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 386 insertions(+), 19 deletions(-)
lib/locking-selftest.c +386 -19
@@ -26,6 +26,8 @@*/ static unsigned int debug_locks_verbose; +static DEFINE_WW_CLASS (ww_lockdep); +static int __init setup_debug_locks_verbose (char *str) {get_option (&str, &debug_locks_verbose);
@@ -42,6 +44,10 @@ __setup("debug_locks_verbose=", setup_debug_locks_verbose);#define LOCKTYPE_RWLOCK 0x2#define LOCKTYPE_MUTEX 0x4#define LOCKTYPE_RWSEM 0x8 +#define LOCKTYPE_WW 0x10 + +static struct ww_acquire_ctx t, t2; +static struct ww_mutex o, o2;/* * Normal standalone locks, for the circular and irq-context
@@ -193,6 +199,16 @@ static void init_shared_classes(void)#define RSU (x) up_read(&rwsem_##x)#define RWSI (x) init_rwsem(&rwsem_##x) +#define WWAI (x) ww_acquire_init(x, &ww_lockdep) +#define WWAD (x) ww_acquire_done(x) +#define WWAF (x) ww_acquire_fini(x) + +#define WWL (x, c) ww_mutex_lock(x, c) +#define WWT (x) ww_mutex_trylock(x) +#define WWL1 (x) ww_mutex_lock(x, NULL) +#define WWU (x) ww_mutex_unlock(x) + +#define LOCK_UNLOCK_2 (x,y) LOCK(x); LOCK(y); UNLOCK(y); UNLOCK(x)/*
@@ -894,11 +910,13 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft)# define I_RWLOCK (x) lockdep_reset_lock(&rwlock_##x.dep_map)# define I_MUTEX (x) lockdep_reset_lock(&mutex_##x.dep_map)# define I_RWSEM (x) lockdep_reset_lock(&rwsem_##x.dep_map) +# define I_WW (x) lockdep_reset_lock(&x.dep_map)#else # define I_SPINLOCK (x)# define I_RWLOCK (x)# define I_MUTEX (x)# define I_RWSEM (x) +# define I_WW (x)#endif #define I1 (x) \
@@ -920,11 +938,20 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft)static void reset_locks (void ) {local_irq_disable (); +lockdep_free_key_range (&ww_lockdep.acquire_key,1 ); +lockdep_free_key_range (&ww_lockdep.mutex_key,1 ); +I1 (A );I1 (B );I1 (C );I1 (D );I1 (X1 );I1 (X2 );I1 (Y1 );I1 (Y2 );I1 (Z1 );I1 (Z2 ); +I_WW (t);I_WW (t2);I_WW (o.base);I_WW (o2.base);lockdep_reset ();I2 (A );I2 (B );I2 (C );I2 (D );init_shared_classes (); + +ww_mutex_init (&o, &ww_lockdep);ww_mutex_init (&o2, &ww_lockdep); +memset (&t,0 ,sizeof (t));memset (&t2,0 ,sizeof (t2)); +memset (&ww_lockdep.acquire_key,0 ,sizeof (ww_lockdep.acquire_key)); +memset (&ww_lockdep.mutex_key,0 ,sizeof (ww_lockdep.mutex_key));local_irq_enable (); }
@@ -938,7 +965,6 @@ static int unexpected_testcase_failures;static void dotest (void (*testcase_fn)(void ),int expected,int lockclass_mask) {unsigned long saved_preempt_count =preempt_count (); -int expected_failure =0 ;WARN_ON (irqs_disabled ());
@@ -946,26 +972,16 @@ static void dotest(void (*testcase_fn)(void), int expected, int lockclass_mask)/* * Filter out expected failures: */ +if (debug_locks != expected) {#ifndef CONFIG_PROVE_LOCKING -if ((lockclass_mask &LOCKTYPE_SPIN ) && debug_locks != expected) - expected_failure =1 ; -if ((lockclass_mask &LOCKTYPE_RWLOCK ) && debug_locks != expected) - expected_failure =1 ; -if ((lockclass_mask &LOCKTYPE_MUTEX ) && debug_locks != expected) - expected_failure =1 ; -if ((lockclass_mask &LOCKTYPE_RWSEM ) && debug_locks != expected) - expected_failure =1 ; + expected_testcase_failures++; +printk ("failed|" ); +#else + unexpected_testcase_failures++; +printk ("FAILED|" ); + +dump_stack ();#endif -if (debug_locks != expected) { -if (expected_failure) { - expected_testcase_failures++; -printk ("failed|" ); - }else { - unexpected_testcase_failures++; - -printk ("FAILED|" ); -dump_stack (); - } }else { testcase_successes++;printk (" ok |" );
@@ -1108,6 +1124,355 @@ static inline void print_testname(const char *testname)DO_TESTCASE_6IRW (desc, name,312 ); \DO_TESTCASE_6IRW (desc, name,321 ); +static void ww_test_fail_acquire (void ) +{ +int ret; + +WWAI (&t); + t.stamp++; + + ret =WWL (&o, &t); + +if (WARN_ON (!o.ctx) || +WARN_ON (ret)) +return ; + +/* No lockdep test, pure API */ + ret =WWL (&o, &t); +WARN_ON (ret != -EALREADY ); + + ret =WWT (&o); +WARN_ON (ret); + + t2 = t; + t2.stamp++; + ret =WWL (&o, &t2); +WARN_ON (ret != -EDEADLK ); +WWU (&o); + +if (WWT (&o)) +WWU (&o); +#ifdef CONFIG_DEBUG_LOCK_ALLOC + else + DEBUG_LOCKS_WARN_ON(1); +#endif +} + +static void ww_test_normal (void ) +{ +int ret; + +WWAI (&t); + +/* +* test if ww_id is kept identical if not +* called with any of the ww_* locking calls +*/ + +/* mutex_lock (and indirectly, mutex_lock_nested) */ + o.ctx = (void *)~0UL ; +mutex_lock (&o.base); +mutex_unlock (&o.base); +WARN_ON (o.ctx != (void *)~0UL ); + +/* mutex_lock_interruptible (and *_nested) */ + o.ctx = (void *)~0UL ; + ret =mutex_lock_interruptible (&o.base); +if (!ret) +mutex_unlock (&o.base); +else +WARN_ON (1 ); +WARN_ON (o.ctx != (void *)~0UL ); + +/* mutex_lock_killable (and *_nested) */ + o.ctx = (void *)~0UL ; + ret =mutex_lock_killable (&o.base); +if (!ret) +mutex_unlock (&o.base); +else +WARN_ON (1 ); +WARN_ON (o.ctx != (void *)~0UL ); + +/* trylock, succeeding */ + o.ctx = (void *)~0UL ; + ret =mutex_trylock (&o.base); +WARN_ON (!ret); +if (ret) +mutex_unlock (&o.base); +else +WARN_ON (1 ); +WARN_ON (o.ctx != (void *)~0UL ); + +/* trylock, failing */ + o.ctx = (void *)~0UL ; +mutex_lock (&o.base); + ret =mutex_trylock (&o.base); +WARN_ON (ret); +mutex_unlock (&o.base); +WARN_ON (o.ctx != (void *)~0UL ); + +/* nest_lock */ + o.ctx = (void *)~0UL ; +mutex_lock_nest_lock (&o.base, &t); +mutex_unlock (&o.base); +WARN_ON (o.ctx != (void *)~0UL ); +} + +static void ww_test_two_contexts (void ) +{ +WWAI (&t); +WWAI (&t2); +} + +static void ww_test_context_unlock_twice (void ) +{ +WWAI (&t); +WWAD (&t); +WWAF (&t); +WWAF (&t); +} + +static void ww_test_object_unlock_twice (void ) +{ +WWL1 (&o); +WWU (&o); +WWU (&o); +} + +static void ww_test_spin_nest_unlocked (void ) +{ +raw_spin_lock_nest_lock (&lock_A, &o.base); +U (A ); +} + +static void ww_test_unneeded_slow (void ) +{ +int ret; + +WWAI (&t); + +ww_mutex_lock_slow (&o, &t); +} + +static void ww_test_context_block (void ) +{ +int ret; + +WWAI (&t); + + ret =WWL (&o, &t); +WARN_ON (ret); +WWL1 (&o2); +} + +static void ww_test_context_try (void ) +{ +int ret; + +WWAI (&t); + + ret =WWL (&o, &t); +WARN_ON (ret); + + ret =WWT (&o2); +WARN_ON (!ret); +WWU (&o2); +WWU (&o); +} + +static void ww_test_context_context (void ) +{ +int ret; + +WWAI (&t); + + ret =WWL (&o, &t); +WARN_ON (ret); + + ret =WWL (&o2, &t); +WARN_ON (ret); + +WWU (&o2); +WWU (&o); +} + +static void ww_test_try_block (void ) +{ +bool ret; + + ret =WWT (&o); +WARN_ON (!ret); + +WWL1 (&o2); +WWU (&o2); +WWU (&o); +} + +static void ww_test_try_try (void ) +{ +bool ret; + + ret =WWT (&o); +WARN_ON (!ret); + ret =WWT (&o2); +WARN_ON (!ret); +WWU (&o2); +WWU (&o); +} + +static void ww_test_try_context (void ) +{ +int ret; + + ret =WWT (&o); +WARN_ON (!ret); + +WWAI (&t); + + ret =WWL (&o2, &t); +WARN_ON (ret); +} + +static void ww_test_block_block (void ) +{ +WWL1 (&o); +WWL1 (&o2); +} + +static void ww_test_block_try (void ) +{ +bool ret; + +WWL1 (&o); + ret =WWT (&o2); +WARN_ON (!ret); +} + +static void ww_test_block_context (void ) +{ +int ret; + +WWL1 (&o); +WWAI (&t); + + ret =WWL (&o2, &t); +WARN_ON (ret); +} + +static void ww_test_spin_block (void ) +{ +L (A ); +U (A ); + +WWL1 (&o); +L (A ); +U (A ); +WWU (&o); + +L (A ); +WWL1 (&o); +WWU (&o); +U (A ); +} + +static void ww_test_spin_try (void ) +{ +bool ret; + +L (A ); +U (A ); + + ret =WWT (&o); +WARN_ON (!ret); +L (A ); +U (A ); +WWU (&o); + +L (A ); + ret =WWT (&o); +WARN_ON (!ret); +WWU (&o); +U (A ); +} + +static void ww_test_spin_context (void ) +{ +int ret; + +L (A ); +U (A ); + +WWAI (&t); + + ret =WWL (&o, &t); +WARN_ON (ret); +L (A ); +U (A ); +WWU (&o); + +L (A ); + ret =WWL (&o, &t); +WARN_ON (ret); +WWU (&o); +U (A ); +} + +static void ww_tests (void ) +{ +printk (" --------------------------------------------------------------------------\n" ); +printk (" | Wound/wait tests |\n" ); +printk (" ---------------------\n" ); + +print_testname ("ww api failures" ); +dotest (ww_test_fail_acquire,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_normal,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_unneeded_slow,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("using two ww contexts" ); +dotest (ww_test_two_contexts,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("finish ww context twice" ); +dotest (ww_test_context_unlock_twice,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("unlock twice" ); +dotest (ww_test_object_unlock_twice,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("spinlock nest unlocked" ); +dotest (ww_test_spin_nest_unlocked,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +printk (" -----------------------------------------------------\n" ); +printk (" |block | try |context|\n" ); +printk (" -----------------------------------------------------\n" ); + +print_testname ("context" ); +dotest (ww_test_context_block,FAILURE ,LOCKTYPE_WW ); +dotest (ww_test_context_try,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_context_context,SUCCESS ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("try" ); +dotest (ww_test_try_block,FAILURE ,LOCKTYPE_WW ); +dotest (ww_test_try_try,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_try_context,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("block" ); +dotest (ww_test_block_block,FAILURE ,LOCKTYPE_WW ); +dotest (ww_test_block_try,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_block_context,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("spinlock" ); +dotest (ww_test_spin_block,FAILURE ,LOCKTYPE_WW ); +dotest (ww_test_spin_try,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_spin_context,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); +}void locking_selftest (void ) {
@@ -1188,6 +1553,8 @@ void locking_selftest(void)DO_TESTCASE_6x2 ("irq read-recursion" , irq_read_recursion);// DO_TESTCASE_6x2B("irq read-recursion #2", irq_read_recursion2); +ww_tests (); +if (unexpected_testcase_failures) {printk ("-----------------------------------------------------------------\n" ); debug_locks =0 ;
Re: [PATCH v4 3/4] mutex: Add ww tests to lib/locking-selftest.c. v4
Quoted 224 lines · Maarten Lankhorst
This stresses the lockdep code in some ways specifically useful to
ww_mutexes. It adds checks for most of the common locking errors.Changes since v1:
- Add tests to verifyreservation_idis untouched.
- UseL()andU()macros where possible.Changes since v2:
- Use theww_mutexapi directly.
- Use macros for most of the code.
Changes since v3:
- Rework tests for the api changes.Signed-off-by Maarten Lankhorst <[email protected]>--- lib/locking-selftest.c | 405 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 386 insertions(+), 19 deletions(-)lib/locking-selftest.c +118
-19@@ -26,6 +26,8 @@*/ static unsigned int debug_locks_verbose; +static DEFINE_WW_CLASS (ww_lockdep); +static int __init setup_debug_locks_verbose (char *str) {get_option (&str, &debug_locks_verbose);@@ -42,6 +44,10 @@ __setup("debug_locks_verbose=", setup_debug_locks_verbose);#define LOCKTYPE_RWLOCK 0x2#define LOCKTYPE_MUTEX 0x4#define LOCKTYPE_RWSEM 0x8 +#define LOCKTYPE_WW 0x10 + +static struct ww_acquire_ctx t, t2; +static struct ww_mutex o, o2;/* * Normal standalone locks, for the circular and irq-context @@ -193,6 +199,16 @@ static void init_shared_classes(void)#define RSU (x) up_read(&rwsem_##x)#define RWSI (x) init_rwsem(&rwsem_##x) +#define WWAI (x) ww_acquire_init(x, &ww_lockdep) +#define WWAD (x) ww_acquire_done(x) +#define WWAF (x) ww_acquire_fini(x) + +#define WWL (x, c) ww_mutex_lock(x, c) +#define WWT (x) ww_mutex_trylock(x) +#define WWL1 (x) ww_mutex_lock(x, NULL) +#define WWU (x) ww_mutex_unlock(x) + +#define LOCK_UNLOCK_2 (x,y) LOCK(x); LOCK(y); UNLOCK(y); UNLOCK(x)/* @@ -894,11 +910,13 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft)# define I_RWLOCK (x) lockdep_reset_lock(&rwlock_##x.dep_map)# define I_MUTEX (x) lockdep_reset_lock(&mutex_##x.dep_map)# define I_RWSEM (x) lockdep_reset_lock(&rwsem_##x.dep_map) +# define I_WW (x) lockdep_reset_lock(&x.dep_map)#else # define I_SPINLOCK (x)# define I_RWLOCK (x)# define I_MUTEX (x)# define I_RWSEM (x) +# define I_WW (x)#endif #define I1 (x) \@@ -920,11 +938,20 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft)static void reset_locks (void ) {local_irq_disable (); +lockdep_free_key_range (&ww_lockdep.acquire_key,1 ); +lockdep_free_key_range (&ww_lockdep.mutex_key,1 ); +I1 (A );I1 (B );I1 (C );I1 (D );I1 (X1 );I1 (X2 );I1 (Y1 );I1 (Y2 );I1 (Z1 );I1 (Z2 ); +I_WW (t);I_WW (t2);I_WW (o.base);I_WW (o2.base);lockdep_reset ();I2 (A );I2 (B );I2 (C );I2 (D );init_shared_classes (); + +ww_mutex_init (&o, &ww_lockdep);ww_mutex_init (&o2, &ww_lockdep); +memset (&t,0 ,sizeof (t));memset (&t2,0 ,sizeof (t2)); +memset (&ww_lockdep.acquire_key,0 ,sizeof (ww_lockdep.acquire_key)); +memset (&ww_lockdep.mutex_key,0 ,sizeof (ww_lockdep.mutex_key));local_irq_enable (); }@@ -938,7 +965,6 @@ static int unexpected_testcase_failures;static void dotest (void (*testcase_fn)(void ),int expected,int lockclass_mask) {unsigned long saved_preempt_count =preempt_count (); -int expected_failure =0 ;WARN_ON (irqs_disabled ());@@ -946,26 +972,16 @@ static void dotest(void (*testcase_fn)(void), int expected, int lockclass_mask)/* * Filter out expected failures: */ +if (debug_locks != expected) {#ifndef CONFIG_PROVE_LOCKING -if ((lockclass_mask &LOCKTYPE_SPIN ) && debug_locks != expected) - expected_failure =1 ; -if ((lockclass_mask &LOCKTYPE_RWLOCK ) && debug_locks != expected) - expected_failure =1 ; -if ((lockclass_mask &LOCKTYPE_MUTEX ) && debug_locks != expected) - expected_failure =1 ; -if ((lockclass_mask &LOCKTYPE_RWSEM ) && debug_locks != expected) - expected_failure =1 ; + expected_testcase_failures++; +printk ("failed|" ); +#else + unexpected_testcase_failures++; +printk ("FAILED|" ); + +dump_stack ();#endif -if (debug_locks != expected) { -if (expected_failure) { - expected_testcase_failures++; -printk ("failed|" ); - }else { - unexpected_testcase_failures++; - -printk ("FAILED|" ); -dump_stack (); - } }else { testcase_successes++;printk (" ok |" );@@ -1108,6 +1124,355 @@ static inline void print_testname(const char *testname)DO_TESTCASE_6IRW (desc, name,312 ); \DO_TESTCASE_6IRW (desc, name,321 ); +static void ww_test_fail_acquire (void ) +{ +int ret; + +WWAI (&t); + t.stamp++; + + ret =WWL (&o, &t); + +if (WARN_ON (!o.ctx) || +WARN_ON (ret)) +return ; + +/* No lockdep test, pure API */ + ret =WWL (&o, &t); +WARN_ON (ret != -EALREADY ); + + ret =WWT (&o); +WARN_ON (ret); + + t2 = t; + t2.stamp++; + ret =WWL (&o, &t2); +WARN_ON (ret != -EDEADLK ); +WWU (&o); + +if (WWT (&o)) +WWU (&o); +#ifdef CONFIG_DEBUG_LOCK_ALLOC + else + DEBUG_LOCKS_WARN_ON(1); +#endif +} + +static void ww_test_normal (void ) +{ +int ret; + +WWAI (&t); + +/* +* test if ww_id is kept identical if not +* called with any of the ww_* locking calls +*/ + +/* mutex_lock (and indirectly, mutex_lock_nested) */ + o.ctx = (void *)~0UL ; +mutex_lock (&o.base); +mutex_unlock (&o.base); +WARN_ON (o.ctx != (void *)~0UL ); + +/* mutex_lock_interruptible (and *_nested) */ + o.ctx = (void *)~0UL ; + ret =mutex_lock_interruptible (&o.base); +if (!ret) +mutex_unlock (&o.base); +else +WARN_ON (1 ); +WARN_ON (o.ctx != (void *)~0UL ); + +/* mutex_lock_killable (and *_nested) */ + o.ctx = (void *)~0UL ; + ret =mutex_lock_killable (&o.base); +if (!ret) +mutex_unlock (&o.base); +else +WARN_ON (1 ); +WARN_ON (o.ctx != (void *)~0UL ); + +/* trylock, succeeding */ + o.ctx = (void *)~0UL ; + ret =mutex_trylock (&o.base); +WARN_ON (!ret); +if (ret) +mutex_unlock (&o.base); +else +WARN_ON (1 ); +WARN_ON (o.ctx != (void *)~0UL ); + +/* trylock, failing */ + o.ctx = (void *)~0UL ; +mutex_lock (&o.base); + ret =mutex_trylock (&o.base);
lib/locking-selftest.c static inline void print_testname(const char *testname) · line 1219
Quoted 10 lines
lib/locking-selftest.c +10
-0+WARN_ON (ret); +mutex_unlock (&o.base); +WARN_ON (o.ctx != (void *)~0UL ); + +/* nest_lock */ + o.ctx = (void *)~0UL ; +mutex_lock_nest_lock (&o.base, &t); +mutex_unlock (&o.base); +WARN_ON (o.ctx != (void *)~0UL ); +}
Since we don't really allow this any more (instead allow ww_mutex_lock without context) do we need this test here really?
Quoted 17 lines
lib/locking-selftest.c +17
-0+ +static void ww_test_two_contexts (void ) +{ +WWAI (&t); +WWAI (&t2); +} + +static void ww_test_context_unlock_twice (void ) +{ +WWAI (&t); +WWAD (&t); +WWAF (&t); +WWAF (&t); +} + +static void ww_test_object_unlock_twice (void ) +{
lib/locking-selftest.c static inline void print_testname(const char *testname) · line 1246
Quoted 10 lines
lib/locking-selftest.c +10
-0+WWL1 (&o); +WWU (&o); +WWU (&o); +} + +static void ww_test_spin_nest_unlocked (void ) +{ +raw_spin_lock_nest_lock (&lock_A, &o.base); +U (A ); +}
I don't quite see the point of this one here ...
lib/locking-selftest.c static inline void print_testname(const char *testname) · line 1255
Quoted 9 lines
lib/locking-selftest.c +9
-0+ +static void ww_test_unneeded_slow (void ) +{ +int ret; + +WWAI (&t); + +ww_mutex_lock_slow (&o, &t); +}
I think checking the _slow debug stuff would be neat, i.e.
- fail/success tests for properly unlocking all held locks
- fail/success tests for lock_slow acquiring the right lock.
Otherwise I didn't spot anything that seems missing in these self-tests here.
Cheers, Daniel
Quoted 233 lines
lib/locking-selftest.c +222
-0+ +static void ww_test_context_block (void ) +{ +int ret; + +WWAI (&t); + + ret =WWL (&o, &t); +WARN_ON (ret); +WWL1 (&o2); +} + +static void ww_test_context_try (void ) +{ +int ret; + +WWAI (&t); + + ret =WWL (&o, &t); +WARN_ON (ret); + + ret =WWT (&o2); +WARN_ON (!ret); +WWU (&o2); +WWU (&o); +} + +static void ww_test_context_context (void ) +{ +int ret; + +WWAI (&t); + + ret =WWL (&o, &t); +WARN_ON (ret); + + ret =WWL (&o2, &t); +WARN_ON (ret); + +WWU (&o2); +WWU (&o); +} + +static void ww_test_try_block (void ) +{ +bool ret; + + ret =WWT (&o); +WARN_ON (!ret); + +WWL1 (&o2); +WWU (&o2); +WWU (&o); +} + +static void ww_test_try_try (void ) +{ +bool ret; + + ret =WWT (&o); +WARN_ON (!ret); + ret =WWT (&o2); +WARN_ON (!ret); +WWU (&o2); +WWU (&o); +} + +static void ww_test_try_context (void ) +{ +int ret; + + ret =WWT (&o); +WARN_ON (!ret); + +WWAI (&t); + + ret =WWL (&o2, &t); +WARN_ON (ret); +} + +static void ww_test_block_block (void ) +{ +WWL1 (&o); +WWL1 (&o2); +} + +static void ww_test_block_try (void ) +{ +bool ret; + +WWL1 (&o); + ret =WWT (&o2); +WARN_ON (!ret); +} + +static void ww_test_block_context (void ) +{ +int ret; + +WWL1 (&o); +WWAI (&t); + + ret =WWL (&o2, &t); +WARN_ON (ret); +} + +static void ww_test_spin_block (void ) +{ +L (A ); +U (A ); + +WWL1 (&o); +L (A ); +U (A ); +WWU (&o); + +L (A ); +WWL1 (&o); +WWU (&o); +U (A ); +} + +static void ww_test_spin_try (void ) +{ +bool ret; + +L (A ); +U (A ); + + ret =WWT (&o); +WARN_ON (!ret); +L (A ); +U (A ); +WWU (&o); + +L (A ); + ret =WWT (&o); +WARN_ON (!ret); +WWU (&o); +U (A ); +} + +static void ww_test_spin_context (void ) +{ +int ret; + +L (A ); +U (A ); + +WWAI (&t); + + ret =WWL (&o, &t); +WARN_ON (ret); +L (A ); +U (A ); +WWU (&o); + +L (A ); + ret =WWL (&o, &t); +WARN_ON (ret); +WWU (&o); +U (A ); +} + +static void ww_tests (void ) +{ +printk (" --------------------------------------------------------------------------\n" ); +printk (" | Wound/wait tests |\n" ); +printk (" ---------------------\n" ); + +print_testname ("ww api failures" ); +dotest (ww_test_fail_acquire,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_normal,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_unneeded_slow,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("using two ww contexts" ); +dotest (ww_test_two_contexts,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("finish ww context twice" ); +dotest (ww_test_context_unlock_twice,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("unlock twice" ); +dotest (ww_test_object_unlock_twice,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("spinlock nest unlocked" ); +dotest (ww_test_spin_nest_unlocked,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +printk (" -----------------------------------------------------\n" ); +printk (" |block | try |context|\n" ); +printk (" -----------------------------------------------------\n" ); + +print_testname ("context" ); +dotest (ww_test_context_block,FAILURE ,LOCKTYPE_WW ); +dotest (ww_test_context_try,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_context_context,SUCCESS ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("try" ); +dotest (ww_test_try_block,FAILURE ,LOCKTYPE_WW ); +dotest (ww_test_try_try,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_try_context,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("block" ); +dotest (ww_test_block_block,FAILURE ,LOCKTYPE_WW ); +dotest (ww_test_block_try,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_block_context,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); + +print_testname ("spinlock" ); +dotest (ww_test_spin_block,FAILURE ,LOCKTYPE_WW ); +dotest (ww_test_spin_try,SUCCESS ,LOCKTYPE_WW ); +dotest (ww_test_spin_context,FAILURE ,LOCKTYPE_WW ); +printk ("\n" ); +}void locking_selftest (void ) {@@ -1188,6 +1553,8 @@ void locking_selftest(void)DO_TESTCASE_6x2 ("irq read-recursion" , irq_read_recursion);// DO_TESTCASE_6x2B("irq read-recursion #2", irq_read_recursion2); +ww_tests (); +if (unexpected_testcase_failures) {printk ("-----------------------------------------------------------------\n" ); debug_locks =0 ;
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH v4 3/4] mutex: Add ww tests to lib/locking-selftest.c. v4
Op 28-05-13 21:18, Daniel Vetter schreef:
Quoted 69 lines · Maarten Lankhorst
Quoted 68 lines
This stresses the lockdep code in some ways specifically useful to
ww_mutexes. It adds checks for most of the common locking errors.Changes since v1:
- Add tests to verifyreservation_idis untouched.
- UseL()andU()macros where possible.Changes since v2:
- Use theww_mutexapi directly.
- Use macros for most of the code.
Changes since v3:
- Rework tests for the api changes.<snip>
lib/locking-selftest.c +53
-0+static void ww_test_normal (void ) +{ +int ret; + +WWAI (&t); + +/* +* test if ww_id is kept identical if not +* called with any of the ww_* locking calls +*/ + +/* mutex_lock (and indirectly, mutex_lock_nested) */ + o.ctx = (void *)~0UL ; +mutex_lock (&o.base); +mutex_unlock (&o.base); +WARN_ON (o.ctx != (void *)~0UL ); + +/* mutex_lock_interruptible (and *_nested) */ + o.ctx = (void *)~0UL ; + ret =mutex_lock_interruptible (&o.base); +if (!ret) +mutex_unlock (&o.base); +else +WARN_ON (1 ); +WARN_ON (o.ctx != (void *)~0UL ); + +/* mutex_lock_killable (and *_nested) */ + o.ctx = (void *)~0UL ; + ret =mutex_lock_killable (&o.base); +if (!ret) +mutex_unlock (&o.base); +else +WARN_ON (1 ); +WARN_ON (o.ctx != (void *)~0UL ); + +/* trylock, succeeding */ + o.ctx = (void *)~0UL ; + ret =mutex_trylock (&o.base); +WARN_ON (!ret); +if (ret) +mutex_unlock (&o.base); +else +WARN_ON (1 ); +WARN_ON (o.ctx != (void *)~0UL ); + +/* trylock, failing */ + o.ctx = (void *)~0UL ; +mutex_lock (&o.base); + ret =mutex_trylock (&o.base); +WARN_ON (ret); +mutex_unlock (&o.base); +WARN_ON (o.ctx != (void *)~0UL ); +
Quoted 8 lines
lib/locking-selftest.c static inline void print_testname(const char *testname) · line 1219
Quoted 6 lines
lib/locking-selftest.c +6
-0+/* nest_lock */ + o.ctx = (void *)~0UL ; +mutex_lock_nest_lock (&o.base, &t); +mutex_unlock (&o.base); +WARN_ON (o.ctx != (void *)~0UL ); +}Since we don't really allow this any more (instead allow
ww_mutex_lockwithout context) do we need this test here really?
Yes. This test verifies all the normal locking paths are not affected by the ww_ctx changes.
Quoted 20 lines
Quoted 20 lines
lib/locking-selftest.c +20
-0+ +static void ww_test_two_contexts (void ) +{ +WWAI (&t); +WWAI (&t2); +} + +static void ww_test_context_unlock_twice (void ) +{ +WWAI (&t); +WWAD (&t); +WWAF (&t); +WWAF (&t); +} + +static void ww_test_object_unlock_twice (void ) +{ +WWL1 (&o); +WWU (&o); +WWU (&o);
Quoted 8 lines
lib/locking-selftest.c static inline void print_testname(const char *testname) · line 1246
Quoted 7 lines
lib/locking-selftest.c +7
-0+} + +static void ww_test_spin_nest_unlocked (void ) +{ +raw_spin_lock_nest_lock (&lock_A, &o.base); +U (A ); +}I don't quite see the point of this one here ...
It's a lockdep test that was missing. o.base is not locked. So lock_A is being nested into an unlocked lock, resulting in a lockdep error.
Quoted 13 lines
lib/locking-selftest.c static inline void print_testname(const char *testname) · line 1255
Quoted 9 lines
lib/locking-selftest.c +9
-0+ +static void ww_test_unneeded_slow (void ) +{ +int ret; + +WWAI (&t); + +ww_mutex_lock_slow (&o, &t); +}I think checking the
_slowdebug stuff would be neat, i.e.
- fail/success tests for properly unlocking all held locks
- fail/success tests forlock_slowacquiring the right lock.
Quoted 3 lines
Otherwise I didn't spot anything that seems missing in these self-tests here.
Yes it would be nice, doing so is left as an excercise for the reviewer, who failed to raise this point sooner. ;-)
~Maarten
Re: [Linaro-mm-sig] [PATCH v4 3/4] mutex: Add ww tests to lib/locking-selftest.c. v4
Quoted 7 lines · Maarten Lankhorst
Quoted 6 lines
lib/locking-selftest.c static inline void print_testname(const char *testname) · line 1246
Quoted 5 lines
lib/locking-selftest.c +5
-0+static void ww_test_spin_nest_unlocked (void ) +{ +raw_spin_lock_nest_lock (&lock_A, &o.base); +U (A ); +}I don't quite see the point of this one here ...
It's a lockdep test that was missing. o.base is not locked. So
lock_Ais being nested into an unlocked lock, resulting in a lockdep error.
Sounds like a different patch then ...
Quoted 13 lines
Quoted 13 lines
lib/locking-selftest.c static inline void print_testname(const char *testname) · line 1255
Quoted 9 lines
lib/locking-selftest.c +9
-0+ +static void ww_test_unneeded_slow (void ) +{ +int ret; + +WWAI (&t); + +ww_mutex_lock_slow (&o, &t); +}I think checking the
_slowdebug stuff would be neat, i.e.
- fail/success tests for properly unlocking all held locks
- fail/success tests forlock_slowacquiring the right lock.
Quoted 4 lines
Quoted 3 lines
Otherwise I didn't spot anything that seems missing in these self-tests here.
Yes it would be nice, doing so is left as an excercise for the reviewer, who failed to raise this point sooner. ;-)
Hm, I guess I've volunteered myself to look into this a bit ;-) -Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
PATCH v4 4/4 mutex: w/w mutex slowpath debugging
In reply to Maarten LankhorstFrom: Daniel Vetter <[email protected]>
Injects EDEADLK conditions at pseudo-random interval, with exponential backoff up to UINT_MAX (to ensure that every lock operation still completes in a reasonable time).
This way we can test the wound slowpath even for ww mutex users where contention is never expected, and the ww deadlock avoidance algorithm is only needed for correctness against malicious userspace. An example would be protecting kernel modesetting properties, which thanks to single-threaded X isn't really expected to contend, ever.
I've looked into using the CONFIG_FAULT_INJECTION infrastructure, but decided against it for two reasons:
- EDEADLK handling is mandatory for ww mutex users and should never affect the outcome of a syscall. This is in contrast to -ENOMEM injection. So fine configurability isn't required.
- The fault injection framework only allows to set a simple probability for failure. Now the probability that a ww mutex acquire stage with N locks will never complete (due to too many injected EDEADLK backoffs) is zero. But the expected number of ww_mutex_lock operations for the completely uncontended case would be O(exp(N)). The per-acuiqire ctx exponential backoff solution choosen here only results in O(log N) overhead due to injection and so O(log N * N) lock operations. This way we can fail with high probability (and so have good test coverage even for fancy backoff and lock acquisition paths) without running into patalogical cases.
Note that EDEADLK will only ever be injected when we managed to acquire the lock. This prevents any behaviour changes for users which rely on the EALREADY semantics.
v2: Drop the cargo-culted __sched (I should read docs next time around) and annotate the non-debug case with inline to prevent gcc from doing something horrible.
v3: Rebase on top of Maarten's latest patches.
v4: Actually make this stuff compile, I've misplace the hunk in the wrong #ifdef block.
v5: Simplify ww_mutex_deadlock_injection definition, and fix lib/locking-selftest.c warnings. Fix lib/Kconfig.debug definition to work correctly. (mlankhorst)
v6:
Do not inject -EDEADLK when ctx->acquired == 0, because the _slow paths are merged now. (mlankhorst)
--- include/linux/mutex.h | 8 ++++++++ kernel/mutex.c | 44 +++++++++++++++++++++++++++++++++++++++++--- lib/Kconfig.debug | 13 +++++++++++++ lib/locking-selftest.c | 5 +++++ 4 files changed, 67 insertions(+), 3 deletions(-)
include/linux/mutex.h +8 -0
@@ -95,6 +95,10 @@ struct ww_acquire_ctx {#ifdef CONFIG_DEBUG_LOCK_ALLOC struct lockdep_map dep_map;#endif +#ifdef CONFIG_DEBUG_WW_MUTEX_SLOWPATH +unsigned deadlock_inject_interval; +unsigned deadlock_inject_countdown; +#endif };struct ww_mutex {
@@ -280,6 +284,10 @@ static inline void ww_acquire_init(struct ww_acquire_ctx *ctx, &ww_class->acquire_key, 0);mutex_acquire (&ctx->dep_map,0 ,0 , _RET_IP_);#endif +#ifdef CONFIG_DEBUG_WW_MUTEX_SLOWPATH + ctx->deadlock_inject_interval =1 ; + ctx->deadlock_inject_countdown = ctx->stamp &0xf ; +#endif }/**
kernel/mutex.c +41 -3
63 lines not on this page · raw message
lib/Kconfig.debug +13 -0
@@ -547,6 +547,19 @@ config DEBUG_MUTEXES This feature allows mutex semantics violations to be detected and reported. +config DEBUG_WW_MUTEX_SLOWPATH + bool "Wait/wound mutex debugging: Slowpath testing" + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT + select DEBUG_LOCK_ALLOC + select DEBUG_SPINLOCK + select DEBUG_MUTEXES + help + This feature enables slowpath testing for w/w mutex users by + injecting additional -EDEADLK wound/backoff cases. Together with + the full mutex checks enabled with (CONFIG_PROVE_LOCKING) this + will test all possible w/w mutex interface abuse with the + exception of simply not acquiring all the required locks. + config DEBUG_LOCK_ALLOC bool "Lock debugging: detect incorrect freeing of live locks" depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
lib/locking-selftest.c +5 -0
@@ -199,7 +199,12 @@ static void init_shared_classes(void)#define RSU (x) up_read(&rwsem_##x)#define RWSI (x) init_rwsem(&rwsem_##x) +#ifndef CONFIG_DEBUG_WW_MUTEX_SLOWPATH #define WWAI (x) ww_acquire_init(x, &ww_lockdep) +#else +#define WWAI (x) do { ww_acquire_init(x, &ww_lockdep); (x)->deadlock_inject_countdown = ~0U; } while (0) + +#endif #define WWAD (x) ww_acquire_done(x)#define WWAF (x) ww_acquire_fini(x)
Op 28-05-13 16:48, Maarten Lankhorst schreef:
Quoted 32 lines
Version 4 already?
Small api changes since v3:
- Removeww_mutex_unlock_singleandww_mutex_lock_single.
- Renameww_mutex_trylock_singletoww_mutex_trylock.
- Remove separate implementations of ww_mutex_lock_slow*, normal functions can be used. Inline versions still exist for extra debugging, and to annotate.
- Cleanup unneeded memory barriers, add comment to the remainingsmp_mb().Thanks to Daniel Vetter, Rob Clark and Peter Zijlstra for their feedback.
---Daniel Vetter (1):
mutex: w/w mutex slowpath debuggingMaarten Lankhorst (3):
arch: make__mutex_fastpath_lock_retvalreturn whether fastpath succeeded or not.
mutex: add support for wound/wait style locks, v5
mutex: Add ww tests tolib/locking-selftest.c. v4Documentation/ww-mutex-design.txt | 344 +++++++++++++++++++++++++++++++ arch/ia64/include/asm/mutex.h | 10 - arch/powerpc/include/asm/mutex.h | 10 - arch/sh/include/asm/mutex-llsc.h | 4 arch/x86/include/asm/mutex_32.h | 11 - arch/x86/include/asm/mutex_64.h | 11 - include/asm-generic/mutex-dec.h | 10 - include/asm-generic/mutex-null.h | 2 include/asm-generic/mutex-xchg.h | 10 -
Quoted 9 lines
include/linux/mutex-debug.h | 1 include/linux/mutex.h | 363 +++++++++++++++++++++++++++++++++ kernel/mutex.c | 384 ++++++++++++++++++++++++++++++++--- lib/Kconfig.debug | 13 + lib/debug_locks.c | 2 lib/locking-selftest.c | 410 +++++++++++++++++++++++++++++++++++-- 15 files changed, 1492 insertions(+), 93 deletions(-) create mode 100644 Documentation/ww-mutex-design.txt
Bump, do you have any feedback peterz?