xfs: _{attr,data}_map_shared should take ILOCK_EXCL until iread_extents is completely done
PATCH 1/1 xfs: _{attr,data}_map_shared should take ILOCK_EXCL until iread_extents is completely done
From: Darrick J. Wong <[email protected]>
While fuzzing the data fork extent count on a btree-format directory with xfs/375, I observed the following (excerpted) splat:
XFS: Assertion failed: xfs_isilocked(ip, XFS_ILOCK_EXCL), file: fs/xfs/libxfs/xfs_bmap.c, line: 1208
------------[ cut here ]------------ WARNING: CPU: 0 PID: 43192 at fs/xfs/xfs_message.c:104 assfail+0x46/0x4a [xfs] Call Trace: <TASK> xfs_iread_extents+0x1af/0x210 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_dir_walk+0xb8/0x190 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_parent_count_parent_dentries+0x41/0x80 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_parent_validate+0x199/0x2e0 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_parent+0xdf/0x130 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_scrub_metadata+0x2b8/0x730 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_scrubv_metadata+0x38b/0x4d0 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_ioc_scrubv_metadata+0x111/0x160 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_file_ioctl+0x367/0xf50 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] __x64_sys_ioctl+0x82/0xa0 do_syscall_64+0x2b/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0
The cause of this is a race condition in xfs_ilock_data_map_shared, which performs an unlocked access to the data fork to guess which lock mode it needs:
Thread 0 Thread 1
xfs_need_iread_extents
<observe no iext tree>xfs_ilock(..., ILOCK_EXCL)xfs_iread_extents
<observe no iext tree>
<check ILOCK_EXCL>
<load bmbt extents into iext>
<notice iext size doesn't
match nextents>
xfs_need_iread_extents <observe iext tree> xfs_ilock(..., ILOCK_SHARED)
<tear down iext tree>xfs_iunlock(..., ILOCK_EXCL)
xfs_iread_extents <observe no iext tree> <check ILOCK_EXCL> *BOOM*
Fix this race by adding a flag to the xfs_ifork structure to indicate that we have not yet read in the extent records and changing the predicate to look at the flag state, not if_height. The memory barrier ensures that the flag will not be set until the very end of the function.
--- fs/xfs/libxfs/xfs_bmap.c | 2 ++ fs/xfs/libxfs/xfs_inode_fork.c | 2 ++ fs/xfs/libxfs/xfs_inode_fork.h | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_bmap.c +2 -0
@@ -1171,6 +1171,8 @@ xfs_iread_extents( goto out; }ASSERT (ir.loaded ==xfs_iext_count (ifp)); +smp_mb (); + ifp->if_needextents =0 ;return 0 ; out:xfs_iext_destroy (ifp);
fs/xfs/libxfs/xfs_inode_fork.c +2 -0
@@ -174,6 +174,8 @@ xfs_iformat_btree(int level; ifp =xfs_ifork_ptr (ip, whichfork); + ifp->if_needextents =1 ; + dfp = (xfs_bmdr_block_t *)XFS_DFORK_PTR (dip, whichfork); size =XFS_BMAP_BROOT_SPACE (mp, dfp); nrecs =be16_to_cpu (dfp->bb_numrecs);
fs/xfs/libxfs/xfs_inode_fork.h +2 -1
@@ -24,6 +24,7 @@ struct xfs_ifork {xfs_extnum_t if_nextents;/* # of extents in this fork */ short if_broot_bytes;/* bytes allocated for root */ int8_t if_format;/* format of this fork */ +int8_t if_needextents;/* extents have not been read */ };/*
@@ -262,7 +263,7 @@ int xfs_iext_count_upgrade(struct xfs_trans *tp, struct xfs_inode *ip,/* returns true if the fork has extents but they are not read in yet. */ static inline bool xfs_need_iread_extents (struct xfs_ifork *ifp) { -return ifp->if_format ==XFS_DINODE_FMT_BTREE && ifp->if_height ==0 ; +return ifp->if_format ==XFS_DINODE_FMT_BTREE && ifp->if_needextents; }#endif /* __XFS_INODE_FORK_H__ */
Quoted 66 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
While fuzzing the data fork extent count on a btree-format directory with xfs/375, I observed the following (excerpted) splat:
XFS: Assertion failed:
xfs_isilocked(ip, XFS_ILOCK_EXCL), file:fs/xfs/libxfs/xfs_bmap.c, line: 1208------------[ cut here ]------------ WARNING: CPU: 0 PID: 43192 at fs/xfs/xfs_message.c:104 assfail+0x46/0x4a [xfs] Call Trace: <TASK> xfs_iread_extents+0x1af/0x210 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_dir_walk+0xb8/0x190 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_parent_count_parent_dentries+0x41/0x80 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_parent_validate+0x199/0x2e0 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_parent+0xdf/0x130 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_scrub_metadata+0x2b8/0x730 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_scrubv_metadata+0x38b/0x4d0 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_ioc_scrubv_metadata+0x111/0x160 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_file_ioctl+0x367/0xf50 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] __x64_sys_ioctl+0x82/0xa0 do_syscall_64+0x2b/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0The cause of this is a race condition in
xfs_ilock_data_map_shared, which performs an unlocked access to the data fork to guess which lock mode it needs:Thread 0 Thread 1
xfs_need_iread_extents
<observe no iext tree>xfs_ilock(..., ILOCK_EXCL)xfs_iread_extents
<observe no iext tree>
<checkILOCK_EXCL>
<load bmbt extents into iext>
<notice iext size doesn't
match nextents>
xfs_need_iread_extents<observe iext tree>xfs_ilock(..., ILOCK_SHARED)
<tear down iext tree>xfs_iunlock(..., ILOCK_EXCL)
xfs_iread_extents<observe no iext tree> <checkILOCK_EXCL> *BOOM*Fix this race by adding a flag to the
xfs_iforkstructure to indicate that we have not yet read in the extent records and changing the predicate to look at the flag state, notif_height. The memory barrier ensures that the flag will not be set until the very end of the function.Signed-off-by Darrick J. Wong <[email protected]>--- fs/xfs/libxfs/xfs_bmap.c | 2 ++ fs/xfs/libxfs/xfs_inode_fork.c | 2 ++ fs/xfs/libxfs/xfs_inode_fork.h | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-)fs/xfs/libxfs/xfs_bmap.c +0
-0
fs/xfs/libxfs/xfs_bmap.c xfs_iread_extents( · line 1175
Quoted 5 lines
fs/xfs/libxfs/xfs_bmap.c +2
-0@@ -1171,6 +1171,8 @@ xfs_iread_extents( goto out; }ASSERT (ir.loaded ==xfs_iext_count (ifp)); +smp_mb (); + ifp->if_needextents =0 ;
Hmmm - if this is to ensure that everything above is completed before the clearing of this flag is visible everywhere else, then we should be able to use load_acquire/store_release semantics? i.e. the above is
smp_store_release(ifp->if_needextents, 0);
and we use
smp_load_acquire(ifp->if_needextents)
when we need to read the value to ensure that all the changes made before the relevant stores are also visible?
fs/xfs/libxfs/xfs_inode_fork.c xfs_iformat_btree( · line 177
Quoted 12 lines
fs/xfs/libxfs/xfs_bmap.c +0
-0return 0 ; out:xfs_iext_destroy (ifp);fs/xfs/libxfs/xfs_inode_fork.c +1
-0@@ -174,6 +174,8 @@ xfs_iformat_btree(int level; ifp =xfs_ifork_ptr (ip, whichfork); + ifp->if_needextents =1 ;
Hmmm - what's the guarantee that the reader will see ifp->if_format set correctly if they if_needextents = 1?
Wouldn't it be better to set this at the same time we set the ifp->if_format value? We clear it unconditionally above in xfs_iread_extents(), so why not set it unconditionally there, too, before we start. i.e.
/* * Set the format before we set needsextents with release * semantics. This ensures that we can use acquire semantics * on needextents in xfs_need_iread_extents() and be * guaranteed to see a valid format value after that load. */ ifp->if_format = dip->di_format; smp_store_release(ifp->if_needextents, 1);
That then means xfs_need_iread_extents() is guaranteed to see a valid ifp->if_format if ifp->if_needextents is set if we do:
/* returns true if the fork has extents but they are not read in yet. */ static inline bool xfs_need_iread_extents(struct xfs_ifork *ifp) {
/* see xfs_iread_extents() for needextents semantics */ return smp_load_acquire(ifp->if_needextents) && ifp->if_format == XFS_DINODE_FMT_BTREE; }
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 78 lines · Dave Chinner
Quoted 66 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
While fuzzing the data fork extent count on a btree-format directory with xfs/375, I observed the following (excerpted) splat:
XFS: Assertion failed:
xfs_isilocked(ip, XFS_ILOCK_EXCL), file:fs/xfs/libxfs/xfs_bmap.c, line: 1208------------[ cut here ]------------ WARNING: CPU: 0 PID: 43192 at fs/xfs/xfs_message.c:104 assfail+0x46/0x4a [xfs] Call Trace: <TASK> xfs_iread_extents+0x1af/0x210 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_dir_walk+0xb8/0x190 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_parent_count_parent_dentries+0x41/0x80 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_parent_validate+0x199/0x2e0 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xchk_parent+0xdf/0x130 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_scrub_metadata+0x2b8/0x730 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_scrubv_metadata+0x38b/0x4d0 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_ioc_scrubv_metadata+0x111/0x160 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] xfs_file_ioctl+0x367/0xf50 [xfs 09f66509ece4938760fac7de64732a0cbd3e39cd] __x64_sys_ioctl+0x82/0xa0 do_syscall_64+0x2b/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0The cause of this is a race condition in
xfs_ilock_data_map_shared, which performs an unlocked access to the data fork to guess which lock mode it needs:Thread 0 Thread 1
xfs_need_iread_extents
<observe no iext tree>xfs_ilock(..., ILOCK_EXCL)xfs_iread_extents
<observe no iext tree>
<checkILOCK_EXCL>
<load bmbt extents into iext>
<notice iext size doesn't
match nextents>
xfs_need_iread_extents<observe iext tree>xfs_ilock(..., ILOCK_SHARED)
<tear down iext tree>xfs_iunlock(..., ILOCK_EXCL)
xfs_iread_extents<observe no iext tree> <checkILOCK_EXCL> *BOOM*Fix this race by adding a flag to the
xfs_iforkstructure to indicate that we have not yet read in the extent records and changing the predicate to look at the flag state, notif_height. The memory barrier ensures that the flag will not be set until the very end of the function.Signed-off-by Darrick J. Wong <[email protected]>--- fs/xfs/libxfs/xfs_bmap.c | 2 ++ fs/xfs/libxfs/xfs_inode_fork.c | 2 ++ fs/xfs/libxfs/xfs_inode_fork.h | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-)fs/xfs/libxfs/xfs_bmap.c +0
-0fs/xfs/libxfs/xfs_bmap.c xfs_iread_extents( · line 1175
Quoted 5 lines
fs/xfs/libxfs/xfs_bmap.c +2
-0@@ -1171,6 +1171,8 @@ xfs_iread_extents( goto out; }ASSERT (ir.loaded ==xfs_iext_count (ifp)); +smp_mb (); + ifp->if_needextents =0 ;Hmmm - if this is to ensure that everything above is completed before the clearing of this flag is visible everywhere else, then we should be able to use load_acquire/store_release semantics? i.e. the above is
Quoted 8 lines
smp_store_release(ifp->if_needextents, 0);and we use
smp_load_acquire(ifp->if_needextents)when we need to read the value to ensure that all the changes made before the relevant stores are also visible?
I think we can; see below.
Quoted 10 lines
Quoted 10 lines
fs/xfs/libxfs/xfs_bmap.c +0
-0return 0 ; out:xfs_iext_destroy (ifp);fs/xfs/libxfs/xfs_inode_fork.c +0
-0@@ -174,6 +174,8 @@ xfs_iformat_btree(int level;
Quoted 5 lines
fs/xfs/libxfs/xfs_inode_fork.c xfs_iformat_btree( · line 177
Quoted 2 lines
fs/xfs/libxfs/xfs_inode_fork.c +1
-0ifp =xfs_ifork_ptr (ip, whichfork); + ifp->if_needextents =1 ;Hmmm - what's the guarantee that the reader will see
ifp->if_formatset correctly if theyif_needextents= 1?
At this point in the iget miss path, the only thread that can see the xfs_inode object is the one currently running the miss path. I think the spin_lock call to add the inode to the radix tree is sufficient to guarantee that both if_format and if_needextents are set consistently when any other thread gains the ability to find the inode in the radix tree.
That said, smp_store_release/smp_load_acquire would make that more explicit.
How will we port this to userspace libxfs?
Quoted 14 lines
Wouldn't it be better to set this at the same time we set the
ifp->if_formatvalue? We clear it unconditionally above inxfs_iread_extents(), so why not set it unconditionally there, too, before we start. i.e./* * Set the format before we set needsextents with release * semantics. This ensures that we can use acquire semantics * on needextents in xfs_need_iread_extents() and be * guaranteed to see a valid format value after that load. */ ifp->if_format = dip->di_format; smp_store_release(ifp->if_needextents, 1);
Quoted 2 lines
That then means
xfs_need_iread_extents()is guaranteed to see a validifp->if_formatififp->if_needextentsis set if we do:
I think we should be smp_stor'ing needextents as appropriate for if_format, so that...
Quoted 7 lines
/* returns true if the fork has extents but they are not read in yet. */ static inline bool
xfs_need_iread_extents(struct xfs_ifork *ifp){/* see xfs_iread_extents() for needextents semantics */ return smp_load_acquire(ifp->if_needextents) && ifp->if_format == XFS_DINODE_FMT_BTREE;
...then we don't need this FMT_BTREE check at all anymore.
--D
Quoted 8 lines
}
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 6 lines · Darrick J. Wong
Quoted 5 lines · Dave Chinner
Quoted 4 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
While fuzzing the data fork extent count on a btree-format directory with xfs/375, I observed the following (excerpted) splat:
....
Quoted 50 lines
Quoted 16 lines
fs/xfs/libxfs/xfs_bmap.c xfs_iread_extents( · line 1175
Quoted 10 lines
fs/xfs/libxfs/xfs_bmap.c +2
-0@@ -1171,6 +1171,8 @@ xfs_iread_extents( goto out; }ASSERT (ir.loaded ==xfs_iext_count (ifp)); +smp_mb (); + ifp->if_needextents =0 ;Hmmm - if this is to ensure that everything above is completed before the clearing of this flag is visible everywhere else, then we should be able to use load_acquire/store_release semantics? i.e. the above is
Quoted 8 lines
smp_store_release(ifp->if_needextents, 0);and we use
smp_load_acquire(ifp->if_needextents)when we need to read the value to ensure that all the changes made before the relevant stores are also visible?
I think we can; see below.
Quoted 10 lines
Quoted 10 lines
fs/xfs/libxfs/xfs_bmap.c +0
-0return 0 ; out:xfs_iext_destroy (ifp);fs/xfs/libxfs/xfs_inode_fork.c +0
-0@@ -174,6 +174,8 @@ xfs_iformat_btree(int level;Quoted 5 lines
fs/xfs/libxfs/xfs_inode_fork.c xfs_iformat_btree( · line 177
Quoted 2 lines
fs/xfs/libxfs/xfs_inode_fork.c +1
-0ifp =xfs_ifork_ptr (ip, whichfork); + ifp->if_needextents =1 ;Hmmm - what's the guarantee that the reader will see
ifp->if_formatset correctly if theyif_needextents= 1?At this point in the iget miss path, the only thread that can see the
xfs_inodeobject is the one currently running the miss path. I think thespin_lockcall to add the inode to the radix tree is sufficient to guarantee that bothif_formatandif_needextentsare set consistently when any other thread gains the ability to find the inode in the radix tree.
Quoted 4 lines
That said, smp_store_release/smp_load_acquire would make that more explicit.
How will we port this to userspace libxfs?
Add liburcu support. This brings across all the kernel side atomic operations and memory model support, along with RCU. Basically, we can then use the kernel side concurrency algorithms with almost no change to the libxfs userspace at all...
See:
https://github.com/urcu/userspace-rcu/blob/master/include/urcu/arch/x86.h
Then we can just add two line wrappers that use cmm_rmb() and cmm_wmb() to provide store_release/load_acquire semantics to the required operations...
I've attached the bitrotted patch I have from the old xfs_buf port to userspace I have sitting around. That series has other libxfs implementations of various kernel concurrency APIs, too...
Quoted 24 lines
Quoted 14 lines
Wouldn't it be better to set this at the same time we set the
ifp->if_formatvalue? We clear it unconditionally above inxfs_iread_extents(), so why not set it unconditionally there, too, before we start. i.e./* * Set the format before we set needsextents with release * semantics. This ensures that we can use acquire semantics * on needextents in xfs_need_iread_extents() and be * guaranteed to see a valid format value after that load. */ ifp->if_format = dip->di_format; smp_store_release(ifp->if_needextents, 1);Quoted 2 lines
That then means
xfs_need_iread_extents()is guaranteed to see a validifp->if_formatififp->if_needextentsis set if we do:I think we should be smp_stor'ing needextents as appropriate for
if_format, so that...Quoted 4 lines
/* returns true if the fork has extents but they are not read in yet. */ static inline bool
xfs_need_iread_extents(struct xfs_ifork *ifp){
Quoted 5 lines
Quoted 3 lines
/* see xfs_iread_extents() for needextents semantics */ return smp_load_acquire(ifp->if_needextents) && ifp->if_format == XFS_DINODE_FMT_BTREE;...then we don't need this
FMT_BTREEcheck at all anymore.
Yup, as Christoph also pointed out. That definitely simplifies things. :)
-Dave.
Signature · 48 lines
Dave Chinner [email protected] xfsprogs: introduce liburcu support From: Dave Chinner <[email protected]> The upcoming buffer cache rework/kerenl sync-up requires atomic variables. I could use C++11 atomics build into GCC, but they are a pain to work with and shoe-horn into the kernel atomic variable API. Much easier is to introduce a dependency on liburcu - the userspace RCU library. This provides atomic variables that very closely match the kernel atomic variable API, and it provides a very similar memory model and memory barrier support to the kernel. And we get RCU support that has an identical interface to the kernel and works the same way. Hence kernel code written with RCU algorithms and atomic variables will just slot straight into the userspace xfsprogs code without us having to think about whether the lockless algorithms will work in userspace or not. This reduces glue and hoop jumping, and gets us a step closer to having the entire userspace libxfs code MT safe. Signed-off-by: Dave Chinner <[email protected]> --- configure.ac | 3 +++ copy/Makefile | 3 ++- copy/xfs_copy.c | 3 +++ db/Makefile | 3 ++- debian/control | 2 +- growfs/Makefile | 3 ++- include/builddefs.in | 4 +++- include/platform_defs.h.in | 1 + libfrog/workqueue.c | 3 +++ libxfs/init.c | 3 +++ libxfs/libxfs_priv.h | 3 +-- logprint/Makefile | 3 ++- m4/Makefile | 1 + m4/package_urcu.m4 | 22 ++++++++++++++++++++++ mdrestore/Makefile | 3 ++- mkfs/Makefile | 2 +- repair/Makefile | 2 +- repair/prefetch.c | 9 +++++++-- repair/progress.c | 4 +++- scrub/Makefile | 3 ++- scrub/progress.c | 2 ++ 21 files changed, 67 insertions(+), 15 deletions(-)
configure.ac +3 -0
@@ -154,6 +154,9 @@ AC_PACKAGE_NEED_UUIDCOMPARE AC_PACKAGE_NEED_PTHREAD_H AC_PACKAGE_NEED_PTHREADMUTEXINIT +AC_PACKAGE_NEED_URCU_H +AC_PACKAGE_NEED_RCU_INIT + AC_HAVE_FADVISE AC_HAVE_MADVISE AC_HAVE_MINCORE
copy/Makefile +2 -1
@@ -9,7 +9,8 @@ LTCOMMAND = xfs_copy CFILES = xfs_copy.c HFILES = xfs_copy.h -LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBFROG) $(LIBUUID) $(LIBPTHREAD) $(LIBRT) +LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBFROG) $(LIBUUID) $(LIBPTHREAD) $(LIBRT) \ + $(LIBURCU) LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) $(LIBFROG) LLDFLAGS = -static-libtool-libs
copy/xfs_copy.c +3 -0
@@ -110,6 +110,7 @@ do_message(int flags, int code, const char *fmt, ...)fprintf (stderr,_ ("Aborting XFS copy -- logfile error -- reason: %s\n" ),strerror (errno)); +rcu_unregister_thread ();pthread_exit (NULL ); } }
@@ -224,6 +225,7 @@ begin_reader(void *arg) {thread_args *args = arg; +rcu_register_thread ();for (;;) {pthread_mutex_lock (&args->wait);if (do_write (args,NULL ))
@@ -243,6 +245,7 @@ handle_error:if (--glob_masks.num_working ==0 )pthread_mutex_unlock (&mainwait);pthread_mutex_unlock (&glob_masks.mutex); +rcu_unregister_thread ();pthread_exit (NULL );return NULL ; }
db/Makefile +2 -1
@@ -18,7 +18,8 @@ CFILES = $(HFILES:.h=.c) btdump.c btheight.c convert.c info.c namei.c \ timelimit.c LSRCFILES = xfs_admin.sh xfs_ncheck.sh xfs_metadump.sh -LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBFROG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) +LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBFROG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) \ + $(LIBURCU) LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) $(LIBFROG) LLDFLAGS += -static-libtool-libs
debian/control +1 -1
@@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: XFS Development Team <[email protected]> Uploaders: Nathan Scott <[email protected]>, Anibal Monsalve Salazar <[email protected]>, Bastian Germann <[email protected]> -Build-Depends: libinih-dev (>= 53), uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config +Build-Depends: libinih-dev (>= 53), uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, pkg-config, liburcu-dev Standards-Version: 4.0.0 Homepage: https://xfs.wiki.kernel.org/
growfs/Makefile +2 -1
@@ -9,7 +9,8 @@ LTCOMMAND = xfs_growfs CFILES = xfs_growfs.c -LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBFROG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) +LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBFROG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) \ + $(LIBURCU) ifeq ($(ENABLE_EDITLINE),yes) LLDLIBS += $(LIBEDITLINE) $(LIBTERMCAP)
include/builddefs.in +3 -1
@@ -22,6 +22,7 @@ LDFLAGS = LIBRT = @librt@ LIBUUID = @libuuid@ +LIBURCU = @liburcu@ LIBPTHREAD = @libpthread@ LIBTERMCAP = @libtermcap@ LIBEDITLINE = @libeditline@
@@ -125,7 +126,8 @@ CROND_DIR = @crond_dir@ GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall # -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-decl -PCFLAGS = -D_GNU_SOURCE $(GCCFLAGS) +# _LGPL_SOURCE is for liburcu to work correctly with GPL/LGPL programs +PCFLAGS = -D_LGPL_SOURCE -D_GNU_SOURCE $(GCCFLAGS) ifeq ($(HAVE_UMODE_T),yes) PCFLAGS += -DHAVE_UMODE_T endif
include/platform_defs.h.in +1 -0
@@ -23,6 +23,7 @@ #include <limits.h> #include <stdbool.h> #include <libgen.h> +#include <urcu.h> typedef struct filldir filldir_t;
libfrog/workqueue.c +3 -0
@@ -11,6 +11,7 @@#include <stdbool.h> #include <errno.h> #include <assert.h> +#include <urcu.h> #include "workqueue.h" /* Main processing thread */
@@ -24,6 +25,7 @@ workqueue_thread(void *arg)* Loop pulling work from the passed in work queue. * Check for notification to exit after every chunk of work. */ +rcu_register_thread ();while (1 ) {pthread_mutex_lock (&wq->lock);
@@ -60,6 +62,7 @@ workqueue_thread(void *arg) (wi->function)(wi->queue, wi->index, wi->arg);free (wi); } +rcu_unregister_thread ();return NULL ; }
libxfs/init.c +3 -0
@@ -310,6 +310,8 @@ libxfs_init(libxfs_init_t *a) fd =-1 ; flags = (a->isreadonly | a->isdirect); +rcu_init (); +rcu_register_thread ();radix_tree_init ();if (a->volname) {
@@ -1023,6 +1025,7 @@ libxfs_destroy(libxfs_bcache_free ();cache_destroy (libxfs_bcache); leaked =destroy_zones (); +rcu_unregister_thread ();if (getenv ("LIBXFS_LEAK_CHECK" ) && leaked)exit (1 ); }
libxfs/libxfs_priv.h +1 -2
@@ -210,8 +210,7 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };#define spin_unlock (a) ((void) 0)#define likely (x) (x)#define unlikely (x) (x) -#define rcu_read_lock () ((void) 0) -#define rcu_read_unlock () ((void) 0) +/* Need to be able to handle this bare or in control flow */ static inline bool WARN_ON (bool expr) {return (expr);
logprint/Makefile +2 -1
@@ -12,7 +12,8 @@ CFILES = logprint.c \ log_copy.c log_dump.c log_misc.c \ log_print_all.c log_print_trans.c log_redo.c -LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBFROG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) +LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBFROG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) \ + $(LIBURCU) LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) $(LIBFROG) LLDFLAGS = -static-libtool-libs
m4/Makefile +1 -0
@@ -24,6 +24,7 @@ LSRCFILES = \ package_services.m4 \ package_types.m4 \ package_icu.m4 \ + package_urcu.m4 \ package_utilies.m4 \ package_uuiddev.m4 \ multilib.m4 \
m4/package_urcu.m4 new file +22 -0
@@ -0,0 +1,22 @@ +AC_DEFUN([AC_PACKAGE_NEED_URCU_H], + [ AC_CHECK_HEADERS(urcu.h) + if test $ac_cv_header_urcu_h = no; then + AC_CHECK_HEADERS(urcu.h,, [ + echo + echo 'FATAL ERROR: could not find a valid urcu header.' + exit 1]) + fi + ]) + +AC_DEFUN([AC_PACKAGE_NEED_RCU_INIT], + [ AC_MSG_CHECKING([for liburcu]) + AC_TRY_COMPILE([ +#define _GNU_SOURCE +#include <urcu.h> + ], [ + rcu_init(); + ], liburcu=-lurcu + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + AC_SUBST(liburcu) + ])
mdrestore/Makefile +2 -1
@@ -8,7 +8,8 @@ include $(TOPDIR)/include/builddefs LTCOMMAND = xfs_mdrestore CFILES = xfs_mdrestore.c -LLDLIBS = $(LIBXFS) $(LIBFROG) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) +LLDLIBS = $(LIBXFS) $(LIBFROG) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) \ + $(LIBURCU) LTDEPENDENCIES = $(LIBXFS) $(LIBFROG) LLDFLAGS = -static
mkfs/Makefile +1 -1
@@ -11,7 +11,7 @@ HFILES = CFILES = proto.c xfs_mkfs.c LLDLIBS += $(LIBXFS) $(LIBXCMD) $(LIBFROG) $(LIBRT) $(LIBPTHREAD) $(LIBBLKID) \ - $(LIBUUID) $(LIBINIH) + $(LIBUUID) $(LIBINIH) $(LIBURCU) LTDEPENDENCIES += $(LIBXFS) $(LIBXCMD) $(LIBFROG) LLDFLAGS = -static-libtool-libs
repair/Makefile +1 -1
@@ -72,7 +72,7 @@ CFILES = \ xfs_repair.c LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBXCMD) $(LIBFROG) $(LIBUUID) $(LIBRT) \ - $(LIBPTHREAD) $(LIBBLKID) + $(LIBPTHREAD) $(LIBBLKID) $(LIBURCU) LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG) $(LIBXCMD) $(LIBFROG) LLDFLAGS = -static-libtool-libs
repair/prefetch.c +7 -2
@@ -660,6 +660,7 @@ pf_io_worker(if (buf ==NULL )return NULL ; +rcu_register_thread ();pthread_mutex_lock (&args->lock);while (!args->queuing_done || !btree_is_empty (args->io_queue)) {pftrace ("waiting to start prefetch I/O for AG %d" , args->agno);
@@ -682,6 +683,7 @@ pf_io_worker(free (buf);pftrace ("finished prefetch I/O for AG %d" , args->agno); +rcu_unregister_thread ();return NULL ; }
@@ -726,6 +728,8 @@ pf_queuing_worker(struct xfs_ino_geometry *igeo =M_IGEO (mp);unsigned long long cluster_mask; +rcu_register_thread (); + cluster_mask = (1ULL << igeo->inodes_per_cluster) -1 ;for (i =0 ; i <PF_THREAD_COUNT ; i++) {
@@ -739,7 +743,7 @@ pf_queuing_worker( args->io_threads[i] =0 ;if (i ==0 ) {pf_skip_prefetch_thread (args); -return NULL ; + goto out; }/* * since we have at least one I/O thread, use them for
@@ -779,7 +783,6 @@ pf_queuing_worker(* Start processing as well, in case everything so * far was already prefetched and the queue is empty. */ -pf_start_io_workers (args);pf_start_processing (args);sem_wait (&args->ra_count);
@@ -841,6 +844,8 @@ pf_queuing_worker(if (next_args)pf_create_prefetch_thread (next_args); +out: +rcu_unregister_thread ();return NULL ; }
repair/progress.c +3 -1
@@ -182,6 +182,7 @@ progress_rpt_thread (void *p)do_error (_ ("progress_rpt: cannot malloc progress msg buffer\n" )); running =1 ; +rcu_register_thread ();/* * Specify a repeating timer that fires each MSG_INTERVAL seconds.
@@ -286,7 +287,8 @@ progress_rpt_thread (void *p)do_warn (_ ("cannot delete timer\n" ));free (msgbuf); -return (NULL ); +rcu_unregister_thread (); +return NULL ; }int
scrub/Makefile +2 -1
@@ -71,7 +71,8 @@ spacemap.c \ vfs.c \ xfs_scrub.c -LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBICU_LIBS) $(LIBRT) +LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBICU_LIBS) $(LIBRT) \ + $(LIBURCU) LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG) LLDFLAGS = -static
scrub/progress.c +2 -0
@@ -116,6 +116,7 @@ progress_report_thread(void *arg)struct timespec abstime;int ret; +rcu_register_thread ();pthread_mutex_lock (&pt.lock);while (1 ) {uint64_t progress_val;
@@ -139,6 +140,7 @@ progress_report_thread(void *arg)progress_report (progress_val); }pthread_mutex_unlock (&pt.lock); +rcu_unregister_thread ();return NULL ; }
Quoted 9 lines · Dave Chinner
fs/xfs/libxfs/xfs_bmap.c xfs_iread_extents( · line 1175
Quoted 3 lines
fs/xfs/libxfs/xfs_bmap.c +2
-0ASSERT (ir.loaded ==xfs_iext_count (ifp)); +smp_mb (); + ifp->if_needextents =0 ;Hmmm - if this is to ensure that everything above is completed before the clearing of this flag is visible everywhere else, then we should be able to use load_acquire/store_release semantics? i.e. the above is
Quoted 5 lines
smp_store_release(ifp->if_needextents, 0);and we use
smp_load_acquire(ifp->if_needextents)
Yeah, that's probably better than my READ_ONCE/WRITE_ONCE suggestions as it also orders vs the previous assignments.
Quoted 20 lines
fs/xfs/libxfs/xfs_inode_fork.c xfs_iformat_btree( · line 177
Quoted 2 lines
fs/xfs/libxfs/xfs_inode_fork.c +1
-0ifp =xfs_ifork_ptr (ip, whichfork); + ifp->if_needextents =1 ;Hmmm - what's the guarantee that the reader will see
ifp->if_formatset correctly if theyif_needextents= 1?Wouldn't it be better to set this at the same time we set the
ifp->if_formatvalue? We clear it unconditionally above inxfs_iread_extents(), so why not set it unconditionally there, too, before we start. i.e./* * Set the format before we set needsextents with release * semantics. This ensures that we can use acquire semantics * on needextents in xfs_need_iread_extents() and be * guaranteed to see a valid format value after that load. */ ifp->if_format = dip->di_format; smp_store_release(ifp->if_needextents, 1);
Quoted 2 lines
That then means
xfs_need_iread_extents()is guaranteed to see a validifp->if_formatififp->if_needextentsis set if we do:
I'd just drop the if_format check in xfs_need_iread_extents, which together with the memory barriers should fix all this.
fs/xfs/libxfs/xfs_bmap.c xfs_iread_extents( · line 1175
Quoted 7 lines · Darrick J. Wong
+++
b/fs/xfs/libxfs/xfs_bmap.cfs/xfs/libxfs/xfs_bmap.c +2
-0@@ -1171,6 +1171,8 @@ xfs_iread_extents( goto out; }ASSERT (ir.loaded ==xfs_iext_count (ifp)); +smp_mb (); + ifp->if_needextents =0 ;
Shouldn't this be a WRITE_ONCE?
fs/xfs/libxfs/xfs_inode_fork.c xfs_iformat_btree( · line 177
Quoted 9 lines
fs/xfs/libxfs/xfs_inode_fork.c +1
-0@@ -174,6 +174,8 @@ xfs_iformat_btree(int level; ifp =xfs_ifork_ptr (ip, whichfork); + ifp->if_needextents =1 ;
Same here.
fs/xfs/libxfs/xfs_inode_fork.h struct xfs_ifork { · line 28
Quoted 13 lines
fs/xfs/libxfs/xfs_inode_fork.c +0
-0dfp = (xfs_bmdr_block_t *)XFS_DFORK_PTR (dip, whichfork); size =XFS_BMAP_BROOT_SPACE (mp, dfp); nrecs =be16_to_cpu (dfp->bb_numrecs);fs/xfs/libxfs/xfs_inode_fork.h +1
-0@@ -24,6 +24,7 @@ struct xfs_ifork {xfs_extnum_t if_nextents;/* # of extents in this fork */ short if_broot_bytes;/* bytes allocated for root */ int8_t if_format;/* format of this fork */ +int8_t if_needextents;/* extents have not been read */ };
I don't think this should be signed.
fs/xfs/libxfs/xfs_inode_fork.h int xfs_iext_count_upgrade(struct xfs_trans *tp, struct xfs_inode *ip, · line 266
Quoted 4 lines
fs/xfs/libxfs/xfs_inode_fork.h +1
-1static inline bool xfs_need_iread_extents (struct xfs_ifork *ifp) { -return ifp->if_format ==XFS_DINODE_FMT_BTREE && ifp->if_height ==0 ; +return ifp->if_format ==XFS_DINODE_FMT_BTREE && ifp->if_needextents;
.. and this should use READ_ONCE and drop the if_format check given that if_needextents is only set in xfs_iformat_btree.