| @@ -5,11 +5,21 @@ · 4 unmodified lines |
| 5 | 5 | #if !defined(_TRACE_LOCK_H) || defined(TRACE_HEADER_MULTI_READ) |
| 6 | 6 | #define _TRACE_LOCK_H |
| 7 | 7 | |
| 8 | | −#include <linux/lockdep.h> |
| 8 | +#include <linux/sched.h> |
| 9 | 9 | #include <linux/tracepoint.h> |
| 10 | 10 | |
| 11 | +/* flags for lock:contention_begin */ |
| 12 | +#define LCB_F_SPIN (1U << 0) |
| 13 | +#define LCB_F_READ (1U << 1) |
| 14 | +#define LCB_F_WRITE (1U << 2) |
| 15 | +#define LCB_F_RT (1U << 3) |
| 16 | +#define LCB_F_PERCPU (1U << 4) |
| 17 | + |
| 18 | + |
| 11 | 19 | #ifdef CONFIG_LOCKDEP |
| 12 | 20 | |
| 21 | +#include <linux/lockdep.h> |
| 22 | + |
| 13 | 23 | TRACE_EVENT(lock_acquire, |
| 14 | 24 | |
| 15 | 25 | TP_PROTO(struct lockdep_map *lock, unsigned int subclass, |
| @@ -78,8 +88,53 @@ DEFINE_EVENT(lock, lock_acquired, · 62 unmodified lines |
| 78 | 88 | TP_ARGS(lock, ip) |
| 79 | 89 | ); |
| 80 | 90 | |
| 81 | | −#endif |
| 82 | | −#endif |
| 91 | +#endif /* CONFIG_LOCK_STAT */ |
| 92 | +#endif /* CONFIG_LOCKDEP */ |
| 93 | + |
| 94 | +TRACE_EVENT(contention_begin, |
| 95 | + |
| 96 | + TP_PROTO(void *lock, unsigned int flags), |
| 97 | + |
| 98 | + TP_ARGS(lock, flags), |
| 99 | + |
| 100 | + TP_STRUCT__entry( |
| 101 | + __field(void *, lock_addr) |
| 102 | + __field(unsigned int, flags) |
| 103 | + ), |
| 104 | + |
| 105 | + TP_fast_assign( |
| 106 | + __entry->lock_addr = lock; |
| 107 | + __entry->flags = flags; |
| 108 | + ), |
| 109 | + |
| 110 | + TP_printk("%p (flags=%s)", __entry->lock_addr, |
| 111 | + __print_flags(__entry->flags, "|", |
| 112 | + { LCB_F_SPIN, "SPIN" }, |
| 113 | + { LCB_F_READ, "READ" }, |
| 114 | + { LCB_F_WRITE, "WRITE" }, |
| 115 | + { LCB_F_RT, "RT" }, |
| 116 | + { LCB_F_PERCPU, "PERCPU" } |
| 117 | + )) |
| 118 | +); |
| 119 | + |
| 120 | +TRACE_EVENT(contention_end, |
| 121 | + |
| 122 | + TP_PROTO(void *lock, int ret), |
| 123 | + |
| 124 | + TP_ARGS(lock, ret), |
| 125 | + |
| 126 | + TP_STRUCT__entry( |
| 127 | + __field(void *, lock_addr) |
| 128 | + __field(int, ret) |
| 129 | + ), |
| 130 | + |
| 131 | + TP_fast_assign( |
| 132 | + __entry->lock_addr = lock; |
| 133 | + __entry->ret = ret; |
| 134 | + ), |
| 135 | + |
| 136 | + TP_printk("%p (ret=%d)", __entry->lock_addr, __entry->ret) |
| 137 | +); |
| 83 | 138 | |
| 84 | 139 | #endif /* _TRACE_LOCK_H */ |
| 85 | 140 | |