xfs: Remove wrappers for some semaphores
v10 cover xfs: Remove wrappers for some semaphores
Remove some wrappers that we have in XFS around the read-write semaphore locks.
The goal of this cleanup is to remove mrlock_t structure and its mr*() wrapper functions and replace it with native rw_semaphore type and its native calls.
Changes in version 8:
* Patchset was rebased so it applies cleanly.
* The patch 'xfs: replace mrlock_t with rw_semaphores' contains change in xfs_btree.c which transfers ownership of lock so lockdep won't assert (This was reported by Darrick and proposed change fixes this issue).
Changes in version 9:
*Fixed white space in patch 'xfs: Refactor xfs_isilocked()'
*Updated code comments as suggested by djwong (thanks!) in patch: 'xfs: replace mrlock_t with rw_semaphores'
Changes in version 10:
* Fixed use-after-free in 'xfs: replace mrlock_t with rw_semaphores' (thanks Darrick)
* Moved part of refactor of xfs_isilocked() from patch 'xfs: Refactor xfs_isilocked()' to patch 'xfs: replace mrlock_t with rw_semaphores' - to fix compilation error
* Typo in comment in 'xfs: replace mrlock_t with rw_semaphores'
Pavel Reichl (4):
xfs: Refactor xfs_isilocked()
xfs: clean up whitespace in xfs_isilocked() calls
xfs: xfs_isilocked() can only check a single lock type
xfs: replace mrlock_t with rw_semaphores
fs/xfs/libxfs/xfs_bmap.c | 8 +-- fs/xfs/libxfs/xfs_btree.c | 24 +++++++++ fs/xfs/mrlock.h | 78 ----------------------------- fs/xfs/xfs_file.c | 3 +- fs/xfs/xfs_inode.c | 102 +++++++++++++++++++++++++------------- fs/xfs/xfs_inode.h | 25 ++++++---- fs/xfs/xfs_iops.c | 4 +- fs/xfs/xfs_linux.h | 2 +- fs/xfs/xfs_qm.c | 2 +- fs/xfs/xfs_super.c | 6 +-- 10 files changed, 121 insertions(+), 133 deletions(-) delete mode 100644 fs/xfs/mrlock.h
Signature · 1 line
2.26.2
PATCH v10 1/4 xfs: Refactor xfs_isilocked()
Refactor xfs_isilocked() to use newly introduced __xfs_rwsem_islocked(). __xfs_rwsem_islocked() is a helper function which encapsulates checking state of rw_semaphores hold by inode.
--- fs/xfs/xfs_inode.c | 48 ++++++++++++++++++++++++++++++++++++++-------- fs/xfs/xfs_inode.h | 21 +++++++++++++------- 2 files changed, 54 insertions(+), 15 deletions(-)
fs/xfs/xfs_inode.c +40 -8
@@ -345,9 +345,43 @@ xfs_ilock_demote( }#if defined(DEBUG ) || defined(XFS_WARN ) -int +static inline bool +__xfs_rwsem_islocked ( +struct rw_semaphore *rwsem, +int lock_flags) +{ +int arg; + +if (!debug_locks) +return rwsem_is_locked (rwsem); + +if (lock_flags & (1 <<XFS_SHARED_LOCK_SHIFT )) { +/* +* The caller could be asking if we have (shared | excl) +* access to the lock. Ask lockdep if the rwsem is +* locked either for read or write access. +* +* The caller could also be asking if we have only +* shared access to the lock. Holding a rwsem +* write-locked implies read access as well, so the +* request to lockdep is the same for this case. +*/ + arg =-1 ; + }else { +/* +* The caller is asking if we have only exclusive access +* to the lock. Ask lockdep if the rwsem is locked for +* write access. +*/ + arg =0 ; + } + +return lockdep_is_held_type (rwsem, arg); +} + +bool xfs_isilocked ( -xfs_inode_t *ip, +struct xfs_inode *ip,uint lock_flags) {if (lock_flags & (XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )) {
@@ -362,15 +396,13 @@ xfs_isilocked( return rwsem_is_locked(&ip->i_mmaplock.mr_lock); } -if (lock_flags & (XFS_IOLOCK_EXCL |XFS_IOLOCK_SHARED )) { -if (!(lock_flags &XFS_IOLOCK_SHARED )) -return !debug_locks || -lockdep_is_held_type (&VFS_I (ip)->i_rwsem,0 ); -return rwsem_is_locked (&VFS_I (ip)->i_rwsem); +if (lock_flags & (XFS_IOLOCK_EXCL |XFS_IOLOCK_SHARED )) { +return __xfs_rwsem_islocked (&VFS_I (ip)->i_rwsem, + (lock_flags >>XFS_IOLOCK_FLAG_SHIFT )); }ASSERT (0 ); -return 0 ; +return false; }#endif
fs/xfs/xfs_inode.h +14 -7
@@ -268,12 +268,19 @@ static inline void xfs_ifunlock(struct xfs_inode *ip)* Bit ranges: 1<<1 - 1<<16-1 -- iolock/ilock modes (bitfield) * 1<<16 - 1<<32-1 -- lockdep annotation (integers) */ -#define XFS_IOLOCK_EXCL (1<<0) -#define XFS_IOLOCK_SHARED (1<<1) -#define XFS_ILOCK_EXCL (1<<2) -#define XFS_ILOCK_SHARED (1<<3) -#define XFS_MMAPLOCK_EXCL (1<<4) -#define XFS_MMAPLOCK_SHARED (1<<5) + +#define XFS_IOLOCK_FLAG_SHIFT 0 +#define XFS_ILOCK_FLAG_SHIFT 2 +#define XFS_MMAPLOCK_FLAG_SHIFT 4 + +#define XFS_SHARED_LOCK_SHIFT 1 + +#define XFS_IOLOCK_EXCL (1 << (XFS_IOLOCK_FLAG_SHIFT)) +#define XFS_IOLOCK_SHARED (XFS_IOLOCK_EXCL << (XFS_SHARED_LOCK_SHIFT)) +#define XFS_ILOCK_EXCL (1 << (XFS_ILOCK_FLAG_SHIFT)) +#define XFS_ILOCK_SHARED (XFS_ILOCK_EXCL << (XFS_SHARED_LOCK_SHIFT)) +#define XFS_MMAPLOCK_EXCL (1 << (XFS_MMAPLOCK_FLAG_SHIFT)) +#define XFS_MMAPLOCK_SHARED (XFS_MMAPLOCK_EXCL << (XFS_SHARED_LOCK_SHIFT))#define XFS_LOCK_MASK (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED \ | XFS_ILOCK_EXCL | XFS_ILOCK_SHARED \
@@ -412,7 +419,7 @@ void xfs_ilock(xfs_inode_t *, uint);int xfs_ilock_nowait (xfs_inode_t *,uint );void xfs_iunlock (xfs_inode_t *,uint );void xfs_ilock_demote (xfs_inode_t *,uint ); -int xfs_isilocked (xfs_inode_t *,uint ); +bool xfs_isilocked (xfs_inode_t *,uint );uint xfs_ilock_data_map_shared (struct xfs_inode *);uint xfs_ilock_attr_map_shared (struct xfs_inode *);
Signature · 1 line
2.26.2
Re: [PATCH v10 1/4] xfs: Refactor xfs_isilocked()
Quoted 114 lines · Pavel Reichl
Refactor
xfs_isilocked()to use newly introduced__xfs_rwsem_islocked().__xfs_rwsem_islocked()is a helper function which encapsulates checking state ofrw_semaphoreshold by inode.Signed-off-by Pavel Reichl <[email protected]>Suggested-by Dave Chinner <[email protected]>Suggested-by Eric Sandeen <[email protected]>Suggested-by Darrick J. Wong <[email protected]>--- fs/xfs/xfs_inode.c | 48 ++++++++++++++++++++++++++++++++++++++-------- fs/xfs/xfs_inode.h | 21 +++++++++++++------- 2 files changed, 54 insertions(+), 15 deletions(-)fs/xfs/xfs_inode.c +40
-8@@ -345,9 +345,43 @@ xfs_ilock_demote( }#if defined(DEBUG ) || defined(XFS_WARN ) -int +static inline bool +__xfs_rwsem_islocked ( +struct rw_semaphore *rwsem, +int lock_flags) +{ +int arg; + +if (!debug_locks) +return rwsem_is_locked (rwsem); + +if (lock_flags & (1 <<XFS_SHARED_LOCK_SHIFT )) { +/* +* The caller could be asking if we have (shared | excl) +* access to the lock. Ask lockdep if the rwsem is +* locked either for read or write access. +* +* The caller could also be asking if we have only +* shared access to the lock. Holding a rwsem +* write-locked implies read access as well, so the +* request to lockdep is the same for this case. +*/ + arg =-1 ; + }else { +/* +* The caller is asking if we have only exclusive access +* to the lock. Ask lockdep if the rwsem is locked for +* write access. +*/ + arg =0 ; + } + +return lockdep_is_held_type (rwsem, arg); +} + +bool xfs_isilocked ( -xfs_inode_t *ip, +struct xfs_inode *ip,uint lock_flags) {if (lock_flags & (XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )) {@@ -362,15 +396,13 @@ xfs_isilocked( return rwsem_is_locked(&ip->i_mmaplock.mr_lock); } -if (lock_flags & (XFS_IOLOCK_EXCL |XFS_IOLOCK_SHARED )) { -if (!(lock_flags &XFS_IOLOCK_SHARED )) -return !debug_locks || -lockdep_is_held_type (&VFS_I (ip)->i_rwsem,0 ); -return rwsem_is_locked (&VFS_I (ip)->i_rwsem); +if (lock_flags & (XFS_IOLOCK_EXCL |XFS_IOLOCK_SHARED )) { +return __xfs_rwsem_islocked (&VFS_I (ip)->i_rwsem, + (lock_flags >>XFS_IOLOCK_FLAG_SHIFT )); }ASSERT (0 ); -return 0 ; +return false; }#endif fs/xfs/xfs_inode.h +13
-6@@ -268,12 +268,19 @@ static inline void xfs_ifunlock(struct xfs_inode *ip)* Bit ranges: 1<<1 - 1<<16-1 -- iolock/ilock modes (bitfield) * 1<<16 - 1<<32-1 -- lockdep annotation (integers) */ -#define XFS_IOLOCK_EXCL (1<<0) -#define XFS_IOLOCK_SHARED (1<<1) -#define XFS_ILOCK_EXCL (1<<2) -#define XFS_ILOCK_SHARED (1<<3) -#define XFS_MMAPLOCK_EXCL (1<<4) -#define XFS_MMAPLOCK_SHARED (1<<5) + +#define XFS_IOLOCK_FLAG_SHIFT 0 +#define XFS_ILOCK_FLAG_SHIFT 2 +#define XFS_MMAPLOCK_FLAG_SHIFT 4 + +#define XFS_SHARED_LOCK_SHIFT 1 + +#define XFS_IOLOCK_EXCL (1 << (XFS_IOLOCK_FLAG_SHIFT)) +#define XFS_IOLOCK_SHARED (XFS_IOLOCK_EXCL << (XFS_SHARED_LOCK_SHIFT)) +#define XFS_ILOCK_EXCL (1 << (XFS_ILOCK_FLAG_SHIFT)) +#define XFS_ILOCK_SHARED (XFS_ILOCK_EXCL << (XFS_SHARED_LOCK_SHIFT)) +#define XFS_MMAPLOCK_EXCL (1 << (XFS_MMAPLOCK_FLAG_SHIFT)) +#define XFS_MMAPLOCK_SHARED (XFS_MMAPLOCK_EXCL << (XFS_SHARED_LOCK_SHIFT))#define XFS_LOCK_MASK (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED \ | XFS_ILOCK_EXCL | XFS_ILOCK_SHARED \
fs/xfs/xfs_inode.h void xfs_ilock(xfs_inode_t *, uint); · line 422
Quoted 5 lines
fs/xfs/xfs_inode.h +1
-1@@ -412,7 +419,7 @@ void xfs_ilock(xfs_inode_t *, uint);int xfs_ilock_nowait (xfs_inode_t *,uint );void xfs_iunlock (xfs_inode_t *,uint );void xfs_ilock_demote (xfs_inode_t *,uint ); -int xfs_isilocked (xfs_inode_t *,uint ); +bool xfs_isilocked (xfs_inode_t *,uint );
Minor nit: you might as well get rid of the typedef here.
With that fixed,
--D
Quoted 6 lines
fs/xfs/xfs_inode.h +0
-0uint xfs_ilock_data_map_shared (struct xfs_inode *);uint xfs_ilock_attr_map_shared (struct xfs_inode *);Signature · 1 line
2.26.2
PATCH v10 2/4 xfs: clean up whitespace in xfs_isilocked() calls
In reply to Pavel ReichlMake whitespace follow the same pattern in all xfs_isilocked() calls.
--- fs/xfs/libxfs/xfs_bmap.c | 2 +- fs/xfs/xfs_file.c | 3 ++- fs/xfs/xfs_inode.c | 4 ++-- fs/xfs/xfs_qm.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +1 -1
@@ -3883,7 +3883,7 @@ xfs_bmapi_read(ASSERT (*nmap >=1 );ASSERT (!(flags & ~(XFS_BMAPI_ATTRFORK |XFS_BMAPI_ENTIRE ))); -ASSERT (xfs_isilocked (ip,XFS_ILOCK_SHARED |XFS_ILOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_SHARED |XFS_ILOCK_EXCL ));if (WARN_ON_ONCE (!ifp))return -EFSCORRUPTED ;
fs/xfs/xfs_file.c +2 -1
@@ -763,7 +763,8 @@ xfs_break_layouts(bool retry;int error; -ASSERT (xfs_isilocked (XFS_I (inode),XFS_IOLOCK_SHARED |XFS_IOLOCK_EXCL )); +ASSERT (xfs_isilocked (XFS_I (inode), +XFS_IOLOCK_SHARED |XFS_IOLOCK_EXCL )); do { retry = false;
fs/xfs/xfs_inode.c +2 -2
@@ -2781,7 +2781,7 @@ static voidxfs_iunpin ( struct xfs_inode *ip) { -ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));trace_xfs_inode_unpin_nowait (ip, _RET_IP_);
@@ -3474,7 +3474,7 @@ xfs_iflush(struct xfs_mount *mp = ip->i_mount;int error; -ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));ASSERT (xfs_isiflocked (ip));ASSERT (ip->i_df.if_format !=XFS_DINODE_FMT_BTREE || ip->i_df.if_nextents >XFS_IFORK_MAXEXT (ip,XFS_DATA_FORK ));
fs/xfs/xfs_qm.c +1 -1
@@ -1803,7 +1803,7 @@ xfs_qm_vop_chown_reserve(int error; -ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ));ASSERT (XFS_IS_QUOTA_RUNNING (mp)); delblks = ip->i_delayed_blks;
Signature · 1 line
2.26.2
PATCH v10 3/4 xfs: xfs_isilocked() can only check a single lock type
In reply to Pavel ReichlIn its current form, xfs_isilocked() is only able to test one lock type at a time - ilock, iolock, or mmap lock, but combinations are not properly handled. The intent here is to check that both XFS_IOLOCK_EXCL and XFS_ILOCK_EXCL are held, so test them each separately.
The commit ecfea3f0c8c6 ("xfs: split xfs_bmap_shift_extents") ORed the flags together which was an error, so this patch reverts that part of the change and check the locks independently.
--- fs/xfs/libxfs/xfs_bmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +4 -2
@@ -5787,7 +5787,8 @@ xfs_bmap_collapse_extents(if (XFS_FORCED_SHUTDOWN (mp))return -EIO ; -ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL |XFS_ILOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));if (!(ifp->if_flags &XFS_IFEXTENTS )) { error =xfs_iread_extents (tp, ip, whichfork);
@@ -5904,7 +5905,8 @@ xfs_bmap_insert_extents(if (XFS_FORCED_SHUTDOWN (mp))return -EIO ; -ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL |XFS_ILOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_IOLOCK_EXCL )); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));if (!(ifp->if_flags &XFS_IFEXTENTS )) { error =xfs_iread_extents (tp, ip, whichfork);
Signature · 1 line
2.26.2
PATCH v10 4/4 xfs: replace mrlock_t with rw_semaphores
In reply to Pavel ReichlRemove mrlock_t as it does not provide any extra value over rw_semaphores. Make i_lock and i_mmaplock native rw_semaphores and replace mr*() functions with native rwsem calls.
Release the lock in xfs_btree_split() just before the work-queue executing xfs_btree_split_worker() is scheduled and make xfs_btree_split_worker() to acquire the lock as a first thing and release it just before returning from the function. This it done so the ownership of the lock is transfered between kernel threads and thus lockdep won't complain about lock being held by a different kernel thread.
--- fs/xfs/libxfs/xfs_btree.c | 24 ++++++++++++ fs/xfs/mrlock.h | 78 --------------------------------------- fs/xfs/xfs_inode.c | 50 +++++++++++++------------ fs/xfs/xfs_inode.h | 4 +- fs/xfs/xfs_iops.c | 4 +- fs/xfs/xfs_linux.h | 2 +- fs/xfs/xfs_super.c | 6 +-- 7 files changed, 57 insertions(+), 111 deletions(-) delete mode 100644 fs/xfs/mrlock.h
fs/xfs/libxfs/xfs_btree.c +24 -0
@@ -2816,6 +2816,12 @@ xfs_btree_split_worker(unsigned long pflags;unsigned long new_pflags =PF_MEMALLOC_NOFS ; +/* +* Update lockdep's lock ownership information to point to +* this thread as the thread that scheduled this worker is waiting +* for its completion. +*/ +rwsem_acquire (&args->cur->bc_ino.ip->i_lock.dep_map,0 ,0 , _RET_IP_);/* * we are in a transaction context here, but may also be doing work * in kswapd context, and hence we may need to inherit that state
@@ -2829,6 +2835,12 @@ xfs_btree_split_worker( args->result =__xfs_btree_split (args->cur, args->level, args->ptrp, args->key, args->curp, args->stat); +/* +* Update lockdep's lock ownership information to reflect that we will +* be transferring the ilock from this worker back to the scheduling +* thread. +*/ +rwsem_release (&args->cur->bc_ino.ip->i_lock.dep_map, _THIS_IP_);complete (args->done);current_restore_flags_nested (&pflags, new_pflags);
@@ -2863,8 +2875,20 @@ xfs_btree_split( args.done = &done; args.kswapd =current_is_kswapd ();INIT_WORK_ONSTACK (&args.work, xfs_btree_split_worker); +/* +* Update lockdep's ownership information to reflect that we +* will be transferring the ilock from this thread to the +* worker. +*/ +rwsem_release (&cur->bc_ino.ip->i_lock.dep_map, _THIS_IP_);queue_work (xfs_alloc_wq, &args.work);wait_for_completion (&done); +/* +* Update lockdep's lock ownership information to point to +* this thread as the lock owner now that the worker item is +* done. +*/ +rwsem_acquire (&cur->bc_ino.ip->i_lock.dep_map,0 ,0 , _RET_IP_);destroy_work_on_stack (&args.work);return args.result; }
fs/xfs/mrlock.h deleted +0 -78
78 lines not on this page · raw message
fs/xfs/xfs_inode.c +26 -24
106 lines not on this page · raw message
fs/xfs/xfs_inode.h +2 -2
@@ -39,8 +39,8 @@ typedef struct xfs_inode {/* Transaction and locking information. */ struct xfs_inode_log_item *i_itemp;/* logging information */ -mrlock_t i_lock;/* inode lock */ -mrlock_t i_mmaplock;/* inode mmap IO lock */ +struct rw_semaphore i_lock;/* inode lock */ +struct rw_semaphore i_mmaplock;/* inode mmap IO lock */ atomic_t i_pincount;/* inode pin count */ /*
fs/xfs/xfs_iops.c +2 -2
@@ -1336,9 +1336,9 @@ xfs_setup_inode(*/ lockdep_set_class (&inode->i_rwsem, &inode->i_sb->s_type->i_mutex_dir_key); -lockdep_set_class (&ip->i_lock.mr_lock, &xfs_dir_ilock_class); +lockdep_set_class (&ip->i_lock, &xfs_dir_ilock_class); }else { -lockdep_set_class (&ip->i_lock.mr_lock, &xfs_nondir_ilock_class); +lockdep_set_class (&ip->i_lock, &xfs_nondir_ilock_class); }/*
fs/xfs/xfs_linux.h +1 -1
@@ -22,7 +22,6 @@ typedef __u32 xfs_nlink_t;#include "xfs_types.h" #include "kmem.h" -#include "mrlock.h" #include <linux/semaphore.h> #include <linux/mm.h>
@@ -61,6 +60,7 @@ typedef __u32 xfs_nlink_t;#include <linux/ratelimit.h> #include <linux/rhashtable.h> #include <linux/xattr.h> +#include <linux/rwsem.h> #include <asm/page.h> #include <asm/div64.h>
fs/xfs/xfs_super.c +2 -4
@@ -708,10 +708,8 @@ xfs_fs_inode_init_once(atomic_set (&ip->i_pincount,0 );spin_lock_init (&ip->i_flags_lock); -mrlock_init (&ip->i_mmaplock,MRLOCK_ALLOW_EQUAL_PRI |MRLOCK_BARRIER , -"xfsino" , ip->i_ino); -mrlock_init (&ip->i_lock,MRLOCK_ALLOW_EQUAL_PRI |MRLOCK_BARRIER , -"xfsino" , ip->i_ino); +init_rwsem (&ip->i_mmaplock); +init_rwsem (&ip->i_lock); }/*
Signature · 1 line
2.26.2
Re: [PATCH v10 4/4] xfs: replace mrlock_t with rw_semaphores
Quoted 12 lines · Pavel Reichl
Remove
mrlock_tas it does not provide any extra value overrw_semaphores. Makei_lockandi_mmaplocknativerw_semaphoresand replace mr*() functions with native rwsem calls.Release the lock in
xfs_btree_split()just before the work-queue executingxfs_btree_split_worker()is scheduled and makexfs_btree_split_worker()to acquire the lock as a first thing and release it just before returning from the function. This it done so the ownership of the lock is transfered between kernel threads and thus lockdep won't complain about lock being held by a different kernel thread.
Quoted 1 line
Signed-off-by Pavel Reichl <[email protected]>
Looks reasonable, let's see how this fares w/ testing...
--D
Quoted 332 lines
--- fs/xfs/libxfs/xfs_btree.c | 24 ++++++++++++ fs/xfs/mrlock.h | 78 --------------------------------------- fs/xfs/xfs_inode.c | 50 +++++++++++++------------ fs/xfs/xfs_inode.h | 4 +- fs/xfs/xfs_iops.c | 4 +- fs/xfs/xfs_linux.h | 2 +- fs/xfs/xfs_super.c | 6 +-- 7 files changed, 57 insertions(+), 111 deletions(-) delete mode 100644 fs/xfs/mrlock.hfs/xfs/libxfs/xfs_btree.c +24
-0@@ -2816,6 +2816,12 @@ xfs_btree_split_worker(unsigned long pflags;unsigned long new_pflags =PF_MEMALLOC_NOFS ; +/* +* Update lockdep's lock ownership information to point to +* this thread as the thread that scheduled this worker is waiting +* for its completion. +*/ +rwsem_acquire (&args->cur->bc_ino.ip->i_lock.dep_map,0 ,0 , _RET_IP_);/* * we are in a transaction context here, but may also be doing work * in kswapd context, and hence we may need to inherit that state @@ -2829,6 +2835,12 @@ xfs_btree_split_worker( args->result =__xfs_btree_split (args->cur, args->level, args->ptrp, args->key, args->curp, args->stat); +/* +* Update lockdep's lock ownership information to reflect that we will +* be transferring the ilock from this worker back to the scheduling +* thread. +*/ +rwsem_release (&args->cur->bc_ino.ip->i_lock.dep_map, _THIS_IP_);complete (args->done);current_restore_flags_nested (&pflags, new_pflags);@@ -2863,8 +2875,20 @@ xfs_btree_split( args.done = &done; args.kswapd =current_is_kswapd ();INIT_WORK_ONSTACK (&args.work, xfs_btree_split_worker); +/* +* Update lockdep's ownership information to reflect that we +* will be transferring the ilock from this thread to the +* worker. +*/ +rwsem_release (&cur->bc_ino.ip->i_lock.dep_map, _THIS_IP_);queue_work (xfs_alloc_wq, &args.work);wait_for_completion (&done); +/* +* Update lockdep's lock ownership information to point to +* this thread as the lock owner now that the worker item is +* done. +*/ +rwsem_acquire (&cur->bc_ino.ip->i_lock.dep_map,0 ,0 , _RET_IP_);destroy_work_on_stack (&args.work);return args.result; }fs/xfs/mrlock.h deleted +0
-78@@ -1,78 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* Copyright (c) 2000-2006 Silicon Graphics, Inc. -* All Rights Reserved. -*/ -#ifndef __XFS_SUPPORT_MRLOCK_H__ -#define __XFS_SUPPORT_MRLOCK_H__ - -#include <linux/rwsem.h> - -typedef struct { -struct rw_semaphore mr_lock; -#if defined(DEBUG ) || defined(XFS_WARN ) -int mr_writer; -#endif -}mrlock_t ; - -#if defined(DEBUG ) || defined(XFS_WARN ) -#define mrinit (mrp, name) \ - do { (mrp)->mr_writer = 0; init_rwsem(&(mrp)->mr_lock); } while (0) -#else -#define mrinit (mrp, name) \ - do { init_rwsem(&(mrp)->mr_lock); } while (0) -#endif - -#define mrlock_init (mrp, t,n,s) mrinit(mrp, n) -#define mrfree (mrp) do { } while (0) - -static inline void mraccess_nested (mrlock_t *mrp,int subclass) -{ -down_read_nested (&mrp->mr_lock, subclass); -} - -static inline void mrupdate_nested (mrlock_t *mrp,int subclass) -{ -down_write_nested (&mrp->mr_lock, subclass); -#if defined(DEBUG ) || defined(XFS_WARN ) - mrp->mr_writer =1 ; -#endif -} - -static inline int mrtryaccess (mrlock_t *mrp) -{ -return down_read_trylock (&mrp->mr_lock); -} - -static inline int mrtryupdate (mrlock_t *mrp) -{ -if (!down_write_trylock (&mrp->mr_lock)) -return 0 ; -#if defined(DEBUG ) || defined(XFS_WARN ) - mrp->mr_writer =1 ; -#endif -return 1 ; -} - -static inline void mrunlock_excl (mrlock_t *mrp) -{ -#if defined(DEBUG ) || defined(XFS_WARN ) - mrp->mr_writer =0 ; -#endif -up_write (&mrp->mr_lock); -} - -static inline void mrunlock_shared (mrlock_t *mrp) -{ -up_read (&mrp->mr_lock); -} - -static inline void mrdemote (mrlock_t *mrp) -{ -#if defined(DEBUG ) || defined(XFS_WARN ) - mrp->mr_writer =0 ; -#endif -downgrade_write (&mrp->mr_lock); -} - -#endif /* __XFS_SUPPORT_MRLOCK_H__ */ fs/xfs/xfs_inode.c +26
-24@@ -191,14 +191,15 @@ xfs_ilock( }if (lock_flags &XFS_MMAPLOCK_EXCL ) -mrupdate_nested (&ip->i_mmaplock,XFS_MMAPLOCK_DEP (lock_flags)); +down_write_nested (&ip->i_mmaplock, +XFS_MMAPLOCK_DEP (lock_flags));else if (lock_flags &XFS_MMAPLOCK_SHARED ) -mraccess_nested (&ip->i_mmaplock,XFS_MMAPLOCK_DEP (lock_flags)); +down_read_nested (&ip->i_mmaplock,XFS_MMAPLOCK_DEP (lock_flags));if (lock_flags &XFS_ILOCK_EXCL ) -mrupdate_nested (&ip->i_lock,XFS_ILOCK_DEP (lock_flags)); +down_write_nested (&ip->i_lock,XFS_ILOCK_DEP (lock_flags));else if (lock_flags &XFS_ILOCK_SHARED ) -mraccess_nested (&ip->i_lock,XFS_ILOCK_DEP (lock_flags)); +down_read_nested (&ip->i_lock,XFS_ILOCK_DEP (lock_flags)); }/* @@ -242,27 +243,27 @@ xfs_ilock_nowait( }if (lock_flags &XFS_MMAPLOCK_EXCL ) { -if (!mrtryupdate (&ip->i_mmaplock)) +if (!down_write_trylock (&ip->i_mmaplock)) goto out_undo_iolock; }else if (lock_flags &XFS_MMAPLOCK_SHARED ) { -if (!mrtryaccess (&ip->i_mmaplock)) +if (!down_read_trylock (&ip->i_mmaplock)) goto out_undo_iolock; }if (lock_flags &XFS_ILOCK_EXCL ) { -if (!mrtryupdate (&ip->i_lock)) +if (!down_write_trylock (&ip->i_lock)) goto out_undo_mmaplock; }else if (lock_flags &XFS_ILOCK_SHARED ) { -if (!mrtryaccess (&ip->i_lock)) +if (!down_read_trylock (&ip->i_lock)) goto out_undo_mmaplock; }return 1 ; out_undo_mmaplock:if (lock_flags &XFS_MMAPLOCK_EXCL ) -mrunlock_excl (&ip->i_mmaplock); +up_write (&ip->i_mmaplock);else if (lock_flags &XFS_MMAPLOCK_SHARED ) -mrunlock_shared (&ip->i_mmaplock); +up_read (&ip->i_mmaplock); out_undo_iolock:if (lock_flags &XFS_IOLOCK_EXCL )up_write (&VFS_I (ip)->i_rwsem);@@ -309,14 +310,14 @@ xfs_iunlock(up_read (&VFS_I (ip)->i_rwsem);if (lock_flags &XFS_MMAPLOCK_EXCL ) -mrunlock_excl (&ip->i_mmaplock); +up_write (&ip->i_mmaplock);else if (lock_flags &XFS_MMAPLOCK_SHARED ) -mrunlock_shared (&ip->i_mmaplock); +up_read (&ip->i_mmaplock);if (lock_flags &XFS_ILOCK_EXCL ) -mrunlock_excl (&ip->i_lock); +up_write (&ip->i_lock);else if (lock_flags &XFS_ILOCK_SHARED ) -mrunlock_shared (&ip->i_lock); +up_read (&ip->i_lock);trace_xfs_iunlock (ip, lock_flags, _RET_IP_); }@@ -335,9 +336,9 @@ xfs_ilock_demote( ~(XFS_IOLOCK_EXCL|XFS_MMAPLOCK_EXCL|XFS_ILOCK_EXCL)) == 0);if (lock_flags &XFS_ILOCK_EXCL ) -mrdemote (&ip->i_lock); +downgrade_write (&ip->i_lock);if (lock_flags &XFS_MMAPLOCK_EXCL ) -mrdemote (&ip->i_mmaplock); +downgrade_write (&ip->i_mmaplock);if (lock_flags &XFS_IOLOCK_EXCL )downgrade_write (&VFS_I (ip)->i_rwsem);@@ -384,16 +385,17 @@ xfs_isilocked( struct xfs_inode *ip, uint lock_flags) { -if (lock_flags & (XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )) { -if (!(lock_flags &XFS_ILOCK_SHARED )) -return !!ip->i_lock.mr_writer; -return rwsem_is_locked (&ip->i_lock.mr_lock); +if (lock_flags & (XFS_ILOCK_EXCL |XFS_ILOCK_SHARED )) { +ASSERT (!(lock_flags & ~(XFS_ILOCK_EXCL |XFS_ILOCK_SHARED ))); +return __xfs_rwsem_islocked (&ip->i_lock, + (lock_flags >>XFS_ILOCK_FLAG_SHIFT )); } -if (lock_flags & (XFS_MMAPLOCK_EXCL |XFS_MMAPLOCK_SHARED )) { -if (!(lock_flags &XFS_MMAPLOCK_SHARED )) -return !!ip->i_mmaplock.mr_writer; -return rwsem_is_locked (&ip->i_mmaplock.mr_lock); +if (lock_flags & (XFS_MMAPLOCK_EXCL |XFS_MMAPLOCK_SHARED )) { +ASSERT (!(lock_flags & + ~(XFS_MMAPLOCK_EXCL |XFS_MMAPLOCK_SHARED ))); +return __xfs_rwsem_islocked (&ip->i_mmaplock, + (lock_flags >>XFS_MMAPLOCK_FLAG_SHIFT )); }if (lock_flags & (XFS_IOLOCK_EXCL |XFS_IOLOCK_SHARED )) {fs/xfs/xfs_inode.h +2
-2@@ -39,8 +39,8 @@ typedef struct xfs_inode {/* Transaction and locking information. */ struct xfs_inode_log_item *i_itemp;/* logging information */ -mrlock_t i_lock;/* inode lock */ -mrlock_t i_mmaplock;/* inode mmap IO lock */ +struct rw_semaphore i_lock;/* inode lock */ +struct rw_semaphore i_mmaplock;/* inode mmap IO lock */ atomic_t i_pincount;/* inode pin count */ /* fs/xfs/xfs_iops.c +2
-2@@ -1336,9 +1336,9 @@ xfs_setup_inode(*/ lockdep_set_class (&inode->i_rwsem, &inode->i_sb->s_type->i_mutex_dir_key); -lockdep_set_class (&ip->i_lock.mr_lock, &xfs_dir_ilock_class); +lockdep_set_class (&ip->i_lock, &xfs_dir_ilock_class); }else { -lockdep_set_class (&ip->i_lock.mr_lock, &xfs_nondir_ilock_class); +lockdep_set_class (&ip->i_lock, &xfs_nondir_ilock_class); }/* fs/xfs/xfs_linux.h +1
-1@@ -22,7 +22,6 @@ typedef __u32 xfs_nlink_t;#include "xfs_types.h" #include "kmem.h" -#include "mrlock.h" #include <linux/semaphore.h> #include <linux/mm.h> @@ -61,6 +60,7 @@ typedef __u32 xfs_nlink_t;#include <linux/ratelimit.h> #include <linux/rhashtable.h> #include <linux/xattr.h> +#include <linux/rwsem.h> #include <asm/page.h> #include <asm/div64.h> fs/xfs/xfs_super.c +2
-4@@ -708,10 +708,8 @@ xfs_fs_inode_init_once(atomic_set (&ip->i_pincount,0 );spin_lock_init (&ip->i_flags_lock); -mrlock_init (&ip->i_mmaplock,MRLOCK_ALLOW_EQUAL_PRI |MRLOCK_BARRIER , -"xfsino" , ip->i_ino); -mrlock_init (&ip->i_lock,MRLOCK_ALLOW_EQUAL_PRI |MRLOCK_BARRIER , -"xfsino" , ip->i_ino); +init_rwsem (&ip->i_mmaplock); +init_rwsem (&ip->i_lock); }/* Signature · 1 line
2.26.2