* [PATCHSET 0/3] common/dm*: support external log and rt devices
@ 2021-07-20 1:09 Darrick J. Wong
2021-07-20 1:09 ` [PATCH 1/3] dmflakey: support external log and realtime devices Darrick J. Wong
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Darrick J. Wong @ 2021-07-20 1:09 UTC (permalink / raw)
To: djwong, guaneryu; +Cc: linux-xfs, fstests, guan, tytso
Hi all,
There are a growing number of fstests that examine what happens to a
filesystem when the block device underneath it goes offline. Many of
them do this to simulate system crashes, and none of them (outside of
btrfs) can handle filesystems with multiple devices. XFS is one of
those beasts that does, so enhance the dm-error and dm-flakey helpers to
take the log and rt devices offline when they're testing the data
device.
If you're going to start using this mess, you probably ought to just
pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy!
Comments and questions are, as always, welcome.
--D
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=dmerror-on-rt-devices
---
common/dmerror | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++---
common/dmflakey | 106 +++++++++++++++++++++++++++++-
src/dmerror | 13 +---
tests/generic/441 | 2 -
tests/generic/487 | 2 -
5 files changed, 289 insertions(+), 24 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/3] dmflakey: support external log and realtime devices
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
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
2 siblings, 0 replies; 7+ messages in thread
From: Darrick J. Wong @ 2021-07-20 1:09 UTC (permalink / raw)
To: djwong, guaneryu; +Cc: linux-xfs, fstests, guan, tytso
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"
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/3] dmerror: export configuration so that subprograms don't have to reinit
2021-07-20 1:09 [PATCHSET 0/3] common/dm*: support external log and rt devices Darrick J. Wong
2021-07-20 1:09 ` [PATCH 1/3] dmflakey: support external log and realtime devices Darrick J. Wong
@ 2021-07-20 1:09 ` Darrick J. Wong
2021-07-20 1:09 ` [PATCH 3/3] dmflakey: support external log and realtime devices Darrick J. Wong
2 siblings, 0 replies; 7+ messages in thread
From: Darrick J. Wong @ 2021-07-20 1:09 UTC (permalink / raw)
To: djwong, guaneryu; +Cc: linux-xfs, fstests, guan, tytso
From: Darrick J. Wong <djwong@kernel.org>
Export the dmerror configuration variables so that subprograms don't
have to reinitialize the configuration in their own subprograms before
calling the helpers. In the next patch (where we allow dmerror for log
and rt devices) it will become important to avoid these
reinitializations.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
common/dmerror | 8 +++++---
src/dmerror | 13 +++++--------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/common/dmerror b/common/dmerror
index 6f1bef09..7f6800c0 100644
--- a/common/dmerror
+++ b/common/dmerror
@@ -10,11 +10,11 @@ _dmerror_setup()
local blk_dev_size=`blockdev --getsz $dm_backing_dev`
- DMERROR_DEV='/dev/mapper/error-test'
+ export DMERROR_DEV='/dev/mapper/error-test'
- DMLINEAR_TABLE="0 $blk_dev_size linear $dm_backing_dev 0"
+ export DMLINEAR_TABLE="0 $blk_dev_size linear $dm_backing_dev 0"
- DMERROR_TABLE="0 $blk_dev_size error $dm_backing_dev 0"
+ export DMERROR_TABLE="0 $blk_dev_size error $dm_backing_dev 0"
}
_dmerror_init()
@@ -42,6 +42,8 @@ _dmerror_cleanup()
$DMSETUP_PROG resume error-test > /dev/null 2>&1
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
_dmsetup_remove error-test
+
+ unset DMERROR_DEV DMLINEAR_TABLE DMERROR_TABLE
}
_dmerror_load_error_table()
diff --git a/src/dmerror b/src/dmerror
index c34d1a9a..cde2b428 100755
--- a/src/dmerror
+++ b/src/dmerror
@@ -5,15 +5,12 @@
. ./common/config
. ./common/dmerror
-_dmerror_setup
+if [ -z "$DMERROR_DEV" ]; then
+ echo "Caller should have run _dmerror_init."
+ exit 1
+fi
case $1 in
-cleanup)
- _dmerror_cleanup
- ;;
-init)
- _dmerror_init
- ;;
load_error_table)
_dmerror_load_error_table
;;
@@ -21,7 +18,7 @@ load_working_table)
_dmerror_load_working_table
;;
*)
- echo "Usage: $0 {init|cleanup|load_error_table|load_working_table}"
+ echo "Usage: $0 {load_error_table|load_working_table}"
exit 1
;;
esac
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/3] dmflakey: support external log and realtime devices
2021-07-20 1:09 [PATCHSET 0/3] common/dm*: support external log and rt devices Darrick J. Wong
2021-07-20 1:09 ` [PATCH 1/3] dmflakey: support external log and realtime devices Darrick J. Wong
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 ` Darrick J. Wong
2021-08-08 15:27 ` Eryu Guan
2 siblings, 1 reply; 7+ messages in thread
From: Darrick J. Wong @ 2021-07-20 1:09 UTC (permalink / raw)
To: djwong, guaneryu; +Cc: linux-xfs, fstests, guan, tytso
From: Darrick J. Wong <djwong@kernel.org>
Upgrade the dmerror code to coordinate making external scratch log and
scratch realtime devices error out along with the scratch device. Note
that unlike SCRATCH_DEV, we save the old rt/log devices in a separate
variable and overwrite SCRATCH_{RT,LOG}DEV so that all the helper
functions continue to work properly.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
common/dmerror | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++---
tests/generic/441 | 2 -
tests/generic/487 | 2 -
3 files changed, 178 insertions(+), 12 deletions(-)
diff --git a/common/dmerror b/common/dmerror
index 7f6800c0..03f3fd97 100644
--- a/common/dmerror
+++ b/common/dmerror
@@ -4,30 +4,94 @@
#
# common functions for setting up and tearing down a dmerror device
+_dmerror_setup_vars()
+{
+ local backing_dev="$1"
+ local tag="$2"
+ local target="$3"
+
+ test -z "$target" && target=error
+ local blk_dev_size=$(blockdev --getsz "$backing_dev")
+
+ eval export "DMLINEAR_${tag}TABLE=\"0 $blk_dev_size linear $backing_dev 0\""
+ eval export "DMERROR_${tag}TABLE=\"0 $blk_dev_size $target $backing_dev 0\""
+}
+
_dmerror_setup()
{
- local dm_backing_dev=$SCRATCH_DEV
+ local rt_target=
+ local linear_target=
- local blk_dev_size=`blockdev --getsz $dm_backing_dev`
+ for arg in "$@"; do
+ case "${arg}" in
+ no_rt) rt_target=linear;;
+ no_log) log_target=linear;;
+ *) echo "${arg}: Unknown _dmerror_setup arg.";;
+ esac
+ done
+ # Scratch device
export DMERROR_DEV='/dev/mapper/error-test'
+ _dmerror_setup_vars $SCRATCH_DEV
- export DMLINEAR_TABLE="0 $blk_dev_size linear $dm_backing_dev 0"
+ # Realtime device. We reassign SCRATCH_RTDEV so that all the scratch
+ # helpers continue to work unmodified.
+ if [ -n "$SCRATCH_RTDEV" ]; then
+ if [ -z "$NON_ERROR_RTDEV" ]; then
+ # Set up the device switch
+ local dm_backing_dev=$SCRATCH_RTDEV
+ export NON_ERROR_RTDEV="$SCRATCH_RTDEV"
+ SCRATCH_RTDEV='/dev/mapper/error-rttest'
+ else
+ # Already set up; recreate tables
+ local dm_backing_dev="$NON_ERROR_RTDEV"
+ fi
- export DMERROR_TABLE="0 $blk_dev_size error $dm_backing_dev 0"
+ _dmerror_setup_vars $dm_backing_dev RT $rt_target
+ fi
+
+ # External log device. We reassign SCRATCH_LOGDEV so that all the
+ # scratch helpers continue to work unmodified.
+ if [ -n "$SCRATCH_LOGDEV" ]; then
+ if [ -z "$NON_ERROR_LOGDEV" ]; then
+ # Set up the device switch
+ local dm_backing_dev=$SCRATCH_LOGDEV
+ export NON_ERROR_LOGDEV="$SCRATCH_LOGDEV"
+ SCRATCH_LOGDEV='/dev/mapper/error-logtest'
+ else
+ # Already set up; recreate tables
+ local dm_backing_dev="$NON_ERROR_LOGDEV"
+ fi
+
+ _dmerror_setup_vars $dm_backing_dev LOG $log_target
+ fi
}
_dmerror_init()
{
- _dmerror_setup
+ _dmerror_setup "$@"
+
_dmsetup_remove error-test
_dmsetup_create error-test --table "$DMLINEAR_TABLE" || \
_fatal "failed to create dm linear device"
+
+ if [ -n "$NON_ERROR_RTDEV" ]; then
+ _dmsetup_remove error-rttest
+ _dmsetup_create error-rttest --table "$DMLINEAR_RTTABLE" || \
+ _fatal "failed to create dm linear rt device"
+ fi
+
+ if [ -n "$NON_ERROR_LOGDEV" ]; then
+ _dmsetup_remove error-logtest
+ _dmsetup_create error-logtest --table "$DMLINEAR_LOGTABLE" || \
+ _fatal "failed to create dm linear log device"
+ fi
}
_dmerror_mount()
{
_scratch_options mount
+
$MOUNT_PROG -t $FSTYP `_common_dev_mount_options $*` $SCRATCH_OPTIONS \
$DMERROR_DEV $SCRATCH_MNT
}
@@ -39,11 +103,23 @@ _dmerror_unmount()
_dmerror_cleanup()
{
+ test -n "$NON_ERROR_LOGDEV" && $DMSETUP_PROG resume error-logtest &>/dev/null
+ test -n "$NON_ERROR_RTDEV" && $DMSETUP_PROG resume error-rttest &>/dev/null
$DMSETUP_PROG resume error-test > /dev/null 2>&1
+
$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+
+ test -n "$NON_ERROR_LOGDEV" && _dmsetup_remove error-logtest
+ test -n "$NON_ERROR_RTDEV" && _dmsetup_remove error-rttest
_dmsetup_remove error-test
unset DMERROR_DEV DMLINEAR_TABLE DMERROR_TABLE
+
+ SCRATCH_LOGDEV="$NON_ERROR_LOGDEV"
+ unset NON_ERROR_LOGDEV DMLINEAR_LOGTABLE DMERROR_LOGTABLE
+
+ SCRATCH_RTDEV="$NON_ERROR_RTDEV"
+ unset NON_ERROR_RTDEV DMLINEAR_RTTABLE DMERROR_RTTABLE
}
_dmerror_load_error_table()
@@ -59,12 +135,47 @@ _dmerror_load_error_table()
suspend_opt="$*"
fi
+ # 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 error-test
[ $? -ne 0 ] && _fail "dmsetup suspend failed"
+ if [ -n "$NON_ERROR_RTDEV" ]; then
+ $DMSETUP_PROG suspend $suspend_opt error-rttest
+ [ $? -ne 0 ] && _fail "failed to suspend error-rttest"
+ fi
+
+ if [ -n "$NON_ERROR_LOGDEV" ]; then
+ $DMSETUP_PROG suspend $suspend_opt error-logtest
+ [ $? -ne 0 ] && _fail "failed to suspend error-logtest"
+ fi
+
+ # Load new table
echo "$DMERROR_TABLE" | $DMSETUP_PROG load error-test
load_res=$?
+ if [ -n "$NON_ERROR_RTDEV" ]; then
+ $DMSETUP_PROG load error-rttest --table "$DMERROR_RTTABLE"
+ [ $? -ne 0 ] && _fail "failed to load error table into error-rttest"
+ fi
+
+ if [ -n "$NON_ERROR_LOGDEV" ]; then
+ $DMSETUP_PROG load error-logtest --table "$DMERROR_LOGTABLE"
+ [ $? -ne 0 ] && _fail "failed to load error table into error-logtest"
+ fi
+
+ # Resume devices in the opposite order that we suspended them.
+ if [ -n "$NON_ERROR_LOGDEV" ]; then
+ $DMSETUP_PROG resume error-logtest
+ [ $? -ne 0 ] && _fail "failed to resume error-logtest"
+ fi
+
+ if [ -n "$NON_ERROR_RTDEV" ]; then
+ $DMSETUP_PROG resume error-rttest
+ [ $? -ne 0 ] && _fail "failed to resume error-rttest"
+ fi
+
$DMSETUP_PROG resume error-test
resume_res=$?
@@ -85,12 +196,47 @@ _dmerror_load_working_table()
suspend_opt="$*"
fi
+ # 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 error-test
[ $? -ne 0 ] && _fail "dmsetup suspend failed"
+ if [ -n "$NON_ERROR_RTDEV" ]; then
+ $DMSETUP_PROG suspend $suspend_opt error-rttest
+ [ $? -ne 0 ] && _fail "failed to suspend error-rttest"
+ fi
+
+ if [ -n "$NON_ERROR_LOGDEV" ]; then
+ $DMSETUP_PROG suspend $suspend_opt error-logtest
+ [ $? -ne 0 ] && _fail "failed to suspend error-logtest"
+ fi
+
+ # Load new table
$DMSETUP_PROG load error-test --table "$DMLINEAR_TABLE"
load_res=$?
+ if [ -n "$NON_ERROR_RTDEV" ]; then
+ $DMSETUP_PROG load error-rttest --table "$DMLINEAR_RTTABLE"
+ [ $? -ne 0 ] && _fail "failed to load working table into error-rttest"
+ fi
+
+ if [ -n "$NON_ERROR_LOGDEV" ]; then
+ $DMSETUP_PROG load error-logtest --table "$DMLINEAR_LOGTABLE"
+ [ $? -ne 0 ] && _fail "failed to load working table into error-logtest"
+ fi
+
+ # Resume devices in the opposite order that we suspended them.
+ if [ -n "$NON_ERROR_LOGDEV" ]; then
+ $DMSETUP_PROG resume error-logtest
+ [ $? -ne 0 ] && _fail "failed to resume error-logtest"
+ fi
+
+ if [ -n "$NON_ERROR_RTDEV" ]; then
+ $DMSETUP_PROG resume error-rttest
+ [ $? -ne 0 ] && _fail "failed to resume error-rttest"
+ fi
+
$DMSETUP_PROG resume error-test
resume_res=$?
@@ -157,20 +303,36 @@ __dmerror_recreate_map()
# Update the dm error table so that the range (start, len) maps to the
# preferred dm target, overriding anything that maps to the implied dm target.
# This assumes that the only desired targets for this dm device are the
-# preferred and and implied targets.
+# preferred and and implied targets. The fifth argument is the scratch device
+# that we want to change the table for.
__dmerror_change()
{
local start="$1"
local len="$2"
local preferred_tgt="$3"
local implied_tgt="$4"
+ local whichdev="$5"
+ test -z "$whichdev" && whichdev="$SCRATCH_DEV"
- DMERROR_TABLE="$( (echo "$DMERROR_TABLE"; echo "$start $len $preferred_tgt") | \
+ case "$whichdev" in
+ "$SCRATCH_DEV") old_table="$DMERROR_TABLE";;
+ "$NON_ERROR_LOGDEV") old_table="$DMERROR_LOGTABLE";;
+ "$NON_ERROR_RTDEV") old_table="$DMERROR_RTTABLE";;
+ *) echo "$whichdev: Unknown dmerror device."; return;;
+ esac
+
+ new_table="$( (echo "$old_table"; echo "$start $len $preferred_tgt") | \
awk -v type="$preferred_tgt" '{if ($3 == type) print $0;}' | \
sort -g | \
__dmerror_combine_extents | \
- __dmerror_recreate_map "$SCRATCH_DEV" "$preferred_tgt" \
+ __dmerror_recreate_map "$whichdev" "$preferred_tgt" \
"$implied_tgt" )"
+
+ case "$whichdev" in
+ "$SCRATCH_DEV") DMERROR_TABLE="$new_table";;
+ "$NON_ERROR_LOGDEV") DMERROR_LOGTABLE="$new_table";;
+ "$NON_ERROR_RTDEV") DMERROR_RTTABLE="$new_table";;
+ esac
}
# Reset the dm error table to everything ok. The dm device itself must be
@@ -178,6 +340,8 @@ __dmerror_change()
_dmerror_reset_table()
{
DMERROR_TABLE="$DMLINEAR_TABLE"
+ DMERROR_LOGTABLE="$DMLINEAR_LOGTABLE"
+ DMERROR_RTTABLE="$DMLINEAR_RTTABLE"
}
# Update the dm error table so that IOs to the given range will return EIO.
@@ -186,8 +350,9 @@ _dmerror_mark_range_bad()
{
local start="$1"
local len="$2"
+ local dev="$3"
- __dmerror_change "$start" "$len" error linear
+ __dmerror_change "$start" "$len" error linear "$dev"
}
# Update the dm error table so that IOs to the given range will succeed.
@@ -196,6 +361,7 @@ _dmerror_mark_range_good()
{
local start="$1"
local len="$2"
+ local dev="$3"
- __dmerror_change "$start" "$len" linear error
+ __dmerror_change "$start" "$len" linear error "$dev"
}
diff --git a/tests/generic/441 b/tests/generic/441
index 0ec751da..85f29a3a 100755
--- a/tests/generic/441
+++ b/tests/generic/441
@@ -52,7 +52,7 @@ unset SCRATCH_RTDEV
echo "Format and mount"
_scratch_mkfs > $seqres.full 2>&1
-_dmerror_init
+_dmerror_init no_log
_dmerror_mount
_require_fs_space $SCRATCH_MNT 65536
diff --git a/tests/generic/487 b/tests/generic/487
index fda8828d..3c9b2233 100755
--- a/tests/generic/487
+++ b/tests/generic/487
@@ -45,7 +45,7 @@ unset SCRATCH_RTDEV
echo "Format and mount"
_scratch_mkfs > $seqres.full 2>&1
-_dmerror_init
+_dmerror_init no_log
_dmerror_mount
datalen=65536
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 3/3] dmflakey: support external log and realtime devices
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
0 siblings, 1 reply; 7+ messages in thread
From: Eryu Guan @ 2021-08-08 15:27 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: guaneryu, linux-xfs, fstests, tytso
On Mon, Jul 19, 2021 at 06:09:19PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Upgrade the dmerror code to coordinate making external scratch log and
> scratch realtime devices error out along with the scratch device. Note
> that unlike SCRATCH_DEV, we save the old rt/log devices in a separate
> variable and overwrite SCRATCH_{RT,LOG}DEV so that all the helper
> functions continue to work properly.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This patch doesn't apply, seems like it's depending on context that
isn't upstreamed yet. I checked your branch and found that we're missing
patch "xfs: test xfs_scrub phase 6 media error reporting"
The patch in question has been posted for review in Mar., but it seems
it has some unresolved comments and has never been merged..
The first two patches look fine to me, and I'm taking them for this
update.
Thanks,
Eryu
>
> Upgrade the dmerror code to coordinate making external scratch log and
> scratch realtime devices error out along with the scratch device.
> Note
> that unlike SCRATCH_DEV, we save the old rt/log devices in a separate
> variable and overwrite SCRATCH_{RT,LOG}DEV so that all the helper
> functions continue to work properly.
>
> ---
> common/dmerror | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++---
> tests/generic/441 | 2 -
> tests/generic/487 | 2 -
> 3 files changed, 178 insertions(+), 12 deletions(-)
>
>
> diff --git a/common/dmerror b/common/dmerror
> index 7f6800c0..03f3fd97 100644
> --- a/common/dmerror
> +++ b/common/dmerror
> @@ -4,30 +4,94 @@
> #
> # common functions for setting up and tearing down a dmerror device
>
> +_dmerror_setup_vars()
> +{
> + local backing_dev="$1"
> + local tag="$2"
> + local target="$3"
> +
> + test -z "$target" && target=error
> + local blk_dev_size=$(blockdev --getsz "$backing_dev")
> +
> + eval export "DMLINEAR_${tag}TABLE=\"0 $blk_dev_size linear $backing_dev 0\""
> + eval export "DMERROR_${tag}TABLE=\"0 $blk_dev_size $target $backing_dev 0\""
> +}
> +
> _dmerror_setup()
> {
> - local dm_backing_dev=$SCRATCH_DEV
> + local rt_target=
> + local linear_target=
>
> - local blk_dev_size=`blockdev --getsz $dm_backing_dev`
> + for arg in "$@"; do
> + case "${arg}" in
> + no_rt) rt_target=linear;;
> + no_log) log_target=linear;;
> + *) echo "${arg}: Unknown _dmerror_setup arg.";;
> + esac
> + done
>
> + # Scratch device
> export DMERROR_DEV='/dev/mapper/error-test'
> + _dmerror_setup_vars $SCRATCH_DEV
>
> - export DMLINEAR_TABLE="0 $blk_dev_size linear $dm_backing_dev 0"
> + # Realtime device. We reassign SCRATCH_RTDEV so that all the scratch
> + # helpers continue to work unmodified.
> + if [ -n "$SCRATCH_RTDEV" ]; then
> + if [ -z "$NON_ERROR_RTDEV" ]; then
> + # Set up the device switch
> + local dm_backing_dev=$SCRATCH_RTDEV
> + export NON_ERROR_RTDEV="$SCRATCH_RTDEV"
> + SCRATCH_RTDEV='/dev/mapper/error-rttest'
> + else
> + # Already set up; recreate tables
> + local dm_backing_dev="$NON_ERROR_RTDEV"
> + fi
>
> - export DMERROR_TABLE="0 $blk_dev_size error $dm_backing_dev 0"
> + _dmerror_setup_vars $dm_backing_dev RT $rt_target
> + fi
> +
> + # External log device. We reassign SCRATCH_LOGDEV so that all the
> + # scratch helpers continue to work unmodified.
> + if [ -n "$SCRATCH_LOGDEV" ]; then
> + if [ -z "$NON_ERROR_LOGDEV" ]; then
> + # Set up the device switch
> + local dm_backing_dev=$SCRATCH_LOGDEV
> + export NON_ERROR_LOGDEV="$SCRATCH_LOGDEV"
> + SCRATCH_LOGDEV='/dev/mapper/error-logtest'
> + else
> + # Already set up; recreate tables
> + local dm_backing_dev="$NON_ERROR_LOGDEV"
> + fi
> +
> + _dmerror_setup_vars $dm_backing_dev LOG $log_target
> + fi
> }
>
> _dmerror_init()
> {
> - _dmerror_setup
> + _dmerror_setup "$@"
> +
> _dmsetup_remove error-test
> _dmsetup_create error-test --table "$DMLINEAR_TABLE" || \
> _fatal "failed to create dm linear device"
> +
> + if [ -n "$NON_ERROR_RTDEV" ]; then
> + _dmsetup_remove error-rttest
> + _dmsetup_create error-rttest --table "$DMLINEAR_RTTABLE" || \
> + _fatal "failed to create dm linear rt device"
> + fi
> +
> + if [ -n "$NON_ERROR_LOGDEV" ]; then
> + _dmsetup_remove error-logtest
> + _dmsetup_create error-logtest --table "$DMLINEAR_LOGTABLE" || \
> + _fatal "failed to create dm linear log device"
> + fi
> }
>
> _dmerror_mount()
> {
> _scratch_options mount
> +
> $MOUNT_PROG -t $FSTYP `_common_dev_mount_options $*` $SCRATCH_OPTIONS \
> $DMERROR_DEV $SCRATCH_MNT
> }
> @@ -39,11 +103,23 @@ _dmerror_unmount()
>
> _dmerror_cleanup()
> {
> + test -n "$NON_ERROR_LOGDEV" && $DMSETUP_PROG resume error-logtest &>/dev/null
> + test -n "$NON_ERROR_RTDEV" && $DMSETUP_PROG resume error-rttest &>/dev/null
> $DMSETUP_PROG resume error-test > /dev/null 2>&1
> +
> $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
> +
> + test -n "$NON_ERROR_LOGDEV" && _dmsetup_remove error-logtest
> + test -n "$NON_ERROR_RTDEV" && _dmsetup_remove error-rttest
> _dmsetup_remove error-test
>
> unset DMERROR_DEV DMLINEAR_TABLE DMERROR_TABLE
> +
> + SCRATCH_LOGDEV="$NON_ERROR_LOGDEV"
> + unset NON_ERROR_LOGDEV DMLINEAR_LOGTABLE DMERROR_LOGTABLE
> +
> + SCRATCH_RTDEV="$NON_ERROR_RTDEV"
> + unset NON_ERROR_RTDEV DMLINEAR_RTTABLE DMERROR_RTTABLE
> }
>
> _dmerror_load_error_table()
> @@ -59,12 +135,47 @@ _dmerror_load_error_table()
> suspend_opt="$*"
> fi
>
> + # 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 error-test
> [ $? -ne 0 ] && _fail "dmsetup suspend failed"
>
> + if [ -n "$NON_ERROR_RTDEV" ]; then
> + $DMSETUP_PROG suspend $suspend_opt error-rttest
> + [ $? -ne 0 ] && _fail "failed to suspend error-rttest"
> + fi
> +
> + if [ -n "$NON_ERROR_LOGDEV" ]; then
> + $DMSETUP_PROG suspend $suspend_opt error-logtest
> + [ $? -ne 0 ] && _fail "failed to suspend error-logtest"
> + fi
> +
> + # Load new table
> echo "$DMERROR_TABLE" | $DMSETUP_PROG load error-test
> load_res=$?
>
> + if [ -n "$NON_ERROR_RTDEV" ]; then
> + $DMSETUP_PROG load error-rttest --table "$DMERROR_RTTABLE"
> + [ $? -ne 0 ] && _fail "failed to load error table into error-rttest"
> + fi
> +
> + if [ -n "$NON_ERROR_LOGDEV" ]; then
> + $DMSETUP_PROG load error-logtest --table "$DMERROR_LOGTABLE"
> + [ $? -ne 0 ] && _fail "failed to load error table into error-logtest"
> + fi
> +
> + # Resume devices in the opposite order that we suspended them.
> + if [ -n "$NON_ERROR_LOGDEV" ]; then
> + $DMSETUP_PROG resume error-logtest
> + [ $? -ne 0 ] && _fail "failed to resume error-logtest"
> + fi
> +
> + if [ -n "$NON_ERROR_RTDEV" ]; then
> + $DMSETUP_PROG resume error-rttest
> + [ $? -ne 0 ] && _fail "failed to resume error-rttest"
> + fi
> +
> $DMSETUP_PROG resume error-test
> resume_res=$?
>
> @@ -85,12 +196,47 @@ _dmerror_load_working_table()
> suspend_opt="$*"
> fi
>
> + # 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 error-test
> [ $? -ne 0 ] && _fail "dmsetup suspend failed"
>
> + if [ -n "$NON_ERROR_RTDEV" ]; then
> + $DMSETUP_PROG suspend $suspend_opt error-rttest
> + [ $? -ne 0 ] && _fail "failed to suspend error-rttest"
> + fi
> +
> + if [ -n "$NON_ERROR_LOGDEV" ]; then
> + $DMSETUP_PROG suspend $suspend_opt error-logtest
> + [ $? -ne 0 ] && _fail "failed to suspend error-logtest"
> + fi
> +
> + # Load new table
> $DMSETUP_PROG load error-test --table "$DMLINEAR_TABLE"
> load_res=$?
>
> + if [ -n "$NON_ERROR_RTDEV" ]; then
> + $DMSETUP_PROG load error-rttest --table "$DMLINEAR_RTTABLE"
> + [ $? -ne 0 ] && _fail "failed to load working table into error-rttest"
> + fi
> +
> + if [ -n "$NON_ERROR_LOGDEV" ]; then
> + $DMSETUP_PROG load error-logtest --table "$DMLINEAR_LOGTABLE"
> + [ $? -ne 0 ] && _fail "failed to load working table into error-logtest"
> + fi
> +
> + # Resume devices in the opposite order that we suspended them.
> + if [ -n "$NON_ERROR_LOGDEV" ]; then
> + $DMSETUP_PROG resume error-logtest
> + [ $? -ne 0 ] && _fail "failed to resume error-logtest"
> + fi
> +
> + if [ -n "$NON_ERROR_RTDEV" ]; then
> + $DMSETUP_PROG resume error-rttest
> + [ $? -ne 0 ] && _fail "failed to resume error-rttest"
> + fi
> +
> $DMSETUP_PROG resume error-test
> resume_res=$?
>
> @@ -157,20 +303,36 @@ __dmerror_recreate_map()
> # Update the dm error table so that the range (start, len) maps to the
> # preferred dm target, overriding anything that maps to the implied dm target.
> # This assumes that the only desired targets for this dm device are the
> -# preferred and and implied targets.
> +# preferred and and implied targets. The fifth argument is the scratch device
> +# that we want to change the table for.
> __dmerror_change()
> {
> local start="$1"
> local len="$2"
> local preferred_tgt="$3"
> local implied_tgt="$4"
> + local whichdev="$5"
> + test -z "$whichdev" && whichdev="$SCRATCH_DEV"
>
> - DMERROR_TABLE="$( (echo "$DMERROR_TABLE"; echo "$start $len $preferred_tgt") | \
> + case "$whichdev" in
> + "$SCRATCH_DEV") old_table="$DMERROR_TABLE";;
> + "$NON_ERROR_LOGDEV") old_table="$DMERROR_LOGTABLE";;
> + "$NON_ERROR_RTDEV") old_table="$DMERROR_RTTABLE";;
> + *) echo "$whichdev: Unknown dmerror device."; return;;
> + esac
> +
> + new_table="$( (echo "$old_table"; echo "$start $len $preferred_tgt") | \
> awk -v type="$preferred_tgt" '{if ($3 == type) print $0;}' | \
> sort -g | \
> __dmerror_combine_extents | \
> - __dmerror_recreate_map "$SCRATCH_DEV" "$preferred_tgt" \
> + __dmerror_recreate_map "$whichdev" "$preferred_tgt" \
> "$implied_tgt" )"
> +
> + case "$whichdev" in
> + "$SCRATCH_DEV") DMERROR_TABLE="$new_table";;
> + "$NON_ERROR_LOGDEV") DMERROR_LOGTABLE="$new_table";;
> + "$NON_ERROR_RTDEV") DMERROR_RTTABLE="$new_table";;
> + esac
> }
>
> # Reset the dm error table to everything ok. The dm device itself must be
> @@ -178,6 +340,8 @@ __dmerror_change()
> _dmerror_reset_table()
> {
> DMERROR_TABLE="$DMLINEAR_TABLE"
> + DMERROR_LOGTABLE="$DMLINEAR_LOGTABLE"
> + DMERROR_RTTABLE="$DMLINEAR_RTTABLE"
> }
>
> # Update the dm error table so that IOs to the given range will return EIO.
> @@ -186,8 +350,9 @@ _dmerror_mark_range_bad()
> {
> local start="$1"
> local len="$2"
> + local dev="$3"
>
> - __dmerror_change "$start" "$len" error linear
> + __dmerror_change "$start" "$len" error linear "$dev"
> }
>
> # Update the dm error table so that IOs to the given range will succeed.
> @@ -196,6 +361,7 @@ _dmerror_mark_range_good()
> {
> local start="$1"
> local len="$2"
> + local dev="$3"
>
> - __dmerror_change "$start" "$len" linear error
> + __dmerror_change "$start" "$len" linear error "$dev"
> }
> diff --git a/tests/generic/441 b/tests/generic/441
> index 0ec751da..85f29a3a 100755
> --- a/tests/generic/441
> +++ b/tests/generic/441
> @@ -52,7 +52,7 @@ unset SCRATCH_RTDEV
>
> echo "Format and mount"
> _scratch_mkfs > $seqres.full 2>&1
> -_dmerror_init
> +_dmerror_init no_log
> _dmerror_mount
>
> _require_fs_space $SCRATCH_MNT 65536
> diff --git a/tests/generic/487 b/tests/generic/487
> index fda8828d..3c9b2233 100755
> --- a/tests/generic/487
> +++ b/tests/generic/487
> @@ -45,7 +45,7 @@ unset SCRATCH_RTDEV
>
> echo "Format and mount"
> _scratch_mkfs > $seqres.full 2>&1
> -_dmerror_init
> +_dmerror_init no_log
> _dmerror_mount
>
> datalen=65536
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 3/3] dmflakey: support external log and realtime devices
2021-08-08 15:27 ` Eryu Guan
@ 2021-08-10 4:16 ` Darrick J. Wong
0 siblings, 0 replies; 7+ messages in thread
From: Darrick J. Wong @ 2021-08-10 4:16 UTC (permalink / raw)
To: Eryu Guan; +Cc: guaneryu, linux-xfs, fstests, tytso
On Sun, Aug 08, 2021 at 11:27:39PM +0800, Eryu Guan wrote:
> On Mon, Jul 19, 2021 at 06:09:19PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@kernel.org>
> >
> > Upgrade the dmerror code to coordinate making external scratch log and
> > scratch realtime devices error out along with the scratch device. Note
> > that unlike SCRATCH_DEV, we save the old rt/log devices in a separate
> > variable and overwrite SCRATCH_{RT,LOG}DEV so that all the helper
> > functions continue to work properly.
> >
> > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
>
> This patch doesn't apply, seems like it's depending on context that
> isn't upstreamed yet. I checked your branch and found that we're missing
> patch "xfs: test xfs_scrub phase 6 media error reporting"
>
> The patch in question has been posted for review in Mar., but it seems
> it has some unresolved comments and has never been merged..
>
> The first two patches look fine to me, and I'm taking them for this
> update.
Ok. Thanks for taking the first two; I'll sort out whatever was going
on with the unresolved patch.
--D
>
> Thanks,
> Eryu
>
> >
> > Upgrade the dmerror code to coordinate making external scratch log and
> > scratch realtime devices error out along with the scratch device.
> > Note
> > that unlike SCRATCH_DEV, we save the old rt/log devices in a separate
> > variable and overwrite SCRATCH_{RT,LOG}DEV so that all the helper
> > functions continue to work properly.
> >
> > ---
> > common/dmerror | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++---
> > tests/generic/441 | 2 -
> > tests/generic/487 | 2 -
> > 3 files changed, 178 insertions(+), 12 deletions(-)
> >
> >
> > diff --git a/common/dmerror b/common/dmerror
> > index 7f6800c0..03f3fd97 100644
> > --- a/common/dmerror
> > +++ b/common/dmerror
> > @@ -4,30 +4,94 @@
> > #
> > # common functions for setting up and tearing down a dmerror device
> >
> > +_dmerror_setup_vars()
> > +{
> > + local backing_dev="$1"
> > + local tag="$2"
> > + local target="$3"
> > +
> > + test -z "$target" && target=error
> > + local blk_dev_size=$(blockdev --getsz "$backing_dev")
> > +
> > + eval export "DMLINEAR_${tag}TABLE=\"0 $blk_dev_size linear $backing_dev 0\""
> > + eval export "DMERROR_${tag}TABLE=\"0 $blk_dev_size $target $backing_dev 0\""
> > +}
> > +
> > _dmerror_setup()
> > {
> > - local dm_backing_dev=$SCRATCH_DEV
> > + local rt_target=
> > + local linear_target=
> >
> > - local blk_dev_size=`blockdev --getsz $dm_backing_dev`
> > + for arg in "$@"; do
> > + case "${arg}" in
> > + no_rt) rt_target=linear;;
> > + no_log) log_target=linear;;
> > + *) echo "${arg}: Unknown _dmerror_setup arg.";;
> > + esac
> > + done
> >
> > + # Scratch device
> > export DMERROR_DEV='/dev/mapper/error-test'
> > + _dmerror_setup_vars $SCRATCH_DEV
> >
> > - export DMLINEAR_TABLE="0 $blk_dev_size linear $dm_backing_dev 0"
> > + # Realtime device. We reassign SCRATCH_RTDEV so that all the scratch
> > + # helpers continue to work unmodified.
> > + if [ -n "$SCRATCH_RTDEV" ]; then
> > + if [ -z "$NON_ERROR_RTDEV" ]; then
> > + # Set up the device switch
> > + local dm_backing_dev=$SCRATCH_RTDEV
> > + export NON_ERROR_RTDEV="$SCRATCH_RTDEV"
> > + SCRATCH_RTDEV='/dev/mapper/error-rttest'
> > + else
> > + # Already set up; recreate tables
> > + local dm_backing_dev="$NON_ERROR_RTDEV"
> > + fi
> >
> > - export DMERROR_TABLE="0 $blk_dev_size error $dm_backing_dev 0"
> > + _dmerror_setup_vars $dm_backing_dev RT $rt_target
> > + fi
> > +
> > + # External log device. We reassign SCRATCH_LOGDEV so that all the
> > + # scratch helpers continue to work unmodified.
> > + if [ -n "$SCRATCH_LOGDEV" ]; then
> > + if [ -z "$NON_ERROR_LOGDEV" ]; then
> > + # Set up the device switch
> > + local dm_backing_dev=$SCRATCH_LOGDEV
> > + export NON_ERROR_LOGDEV="$SCRATCH_LOGDEV"
> > + SCRATCH_LOGDEV='/dev/mapper/error-logtest'
> > + else
> > + # Already set up; recreate tables
> > + local dm_backing_dev="$NON_ERROR_LOGDEV"
> > + fi
> > +
> > + _dmerror_setup_vars $dm_backing_dev LOG $log_target
> > + fi
> > }
> >
> > _dmerror_init()
> > {
> > - _dmerror_setup
> > + _dmerror_setup "$@"
> > +
> > _dmsetup_remove error-test
> > _dmsetup_create error-test --table "$DMLINEAR_TABLE" || \
> > _fatal "failed to create dm linear device"
> > +
> > + if [ -n "$NON_ERROR_RTDEV" ]; then
> > + _dmsetup_remove error-rttest
> > + _dmsetup_create error-rttest --table "$DMLINEAR_RTTABLE" || \
> > + _fatal "failed to create dm linear rt device"
> > + fi
> > +
> > + if [ -n "$NON_ERROR_LOGDEV" ]; then
> > + _dmsetup_remove error-logtest
> > + _dmsetup_create error-logtest --table "$DMLINEAR_LOGTABLE" || \
> > + _fatal "failed to create dm linear log device"
> > + fi
> > }
> >
> > _dmerror_mount()
> > {
> > _scratch_options mount
> > +
> > $MOUNT_PROG -t $FSTYP `_common_dev_mount_options $*` $SCRATCH_OPTIONS \
> > $DMERROR_DEV $SCRATCH_MNT
> > }
> > @@ -39,11 +103,23 @@ _dmerror_unmount()
> >
> > _dmerror_cleanup()
> > {
> > + test -n "$NON_ERROR_LOGDEV" && $DMSETUP_PROG resume error-logtest &>/dev/null
> > + test -n "$NON_ERROR_RTDEV" && $DMSETUP_PROG resume error-rttest &>/dev/null
> > $DMSETUP_PROG resume error-test > /dev/null 2>&1
> > +
> > $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
> > +
> > + test -n "$NON_ERROR_LOGDEV" && _dmsetup_remove error-logtest
> > + test -n "$NON_ERROR_RTDEV" && _dmsetup_remove error-rttest
> > _dmsetup_remove error-test
> >
> > unset DMERROR_DEV DMLINEAR_TABLE DMERROR_TABLE
> > +
> > + SCRATCH_LOGDEV="$NON_ERROR_LOGDEV"
> > + unset NON_ERROR_LOGDEV DMLINEAR_LOGTABLE DMERROR_LOGTABLE
> > +
> > + SCRATCH_RTDEV="$NON_ERROR_RTDEV"
> > + unset NON_ERROR_RTDEV DMLINEAR_RTTABLE DMERROR_RTTABLE
> > }
> >
> > _dmerror_load_error_table()
> > @@ -59,12 +135,47 @@ _dmerror_load_error_table()
> > suspend_opt="$*"
> > fi
> >
> > + # 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 error-test
> > [ $? -ne 0 ] && _fail "dmsetup suspend failed"
> >
> > + if [ -n "$NON_ERROR_RTDEV" ]; then
> > + $DMSETUP_PROG suspend $suspend_opt error-rttest
> > + [ $? -ne 0 ] && _fail "failed to suspend error-rttest"
> > + fi
> > +
> > + if [ -n "$NON_ERROR_LOGDEV" ]; then
> > + $DMSETUP_PROG suspend $suspend_opt error-logtest
> > + [ $? -ne 0 ] && _fail "failed to suspend error-logtest"
> > + fi
> > +
> > + # Load new table
> > echo "$DMERROR_TABLE" | $DMSETUP_PROG load error-test
> > load_res=$?
> >
> > + if [ -n "$NON_ERROR_RTDEV" ]; then
> > + $DMSETUP_PROG load error-rttest --table "$DMERROR_RTTABLE"
> > + [ $? -ne 0 ] && _fail "failed to load error table into error-rttest"
> > + fi
> > +
> > + if [ -n "$NON_ERROR_LOGDEV" ]; then
> > + $DMSETUP_PROG load error-logtest --table "$DMERROR_LOGTABLE"
> > + [ $? -ne 0 ] && _fail "failed to load error table into error-logtest"
> > + fi
> > +
> > + # Resume devices in the opposite order that we suspended them.
> > + if [ -n "$NON_ERROR_LOGDEV" ]; then
> > + $DMSETUP_PROG resume error-logtest
> > + [ $? -ne 0 ] && _fail "failed to resume error-logtest"
> > + fi
> > +
> > + if [ -n "$NON_ERROR_RTDEV" ]; then
> > + $DMSETUP_PROG resume error-rttest
> > + [ $? -ne 0 ] && _fail "failed to resume error-rttest"
> > + fi
> > +
> > $DMSETUP_PROG resume error-test
> > resume_res=$?
> >
> > @@ -85,12 +196,47 @@ _dmerror_load_working_table()
> > suspend_opt="$*"
> > fi
> >
> > + # 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 error-test
> > [ $? -ne 0 ] && _fail "dmsetup suspend failed"
> >
> > + if [ -n "$NON_ERROR_RTDEV" ]; then
> > + $DMSETUP_PROG suspend $suspend_opt error-rttest
> > + [ $? -ne 0 ] && _fail "failed to suspend error-rttest"
> > + fi
> > +
> > + if [ -n "$NON_ERROR_LOGDEV" ]; then
> > + $DMSETUP_PROG suspend $suspend_opt error-logtest
> > + [ $? -ne 0 ] && _fail "failed to suspend error-logtest"
> > + fi
> > +
> > + # Load new table
> > $DMSETUP_PROG load error-test --table "$DMLINEAR_TABLE"
> > load_res=$?
> >
> > + if [ -n "$NON_ERROR_RTDEV" ]; then
> > + $DMSETUP_PROG load error-rttest --table "$DMLINEAR_RTTABLE"
> > + [ $? -ne 0 ] && _fail "failed to load working table into error-rttest"
> > + fi
> > +
> > + if [ -n "$NON_ERROR_LOGDEV" ]; then
> > + $DMSETUP_PROG load error-logtest --table "$DMLINEAR_LOGTABLE"
> > + [ $? -ne 0 ] && _fail "failed to load working table into error-logtest"
> > + fi
> > +
> > + # Resume devices in the opposite order that we suspended them.
> > + if [ -n "$NON_ERROR_LOGDEV" ]; then
> > + $DMSETUP_PROG resume error-logtest
> > + [ $? -ne 0 ] && _fail "failed to resume error-logtest"
> > + fi
> > +
> > + if [ -n "$NON_ERROR_RTDEV" ]; then
> > + $DMSETUP_PROG resume error-rttest
> > + [ $? -ne 0 ] && _fail "failed to resume error-rttest"
> > + fi
> > +
> > $DMSETUP_PROG resume error-test
> > resume_res=$?
> >
> > @@ -157,20 +303,36 @@ __dmerror_recreate_map()
> > # Update the dm error table so that the range (start, len) maps to the
> > # preferred dm target, overriding anything that maps to the implied dm target.
> > # This assumes that the only desired targets for this dm device are the
> > -# preferred and and implied targets.
> > +# preferred and and implied targets. The fifth argument is the scratch device
> > +# that we want to change the table for.
> > __dmerror_change()
> > {
> > local start="$1"
> > local len="$2"
> > local preferred_tgt="$3"
> > local implied_tgt="$4"
> > + local whichdev="$5"
> > + test -z "$whichdev" && whichdev="$SCRATCH_DEV"
> >
> > - DMERROR_TABLE="$( (echo "$DMERROR_TABLE"; echo "$start $len $preferred_tgt") | \
> > + case "$whichdev" in
> > + "$SCRATCH_DEV") old_table="$DMERROR_TABLE";;
> > + "$NON_ERROR_LOGDEV") old_table="$DMERROR_LOGTABLE";;
> > + "$NON_ERROR_RTDEV") old_table="$DMERROR_RTTABLE";;
> > + *) echo "$whichdev: Unknown dmerror device."; return;;
> > + esac
> > +
> > + new_table="$( (echo "$old_table"; echo "$start $len $preferred_tgt") | \
> > awk -v type="$preferred_tgt" '{if ($3 == type) print $0;}' | \
> > sort -g | \
> > __dmerror_combine_extents | \
> > - __dmerror_recreate_map "$SCRATCH_DEV" "$preferred_tgt" \
> > + __dmerror_recreate_map "$whichdev" "$preferred_tgt" \
> > "$implied_tgt" )"
> > +
> > + case "$whichdev" in
> > + "$SCRATCH_DEV") DMERROR_TABLE="$new_table";;
> > + "$NON_ERROR_LOGDEV") DMERROR_LOGTABLE="$new_table";;
> > + "$NON_ERROR_RTDEV") DMERROR_RTTABLE="$new_table";;
> > + esac
> > }
> >
> > # Reset the dm error table to everything ok. The dm device itself must be
> > @@ -178,6 +340,8 @@ __dmerror_change()
> > _dmerror_reset_table()
> > {
> > DMERROR_TABLE="$DMLINEAR_TABLE"
> > + DMERROR_LOGTABLE="$DMLINEAR_LOGTABLE"
> > + DMERROR_RTTABLE="$DMLINEAR_RTTABLE"
> > }
> >
> > # Update the dm error table so that IOs to the given range will return EIO.
> > @@ -186,8 +350,9 @@ _dmerror_mark_range_bad()
> > {
> > local start="$1"
> > local len="$2"
> > + local dev="$3"
> >
> > - __dmerror_change "$start" "$len" error linear
> > + __dmerror_change "$start" "$len" error linear "$dev"
> > }
> >
> > # Update the dm error table so that IOs to the given range will succeed.
> > @@ -196,6 +361,7 @@ _dmerror_mark_range_good()
> > {
> > local start="$1"
> > local len="$2"
> > + local dev="$3"
> >
> > - __dmerror_change "$start" "$len" linear error
> > + __dmerror_change "$start" "$len" linear error "$dev"
> > }
> > diff --git a/tests/generic/441 b/tests/generic/441
> > index 0ec751da..85f29a3a 100755
> > --- a/tests/generic/441
> > +++ b/tests/generic/441
> > @@ -52,7 +52,7 @@ unset SCRATCH_RTDEV
> >
> > echo "Format and mount"
> > _scratch_mkfs > $seqres.full 2>&1
> > -_dmerror_init
> > +_dmerror_init no_log
> > _dmerror_mount
> >
> > _require_fs_space $SCRATCH_MNT 65536
> > diff --git a/tests/generic/487 b/tests/generic/487
> > index fda8828d..3c9b2233 100755
> > --- a/tests/generic/487
> > +++ b/tests/generic/487
> > @@ -45,7 +45,7 @@ unset SCRATCH_RTDEV
> >
> > echo "Format and mount"
> > _scratch_mkfs > $seqres.full 2>&1
> > -_dmerror_init
> > +_dmerror_init no_log
> > _dmerror_mount
> >
> > datalen=65536
^ permalink raw reply [flat|nested] 7+ messages in thread
* 2020 NYE Patchbomb Guide!
@ 2020-12-31 22:38 Darrick J. Wong
2020-12-31 22:48 ` [PATCHSET 0/3] common/dm*: support external log and rt devices Darrick J. Wong
0 siblings, 1 reply; 7+ messages in thread
From: Darrick J. Wong @ 2020-12-31 22:38 UTC (permalink / raw)
To: xfs
Hi folks,
It's still the last day of 2020 in the US/Pacific timezone, which means
it's time for me to patchbomb every new feature that's been sitting
around in my development trees!
Once a year I like to dump everything into the public archives to
increase XFS' bus factor. However, there are 660 patches and 46 cover
letters across my three development trees, so this year I'm only sending
the guide and the cover letters.
Just like last year, this guide lists each feature branch that's merged
into the development tree, along with some notes to help readers figure
out the real dependencies between branches.
If you want to try out this code, you /really/ should pull from
kernel.org:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-documentation.git
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git
==============
The kernel tree contains the following branches:
pwork-parallelism ("xfs: increase pwork parallelism")
Single patch to increase parallelism of background threads to handle
high-iops storage. At this point in the branch the only piece to need
this is quotacheck, and I haven't been able to show that parallel
quotacheck is any faster due to the bottlenecks shifting to memory
reclaim, but deferred inode inactivation will want this.
scrub-fixes ("xfs: more scrub fixes")
The usual pile of bug fixes and verification strengthening for scrub.
reflink-speedups ("xfs: fix reflink inefficiencies")
This independent series cleans up some warts with bunmapi when reflink
is enabled, since we've now restructured various shortcomings in the
defer ops code and the log that made some dirty hacks unnecessary.
repair-reap-fixes ("xfs: fix online repair block reaping")
repair-bitmap-rework ("xfs: rework online repair incore bitmap")
repair-prep-for-bulk-loading ("xfs: prepare repair for bulk loading")
scrub-rtsummary ("xfs: online scrubbing of realtime summary files")
repair-ag-btrees ("xfs: online repair of AG btrees")
repair-inodes ("xfs: online repair of inodes and extent maps")
repair-quota ("xfs: online repair of quota and counters")
corruption-health-reports ("xfs: report corruption to the health trackers")
Here's the first part of online filesystem repair. Since last year,
we've landed the btree bulk loading code, which shortened this story
arc by one. However, I've also added the ability to check the realtime
summary metadata, and strengthened the rebuilder code to check the
sanity of the records it collects during a rebuild process.
reclaim-space-harder ("xfs: try harder to reclaim space when we run out")
eofblocks-consolidation ("xfs: consolidate posteof and cowblocks cleanup")
deferred-inactivation ("xfs: deferred inode inactivation")
I think I'll send these three branches for the next kernel. The third
branch implements deferred inode inactivation, which is to say that we
move all file deletion activities to background threads. This makes
unlink calls return to userspace faster and should speed up mass
deletions since we now process inodes in disk order instead of deletion
order. The first series makes ENOSPC space reclamation push the
filesystem harder so that it will behave the same after we push inode
inactivation to a background workqueue. The second series combines
garbage collection of speculative post-EOF blocks and COW extents into a
single piece of code so that we can free up one radix tree tag bit.
(None of this code require online repair...)
indirect-health-reporting ("xfs: indirect health reporting")
This series improves the metadata health reporting system so that it can
remember health problems for principal filesystem objects whose incore
representations had to be reclaimed. In other words, the per-AG state
can remember the fact that an inode in that AG had problems, even if we
have to reclaim the xfs_inode for that broken file.
repair-hard-problems ("xfs: online repair hard problems")
This branch contains harder repair problems, namely the ones that
require full filesystem scans. These scans depend upon being able to
shut down background operations temporarily, which is we need deferred
inode inactivation (and part 1 of online repair) to solve these
problems.
realtime-bmap-intents ("xfs: widen BUI formats to support rt")
expand-bmap-intent-usage ("xfs: support attrfork and unwritten BUIs")
atomic-file-updates ("xfs: atomic file updates")
A key part of the third installment of online filesystem repair will be
the ability to switch the contents of xattrs, directories, rt metadata,
and symbolic links atomically. For this, I developed a new high-level
log operation to swap the extents of any two file forks and to resume
the swap even if the system goes down during the operation. I also
wired this up to a userspace ioctl so that user programs can commit file
content updates atomically.
repair-rtsummary ("xfs: online repair of realtime summaries")
repair-xattrs ("xfs: online repair of extended attributes")
repair-dirs ("xfs: online repair of directories")
This third piece of online filesystem repair builds upon the atomic
extent swap in the previous batch. It enables us to rebuild file-based
metadata.
inode-refactor ("xfs: hoist inode operations to libxfs")
metadir ("xfs: metadata inode directories")
The first branch in this series hoists all the inode allocation and
freeing code to libxfs so that the second series can create arbitrary
directory trees for metadata. This will also allow us to refactor all
of the similar but not identical code in userspace so that file
attributes can be inherited in a consistent manner when constructing a
filesystem from a protofile.
btree-ifork-records ("xfs: refactor btrees to support records in inode root")
btree-dynamic-depth ("xfs: support dynamic btree cursor height")
These three branches refactor the generic btree code to support using
inode root areas for btree records, which will be needed for realtime
rmap and reflink.
refactor-rt-locking ("xfs: refactor realtime meta inode locking")
reserve-rt-metadata-space ("xfs: enable in-core block reservation for rt metadata")
Once I started running fstests on rmap/reflink-enabled rt filesystems, I
noticed that I was running into weird deadlocks and space allocation
failure issues that happened with the original rmap and reflink
implementations. The first series refactors locking of rt metadata so
that we can do it in a systematic way, and the second series extends the
per-AG allocation code to work on realtime devices too.
realtime-extfree-intents ("xfs: widen EFI format to support rt")
realtime-rmap ("xfs: realtime reverse-mapping support")
This series uses the metadata directory tree to add reverse mapping
abilities to the realtime device, and using that rmap data to
reconstruct realtime free space metadata. It depends on the six
branches above.
noalloc-ags ("xfs: noalloc allocation groups")
A quick branch I whipped up while exploring online filesystem shrink,
which gives us the ability to prevent allocations in an AG. It doesn't
depend on any of the branches above it; this is just where it landed in
my development tree.
realtime-reflink ("xfs: reflink on the realtime device")
realtime-reflink-extsize ("xfs: reflink with large realtime extents")
This last series uses the metadata directory tree to create a new
refcount btree for the realtime device. With that, we can support
reflink on realtime devices. This requires every branch from
inode-refactor to reserve-rt-metadata-space.
==============
On the xfsprogs side of things, here are some significant branches that
I would like to highlight. The branch groups do not depend on each other.
xfs_db-directory-navigation ("xfs_db: add minimal directory navigation")
This branch adds directory navigation and directory listing abilities to
xfs_db.
needsrepair ("xfs: add the ability to flag a fs for repair")
fs-upgrades ("xfs_admin: support upgrading v5 filesystems")
These two branches enable sysadmins to add (some) new features to
existing V5 filesystems.
repair-rebuild-forks ("xfs_repair: rebuild inode fork mappings")
This branch teaches xfs_repair to rebuild inode fork mappings from rmap
data.
packaging-cleanups ("xfsprogs: packaging cleanups")
bmap-utils ("xfsprogs: file write utility refactoring")
A couple of cleanups for userspace.
scrub-iscan-rebalance ("xfs_scrub: improve balancing of threads for inode scan")
This is a major rework of inode scans in xfs_scrub. The first branch
parallelises inode scans at a finer granularity -- now each worker
thread deals with an inobt record, and not an entire AG. This reduces
the amount of pending scrub work that can stall behind a single large
fragmented file.
xfs-scrub-fixes ("xfs_scrub: second fixes series")
scrub-repair-data-deps ("xfs_scrub: track data dependencies for repairs")
These last two restructure how we track metadata repair activities so
that it is done on a per-fs principal (AGs, inodes) basis instead of
tracking each repair individually. What this means is that we now
preserve ordering dependencies between repair types. That makes us
smart enough not to try to repair a directory if the data bmbt is still
broken.
==============
Finally, here some significant branches awaiting review for fstests:
fuzz-baseline ("xfstests: establish baseline for fuzz tests")
fuzzer-improvements ("xfstests: improve xfs fuzzing")
more-fuzz-testing ("xfstests: strengthen fuzz testing")
In these three branches, I rework the XFS metadata fuzz testing
infrastructure to provide /some/ sort of a baseline golden output, and
to be a bit more systematic about how it reports where it is in a fuzz
process. I also rework the fuzz repair strategies so that they more
closely follow the known reaction cases (no repair at all; online repair
only; offline repair only; and online repair followed by offline repair
if needed).
dmerror-on-rt-devices ("common/dm*: support external log and rt devices")
This makes it so that we can use dmerror and dmflakey for external log
and realtime devices.
With that, I hope you all have a happy new year! See you in 2021!
--D
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCHSET 0/3] common/dm*: support external log and rt devices
2020-12-31 22:38 2020 NYE Patchbomb Guide! Darrick J. Wong
@ 2020-12-31 22:48 ` Darrick J. Wong
0 siblings, 0 replies; 7+ messages in thread
From: Darrick J. Wong @ 2020-12-31 22:48 UTC (permalink / raw)
To: darrick.wong, guaneryu; +Cc: linux-xfs, fstests
Hi all,
There are a growing number of fstests that examine what happens to a
filesystem when the block device underneath it goes offline. Many of
them do this to simulate system crashes, and none of them (outside of
btrfs) can handle filesystems with multiple devices. XFS is one of
those beasts that does, so enhance the dm-error and dm-flakey helpers to
take the log and rt devices offline when they're testing the data
device.
If you're going to start using this mess, you probably ought to just
pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy!
Comments and questions are, as always, welcome.
--D
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=dmerror-on-rt-devices
---
common/dmerror | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++---
common/dmflakey | 106 +++++++++++++++++++++++++++++++++-
tests/generic/250 | 3 -
tests/generic/252 | 3 -
tests/generic/441 | 3 -
tests/generic/484 | 3 -
tests/generic/487 | 3 -
7 files changed, 257 insertions(+), 27 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-08-10 4:16 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-20 1:09 [PATCHSET 0/3] common/dm*: support external log and rt devices Darrick J. Wong
2021-07-20 1:09 ` [PATCH 1/3] dmflakey: support external log and realtime devices Darrick J. Wong
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
-- strict thread matches above, loose matches on Subject: below --
2020-12-31 22:38 2020 NYE Patchbomb Guide! Darrick J. Wong
2020-12-31 22:48 ` [PATCHSET 0/3] common/dm*: support external log and rt devices Darrick J. Wong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.