From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org, guaneryu@gmail.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me,
tytso@mit.edu
Subject: [PATCH 1/3] dmflakey: support external log and realtime devices
Date: Mon, 19 Jul 2021 18:09:08 -0700 [thread overview]
Message-ID: <162674334822.2651055.756804899535330518.stgit@magnolia> (raw)
In-Reply-To: <162674334277.2651055.14927938006488444114.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
Upgrade the dmflakey code to coordinate making external scratch log and
scratch realtime devices flakey along with the scratch device. Note
that unlike SCRATCH_DEV, we save the old rt/log devices as separate
variables and replace SCRATCH_{RT,LOG}DEV so that helper functions
continue to work without modification.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
common/dmflakey | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 103 insertions(+), 3 deletions(-)
diff --git a/common/dmflakey b/common/dmflakey
index b4e11ae9..af4371a3 100644
--- a/common/dmflakey
+++ b/common/dmflakey
@@ -10,6 +10,7 @@ FLAKEY_ERROR_WRITES=2
_init_flakey()
{
+ # Scratch device
local BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
FLAKEY_DEV=/dev/mapper/flakey-test
FLAKEY_TABLE="0 $BLK_DEV_SIZE flakey $SCRATCH_DEV 0 180 0"
@@ -17,11 +18,50 @@ _init_flakey()
FLAKEY_TABLE_ERROR="0 $BLK_DEV_SIZE flakey $SCRATCH_DEV 0 0 180 1 error_writes"
_dmsetup_create flakey-test --table "$FLAKEY_TABLE" || \
_fatal "failed to create flakey device"
+
+ # Realtime device
+ if [ -n "$SCRATCH_RTDEV" ]; then
+ if [ -z "$NON_FLAKEY_RTDEV" ]; then
+ # Set up the device switch
+ local backing_dev="$SCRATCH_RTDEV"
+ export NON_FLAKEY_RTDEV="$SCRATCH_RTDEV"
+ SCRATCH_RTDEV=/dev/mapper/flakey-rttest
+ else
+ # Already set up; recreate tables
+ local backing_dev="$NON_FLAKEY_RTDEV"
+ fi
+ local BLK_DEV_SIZE=`blockdev --getsz $backing_dev`
+ FLAKEY_RTTABLE="0 $BLK_DEV_SIZE flakey $backing_dev 0 180 0"
+ FLAKEY_RTTABLE_DROP="0 $BLK_DEV_SIZE flakey $backing_dev 0 0 180 1 drop_writes"
+ FLAKEY_RTTABLE_ERROR="0 $BLK_DEV_SIZE flakey $backing_dev 0 0 180 1 error_writes"
+ _dmsetup_create flakey-rttest --table "$FLAKEY_RTTABLE" || \
+ _fatal "failed to create flakey rt device"
+ fi
+
+ # External log device
+ if [ -n "$SCRATCH_LOGDEV" ]; then
+ if [ -z "$NON_FLAKEY_LOGDEV" ]; then
+ # Set up the device switch
+ local backing_dev="$SCRATCH_LOGDEV"
+ export NON_FLAKEY_LOGDEV="$SCRATCH_LOGDEV"
+ SCRATCH_LOGDEV=/dev/mapper/flakey-logtest
+ else
+ # Already set up; recreate tables
+ local backing_dev="$NON_FLAKEY_LOGDEV"
+ fi
+ local BLK_DEV_SIZE=`blockdev --getsz $backing_dev`
+ FLAKEY_LOGTABLE="0 $BLK_DEV_SIZE flakey $backing_dev 0 180 0"
+ FLAKEY_LOGTABLE_DROP="0 $BLK_DEV_SIZE flakey $backing_dev 0 0 180 1 drop_writes"
+ FLAKEY_LOGTABLE_ERROR="0 $BLK_DEV_SIZE flakey $backing_dev 0 0 180 1 error_writes"
+ _dmsetup_create flakey-logtest --table "$FLAKEY_LOGTABLE" || \
+ _fatal "failed to create flakey log device"
+ fi
}
_mount_flakey()
{
_scratch_options mount
+
mount -t $FSTYP $SCRATCH_OPTIONS $MOUNT_OPTIONS $FLAKEY_DEV $SCRATCH_MNT
}
@@ -34,9 +74,21 @@ _cleanup_flakey()
{
# If dmsetup load fails then we need to make sure to do resume here
# otherwise the umount will hang
+ test -n "$NON_FLAKEY_LOGDEV" && $DMSETUP_PROG resume flakey-logtest &> /dev/null
+ test -n "$NON_FLAKEY_RTDEV" && $DMSETUP_PROG resume flakey-rttest &> /dev/null
$DMSETUP_PROG resume flakey-test > /dev/null 2>&1
+
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+
_dmsetup_remove flakey-test
+ test -n "$NON_FLAKEY_LOGDEV" && _dmsetup_remove flakey-logtest
+ test -n "$NON_FLAKEY_RTDEV" && _dmsetup_remove flakey-rttest
+
+ SCRATCH_LOGDEV="$NON_FLAKEY_LOGDEV"
+ unset NON_FLAKEY_LOGDEV
+
+ SCRATCH_RTDEV="$NON_FLAKEY_RTDEV"
+ unset NON_FLAKEY_RTDEV
}
# _load_flakey_table <table> [lockfs]
@@ -45,22 +97,70 @@ _cleanup_flakey()
# table, so it simulates power failure.
_load_flakey_table()
{
- table="$FLAKEY_TABLE"
- [ $1 -eq $FLAKEY_DROP_WRITES ] && table="$FLAKEY_TABLE_DROP"
- [ $1 -eq $FLAKEY_ERROR_WRITES ] && table="$FLAKEY_TABLE_ERROR"
+ case "$1" in
+ "$FLAKEY_DROP_WRITES")
+ table="$FLAKEY_TABLE_DROP"
+ logtable="$FLAKEY_LOGTABLE_DROP"
+ rttable="$FLAKEY_RTTABLE_DROP"
+ ;;
+ "$FLAKEY_ERROR_WRITES")
+ table="$FLAKEY_TABLE_ERROR"
+ logtable="$FLAKEY_LOGTABLE_ERROR"
+ rttable="$FLAKEY_RTTABLE_ERROR"
+ ;;
+ *)
+ table="$FLAKEY_TABLE"
+ logtable="$FLAKEY_LOGTABLE"
+ rttable="$FLAKEY_RTTABLE"
+ ;;
+ esac
suspend_opt="--nolockfs"
[ $# -gt 1 ] && [ $2 -eq 1 ] && suspend_opt=""
+ # Suspend the scratch device before the log and realtime devices so
+ # that the kernel can freeze and flush the filesystem if the caller
+ # wanted a freeze.
$DMSETUP_PROG suspend $suspend_opt flakey-test
[ $? -ne 0 ] && _fatal "failed to suspend flakey-test"
+ if [ -n "$NON_FLAKEY_RTDEV" ]; then
+ $DMSETUP_PROG suspend $suspend_opt flakey-rttest
+ [ $? -ne 0 ] && _fatal "failed to suspend flakey-rttest"
+ fi
+
+ if [ -n "$NON_FLAKEY_LOGDEV" ]; then
+ $DMSETUP_PROG suspend $suspend_opt flakey-logtest
+ [ $? -ne 0 ] && _fatal "failed to suspend flakey-logtest"
+ fi
+
# There may be multiple dm targets in the table, and these dm targets
# will be joined by the newline ("\n"). Option --table can not cope with
# the multiple-targets case, so get them by reading from standard input.
echo -e "$table" | $DMSETUP_PROG load flakey-test
[ $? -ne 0 ] && _fatal "failed to load table into flakey-test"
+ if [ -n "$NON_FLAKEY_RTDEV" ]; then
+ echo -e "$rttable" | $DMSETUP_PROG load flakey-rttest
+ [ $? -ne 0 ] && _fatal "failed to load table into flakey-rttest"
+ fi
+
+ if [ -n "$NON_FLAKEY_LOGDEV" ]; then
+ echo -e "$logtable" | $DMSETUP_PROG load flakey-logtest
+ [ $? -ne 0 ] && _fatal "failed to load table into flakey-logtest"
+ fi
+
+ # Resume devices in the opposite order that we suspended them.
+ if [ -n "$NON_FLAKEY_LOGDEV" ]; then
+ $DMSETUP_PROG resume flakey-logtest
+ [ $? -ne 0 ] && _fatal "failed to resume flakey-logtest"
+ fi
+
+ if [ -n "$NON_FLAKEY_RTDEV" ]; then
+ $DMSETUP_PROG resume flakey-rttest
+ [ $? -ne 0 ] && _fatal "failed to resume flakey-rttest"
+ fi
+
$DMSETUP_PROG resume flakey-test
[ $? -ne 0 ] && _fatal "failed to resume flakey-test"
}
next prev parent reply other threads:[~2021-07-20 1:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 1:09 [PATCHSET 0/3] common/dm*: support external log and rt devices Darrick J. Wong
2021-07-20 1:09 ` Darrick J. Wong [this message]
2021-07-20 1:09 ` [PATCH 2/3] dmerror: export configuration so that subprograms don't have to reinit Darrick J. Wong
2021-07-20 1:09 ` [PATCH 3/3] dmflakey: support external log and realtime devices Darrick J. Wong
2021-08-08 15:27 ` Eryu Guan
2021-08-10 4:16 ` Darrick J. Wong
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=162674334822.2651055.756804899535330518.stgit@magnolia \
--to=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=guan@eryu.me \
--cc=guaneryu@gmail.com \
--cc=linux-xfs@vger.kernel.org \
--cc=tytso@mit.edu \
/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).