On Fri, Jun 06, 2025 at 09:23:26AM +0200, Amir Goldstein wrote: > On Fri, Jun 6, 2025 at 3:45 AM Zorro Lang <zlang@xxxxxxxxxx> wrote: > > > > On Thu, Jun 05, 2025 at 08:38:30PM +0200, Amir Goldstein wrote: > > > On Thu, Jun 5, 2025 at 7:32 PM Zorro Lang <zlang@xxxxxxxxxx> wrote: > > > > > > > > On Tue, Jun 03, 2025 at 12:07:43PM +0200, Amir Goldstein wrote: > > > > > This test performs shutdown via xfs_io -c shutdown. > > > > > > > > > > Overlayfs tests can use _scratch_shutdown, but they cannot use > > > > > "-c shutdown" xfs_io command without jumping through hoops, so by > > > > > default we do not support it. > > > > > > > > > > Add this condition to _require_xfs_io_command and add the require > > > > > statement to test generic/623 so it wont run with overlayfs. > > > > > > > > > > Reported-by: André Almeida <andrealmeid@xxxxxxxxxx> > > > > > Tested-by: André Almeida <andrealmeid@xxxxxxxxxx> > > > > > Link: https://lore.kernel.org/linux-fsdevel/20250521-ovl_ro-v1-1-2350b1493d94@xxxxxxxxxx/ > > > > > Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> > > > > > --- > > > > > common/rc | 8 ++++++++ > > > > > tests/generic/623 | 1 + > > > > > 2 files changed, 9 insertions(+) > > > > > > > > > > diff --git a/common/rc b/common/rc > > > > > index d8ee8328..bffd576a 100644 > > > > > --- a/common/rc > > > > > +++ b/common/rc > > > > > @@ -3033,6 +3033,14 @@ _require_xfs_io_command() > > > > > touch $testfile > > > > > testio=`$XFS_IO_PROG -c "syncfs" $testfile 2>&1` > > > > > ;; > > > > > + "shutdown") > > > > > + if [ $FSTYP = "overlay" ]; then > > > > > + # Overlayfs tests can use _scratch_shutdown, but they > > > > > + # cannot use "-c shutdown" xfs_io command without jumping > > > > > + # through hoops, so by default we do not support it. > > > > > + _notrun "xfs_io $command not supported on $FSTYP" > > > > > + fi > > > > > + ;; > > > > > > > > Hmm... I'm not sure this's a good way. > > > > For example, overlay/087 does xfs_io shutdown too, > > > > > > Yes it does but look at the effort needed to do that properly: > > > > > > $XFS_IO_PROG -x -c "open $(_scratch_shutdown_handle)" -c 'shutdown -f > > > ' -c close -c syncfs $SCRATCH_MNT | \ > > > grep -vF '[00' > > > > > > > generally it should calls > > > > _require_xfs_io_command "shutdown" although it doesn't. If someone overlay > > > > test case hope to test as o/087 does, and it calls _require_xfs_io_command "shutdown", > > > > then it'll be _notrun. > > > > > > If someone knows enough to perform the dance above with _scratch_shutdown_handle > > > then that someone should know enough not to call > > > _require_xfs_io_command "shutdown". > > > OTOH, if someone doesn't know then default is to not run. > > > > Sure, I can understand that, just this logic is a bit *obscure* :) It sounds like: > > "If an overlay test case wants to do xfs_io shutdown, it shouldn't call > > _require_xfs_io_command "shutdown". Or call that to skip a shutdown test > > on overlay :)" > > > > And the expected result of _require_xfs_io_command "shutdown" will be totally > > opposite with _require_scratch_shutdown on overlay, that might be confused. > > Can we have a clearer way to deal with that? > > > > I don't really understand the confusion. > > _require_xfs_io_command "shutdown" > > Like any other _require statement > requires support for what this test does - > meaning that a test does xfs_io -c shutdown, just like test generic/623 does > > and _require_scratch_shutdown implies that the test does > _scratch_shutdown > > FSTYP overlay happens to be able to do _scratch_shutdown > but not able to do xfs_io -c shutdown $SCRATCH_MNT > > The different _require statements simply reflect reality as it is. > > We can solve the confused about o/087 not having > _require_xfs_io_command "shutdown" > by moving the special hand crafted xfs_io command in o/087 > to a helper _scratch_shutdown_and_syncfs to hide those internal > implementation details from test writers. > See attached patch. Hmm... give me a moment to order my thoughts step by step :) There're only 2 cases tend to do xfs_io shutdown on overlay currently (others are xfs specific test cases): $ grep -rsn shutdown tests/|grep -- "-c" tests/generic/623:29:$XFS_IO_PROG -x -c "mmap 0 4k" -c "mwrite 0 4k" -c shutdown -c fsync \ tests/overlay/087:50:$XFS_IO_PROG -x -c "open $(_scratch_shutdown_handle)" -c 'shutdown -f ' -c close -c syncfs $SCRATCH_MNT | \ tests/overlay/087:57:$XFS_IO_PROG -x -c "open $(_scratch_shutdown_handle)" -c 'shutdown -f ' -c close -c syncfs $SCRATCH_MNT | \ ... others shutdown cases nearly all use *_scratch_shutdown* with *_require_scratch_shutdown*, these two functions are consistent in code logic. And no one calls "_require_xfs_io_command shutdown" currently. So g/623 and o/087 are specifal, actually they call _require_scratch_shutdown too, that makes sense for o/087. Now only g/623 doesn't make sense. Now we need to help it to make sense. I think the key is in _require_scratch_shutdown function [1], how about add an argument to clearly tell it we need to check shutdown "only on the top layer $SCRATCH_MNT" or "try the lowest layer $BASE_SCRATCH_MNT if there is". For example: diff --git a/common/rc b/common/rc index c3af8485c..5f30143e4 100644 --- a/common/rc +++ b/common/rc @@ -4075,15 +4075,17 @@ _require_exportfs() _require_open_by_handle } -# Does shutdown work on this fs? +# Does shutdown work on this [lower|top] layer fs? _require_scratch_shutdown() { + local layer="${1:-lower}" + [ -x $here/src/godown ] || _notrun "src/godown executable not found" _scratch_mkfs > /dev/null 2>&1 || _notrun "_scratch_mkfs failed on $SCRATCH_DEV" _scratch_mount - if [ $FSTYP = "overlay" ]; then + if [ $FSTYP = "overlay" -a "$level" = "lower" ]; then if [ -z $OVL_BASE_SCRATCH_DEV ]; then # In lagacy overlay usage, it may specify directory as # SCRATCH_DEV, in this case OVL_BASE_SCRATCH_DEV diff --git a/tests/generic/623 b/tests/generic/623 index b97e2adbe..af0f55397 100755 --- a/tests/generic/623 +++ b/tests/generic/623 @@ -15,7 +15,7 @@ _begin_fstest auto quick shutdown mmap "xfs: restore shutdown check in mapped write fault path" _require_scratch_nocheck -_require_scratch_shutdown +_require_scratch_shutdown top _scratch_mkfs &>> $seqres.full _scratch_mount Thanks, Zorro [1] _require_scratch_shutdown() { [ -x $here/src/godown ] || _notrun "src/godown executable not found" _scratch_mkfs > /dev/null 2>&1 || _notrun "_scratch_mkfs failed on $SCRATCH_DEV" _scratch_mount if [ $FSTYP = "overlay" ]; then if [ -z $OVL_BASE_SCRATCH_DEV ]; then # In lagacy overlay usage, it may specify directory as # SCRATCH_DEV, in this case OVL_BASE_SCRATCH_DEV # will be null, so check OVL_BASE_SCRATCH_DEV before # running shutdown to avoid shutting down base fs accidently. _notrun "This test requires a valid $OVL_BASE_SCRATCH_DEV as ovl base fs" else $here/src/godown -f $OVL_BASE_SCRATCH_MNT 2>&1 \ || _notrun "Underlying filesystem does not support shutdown" fi else $here/src/godown -f $SCRATCH_MNT 2>&1 \ || _notrun "$FSTYP does not support shutdown" fi _scratch_unmount } > > Thanks, > Amir.
