aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/locking
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2013-10-31 13:11:53 -0400
committerIngo Molnar <mingo@kernel.org>2013-11-06 01:55:07 -0500
commit01768b42dc97a67b4fb33a2535c49fc1969880df (patch)
tree448a1aff2286e8e9752124964e725d7bd5d3dba8 /kernel/locking
parentc90423d1de12fbeaf0c898e1db0e962de347302b (diff)
locking: Move the mutex code to kernel/locking/
Suggested-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/n/tip-1ditvncg30dgbpvrz2bxfmke@git.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking')
-rw-r--r--kernel/locking/Makefile9
-rw-r--r--kernel/locking/mutex-debug.c110
-rw-r--r--kernel/locking/mutex-debug.h55
-rw-r--r--kernel/locking/mutex.c960
-rw-r--r--kernel/locking/mutex.h48
5 files changed, 1182 insertions, 0 deletions
<
diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile
new file mode 100644
index 000000000000..fe8bd58b22f8
--- /dev/null
+++ b/kernel/locking/Makefile
@@ -0,0 +1,9 @@
1
2obj-y += mutex.o
3
4ifdef CONFIG_FUNCTION_TRACER
5CFLAGS_REMOVE_mutex-debug.o = -pg
6CFLAGS_REMOVE_rtmutex-debug.o = -pg
7endif
8
9obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
new file mode 100644
index 000000000000..7e3443fe1f48
--- /dev/null
+++ b/kernel/locking/mutex-debug.c
@@ -0,0 +1,110 @@
1/*
2 * kernel/mutex-debug.c
3 *
4 * Debugging code for mutexes
5 *
6 * Started by Ingo Molnar:
7 *
8 * Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
9 *
10 * lock debugging, locking tree, deadlock detection started by:
11 *
12 * Copyright (C) 2004, LynuxWorks, Inc., Igor Manyilov, Bill Huey
13 * Released under the General Public License (GPL).
14 */
15#include <linux/mutex.h>
16#include <linux/delay.h>
17#include <linux/export.h>
18#include <linux/poison.h>
19#include <linux/sched.h>
20#include <linux/spinlock.h>
21#include <linux/kallsyms.h>
22#include <linux/interrupt.h>
23#include <linux/debug_locks.h>
24
25#include "mutex-debug.h"
26
27/*
28 * Must be called with lock->wait_lock held.
29 */
30void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
31{
32 memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));
33 waiter->magic = waiter;
34 INIT_LIST_HEAD(&waiter->list);
35}
36
37void debug_mutex_wake_waiter(struct mutex *lock, struct mutex_waiter *waiter)
38{
39 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
40 DEBUG_LOCKS_WARN_ON(list_empty(&lock->wait_list));
41 DEBUG_LOCKS_WARN_ON(waiter->magic != waiter);
42 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
43}
44
45void debug_mutex_free_waiter(struct mutex_waiter *waiter)
46{
47 DEBUG_LOCKS_WARN_ON(!list_empty(&waiter->list));
48 memset(waiter, MUTEX_DEBUG_FREE, sizeof(*waiter));
49}
50
51void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
52 struct thread_info *ti)
53{
54 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
55
56 /* Mark the current thread as blocked on the lock: */
57 ti->task->blocked_on = waiter;
58}
59
60void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
61 struct thread_info *ti)
62{
63 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
64 DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
65 DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
66 ti->task->blocked_on = NULL;
67
68 list_del_init(&waiter->list);
69 waiter->task = NULL;
70}
71
72void debug_mutex_unlock(struct mutex *lock)
73{
74 if (unlikely(!debug_locks))
75 return;
76
77 DEBUG_LOCKS_WARN_ON(lock->magic != lock);
78 DEBUG_LOCKS_WARN_ON(lock->owner != current);
79 DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
80 mutex_clear_owner(lock);
81}
82
83void debug_mutex_init(struct mutex *lock, const char *name,
84 struct lock_class_key *key)
85{
86#ifdef CONFIG_DEBUG_LOCK_ALLOC
87 /*
88 * Make sure we are not reinitializing a held lock:
89 */
90 debug_check_no_locks_freed((void *)lock, sizeof(*lock));
91 lockdep_init_map(&lock->dep_map, name, key, 0);
92#endif
93 lock->magic = lock;
94}
95
96/***
97 * mutex_destroy - mark a mutex unusable
98 * @lock: the mutex to be destroyed
99 *
100 * This function marks the mutex uninitialized, and any subsequent
101 * use of the mutex is forbidden. The mutex must not be locked when
102 * this function is called.
103 */
104void mutex_destroy(struct mutex *lock)
105{
106 DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock));
107 lock->magic = NULL;
108}
109
110EXPORT_SYMBOL_GPL(mutex_destroy);
diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
new file mode 100644
index 000000000000..0799fd3e4cfa
--- /dev/null
+++ b/kernel/locking/mutex-debug.h
@@ -0,0 +1,55 @@
1/*
2 * Mutexes: blocking mutual exclusion locks
3 *
4 * started by Ingo Molnar:
5 *
6 * Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
7 *
8 * This file contains mutex debugging related internal declarations,
9 * prototypes and inline functions, for the CONFIG_DEBUG_MUTEXES case.
10 * More details are in kernel/mutex-debug.c.
11 */
12
13/*
14 * This must be called with lock->wait_lock held.
15 */
16extern void debug_mutex_lock_common(struct mutex *lock,
17 struct mutex_waiter *waiter);
18extern void debug_mutex_wake_waiter(struct mutex *lock,
19 struct mutex_waiter *waiter);
20extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
21extern void debug_mutex_add_waiter(struct mutex *lock,
22 struct mutex_waiter *waiter,
23 struct thread_info *ti);
24extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
25 struct thread_info *ti);
26extern void debug_mutex_unlock(struct mutex *lock);
27extern void debug_mutex_init(struct mutex *lock, const char *name,
28 struct lock_class_key *key);
29
30static inline void mutex_set_owner(struct mutex *lock)
31{
32 lock->owner = current;
33}
34
35static inline void mutex_clear_owner(struct mutex *lock)
36{
37 lock->owner = NULL;
38}
39
40#define spin_lock_mutex(lock, flags) \
41 do { \
42 struct mutex *l = container_of(lock, struct mutex, wait_lock); \
43 \
44 DEBUG_LOCKS_WARN_ON(in_interrupt()); \
45 local_irq_save(flags); \
46 arch_spin_lock(&(lock)->rlock.raw_lock);\
47 DEBUG_LOCKS_WARN_ON(l->magic != l); \
48 } while (0)
49
50#define spin_unlock_mutex(lock, flags) \
51 do { \
52 arch_spin_unlock(&(lock)->rlock.raw_lock); \
53 local_irq_restore(flags); \
54 preempt_check_resched(); \
55 } while (0)
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
new file mode 100644
index 000000000000..d24105b1b794
--- /dev/null
+++ b/kernel/locking/mutex.c
@@ -0,0 +1,960 @@
1/*
2 * kernel/mutex.c
3 *
4 * Mutexes: blocking mutual exclusion locks
5 *
6 * Started by Ingo Molnar:
7 *
8 * Copyright (C) 2004, 2005, 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
9 *
10 * Many thanks to Arjan van de Ven, Thomas Gleixner, Steven Rostedt and