lockdep: Rename lockdep_assert_held_exclusive -> lockdep_assert_held_write
Subsystems (9)
PATCH 1/1 lockdep: Rename lockdep_assert_held_exclusive -> lockdep_assert_held_write
All callers of lockdep_assert_held_exclusive use it to verify the correct locking state of either a semaphore (ldisc_sem in tty, mmap_sem for perf events, i_rwsem of inode for dax) or rwlock by apparmor. Thus it makes sense to rename _exclusive to _write since that's the semantics callers care. Additionally there is already locdep_assert_held_read, this bring asymmetry to the naming.
No functional changes.
--- arch/x86/events/core.c | 2 +- drivers/infiniband/core/device.c | 2 +- drivers/tty/tty_ldisc.c | 8 ++++---- fs/dax.c | 2 +- include/linux/lockdep.h | 4 ++-- security/apparmor/label.c | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-)
arch/x86/events/core.c +1 -1
@@ -2179,7 +2179,7 @@ static void x86_pmu_event_mapped(struct perf_event *event, struct mm_struct *mm)* For now, this can't happen because all callers hold mmap_sem * for write. If this changes, we'll need a different solution. */ -lockdep_assert_held_exclusive (&mm->mmap_sem); +lockdep_assert_held_write (&mm->mmap_sem);if (atomic_inc_return (&mm->context.perf_rdpmc_allowed) ==1 )on_each_cpu_mask (mm_cpumask (mm), refresh_pce,NULL ,1 );
drivers/infiniband/core/device.c +1 -1
@@ -440,7 +440,7 @@ static int alloc_name(struct ib_device *ibdev, const char *name)int rc;int i; -lockdep_assert_held_exclusive (&devices_rwsem); +lockdep_assert_held_write (&devices_rwsem);ida_init (&inuse); xa_for_each (&devices, index, device) {char buf[IB_DEVICE_NAME_MAX ];
drivers/tty/tty_ldisc.c +4 -4
@@ -487,7 +487,7 @@ static int tty_ldisc_open(struct tty_struct *tty, struct tty_ldisc *ld)static void tty_ldisc_close (struct tty_struct *tty,struct tty_ldisc *ld) { -lockdep_assert_held_exclusive (&tty->ldisc_sem); +lockdep_assert_held_write (&tty->ldisc_sem);WARN_ON (!test_bit (TTY_LDISC_OPEN , &tty->flags));clear_bit (TTY_LDISC_OPEN , &tty->flags);if (ld->ops->close)
@@ -509,7 +509,7 @@ static int tty_ldisc_failto(struct tty_struct *tty, int ld)struct tty_ldisc *disc =tty_ldisc_get (tty, ld);int r; -lockdep_assert_held_exclusive (&tty->ldisc_sem); +lockdep_assert_held_write (&tty->ldisc_sem);if (IS_ERR (disc))return PTR_ERR (disc); tty->ldisc = disc;
@@ -633,7 +633,7 @@ EXPORT_SYMBOL_GPL(tty_set_ldisc);*/ static void tty_ldisc_kill (struct tty_struct *tty) { -lockdep_assert_held_exclusive (&tty->ldisc_sem); +lockdep_assert_held_write (&tty->ldisc_sem);if (!tty->ldisc)return ;/*
@@ -681,7 +681,7 @@ int tty_ldisc_reinit(struct tty_struct *tty, int disc)struct tty_ldisc *ld;int retval; -lockdep_assert_held_exclusive (&tty->ldisc_sem); +lockdep_assert_held_write (&tty->ldisc_sem); ld =tty_ldisc_get (tty, disc);if (IS_ERR (ld)) {BUG_ON (disc ==N_TTY );
fs/dax.c +1 -1
@@ -1196,7 +1196,7 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,unsigned flags =0 ;if (iov_iter_rw (iter) ==WRITE ) { -lockdep_assert_held_exclusive (&inode->i_rwsem); +lockdep_assert_held_write (&inode->i_rwsem); flags |=IOMAP_WRITE ; }else {lockdep_assert_held (&inode->i_rwsem);
include/linux/lockdep.h +2 -2
@@ -385,7 +385,7 @@ extern void lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie);WARN_ON (debug_locks && !lockdep_is_held (l)); \ } while (0) -#define lockdep_assert_held_exclusive (l) do { \ +#define lockdep_assert_held_write (l) do { \ WARN_ON(debug_locks && !lockdep_is_held_type(l, 0)); \ } while (0)
@@ -466,7 +466,7 @@ struct lockdep_map { };#define lockdep_is_held_type (l, r) (1)#define lockdep_assert_held (l) do { (void)(l); } while (0) -#define lockdep_assert_held_exclusive (l) do { (void)(l); } while (0) +#define lockdep_assert_held_write (l) do { (void)(l); } while (0)#define lockdep_assert_held_read (l) do { (void)(l); } while (0)#define lockdep_assert_held_once (l) do { (void)(l); } while (0)
security/apparmor/label.c +4 -4
@@ -80,7 +80,7 @@ void __aa_proxy_redirect(struct aa_label *orig, struct aa_label *new)AA_BUG (!orig);AA_BUG (!new); -lockdep_assert_held_exclusive (&labels_set (orig)->lock); +lockdep_assert_held_write (&labels_set (orig)->lock); tmp =rcu_dereference_protected (orig->proxy->label, &labels_ns (orig)->lock);
@@ -570,7 +570,7 @@ static bool __label_remove(struct aa_label *label, struct aa_label *new)AA_BUG (!ls);AA_BUG (!label); -lockdep_assert_held_exclusive (&ls->lock); +lockdep_assert_held_write (&ls->lock);if (new)__aa_proxy_redirect (label, new);
@@ -607,7 +607,7 @@ static bool __label_replace(struct aa_label *old, struct aa_label *new)AA_BUG (!ls);AA_BUG (!old);AA_BUG (!new); -lockdep_assert_held_exclusive (&ls->lock); +lockdep_assert_held_write (&ls->lock);AA_BUG (new->flags &FLAG_IN_TREE );if (!label_is_stale (old))
@@ -644,7 +644,7 @@ static struct aa_label *__label_insert(struct aa_labelset *ls,AA_BUG (!ls);AA_BUG (!label);AA_BUG (labels_set (label) != ls); -lockdep_assert_held_exclusive (&ls->lock); +lockdep_assert_held_write (&ls->lock);AA_BUG (label->flags &FLAG_IN_TREE );/* Figure out where to put new node */
Signature · 1 line
2.17.1
tip-bot for Nikolay Borisov
merge bot[tip:locking/core] locking/lockdep: Rename lockdep_assert_held_exclusive() -> lockdep_assert_held_write()
locking/lockdep: Rename lockdep_assert_held_exclusive() -> lockdep_assert_held_write()
Commit-ID: 9ffbe8ac05dbb4ab4a4836a55a47fc6be945a38f Gitweb: https://git.kernel.org/tip/9ffbe8ac05dbb4ab4a4836a55a47fc6be945a38f Author: Nikolay Borisov <[email protected]> AuthorDate: Fri, 31 May 2019 13:06:51 +0300 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 17 Jun 2019 12:09:24 +0200
locking/lockdep: Rename lockdep_assert_held_exclusive() -> lockdep_assert_held_write()
All callers of lockdep_assert_held_exclusive() use it to verify the correct locking state of either a semaphore (ldisc_sem in tty, mmap_sem for perf events, i_rwsem of inode for dax) or rwlock by apparmor. Thus it makes sense to rename _exclusive to _write since that's the semantics callers care. Additionally there is already lockdep_assert_held_read(), which this new naming is more consistent with.
No functional changes.
--- arch/x86/events/core.c | 2 +- drivers/infiniband/core/device.c | 2 +- drivers/tty/tty_ldisc.c | 8 ++++---- fs/dax.c | 2 +- include/linux/lockdep.h | 4 ++-- security/apparmor/label.c | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-)
arch/x86/events/core.c +1 -1
@@ -2179,7 +2179,7 @@ static void x86_pmu_event_mapped(struct perf_event *event, struct mm_struct *mm)* For now, this can't happen because all callers hold mmap_sem * for write. If this changes, we'll need a different solution. */ -lockdep_assert_held_exclusive (&mm->mmap_sem); +lockdep_assert_held_write (&mm->mmap_sem);if (atomic_inc_return (&mm->context.perf_rdpmc_allowed) ==1 )on_each_cpu_mask (mm_cpumask (mm), refresh_pce,NULL ,1 );
drivers/infiniband/core/device.c +1 -1
@@ -457,7 +457,7 @@ static int alloc_name(struct ib_device *ibdev, const char *name)int rc;int i; -lockdep_assert_held_exclusive (&devices_rwsem); +lockdep_assert_held_write (&devices_rwsem);ida_init (&inuse); xa_for_each (&devices, index, device) {char buf[IB_DEVICE_NAME_MAX ];
drivers/tty/tty_ldisc.c +4 -4
@@ -487,7 +487,7 @@ static int tty_ldisc_open(struct tty_struct *tty, struct tty_ldisc *ld)static void tty_ldisc_close (struct tty_struct *tty,struct tty_ldisc *ld) { -lockdep_assert_held_exclusive (&tty->ldisc_sem); +lockdep_assert_held_write (&tty->ldisc_sem);WARN_ON (!test_bit (TTY_LDISC_OPEN , &tty->flags));clear_bit (TTY_LDISC_OPEN , &tty->flags);if (ld->ops->close)
@@ -509,7 +509,7 @@ static int tty_ldisc_failto(struct tty_struct *tty, int ld)struct tty_ldisc *disc =tty_ldisc_get (tty, ld);int r; -lockdep_assert_held_exclusive (&tty->ldisc_sem); +lockdep_assert_held_write (&tty->ldisc_sem);if (IS_ERR (disc))return PTR_ERR (disc); tty->ldisc = disc;
@@ -633,7 +633,7 @@ EXPORT_SYMBOL_GPL(tty_set_ldisc);*/ static void tty_ldisc_kill (struct tty_struct *tty) { -lockdep_assert_held_exclusive (&tty->ldisc_sem); +lockdep_assert_held_write (&tty->ldisc_sem);if (!tty->ldisc)return ;/*
@@ -681,7 +681,7 @@ int tty_ldisc_reinit(struct tty_struct *tty, int disc)struct tty_ldisc *ld;int retval; -lockdep_assert_held_exclusive (&tty->ldisc_sem); +lockdep_assert_held_write (&tty->ldisc_sem); ld =tty_ldisc_get (tty, disc);if (IS_ERR (ld)) {BUG_ON (disc ==N_TTY );
fs/dax.c +1 -1
@@ -1188,7 +1188,7 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,unsigned flags =0 ;if (iov_iter_rw (iter) ==WRITE ) { -lockdep_assert_held_exclusive (&inode->i_rwsem); +lockdep_assert_held_write (&inode->i_rwsem); flags |=IOMAP_WRITE ; }else {lockdep_assert_held (&inode->i_rwsem);
include/linux/lockdep.h +2 -2
@@ -394,7 +394,7 @@ extern void lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie);WARN_ON (debug_locks && !lockdep_is_held (l)); \ } while (0) -#define lockdep_assert_held_exclusive (l) do { \ +#define lockdep_assert_held_write (l) do { \ WARN_ON(debug_locks && !lockdep_is_held_type(l, 0)); \ } while (0)
@@ -479,7 +479,7 @@ struct lockdep_map { };#define lockdep_is_held_type (l, r) (1)#define lockdep_assert_held (l) do { (void)(l); } while (0) -#define lockdep_assert_held_exclusive (l) do { (void)(l); } while (0) +#define lockdep_assert_held_write (l) do { (void)(l); } while (0)#define lockdep_assert_held_read (l) do { (void)(l); } while (0)#define lockdep_assert_held_once (l) do { (void)(l); } while (0)
security/apparmor/label.c +4 -4
@@ -76,7 +76,7 @@ void __aa_proxy_redirect(struct aa_label *orig, struct aa_label *new)AA_BUG (!orig);AA_BUG (!new); -lockdep_assert_held_exclusive (&labels_set (orig)->lock); +lockdep_assert_held_write (&labels_set (orig)->lock); tmp =rcu_dereference_protected (orig->proxy->label, &labels_ns (orig)->lock);
@@ -566,7 +566,7 @@ static bool __label_remove(struct aa_label *label, struct aa_label *new)AA_BUG (!ls);AA_BUG (!label); -lockdep_assert_held_exclusive (&ls->lock); +lockdep_assert_held_write (&ls->lock);if (new)__aa_proxy_redirect (label, new);
@@ -603,7 +603,7 @@ static bool __label_replace(struct aa_label *old, struct aa_label *new)AA_BUG (!ls);AA_BUG (!old);AA_BUG (!new); -lockdep_assert_held_exclusive (&ls->lock); +lockdep_assert_held_write (&ls->lock);AA_BUG (new->flags &FLAG_IN_TREE );if (!label_is_stale (old))
@@ -640,7 +640,7 @@ static struct aa_label *__label_insert(struct aa_labelset *ls,AA_BUG (!ls);AA_BUG (!label);AA_BUG (labels_set (label) != ls); -lockdep_assert_held_exclusive (&ls->lock); +lockdep_assert_held_write (&ls->lock);AA_BUG (label->flags &FLAG_IN_TREE );/* Figure out where to put new node */