diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-02-05 22:18:59 +0100 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-31 03:26:45 +0100 |
| commit | 20e425d301d673dbd5df0c9d4b186c70b43813bb (patch) | |
| tree | c189f6cae3cdb88fc9f3a428e3c1b415d1558f6a /fs/bcachefs/six.c | |
| parent | closures: Fix race in closure_sync() (diff) | |
| download | linux-20e425d301d673dbd5df0c9d4b186c70b43813bb.tar.xz linux-20e425d301d673dbd5df0c9d4b186c70b43813bb.zip | |
six locks: Lock contended tracepoints
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/six.c')
| -rw-r--r-- | fs/bcachefs/six.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/bcachefs/six.c b/fs/bcachefs/six.c index b684b9f00c1b..b775cf0fb7cb 100644 --- a/fs/bcachefs/six.c +++ b/fs/bcachefs/six.c @@ -11,6 +11,8 @@ #include <linux/sched/task.h> #include <linux/slab.h> +#include <trace/events/lock.h> + #include "six.h" #ifdef DEBUG @@ -462,11 +464,12 @@ static int six_lock_slowpath(struct six_lock *lock, enum six_lock_type type, smp_mb__after_atomic(); } + trace_contention_begin(lock, 0); + lock_contended(&lock->dep_map, ip); + if (six_optimistic_spin(lock, type)) goto out; - lock_contended(&lock->dep_map, ip); - wait->task = current; wait->lock_want = type; wait->lock_acquired = false; @@ -546,6 +549,7 @@ out: six_clear_bitmask(lock, SIX_LOCK_HELD_write); six_lock_wakeup(lock, atomic_read(&lock->state), SIX_LOCK_read); } + trace_contention_end(lock, 0); return ret; } |