From: "Darrick J. Wong" <djwong@kernel.org>
To: zlang@redhat.com, Christoph Hellwig <hch@infradead.org>
Cc: fstests@vger.kernel.org, linux-xfs@vger.kernel.org
Subject: [PATCH 15/14] xfs: test xfs_healer can follow private mntns mount moves
Date: Thu, 12 Mar 2026 07:21:30 -0700 [thread overview]
Message-ID: <20260312142130.GG1770774@frogsfrogsfrogs> (raw)
In-Reply-To: <177311403712.1186408.7032564474004561606.stgit@frogsfrogsfrogs>
From: Darrick J. Wong <djwong@kernel.org>
Make sure that when xfs_healer needs to reopen a filesystem to repair
it, it can still find the filesystem even if it has been mount --move'd.
This requires a bunch of private namespace magic.
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
tests/xfs/1904 | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/xfs/1904.out | 3 +
2 files changed, 132 insertions(+)
create mode 100755 tests/xfs/1904
create mode 100755 tests/xfs/1904.out
diff --git a/tests/xfs/1904 b/tests/xfs/1904
new file mode 100755
index 00000000000000..78e8f5dcb0e834
--- /dev/null
+++ b/tests/xfs/1904
@@ -0,0 +1,129 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2026 Oracle. All Rights Reserved.
+#
+# FS QA Test 1904
+#
+# Ensure that autonomous self healing fixes the filesystem correctly even if
+# the original mount has moved somewhere else via --move.
+#
+. ./common/preamble
+_begin_fstest auto selfhealing
+
+. ./common/filter
+. ./common/fuzzy
+. ./common/systemd
+
+if [ -n "$IN_MOUNTNS" ]; then
+ _mount --make-rprivate /
+ findmnt -o TARGET,PROPAGATION >> $seqres.full
+
+ _scratch_mount
+ _scratch_invoke_xfs_healer "$tmp.healer" --repair
+
+ # Move the scratch filesystem to a completely different mountpoint so that
+ # we can test if the healer can find it again.
+ new_dir=$TEST_DIR/moocow
+ mkdir -p $new_dir
+ _mount --move $SCRATCH_MNT $new_dir
+
+ df -t xfs >> $seqres.full
+
+ # Access the broken directory to trigger a repair, then poll the directory
+ # for 5 seconds to see if it gets fixed without us needing to intervene.
+ ls $new_dir/some/victimdir > /dev/null 2> $tmp.err
+ _filter_scratch < $tmp.err | _filter_test_dir
+ try=0
+ while [ $try -lt 50 ] && grep -q 'Structure needs cleaning' $tmp.err; do
+ echo "try $try saw corruption" >> $seqres.full
+ sleep 0.1
+ ls $new_dir/some/victimdir > /dev/null 2> $tmp.err
+ try=$((try + 1))
+ done
+ echo "try $try no longer saw corruption or gave up" >> $seqres.full
+ _filter_scratch < $tmp.err | _filter_test_dir
+
+ # List the dirents of /victimdir to see if it stops reporting corruption
+ ls $new_dir/some/victimdir > /dev/null 2> $tmp.err
+ try=0
+ while [ $try -lt 50 ] && grep -q 'Structure needs cleaning' $tmp.err; do
+ echo "retry $try still saw corruption" >> $seqres.full
+ sleep 0.1
+ ls $SCRATCH_MNT/some/victimdir > /dev/null 2> $tmp.err
+ try=$((try + 1))
+ done
+ echo "retry $try no longer saw corruption or gave up" >> $seqres.full
+
+ new_dir_unmount() {
+ _unmount $new_dir
+ }
+
+ # Unmount to kill the healer
+ _scratch_kill_xfs_healer new_dir_unmount
+ cat $tmp.healer >> $seqres.full
+
+ # No need to clean up, the mount ns destructor will detach the
+ # filesystems for us.
+ exit
+fi
+
+_cleanup()
+{
+ command -v _kill_fsstress &>/dev/null && _kill_fsstress
+ cd /
+ rm -r -f $tmp.*
+ if [ -n "$new_dir" ]; then
+ _unmount "$new_dir" &>/dev/null
+ rm -rf "$new_dir"
+ fi
+}
+
+_require_unshare
+_require_test
+_require_scrub
+_require_xfs_io_command "repair" # online repair support
+_require_xfs_db_command "blocktrash"
+_require_command "$XFS_HEALER_PROG" "xfs_healer"
+_require_command "$XFS_PROPERTY_PROG" "xfs_property"
+_require_scratch
+
+_scratch_mkfs >> $seqres.full
+_scratch_mount
+
+_xfs_has_feature $SCRATCH_MNT rmapbt || \
+ _notrun "reverse mapping required to test directory auto-repair"
+_xfs_has_feature $SCRATCH_MNT parent || \
+ _notrun "parent pointers required to test directory auto-repair"
+_require_xfs_healer $SCRATCH_MNT --repair
+
+# Configure the filesystem for automatic repair of the filesystem.
+$XFS_PROPERTY_PROG $SCRATCH_MNT set autofsck=repair >> $seqres.full
+
+# Create a largeish directory
+dblksz=$(_xfs_get_dir_blocksize "$SCRATCH_MNT")
+echo testdata > $SCRATCH_MNT/a
+mkdir -p "$SCRATCH_MNT/some/victimdir"
+for ((i = 0; i < (dblksz / 255); i++)); do
+ fname="$(printf "%0255d" "$i")"
+ ln $SCRATCH_MNT/a $SCRATCH_MNT/some/victimdir/$fname
+done
+
+# Did we get at least two dir blocks?
+dirsize=$(stat -c '%s' $SCRATCH_MNT/some/victimdir)
+test "$dirsize" -gt "$dblksz" || echo "failed to create two-block directory"
+
+# Break the directory, remount filesystem
+_scratch_unmount
+_scratch_xfs_db -x \
+ -c 'path /some/victimdir' \
+ -c 'bmap' \
+ -c 'dblock 1' \
+ -c 'blocktrash -z -0 -o 0 -x 2048 -y 2048 -n 2048' >> $seqres.full
+
+# mount --move only works if mount propagation is disabled, so we have to start
+# a subshell with a separate mount namespace, disable propagation for the
+# entire directory tree, and only then can we run our tests.
+IN_MOUNTNS=1 unshare -m bash "$0"
+
+status=0
+exit
diff --git a/tests/xfs/1904.out b/tests/xfs/1904.out
new file mode 100755
index 00000000000000..34a46298dd439a
--- /dev/null
+++ b/tests/xfs/1904.out
@@ -0,0 +1,3 @@
+QA output created by 1904
+QA output created by 1904
+ls: reading directory 'TEST_DIR/moocow/some/victimdir': Structure needs cleaning
next prev parent reply other threads:[~2026-03-12 14:21 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-10 3:38 [PATCHBOMB v9] xfsprogs: autonomous self healing of filesystems Darrick J. Wong
2026-03-10 3:42 ` [PATCHSET v9 1/2] fstests: test generic file IO error reporting Darrick J. Wong
2026-03-10 3:50 ` [PATCH 1/1] generic: test fsnotify filesystem " Darrick J. Wong
2026-03-10 7:07 ` Amir Goldstein
2026-03-13 18:01 ` Zorro Lang
2026-03-13 23:27 ` Darrick J. Wong
2026-03-16 9:08 ` Christoph Hellwig
2026-03-16 16:21 ` Darrick J. Wong
2026-03-16 18:40 ` Zorro Lang
2026-03-16 22:16 ` Darrick J. Wong
2026-03-17 3:43 ` Zorro Lang
2026-03-10 3:42 ` [PATCHSET v9 2/2] fstests: autonomous self healing of filesystems Darrick J. Wong
2026-03-10 3:50 ` [PATCH 01/14] xfs: test health monitoring code Darrick J. Wong
2026-03-13 18:18 ` Zorro Lang
2026-03-10 3:50 ` [PATCH 02/14] xfs: test for metadata corruption error reporting via healthmon Darrick J. Wong
2026-03-13 18:35 ` Zorro Lang
2026-03-10 3:50 ` [PATCH 03/14] xfs: test io " Darrick J. Wong
2026-03-13 18:53 ` Zorro Lang
2026-03-10 3:51 ` [PATCH 04/14] xfs: set up common code for testing xfs_healer Darrick J. Wong
2026-03-13 19:04 ` Zorro Lang
2026-03-14 20:37 ` Zorro Lang
2026-03-15 4:51 ` Darrick J. Wong
2026-03-10 3:51 ` [PATCH 05/14] xfs: test xfs_healer's event handling Darrick J. Wong
2026-03-13 19:19 ` Zorro Lang
2026-03-10 3:51 ` [PATCH 06/14] xfs: test xfs_healer can fix a filesystem Darrick J. Wong
2026-03-13 19:28 ` Zorro Lang
2026-03-10 3:51 ` [PATCH 07/14] xfs: test xfs_healer can report file I/O errors Darrick J. Wong
2026-03-13 19:32 ` Zorro Lang
2026-03-10 3:52 ` [PATCH 08/14] xfs: test xfs_healer can report file media errors Darrick J. Wong
2026-03-13 19:36 ` Zorro Lang
2026-03-10 3:52 ` [PATCH 09/14] xfs: test xfs_healer can report filesystem shutdowns Darrick J. Wong
2026-03-13 19:45 ` Zorro Lang
2026-03-10 3:52 ` [PATCH 10/14] xfs: test xfs_healer can initiate full filesystem repairs Darrick J. Wong
2026-03-13 19:48 ` Zorro Lang
2026-03-10 3:52 ` [PATCH 11/14] xfs: test xfs_healer can follow mount moves Darrick J. Wong
2026-03-13 19:39 ` Zorro Lang
2026-03-10 3:53 ` [PATCH 12/14] xfs: test xfs_healer wont repair the wrong filesystem Darrick J. Wong
2026-03-13 19:53 ` Zorro Lang
2026-03-10 3:53 ` [PATCH 13/14] xfs: test xfs_healer background service Darrick J. Wong
2026-03-13 19:56 ` Zorro Lang
2026-03-10 3:53 ` [PATCH 14/14] xfs: test xfs_healer startup service Darrick J. Wong
2026-03-13 19:58 ` Zorro Lang
2026-03-12 14:21 ` Darrick J. Wong [this message]
2026-03-13 20:05 ` [PATCH 15/14] xfs: test xfs_healer can follow private mntns mount moves Zorro Lang
2026-03-13 23:41 ` 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=20260312142130.GG1770774@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=hch@infradead.org \
--cc=linux-xfs@vger.kernel.org \
--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