diff options
| author | Liam R. Howlett <Liam.Howlett@oracle.com> | 2023-07-14 15:55:51 -0400 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-08-18 10:12:40 -0700 |
| commit | 19a462f06eb5a78e0c3ebe4fd4fbdc71620b8788 (patch) | |
| tree | d3de1776e5a6a170d97ebecf6aa421ff73202a23 /include | |
| parent | 02fdb25fb41c563a3afbd4a97469c527a6c5abbf (diff) | |
maple_tree: Be more strict about locking
Use lockdep to check the write path in the maple tree holds the lock in
write mode.
Introduce mt_write_lock_is_held() to check if the lock is held for
writing. Update the necessary checks for rcu_dereference_protected() to
use the new write lock check.
Link: https://lkml.kernel.org/r/20230714195551.894800-5-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oliver Sang <oliver.sang@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/maple_tree.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index e278b9598428..949f911bf955 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -185,13 +185,18 @@ typedef struct lockdep_map *lockdep_map_p; #define mt_lock_is_held(mt) \ (!(mt)->ma_external_lock || lock_is_held((mt)->ma_external_lock)) +#define mt_write_lock_is_held(mt) \ + (!(mt)->ma_external_lock || \ + lock_is_held_type((mt)->ma_external_lock, 0)) + #define mt_set_external_lock(mt, lock) \ (mt)->ma_external_lock = &(lock)->dep_map #define mt_on_stack(mt) (mt).ma_external_lock = NULL #else typedef struct { /* nothing */ } lockdep_map_p; -#define mt_lock_is_held(mt) 1 +#define mt_lock_is_held(mt) 1 +#define mt_write_lock_is_held(mt) 1 #define mt_set_external_lock(mt, lock) do { } while (0) #define mt_on_stack(mt) do { } while (0) #endif |