From: Amir Goldstein <amir73il@gmail.com>
To: Zorro Lang <zlang@redhat.com>
Cc: "Miklos Szeredi" <miklos@szeredi.hu>,
"Christian Brauner" <brauner@kernel.org>,
"André Almeida" <andrealmeid@igalia.com>,
linux-unionfs@vger.kernel.org, fstests@vger.kernel.org
Subject: [PATCH 2/3] fstests: add helper _require_xfs_io_shutdown
Date: Mon, 9 Jun 2025 17:19:14 +0200 [thread overview]
Message-ID: <20250609151915.2638057-3-amir73il@gmail.com> (raw)
In-Reply-To: <20250609151915.2638057-1-amir73il@gmail.com>
Requirements for tests that shutdown fs using "xfs_io -c shutdown".
The requirements are stricter than the requirement for tests that
shutdown fs using _scratch_shutdown helper.
Generally, with overlay fs, tests can do _scratch_shutdown, but not
xfs_io -c shutdown.
Encode this stricter requirement in helper _require_xfs_io_shutdown
and use it in test generic/623, to express that it cannot run on
overalyfs.
Reported-by: André Almeida <andrealmeid@igalia.com>
Link: https://lore.kernel.org/linux-fsdevel/20250521-ovl_ro-v1-1-2350b1493d94@igalia.com/
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
common/rc | 21 +++++++++++++++++++++
tests/generic/623 | 2 +-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/common/rc b/common/rc
index d9a8b52e..21899a4a 100644
--- a/common/rc
+++ b/common/rc
@@ -616,6 +616,27 @@ _scratch_shutdown_and_syncfs()
fi
}
+# Requirements for tests that shutdown fs using "xfs_io -c shutdown".
+# The requirements are stricter than the requirement for tests that
+# shutdown fs using _scratch_shutdown helper.
+# Generally, with overlay fs, test can do _scratch_shutdown, but not
+# xfs_io -c shutdown.
+# It is possible, but not trivial, to execute "xfs_io -c shutdown" as part
+# of a command sequence when shutdown ioctl is to be performed on the base fs
+# (i.e. on an alternative _scratch_shutdown_handle path) as the example code
+# in _scratch_shutdown_and_syncfs() does.
+# A test that open codes this pattern can relax the _require_xfs_io_shutdown
+# requirement down to _require_scratch_shutdown.
+_require_xfs_io_shutdown()
+{
+ if [ _scratch_shutdown_handle != $SCRATCH_MNT ]; then
+ # Most likely overlayfs
+ _notrun "xfs_io -c shutdown not supported on $FSTYP"
+ fi
+ _require_xfs_io_command "shutdown"
+ _require_scratch_shutdown
+}
+
_move_mount()
{
local mnt=$1
diff --git a/tests/generic/623 b/tests/generic/623
index b97e2adb..f546d529 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_xfs_io_shutdown
_scratch_mkfs &>> $seqres.full
_scratch_mount
--
2.34.1
next prev parent reply other threads:[~2025-06-09 15:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-09 15:19 [PATCH 0/3] fstests overlay updates for 6.16-rc1 Amir Goldstein
2025-06-09 15:19 ` [PATCH 1/3] fstests: add helper _scratch_shutdown_and_syncfs Amir Goldstein
2025-06-10 14:37 ` Darrick J. Wong
2025-06-18 15:18 ` Zorro Lang
2025-06-09 15:19 ` Amir Goldstein [this message]
2025-06-09 20:20 ` [PATCH 2/3] fstests: add helper _require_xfs_io_shutdown André Almeida
2025-06-10 14:42 ` Darrick J. Wong
2025-06-10 18:34 ` Amir Goldstein
2025-06-10 19:02 ` Darrick J. Wong
2025-06-18 15:20 ` Zorro Lang
2025-06-09 15:19 ` [PATCH 3/3] overlay/08[89]: add tests for data-only redirect with userxattr Amir Goldstein
2025-06-18 16:02 ` Zorro Lang
2025-06-18 18:46 ` Amir Goldstein
2025-06-10 18:00 ` [PATCH 0/3] fstests overlay updates for 6.16-rc1 André Almeida
2025-06-10 18:25 ` Amir Goldstein
2025-06-18 14:56 ` Zorro Lang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250609151915.2638057-3-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=andrealmeid@igalia.com \
--cc=brauner@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=zlang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).