xfs: parent pointers and online repair part 2
RFC v12 1/2 xfs: parent pointers and online repair part 2
Hi everyone,
I am also sending out an RFC for part 2 of online repair. I've merged Allison's parent pointers work into djwong-dev and ported the prototype reconstruction algorithms that I showed off in v11 on top of part 1 of online repair. In short, XFS can now rebuild its own directory tree.
Parent pointers now look like this:
(parent_ino, parent_gen, namehash) -> (name[])
I think this feature is ready to go once we've merged part 1 of the online repair code. A full run of the online/offline fsck fuzz testing show that this code is ready to go, though I have not yet looked deeply into whether or not things like cycle detection are now easy to construct.
--D
cover fstests: adjust tests for xfs parent pointers
Hi all,
These are the test adjustments that are required for parent pointers. There's also a few new tests to ensure that the GETPARENTS ioctl (and
file extent can cross an rtgroup boundary.
The best advantage for rtgroups will become evident later when we get to adding rmap and reflink to the realtime volume, since the geometry constraints are the same for rt groups and AGs. Hence we can reuse all that code directly.
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
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=pptrs
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=pptrs
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=pptrs
---
common/parent | 209 +++++++
common/populate | 38 +
common/rc | 7
common/xfs | 12
doc/group-names.txt | 1
src/popdir.pl | 11
tests/generic/050 | 20 +
tests/generic/050.cfg | 1
tests/generic/050.out.xfsquotaparent | 23 +
tests/xfs/018 | 7
tests/xfs/021 | 15 -
tests/xfs/021.cfg | 1
tests/xfs/021.out.default | 0
tests/xfs/021.out.parent | 62 ++
tests/xfs/122.out | 3
tests/xfs/191 | 7
tests/xfs/206 | 3
tests/xfs/288 | 7
tests/xfs/306 | 9
tests/xfs/851 | 116 ++++
tests/xfs/851.out | 69 ++
tests/xfs/852 | 69 ++
tests/xfs/852.out | 1002 ++++++++++++++++++++++++++++++++++
tests/xfs/853 | 85 +++
tests/xfs/853.out | 14
25 files changed, 1778 insertions(+), 13 deletions(-)
create mode 100644 common/parent
create mode 100644 tests/generic/050.out.xfsquotaparent
create mode 100644 tests/xfs/021.cfg
rename tests/xfs/{021.out => 021.out.default} (100%)
create mode 100644 tests/xfs/021.out.parent
create mode 100755 tests/xfs/851
create mode 100644 tests/xfs/851.out
create mode 100755 tests/xfs/852
create mode 100644 tests/xfs/852.out
create mode 100755 tests/xfs/853
create mode 100644 tests/xfs/853.outPATCH 1/11 xfs/206: filter out the parent= status from mkfs
From: Darrick J. Wong <[email protected]>
Filter out the parent pointer bits from the mkfs output so that we don't cause a regression in this test.
--- tests/xfs/206 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tests/xfs/206 +2 -1
@@ -64,7 +64,8 @@ mkfs_filter() -e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \ -e "s/, lazy-count=[0-9]//" \ -e "/.*crc=/d" \ - -e "/^Default configuration/d" + -e "/^Default configuration/d" \ + -e '/parent=/d' } # mkfs slightly smaller than that, small log for speed.
PATCH 2/11 xfs/122: update for parent pointers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Update test for parent pointers.
--- tests/xfs/122.out | 3 +++ 1 file changed, 3 insertions(+)
tests/xfs/122.out +3 -0
@@ -98,6 +98,8 @@ sizeof(struct xfs_fsop_ag_resblks) = 64 sizeof(struct xfs_fsop_geom) = 256 sizeof(struct xfs_fsop_geom_v1) = 112 sizeof(struct xfs_fsop_geom_v4) = 112 +sizeof(struct xfs_getparents) = 96 +sizeof(struct xfs_getparents_rec) = 24 sizeof(struct xfs_icreate_log) = 28 sizeof(struct xfs_inode_log_format) = 56 sizeof(struct xfs_inode_log_format_32) = 52
@@ -107,6 +109,7 @@ sizeof(struct xfs_legacy_timestamp) = 8 sizeof(struct xfs_log_dinode) = 176 sizeof(struct xfs_log_legacy_timestamp) = 8 sizeof(struct xfs_map_extent) = 32 +sizeof(struct xfs_parent_name_rec) = 16 sizeof(struct xfs_phys_extent) = 16 sizeof(struct xfs_refcount_key) = 4 sizeof(struct xfs_refcount_rec) = 12
PATCH 3/11 populate: create hardlinks for parent pointers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Create some hardlinked files so that we can exercise parent pointers.
--- common/populate | 38 ++++++++++++++++++++++++++++++++++++++ src/popdir.pl | 11 +++++++++++ 2 files changed, 49 insertions(+)
common/populate +38 -0
@@ -450,6 +450,44 @@ _scratch_xfs_populate() { cp --reflink=always "${SCRATCH_MNT}/REFCOUNTBT" "${SCRATCH_MNT}/REFCOUNTBT2" fi + # Parent pointers + is_pptr="$(_xfs_has_feature "$SCRATCH_MNT" parent -v)" + if [ $is_pptr -gt 0 ]; then + echo "+ parent pointers" + + # Create a couple of parent pointers + __populate_create_dir "${SCRATCH_MNT}/PPTRS" 1 '' --hardlink --format "two_%d" + + # Create one xattr leaf block of parent pointers + nr="$((blksz * 2 / 16))" + __populate_create_dir "${SCRATCH_MNT}/PPTRS" ${nr} '' --hardlink --format "many%04d" + + # Create multiple xattr leaf blocks of large parent pointers + nr="$((blksz * 16 / 16))" + __populate_create_dir "${SCRATCH_MNT}/PPTRS" ${nr} '' --hardlink --format "y%0254d" + + # Create multiple paths to a file + local moof="${SCRATCH_MNT}/PPTRS/moofile" + touch "${moof}" + for ((i = 0; i < 4; i++)); do + mkdir -p "${SCRATCH_MNT}/PPTRS/SUB${i}" + ln "${moof}" "${SCRATCH_MNT}/PPTRS/SUB${i}/moofile" + done + + # Create parent pointers of various lengths + touch "${SCRATCH_MNT}/PPTRS/vlength" + local len_len + local tst + local fname + ln "${SCRATCH_MNT}/PPTRS/vlength" "${SCRATCH_MNT}/PPTRS/b" + for len in 32 64 96 128 160 192 224 250 255; do + len_len="${#len}" + tst="$(perl -e "print \"b\" x (${len} - (${len_len} + 1))")" + fname="v${tst}${len}" + ln "${SCRATCH_MNT}/PPTRS/vlength" "${SCRATCH_MNT}/PPTRS/${fname}" + done + fi + # Copy some real files (xfs tests, I guess...) echo "+ real files" test $fill -ne 0 && __populate_fill_fs "${SCRATCH_MNT}" 5
src/popdir.pl +11 -0
@@ -17,6 +17,7 @@ GetOptions("start=i" => \$start, "dir=s" => \$dir, "remove!" => \$remove, "help!" => \$help, + "hardlink!" => \$hardlink, "verbose!" => \$verbose);
@@ -35,6 +36,7 @@ Options: --format=str printf formatting string for file name ("%08d") --verbose verbose output --help this help screen + --hardlink hardlink subsequent files to the first one created EOF exit(1) unless defined $help; # otherwise...
@@ -56,12 +58,21 @@ if ($file_pct < 0) { $file_pct = 100; } +if ($hardlink) { + $file_pct = 100; + $link_fname = sprintf($format, $start); +} + for ($i = $start; $i <= $end; $i += $incr) { $fname = sprintf($format, $i); if ($remove) { $verbose && print "rm $fname\n"; unlink($fname) or rmdir($fname) or die("unlink $fname"); + } elsif ($hardlink && $i > $start) { + # hardlink everything after the first file + $verbose && print "ln $link_fname $fname\n"; + link $link_fname, $fname; } elsif (($i % 100) < $file_pct) { # create a file $verbose && print "touch $fname\n";
PATCH 4/11 xfs/021: adapt golden output files for parent pointers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Parent pointers change the xattr structure dramatically, so fix this test to handle them. For the most part we can get away with filtering out the parent pointer fields (which xfs_db decodes for us), but the namelen/valuelen/attr_filter fields still show through.
---
common/rc | 4 +++
tests/xfs/021 | 15 +++++++++--
tests/xfs/021.cfg | 1 +
tests/xfs/021.out.default | 0
tests/xfs/021.out.parent | 62 +++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 80 insertions(+), 2 deletions(-)
create mode 100644 tests/xfs/021.cfg
rename tests/xfs/{021.out => 021.out.default} (100%)
create mode 100644 tests/xfs/021.out.parentcommon/rc +4 -0
@@ -3382,6 +3382,8 @@ _get_os_name() _link_out_file_named() { + test -n "$seqfull" || _fail "need to set seqfull" + local features=$2 local suffix=$(FEATURES="$features" perl -e ' my %feathash;
@@ -3417,6 +3419,8 @@ _link_out_file() { local features + test -n "$seqfull" || _fail "need to set seqfull" + if [ $# -eq 0 ]; then features="$(_get_os_name),$FSTYP" if [ -n "$MOUNT_OPTIONS" ]; then
tests/xfs/021 +13 -2
@@ -67,6 +67,13 @@ _scratch_mkfs_xfs >/dev/null \ echo "*** mount FS" _scratch_mount +seqfull=$0 +if _xfs_has_feature $SCRATCH_MNT parent; then + _link_out_file "parent" +else + _link_out_file "" +fi + testfile=$SCRATCH_MNT/testfile echo "*** make test file 1"
@@ -108,7 +115,10 @@ _scratch_unmount >>$seqres.full 2>&1 \ echo "*** dump attributes (1)" _scratch_xfs_db -r -c "inode $inum_1" -c "print a.sfattr" | \ - sed -e '/secure = /d' | sed -e '/parent = /d' + perl -ne ' +/\.secure/ && next; +/\.parent/ && next; + print unless /^\d+:\[.*/;' echo "*** dump attributes (2)"
@@ -124,10 +134,11 @@ s/info.hdr/info/; /hdr.info.uuid/ && next; /hdr.info.lsn/ && next; /hdr.info.owner/ && next; +/\.parent/ && next; s/^(hdr.info.magic =) 0x3bee/\1 0xfbee/; s/^(hdr.firstused =) (\d+)/\1 FIRSTUSED/; s/^(hdr.freemap\[0-2] = \[base,size]).*/\1 [FREEMAP..]/; -s/^(entries\[0-2] = \[hashval,nameidx,incomplete,root,local]).*/\1 [ENTRIES..]/; +s/^(entries\[0-[23]] = \[hashval,nameidx,incomplete,root,local]).*/\1 [ENTRIES..]/; print unless /^\d+:\[.*/;' echo "*** done"
tests/xfs/021.cfg new file +1 -0
@@ -0,0 +1 @@ +parent: parent
tests/xfs/021.out.default renamed from tests/xfs/021.out +0 -0
tests/xfs/021.out.parent new file +62 -0
62 lines not on this page · raw message
PATCH 5/11 generic/050: adapt for parent pointers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Fix this test when quotas and parent pointers are enabled.
--- tests/generic/050 | 20 ++++++++++++++++++-- tests/generic/050.cfg | 1 + tests/generic/050.out.xfsquotaparent | 23 +++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 tests/generic/050.out.xfsquotaparent
tests/generic/050 +18 -2
@@ -33,9 +33,25 @@ features="" if ! _has_metadata_journaling $SCRATCH_DEV >/dev/null; then features="nojournal" elif [ "$FSTYP" = "xfs" ] && echo "$MOUNT_OPTIONS" | grep -q quota ; then - # Mounting with quota on XFS requires a writable fs, which means - # we expect to fail the ro blockdev test with with EPERM. + # *Trying* to mount with quota on XFS requires a writable fs, which + # means we expect to fail the ro blockdev test with with EPERM. It + # doesn't matter if xfs_mount would ultimately decide that quota is not + # supported. features="xfsquota" + + if _xfs_has_feature $SCRATCH_DEV parent && \ + ! _xfs_has_feature $SCRATCH_DEV realtime; then + # If we have quotas and parent pointers enabled, the primary + # superblock will be written out with the quota flags set when + # the logged xattrs log_incompat feature is set. Hence the + # ro-norecovery mount won't fail with EPERM because the ondisk + # super's qflags actually match the mount qflags. + # + # Quota is not supported with realtime; in that case, the + # ondisk super's qflags will be zero and hence not match the + # mount qflags. Select 'xfsquota' in that case. + features="xfsquotaparent" + fi fi _link_out_file "$features"
tests/generic/050.cfg +1 -0
@@ -1,2 +1,3 @@ nojournal: nojournal xfsquota: xfsquota +xfsquotaparent: xfsquotaparent
tests/generic/050.out.xfsquotaparent new file +23 -0
@@ -0,0 +1,23 @@ +QA output created by 050 +setting device read-only +mounting read-only block device: +mount: SCRATCH_MNT: permission denied +unmounting read-only filesystem +umount: SCRATCH_DEV: not mounted +setting device read-write +mounting read-write block device: +touch files +going down: +unmounting shutdown filesystem: +setting device read-only +mounting filesystem that needs recovery on a read-only device: +mount: device write-protected, mounting read-only +mount: cannot mount device read-only +unmounting read-only filesystem +umount: SCRATCH_DEV: not mounted +mounting filesystem with -o norecovery on a read-only device: +mount: device write-protected, mounting read-only +unmounting read-only filesystem +setting device read-write +mounting filesystem that needs recovery with -o ro: +*** done
PATCH 6/11 xfs/018: disable parent pointers for this test
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
This test depends heavily on the xattr formats created for new files. Parent pointers break those assumptions, so force parent pointers off.
--- tests/xfs/018 | 7 ++++++- tests/xfs/191 | 7 ++++++- tests/xfs/288 | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-)
tests/xfs/018 +6 -1
@@ -100,7 +100,12 @@ attr32l="X$attr32k" attr64k="$attr32k$attr32k" echo "*** mkfs" -_scratch_mkfs >/dev/null + +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) +_scratch_mkfs "${mkfs_args[@]}" >/dev/null blk_sz=$(_scratch_xfs_get_sb_field blocksize) err_inj_attr_sz=$(( blk_sz / 3 - 50 ))
tests/xfs/191 +6 -1
@@ -33,7 +33,12 @@ _fixed_by_kernel_commit 7be3bd8856fb "xfs: empty xattr leaf header blocks are no _fixed_by_kernel_commit e87021a2bc10 "xfs: use larger in-core attr firstused field and detect overflow" _fixed_by_git_commit xfsprogs f50d3462c654 "xfs_repair: ignore empty xattr leaf blocks" -_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) + +_scratch_mkfs_xfs "${mkfs_args[@]}" | _filter_mkfs >$seqres.full 2>$tmp.mkfs cat $tmp.mkfs >> $seqres.full source $tmp.mkfs _scratch_mount
tests/xfs/288 +6 -1
@@ -19,8 +19,13 @@ _supported_fs xfs _require_scratch _require_attrs +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) + # get block size ($dbsize) from the mkfs output -_scratch_mkfs_xfs 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs_xfs "${mkfs_args[@]}" 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs _scratch_mount
Re: [PATCH 06/11] xfs/018: disable parent pointers for this test
Quoted 18 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
This test depends heavily on the xattr formats created for new files. Parent pointers break those assumptions, so force parent pointers off.
Signed-off-by Darrick J. Wong <[email protected]>--- tests/xfs/018 | 7 ++++++- tests/xfs/191 | 7 ++++++- tests/xfs/288 | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-)tests/xfs/018 +0
-0
tests/xfs/018 attr32l="X$attr32k" · line 107
Quoted 9 lines
tests/xfs/018 +5
-1@@ -100,7 +100,12 @@ attr32l="X$attr32k" attr64k="$attr32k$attr32k" echo "*** mkfs" -_scratch_mkfs >/dev/null + +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0)
Maybe we need a _require_no_xfs_parent() ?
Thanks,
Zorro
Quoted 42 lines
tests/xfs/018 +1
-0+_scratch_mkfs "${mkfs_args[@]}" >/dev/null blk_sz=$(_scratch_xfs_get_sb_field blocksize) err_inj_attr_sz=$(( blk_sz / 3 - 50 ))tests/xfs/191 +6
-1@@ -33,7 +33,12 @@ _fixed_by_kernel_commit 7be3bd8856fb "xfs: empty xattr leaf header blocks are no _fixed_by_kernel_commit e87021a2bc10 "xfs: use larger in-core attr firstused field and detect overflow" _fixed_by_git_commit xfsprogs f50d3462c654 "xfs_repair: ignore empty xattr leaf blocks" -_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) + +_scratch_mkfs_xfs "${mkfs_args[@]}" | _filter_mkfs >$seqres.full 2>$tmp.mkfs cat $tmp.mkfs >> $seqres.full source $tmp.mkfs _scratch_mounttests/xfs/288 +6
-1@@ -19,8 +19,13 @@ _supported_fs xfs _require_scratch _require_attrs +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) + # get block size ($dbsize) from the mkfs output -_scratch_mkfs_xfs 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs_xfs "${mkfs_args[@]}" 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs _scratch_mount
Re: [PATCH 06/11] xfs/018: disable parent pointers for this test
Quoted 21 lines · Zorro Lang
Quoted 20 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
This test depends heavily on the xattr formats created for new files. Parent pointers break those assumptions, so force parent pointers off.
Signed-off-by Darrick J. Wong <[email protected]>--- tests/xfs/018 | 7 ++++++- tests/xfs/191 | 7 ++++++- tests/xfs/288 | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-)tests/xfs/018 +0
-0@@ -100,7 +100,12 @@ attr32l="X$attr32k" attr64k="$attr32k$attr32k"
Quoted 9 lines
tests/xfs/018 attr32l="X$attr32k" · line 107
Quoted 7 lines
tests/xfs/018 +5
-1echo "*** mkfs" -_scratch_mkfs >/dev/null + +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0)Maybe we need a
_require_no_xfs_parent()?
We still want to run the test, we just don't want parent pointer xattrs muddying up the golden output.
--D
Quoted 46 lines
Thanks,
ZorroQuoted 42 lines
tests/xfs/018 +1
-0+_scratch_mkfs "${mkfs_args[@]}" >/dev/null blk_sz=$(_scratch_xfs_get_sb_field blocksize) err_inj_attr_sz=$(( blk_sz / 3 - 50 ))tests/xfs/191 +6
-1@@ -33,7 +33,12 @@ _fixed_by_kernel_commit 7be3bd8856fb "xfs: empty xattr leaf header blocks are no _fixed_by_kernel_commit e87021a2bc10 "xfs: use larger in-core attr firstused field and detect overflow" _fixed_by_git_commit xfsprogs f50d3462c654 "xfs_repair: ignore empty xattr leaf blocks" -_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) + +_scratch_mkfs_xfs "${mkfs_args[@]}" | _filter_mkfs >$seqres.full 2>$tmp.mkfs cat $tmp.mkfs >> $seqres.full source $tmp.mkfs _scratch_mounttests/xfs/288 +6
-1@@ -19,8 +19,13 @@ _supported_fs xfs _require_scratch _require_attrs +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) + # get block size ($dbsize) from the mkfs output -_scratch_mkfs_xfs 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs_xfs "${mkfs_args[@]}" 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs _scratch_mount
Re: [PATCH 06/11] xfs/018: disable parent pointers for this test
Quoted 32 lines · Darrick J. Wong
Quoted 21 lines · Zorro Lang
Quoted 20 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
This test depends heavily on the xattr formats created for new files. Parent pointers break those assumptions, so force parent pointers off.
Signed-off-by Darrick J. Wong <[email protected]>--- tests/xfs/018 | 7 ++++++- tests/xfs/191 | 7 ++++++- tests/xfs/288 | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-)tests/xfs/018 +0
-0@@ -100,7 +100,12 @@ attr32l="X$attr32k" attr64k="$attr32k$attr32k"Quoted 9 lines
tests/xfs/018 attr32l="X$attr32k" · line 107
Quoted 7 lines
tests/xfs/018 +5
-1echo "*** mkfs" -_scratch_mkfs >/dev/null + +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0)Maybe we need a
_require_no_xfs_parent()?
Quoted 2 lines
We still want to run the test, we just don't want parent pointer xattrs muddying up the golden output.
But if there's a specified MKFS_OPTIONS="... -n parent=1", this change will cause the whole test fails, right?
Quoted 50 lines
--D
Quoted 46 lines
Thanks,
ZorroQuoted 42 lines
tests/xfs/018 +1
-0+_scratch_mkfs "${mkfs_args[@]}" >/dev/null blk_sz=$(_scratch_xfs_get_sb_field blocksize) err_inj_attr_sz=$(( blk_sz / 3 - 50 ))tests/xfs/191 +6
-1@@ -33,7 +33,12 @@ _fixed_by_kernel_commit 7be3bd8856fb "xfs: empty xattr leaf header blocks are no _fixed_by_kernel_commit e87021a2bc10 "xfs: use larger in-core attr firstused field and detect overflow" _fixed_by_git_commit xfsprogs f50d3462c654 "xfs_repair: ignore empty xattr leaf blocks" -_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) + +_scratch_mkfs_xfs "${mkfs_args[@]}" | _filter_mkfs >$seqres.full 2>$tmp.mkfs cat $tmp.mkfs >> $seqres.full source $tmp.mkfs _scratch_mounttests/xfs/288 +6
-1@@ -19,8 +19,13 @@ _supported_fs xfs _require_scratch _require_attrs +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) + # get block size ($dbsize) from the mkfs output -_scratch_mkfs_xfs 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs_xfs "${mkfs_args[@]}" 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs _scratch_mount
Re: [PATCH 06/11] xfs/018: disable parent pointers for this test
Quoted 33 lines · Zorro Lang
Quoted 32 lines · Darrick J. Wong
Quoted 30 lines · Zorro Lang
Quoted 18 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
This test depends heavily on the xattr formats created for new files. Parent pointers break those assumptions, so force parent pointers off.
Signed-off-by Darrick J. Wong <[email protected]>--- tests/xfs/018 | 7 ++++++- tests/xfs/191 | 7 ++++++- tests/xfs/288 | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-)tests/xfs/018 +0
-0tests/xfs/018 attr32l="X$attr32k" · line 107
Quoted 9 lines
tests/xfs/018 +5
-1@@ -100,7 +100,12 @@ attr32l="X$attr32k" attr64k="$attr32k$attr32k" echo "*** mkfs" -_scratch_mkfs >/dev/null + +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0)Maybe we need a
_require_no_xfs_parent()?
Quoted 5 lines
Quoted 2 lines
We still want to run the test, we just don't want parent pointer xattrs muddying up the golden output.
But if there's a specified MKFS_OPTIONS="... -n parent=1", this change will cause the whole test fails, right?
Ahaha, thank you for pointing that out. Yes, this should change parent=X to parent=0 if it's specified, or add parent=0 if not.
--D
Quoted 51 lines
Quoted 50 lines
--D
Quoted 46 lines
Thanks,
ZorroQuoted 42 lines
tests/xfs/018 +1
-0+_scratch_mkfs "${mkfs_args[@]}" >/dev/null blk_sz=$(_scratch_xfs_get_sb_field blocksize) err_inj_attr_sz=$(( blk_sz / 3 - 50 ))tests/xfs/191 +6
-1@@ -33,7 +33,12 @@ _fixed_by_kernel_commit 7be3bd8856fb "xfs: empty xattr leaf header blocks are no _fixed_by_kernel_commit e87021a2bc10 "xfs: use larger in-core attr firstused field and detect overflow" _fixed_by_git_commit xfsprogs f50d3462c654 "xfs_repair: ignore empty xattr leaf blocks" -_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) + +_scratch_mkfs_xfs "${mkfs_args[@]}" | _filter_mkfs >$seqres.full 2>$tmp.mkfs cat $tmp.mkfs >> $seqres.full source $tmp.mkfs _scratch_mounttests/xfs/288 +6
-1@@ -19,8 +19,13 @@ _supported_fs xfs _require_scratch _require_attrs +# Parent pointers change the xattr formats sufficiently to break this test. +# Disable parent pointers if mkfs supports it. +mkfs_args=() +$MKFS_XFS_PROG 2>&1 | grep -q parent=0 && mkfs_args+=(-n parent=0) + # get block size ($dbsize) from the mkfs output -_scratch_mkfs_xfs 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs_xfs "${mkfs_args[@]}" 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs _scratch_mount
PATCH 7/11 xfs/306: fix formatting failures with parent pointers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
The parent pointers feature isn't supported on tiny 20MB filesystems because the larger directory transactions result in larger minimum log sizes, particularly with nrext64 enabled:
** mkfs failed with extra mkfs options added to " -m rmapbt=0, -i nrext64=1, -n parent=1," by test 306 ** ** attempting to mkfs using only test 306 options: -d size=20m -n size=64k **
max log size 5108 smaller than min log size 5310, filesystem is too small
We don't support 20M filesystems anymore, so bump the filesystem size up to 100M and skip this test if we can't actually format the filesystem. Convert the open-coded punch-alternating logic into a call to that program to reduce execve overhead, which more than makes up having to write 5x as much data to fragment the free space.
--- tests/xfs/306 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
tests/xfs/306 +4 -5
@@ -23,6 +23,7 @@ _supported_fs xfs _require_scratch_nocheck # check complains about single AG fs _require_xfs_io_command "fpunch" _require_command $UUIDGEN_PROG uuidgen +_require_test_program "punch-alternating" # Disable the scratch rt device to avoid test failures relating to the rt # bitmap consuming all the free space in our small data device.
@@ -30,7 +31,8 @@ unset SCRATCH_RTDEV # Create a small fs with a large directory block size. We want to fill up the fs # quickly and then create multi-fsb dirblocks over fragmented free space. -_scratch_mkfs_xfs -d size=20m -n size=64k >> $seqres.full 2>&1 +_scratch_mkfs_xfs -d size=100m -n size=64k >> $seqres.full 2>&1 || \ + _notrun 'could not format tiny scratch fs' _scratch_mount # Fill a source directory with many largish-named files. 1k uuid-named entries
@@ -49,10 +51,7 @@ done $XFS_IO_PROG -xc "resblks 16" $SCRATCH_MNT >> $seqres.full 2>&1 dd if=/dev/zero of=$SCRATCH_MNT/file bs=4k >> $seqres.full 2>&1 $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/file >> $seqres.full 2>&1 -size=`_get_filesize $SCRATCH_MNT/file` -for i in $(seq 0 8192 $size); do - $XFS_IO_PROG -c "fpunch $i 4k" $SCRATCH_MNT/file >> $seqres.full 2>&1 -done +$here/src/punch-alternating $SCRATCH_MNT/file # Replicate the src dir several times into fragmented free space. After one or # two dirs, we should have nothing but non-contiguous directory blocks.
PATCH 8/11 common: add helpers for parent pointer tests
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Add helper functions in common/parent to parse and verify parent pointers. Also add functions to check that mkfs, kernel, and xfs_io support parent pointers.
[djwong: add license and copyright, dont _fail tests immediately, make
sure the pptr-generated paths match the dir-generated paths]
--- common/parent | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/rc | 3 + common/xfs | 12 +++ 3 files changed, 224 insertions(+) create mode 100644 common/parent
common/parent new file +209 -0
@@ -0,0 +1,209 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022-2023, Oracle and/or its affiliates. All Rights Reserved. +# +# Parent pointer common functions +# + +# +# parse_parent_pointer parents parent_inode parent_pointer_name +# +# Given a list of parent pointers, find the record that matches +# the given inode and filename +# +# inputs: +# parents : A list of parent pointers in the format of: +# inode/generation/name_length/name +# parent_inode : The parent inode to search for +# parent_name : The parent name to search for +# +# outputs: +# PPINO : Parent pointer inode +# PPGEN : Parent pointer generation +# PPNAME : Parent pointer name +# PPNAME_LEN : Parent pointer name length +# +_parse_parent_pointer() +{ + local parents=$1 + local pino=$2 + local parent_pointer_name=$3 + + local found=0 + + # Find the entry that has the same inode as the parent + # and parse out the entry info + while IFS=\/ read PPINO PPGEN PPNAME_LEN PPNAME; do + if [ "$PPINO" != "$pino" ]; then + continue + fi + + if [ "$PPNAME" != "$parent_pointer_name" ]; then + continue + fi + + found=1 + break + done <<< $(echo "$parents") + + # Check to see if we found anything + # We do not fail the test because we also use this + # routine to verify when parent pointers should + # be removed or updated (ie a rename or a move + # operation changes your parent pointer) + if [ $found -eq "0" ]; then + return 1 + fi + + # Verify the parent pointer name length is correct + if [ "$PPNAME_LEN" -ne "${#parent_pointer_name}" ] + then + echo "*** Bad parent pointer:"\ + "name:$PPNAME, namelen:$PPNAME_LEN" + fi + + #return sucess + return 0 +} + +# +# _verify_parent parent_path parent_pointer_name child_path +# +# Verify that the given child path lists the given parent as a parent pointer +# and that the parent pointer name matches the given name +# +# Examples: +# +# #simple example +# mkdir testfolder1 +# touch testfolder1/file1 +# verify_parent testfolder1 file1 testfolder1/file1 +# +# # In this above example, we want to verify that "testfolder1" +# # appears as a parent pointer of "testfolder1/file1". Additionally +# # we verify that the name record of the parent pointer is "file1" +# +# +# #hardlink example +# mkdir testfolder1 +# mkdir testfolder2 +# touch testfolder1/file1 +# ln testfolder1/file1 testfolder2/file1_ln +# verify_parent testfolder2 file1_ln testfolder1/file1 +# +# # In this above example, we want to verify that "testfolder2" +# # appears as a parent pointer of "testfolder1/file1". Additionally +# # we verify that the name record of the parent pointer is "file1_ln" +# +_verify_parent() +{ + local parent_path=$1 + local parent_pointer_name=$2 + local child_path=$3 + + local parent_ppath="$parent_path/$parent_pointer_name" + + # Verify parent exists + if [ ! -d $SCRATCH_MNT/$parent_path ]; then + echo "$SCRATCH_MNT/$parent_path not found" + else + echo "*** $parent_path OK" + fi + + # Verify child exists + if [ ! -f $SCRATCH_MNT/$child_path ]; then + echo "$SCRATCH_MNT/$child_path not found" + else + echo "*** $child_path OK" + fi + + # Verify the parent pointer name exists as a child of the parent + if [ ! -f $SCRATCH_MNT/$parent_ppath ]; then + echo "$SCRATCH_MNT/$parent_ppath not found" + else + echo "*** $parent_ppath OK" + fi + + # Get the inodes of both parent and child + pino="$(stat -c '%i' $SCRATCH_MNT/$parent_path)" + cino="$(stat -c '%i' $SCRATCH_MNT/$child_path)" + + # Get all the parent pointers of the child + parents=($($XFS_IO_PROG -x -c \ + "parent -f -i $pino -n $parent_pointer_name" $SCRATCH_MNT/$child_path)) + if [[ $? != 0 ]]; then + echo "No parent pointers found for $child_path" + fi + + # Parse parent pointer output. + # This sets PPINO PPGEN PPNAME PPNAME_LEN + _parse_parent_pointer $parents $pino $parent_pointer_name + + # If we didnt find one, bail out + if [ $? -ne 0 ]; then + echo "No parent pointer record found for $parent_path"\ + "in $child_path" + fi + + # Verify the inode generated by the parent pointer name is + # the same as the child inode + pppino="$(stat -c '%i' $SCRATCH_MNT/$parent_ppath)" + if [ $cino -ne $pppino ] + then + echo "Bad parent pointer name value for $child_path."\ + "$SCRATCH_MNT/$parent_ppath belongs to inode $PPPINO,"\ + "but should be $cino" + fi + + # Make sure path printing works by checking that the paths returned + # all point to the same inode. + local tgt="$SCRATCH_MNT/$child_path" + $XFS_IO_PROG -x -c 'parent -p' "$tgt" | while read pptr_path; do + test "$tgt" -ef "$pptr_path" || \ + echo "$tgt parent pointer $pptr_path should be the same file" + done + + echo "*** Verified parent pointer:"\ + "name:$PPNAME, namelen:$PPNAME_LEN" + echo "*** Parent pointer OK for child $child_path" +} + +# +# _verify_parent parent_pointer_name pino child_path +# +# Verify that the given child path contains no parent pointer entry +# for the given inode and file name +# +_verify_no_parent() +{ + local parent_pname=$1 + local pino=$2 + local child_path=$3 + + # Verify child exists + if [ ! -f $SCRATCH_MNT/$child_path ]; then + echo "$SCRATCH_MNT/$child_path not found" + else + echo "*** $child_path OK" + fi + + # Get all the parent pointers of the child + local parents=($($XFS_IO_PROG -x -c \ + "parent -f -i $pino -n $parent_pname" $SCRATCH_MNT/$child_path)) + if [[ $? != 0 ]]; then + return 0 + fi + + # Parse parent pointer output. + # This sets PPINO PPGEN PPNAME PPNAME_LEN + _parse_parent_pointer $parents $pino $parent_pname + + # If we didnt find one, return sucess + if [ $? -ne 0 ]; then + return 0 + fi + + echo "Parent pointer entry found where none should:"\ + "inode:$PPINO, gen:$PPGEN," + "name:$PPNAME, namelen:$PPNAME_LEN" +}
common/rc +3 -0
@@ -2634,6 +2634,9 @@ _require_xfs_io_command() echo $testio | grep -q "invalid option" && \ _notrun "xfs_io $command support is missing" ;; + "parent") + testio=`$XFS_IO_PROG -x -c "parent" $TEST_DIR 2>&1` + ;; "pwrite") # -N (RWF_NOWAIT) only works with direct vectored I/O writes local pwrite_opts=" "
common/xfs +12 -0
@@ -1816,3 +1816,15 @@ _xfs_discard_max_offset_kb() $XFS_IO_PROG -c 'statfs' "$1" | \ awk '{g[$1] = $3} END {print (g["geom.bsize"] * g["geom.datablocks"] / 1024)}' } + +# this test requires the xfs parent pointers feature +# +_require_xfs_parent() +{ + _scratch_mkfs_xfs_supported -n parent > /dev/null 2>&1 \ + || _notrun "mkfs.xfs does not support parent pointers" + _scratch_mkfs_xfs -n parent > /dev/null 2>&1 + _try_scratch_mount >/dev/null 2>&1 \ + || _notrun "kernel does not support parent pointers" + _scratch_unmount +}
PATCH 9/11 xfs: add parent pointer test
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Add a test to verify basic parent pointers operations (create, move, link, unlink, rename, overwrite).
--- doc/group-names.txt | 1 tests/xfs/851 | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/851.out | 69 ++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+) create mode 100755 tests/xfs/851 create mode 100644 tests/xfs/851.out
doc/group-names.txt +1 -0
@@ -83,6 +83,7 @@ nfs4_acl NFSv4 access control lists nonsamefs overlayfs layers on different filesystems online_repair online repair functionality tests other dumping ground, do not add more tests to this group +parent Parent pointer tests pattern specific IO pattern tests perms access control and permission checking pipe pipe functionality
tests/xfs/851 new file +116 -0
116 lines not on this page · raw message
tests/xfs/851.out new file +69 -0
69 lines not on this page · raw message
PATCH 10/11 xfs: add multi link parent pointer test
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Add a test to verify parent pointers while multiple links to a file are created and removed.
--- tests/xfs/852 | 69 ++++ tests/xfs/852.out | 1002 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1071 insertions(+) create mode 100755 tests/xfs/852 create mode 100644 tests/xfs/852.out
tests/xfs/852 new file +69 -0
@@ -0,0 +1,69 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022, Oracle and/or its affiliates. All Rights Reserved. +# +# FS QA Test 852 +# +# multi link parent pointer test +# +. ./common/preamble +_begin_fstest auto quick parent + +# get standard environment, filters and checks +. ./common/parent + +# Modify as appropriate +_supported_fs xfs +_require_scratch +_require_xfs_sysfs debug/larp +_require_xfs_parent +_require_xfs_io_command "parent" + +# real QA test starts here + +# Create a directory tree using a protofile and +# make sure all inodes created have parent pointers + +protofile=$tmp.proto + +cat >$protofile <<EOF +DUMMY1 +0 0 +: root directory +d--777 3 1 +: a directory +testfolder1 d--755 3 1 +file1 ---755 3 1 /dev/null +: done +$ +EOF + +_scratch_mkfs -f -n parent=1 -p $protofile >>$seqresres.full 2>&1 \ + || _fail "mkfs failed" +_check_scratch_fs + +_scratch_mount >>$seqres.full 2>&1 \ + || _fail "mount failed" + +testfolder1="testfolder1" +file1="file1" +file1_ln="file1_link" + +echo "" +# Multi link parent pointer test +NLINKS=100 +for (( j=0; j<$NLINKS; j++ )); do + ln $SCRATCH_MNT/$testfolder1/$file1 $SCRATCH_MNT/$testfolder1/$file1_ln.$j + _verify_parent "$testfolder1" "$file1_ln.$j" "$testfolder1/$file1" + _verify_parent "$testfolder1" "$file1" "$testfolder1/$file1_ln.$j" +done +# Multi unlink parent pointer test +for (( j=$NLINKS-1; j<=0; j-- )); do + ino="$(stat -c '%i' $SCRATCH_MNT/$testfolder1/$file1_ln.$j)" + rm $SCRATCH_MNT/$testfolder1/$file1_ln.$j + _verify_no_parent "$file1_ln.$j" "$ino" "$testfolder1/$file1" +done + +# success, all done +status=0 +exit
tests/xfs/852.out new file +1002 -0
1,002 lines not on this page · raw message
PATCH 11/11 xfs: add parent pointer inject test
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Add a test to verify parent pointers after an error injection and log replay.
--- tests/xfs/853 | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/853.out | 14 +++++++++ 2 files changed, 99 insertions(+) create mode 100755 tests/xfs/853 create mode 100644 tests/xfs/853.out
tests/xfs/853 new file +85 -0
@@ -0,0 +1,85 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022, Oracle and/or its affiliates. All Rights Reserved. +# +# FS QA Test 853 +# +# parent pointer inject test +# +. ./common/preamble +_begin_fstest auto quick parent + +# get standard environment, filters and checks +. ./common/filter +. ./common/inject +. ./common/parent + +# Modify as appropriate +_supported_fs xfs +_require_scratch +_require_xfs_sysfs debug/larp +_require_xfs_io_error_injection "larp" +_require_xfs_parent +_require_xfs_io_command "parent" + +# real QA test starts here + +# Create a directory tree using a protofile and +# make sure all inodes created have parent pointers + +protofile=$tmp.proto + +cat >$protofile <<EOF +DUMMY1 +0 0 +: root directory +d--777 3 1 +: a directory +testfolder1 d--755 3 1 +$ +: back in the root +testfolder2 d--755 3 1 +: done +$ +EOF + +_scratch_mkfs -f -n parent=1 -p $protofile >>$seqres.full 2>&1 \ + || _fail "mkfs failed" +_check_scratch_fs + +_scratch_mount >>$seqres.full 2>&1 \ + || _fail "mount failed" + +testfolder1="testfolder1" +testfolder2="testfolder2" +file4="file4" +file5="file5" + +echo "" + +# Create files +touch $SCRATCH_MNT/$testfolder1/$file4 +_verify_parent "$testfolder1" "$file4" "$testfolder1/$file4" + +# Inject error +_scratch_inject_error "larp" + +# Move files +mv $SCRATCH_MNT/$testfolder1/$file4 $SCRATCH_MNT/$testfolder2/$file5 2>&1 \ + | _filter_scratch + +# FS should be shut down, touch will fail +touch $SCRATCH_MNT/$testfolder2/$file5 2>&1 | _filter_scratch + +# Remount to replay log +_scratch_remount_dump_log >> $seqres.full + +# FS should be online, touch should succeed +touch $SCRATCH_MNT/$testfolder2/$file5 + +# Check files again +_verify_parent "$testfolder2" "$file5" "$testfolder2/$file5" + +# success, all done +status=0 +exit
tests/xfs/853.out new file +14 -0
@@ -0,0 +1,14 @@ +QA output created by 853 + +*** testfolder1 OK +*** testfolder1/file4 OK +*** testfolder1/file4 OK +*** Verified parent pointer: name:file4, namelen:5 +*** Parent pointer OK for child testfolder1/file4 +mv: cannot stat 'SCRATCH_MNT/testfolder1/file4': Input/output error +touch: cannot touch 'SCRATCH_MNT/testfolder2/file5': Input/output error +*** testfolder2 OK +*** testfolder2/file5 OK +*** testfolder2/file5 OK +*** Verified parent pointer: name:file5, namelen:5 +*** Parent pointer OK for child testfolder2/file5
cover xfs: retain ILOCK during directory updates
In reply to Darrick J. WongHi all,
This series changes the directory update code to retain the ILOCK on all files involved in a rename until the end of the operation. The upcoming parent pointers patchset applies parent pointers in a separate chained update from the actual directory update, which is why it is now necessary to keep the ILOCK instead of dropping it after the first transaction in the chain.
As a side effect, we no longer need to hold the IOLOCK during an rmapbt scan of inodes to serialize the scan with ongoing directory updates.
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
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=retain-ilock-during-dir-ops
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=retain-ilock-during-dir-ops
--- fs/xfs/libxfs/xfs_defer.c | 6 ++- fs/xfs/libxfs/xfs_defer.h | 8 +++- fs/xfs/scrub/rmap_repair.c | 16 ------- fs/xfs/scrub/tempfile.c | 2 + fs/xfs/xfs_dquot.c | 38 +++++++++++++++++ fs/xfs/xfs_dquot.h | 1 fs/xfs/xfs_inode.c | 98 ++++++++++++++++++++++++++++++++------------ fs/xfs/xfs_inode.h | 2 + fs/xfs/xfs_qm.c | 4 +- fs/xfs/xfs_qm.h | 2 - fs/xfs/xfs_symlink.c | 6 ++- fs/xfs/xfs_trans.c | 9 +++- fs/xfs/xfs_trans_dquot.c | 15 ++++--- 13 files changed, 153 insertions(+), 54 deletions(-)
PATCH 1/7 xfs: Increase XFS_DEFER_OPS_NR_INODES to 5
From: Allison Henderson <[email protected]>
Renames that generate parent pointer updates can join up to 5 inodes locked in sorted order. So we need to increase the number of defer ops inodes and relock them in the same way.
--- fs/xfs/libxfs/xfs_defer.c | 6 +++++- fs/xfs/libxfs/xfs_defer.h | 8 +++++++- fs/xfs/xfs_inode.c | 27 ++++++++++++++++++--------- fs/xfs/xfs_inode.h | 2 ++ 4 files changed, 32 insertions(+), 11 deletions(-)
fs/xfs/libxfs/xfs_defer.c +5 -1
@@ -830,7 +830,11 @@ xfs_defer_ops_continue(ASSERT (!(tp->t_flags &XFS_TRANS_DIRTY ));/* Lock the captured resources to the new transaction. */ -if (dfc->dfc_held.dr_inos ==2 ) +if (dfc->dfc_held.dr_inos >2 ) { +xfs_sort_inodes (dfc->dfc_held.dr_ip, dfc->dfc_held.dr_inos); +xfs_lock_inodes (dfc->dfc_held.dr_ip, dfc->dfc_held.dr_inos, +XFS_ILOCK_EXCL ); + }else if (dfc->dfc_held.dr_inos ==2 )xfs_lock_two_inodes (dfc->dfc_held.dr_ip[0 ],XFS_ILOCK_EXCL , dfc->dfc_held.dr_ip[1 ],XFS_ILOCK_EXCL );else if (dfc->dfc_held.dr_inos ==1 )
fs/xfs/libxfs/xfs_defer.h +7 -1
@@ -71,7 +71,13 @@ extern const struct xfs_defer_op_type xfs_swapext_defer_type;/* * Deferred operation item relogging limits. */ -#define XFS_DEFER_OPS_NR_INODES 2/* join up to two inodes */ + +/* +* Rename w/ parent pointers can require up to 5 inodes with deferred ops to +* be joined to the transaction: src_dp, target_dp, src_ip, target_ip, and wip. +* These inodes are locked in sorted order by their inode numbers +*/ +#define XFS_DEFER_OPS_NR_INODES 5#define XFS_DEFER_OPS_NR_BUFS 2/* join up to two buffers */ /* Resources that must be held across a transaction roll. */
fs/xfs/xfs_inode.c +18 -9
@@ -440,7 +440,7 @@ xfs_lock_inumorder(* lock more than one at a time, lockdep will report false positives saying we * have violated locking orders. */ -static void +void xfs_lock_inodes( struct xfs_inode **ips, int inodes,
@@ -2705,7 +2705,7 @@ xfs_sort_for_rename(struct xfs_inode **i_tab,/* out: sorted array of inodes */ int *num_inodes) /* in/out: inodes in array */ { - int i, j; + int i;ASSERT (*num_inodes == __XFS_SORT_INODES);memset (i_tab,0 , *num_inodes *sizeof (struct xfs_inode *));
@@ -2727,17 +2727,26 @@ xfs_sort_for_rename( i_tab[i++] = wip; *num_inodes = i; +xfs_sort_inodes (i_tab, *num_inodes); +} + +void +xfs_sort_inodes ( +struct xfs_inode **i_tab, +unsigned int num_inodes) +{ +int i, j; + +ASSERT (num_inodes <= __XFS_SORT_INODES); +/* * Sort the elements via bubble sort. (Remember, there are at * most 5 elements to sort, so this is adequate.) */ -for (i =0 ; i < *num_inodes; i++) { -for (j =1 ; j < *num_inodes; j++) { -if (i_tab[j]->i_ino < i_tab[j-1 ]->i_ino) { -struct xfs_inode *temp = i_tab[j]; - i_tab[j] = i_tab[j-1 ]; - i_tab[j-1 ] = temp; - } +for (i =0 ; i < num_inodes; i++) { +for (j =1 ; j < num_inodes; j++) { +if (i_tab[j]->i_ino < i_tab[j-1 ]->i_ino) +swap (i_tab[j], i_tab[j -1 ]); } } }
fs/xfs/xfs_inode.h +2 -0
@@ -603,6 +603,8 @@ void xfs_end_io(struct work_struct *work);int xfs_ilock2_io_mmap (struct xfs_inode *ip1,struct xfs_inode *ip2);void xfs_iunlock2_io_mmap (struct xfs_inode *ip1,struct xfs_inode *ip2);void xfs_bumplink (struct xfs_trans *tp,struct xfs_inode *ip); +void xfs_lock_inodes (struct xfs_inode **ips,int inodes,uint lock_mode); +void xfs_sort_inodes (struct xfs_inode **i_tab,unsigned int num_inodes);void xfs_inode_count_blocks (struct xfs_trans *tp,struct xfs_inode *ip,xfs_filblks_t *dblocks,xfs_filblks_t *rblocks);
PATCH 2/7 xfs: Increase XFS_QM_TRANS_MAXDQS to 5
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
With parent pointers enabled, a rename operation can update up to 5
inodes: src_dp, target_dp, src_ip, target_ip and wip. This causes their dquots to a be attached to the transaction chain, so we need to increase XFS_QM_TRANS_MAXDQS. This patch also add a helper function xfs_dqlockn to lock an arbitrary number of dquots.
--- fs/xfs/xfs_dquot.c | 38 ++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_dquot.h | 1 + fs/xfs/xfs_qm.h | 2 +- fs/xfs/xfs_trans_dquot.c | 15 ++++++++++----- 4 files changed, 50 insertions(+), 6 deletions(-)
fs/xfs/xfs_dquot.c +38 -0
@@ -1362,6 +1362,44 @@ xfs_dqlock2( } } +static int +xfs_dqtrx_cmp ( +const void *a, +const void *b) +{ +const struct xfs_dqtrx *qa = a; +const struct xfs_dqtrx *qb = b; + +if (qa->qt_dquot->q_id > qb->qt_dquot->q_id) +return 1 ; +if (qa->qt_dquot->q_id < qb->qt_dquot->q_id) +return -1 ; +return 0 ; +} + +void +xfs_dqlockn ( +struct xfs_dqtrx *q) +{ +unsigned int i; + +/* Sort in order of dquot id, do not allow duplicates */ +for (i =0 ; i <XFS_QM_TRANS_MAXDQS && q[i].qt_dquot !=NULL ; i++) { +unsigned int j; + +for (j =0 ; j < i; j++) +ASSERT (q[i].qt_dquot != q[j].qt_dquot); + } +if (i ==0 ) +return ; + +sort (q, i,sizeof (struct xfs_dqtrx ), xfs_dqtrx_cmp,NULL ); + +mutex_lock (&q[0 ].qt_dquot->q_qlock); +for (i =1 ; i <XFS_QM_TRANS_MAXDQS && q[i].qt_dquot !=NULL ; i++) +mutex_lock_nested (&q[i].qt_dquot->q_qlock,XFS_QLOCK_NESTED ); +} +int __init xfs_qm_init (void ) {
fs/xfs/xfs_dquot.h +1 -0
@@ -223,6 +223,7 @@ int xfs_qm_dqget_uncached(struct xfs_mount *mp,void xfs_qm_dqput (struct xfs_dquot *dqp);void xfs_dqlock2 (struct xfs_dquot *,struct xfs_dquot *); +void xfs_dqlockn (struct xfs_dqtrx *q);void xfs_dquot_set_prealloc_limits (struct xfs_dquot *);
fs/xfs/xfs_qm.h +1 -1
@@ -136,7 +136,7 @@ enum {XFS_QM_TRANS_PRJ , XFS_QM_TRANS_DQTYPES }; -#define XFS_QM_TRANS_MAXDQS 2 +#define XFS_QM_TRANS_MAXDQS 5struct xfs_dquot_acct {struct xfs_dqtrx dqs[XFS_QM_TRANS_DQTYPES ][XFS_QM_TRANS_MAXDQS ]; };
fs/xfs/xfs_trans_dquot.c +10 -5
@@ -368,24 +368,29 @@ xfs_trans_mod_dquot(/* * Given an array of dqtrx structures, lock all the dquots associated and join -* them to the transaction, provided they have been modified. We know that the -* highest number of dquots of one type - usr, grp and prj - involved in a -* transaction is 3 so we don't need to make this very generic. +* them to the transaction, provided they have been modified. */ STATIC voidxfs_trans_dqlockedjoin (struct xfs_trans *tp,struct xfs_dqtrx *q) { +unsigned int i;ASSERT (q[0 ].qt_dquot !=NULL );if (q[1 ].qt_dquot ==NULL ) {xfs_dqlock (q[0 ].qt_dquot);xfs_trans_dqjoin (tp, q[0 ].qt_dquot); - }else { -ASSERT (XFS_QM_TRANS_MAXDQS ==2 ); + }else if (q[2 ].qt_dquot ==NULL ) {xfs_dqlock2 (q[0 ].qt_dquot, q[1 ].qt_dquot);xfs_trans_dqjoin (tp, q[0 ].qt_dquot);xfs_trans_dqjoin (tp, q[1 ].qt_dquot); + }else { +xfs_dqlockn (q); +for (i =0 ; i <XFS_QM_TRANS_MAXDQS ; i++) { +if (q[i].qt_dquot ==NULL ) +break ; +xfs_trans_dqjoin (tp, q[i].qt_dquot); + } } }
PATCH 3/7 xfs: Hold inode locks in xfs_ialloc
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Modify xfs_ialloc to hold locks after return. Caller will be responsible for manual unlock. We will need this later to hold locks across parent pointer operations
--- fs/xfs/xfs_inode.c | 12 +++++++++--- fs/xfs/xfs_qm.c | 4 +++- fs/xfs/xfs_symlink.c | 6 ++++-- 3 files changed, 16 insertions(+), 6 deletions(-)
fs/xfs/xfs_inode.c +9 -3
@@ -767,6 +767,8 @@ xfs_inode_inherit_flags2(/* * Initialise a newly allocated inode and return the in-core inode to the * caller locked exclusively. +* +* Caller is responsible for unlocking the inode manually upon return */ int xfs_init_new_inode(
@@ -894,7 +896,7 @@ xfs_init_new_inode(/* * Log the new values stuffed into the inode. */ -xfs_trans_ijoin (tp, ip,XFS_ILOCK_EXCL ); +xfs_trans_ijoin (tp, ip,0 );xfs_trans_log_inode (tp, ip, flags);/* now that we have an i_mode we can setup the inode structure */
@@ -1101,8 +1103,7 @@ xfs_create(* the transaction cancel unlocking dp so don't do it explicitly in the * error path. */ -xfs_trans_ijoin (tp, dp,XFS_ILOCK_EXCL ); - unlock_dp_on_error = false; +xfs_trans_ijoin (tp, dp,0 ); error =xfs_dir_createname (tp, dp, name, ip->i_ino, resblks -XFS_IALLOC_SPACE_RES (mp));
@@ -1151,6 +1152,8 @@ xfs_create(xfs_qm_dqrele (pdqp); *ipp = ip; +xfs_iunlock (ip,XFS_ILOCK_EXCL ); +xfs_iunlock (dp,XFS_ILOCK_EXCL );return 0 ; out_trans_cancel:
@@ -1162,6 +1165,7 @@ xfs_create(* transactions and deadlocks from xfs_inactive. */ if (ip) { +xfs_iunlock (ip,XFS_ILOCK_EXCL );xfs_finish_inode_setup (ip);xfs_irele (ip); }
@@ -1247,6 +1251,7 @@ xfs_create_tmpfile(xfs_qm_dqrele (pdqp); *ipp = ip; +xfs_iunlock (ip,XFS_ILOCK_EXCL );return 0 ; out_trans_cancel:
@@ -1258,6 +1263,7 @@ xfs_create_tmpfile(* transactions and deadlocks from xfs_inactive. */ if (ip) { +xfs_iunlock (ip,XFS_ILOCK_EXCL );xfs_finish_inode_setup (ip);xfs_irele (ip); }
fs/xfs/xfs_qm.c +3 -1
@@ -834,8 +834,10 @@ xfs_qm_qino_alloc(ASSERT (xfs_is_shutdown (mp));xfs_alert (mp,"%s failed (error %d)!" , __func__, error); } -if (need_alloc) +if (need_alloc) { +xfs_iunlock (*ipp,XFS_ILOCK_EXCL );xfs_finish_inode_setup (*ipp); + }return error; }
fs/xfs/xfs_symlink.c +4 -2
@@ -171,8 +171,7 @@ xfs_symlink(* the transaction cancel unlocking dp so don't do it explicitly in the * error path. */ -xfs_trans_ijoin (tp, dp,XFS_ILOCK_EXCL ); - unlock_dp_on_error = false; +xfs_trans_ijoin (tp, dp,0 );/* * Also attach the dquot(s) to it, if applicable.
@@ -214,6 +213,8 @@ xfs_symlink(xfs_qm_dqrele (pdqp); *ipp = ip; +xfs_iunlock (ip,XFS_ILOCK_EXCL ); +xfs_iunlock (dp,XFS_ILOCK_EXCL );return 0 ; out_trans_cancel:
@@ -225,6 +226,7 @@ xfs_symlink(* transactions and deadlocks from xfs_inactive. */ if (ip) { +xfs_iunlock (ip,XFS_ILOCK_EXCL );xfs_finish_inode_setup (ip);xfs_irele (ip); }
PATCH 4/7 xfs: Hold inode locks in xfs_trans_alloc_dir
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Modify xfs_trans_alloc_dir to hold locks after return. Caller will be responsible for manual unlock. We will need this later to hold locks across parent pointer operations
--- fs/xfs/xfs_inode.c | 14 ++++++++++++-- fs/xfs/xfs_trans.c | 9 +++++++-- 2 files changed, 19 insertions(+), 4 deletions(-)
fs/xfs/xfs_inode.c +12 -2
@@ -1355,10 +1355,15 @@ xfs_link(if (xfs_has_wsync (mp) ||xfs_has_dirsync (mp))xfs_trans_set_sync (tp); -return xfs_trans_commit (tp); + error =xfs_trans_commit (tp); +xfs_iunlock (tdp,XFS_ILOCK_EXCL ); +xfs_iunlock (sip,XFS_ILOCK_EXCL ); +return error; error_return:xfs_trans_cancel (tp); +xfs_iunlock (tdp,XFS_ILOCK_EXCL ); +xfs_iunlock (sip,XFS_ILOCK_EXCL ); std_return:if (error == -ENOSPC && nospace_error) error = nospace_error;
@@ -2684,15 +2689,20 @@ xfs_remove( error =xfs_trans_commit (tp);if (error) - goto std_return; + goto out_unlock;if (is_dir &&xfs_inode_is_filestream (ip))xfs_filestream_deassociate (ip); +xfs_iunlock (ip,XFS_ILOCK_EXCL ); +xfs_iunlock (dp,XFS_ILOCK_EXCL );return 0 ; out_trans_cancel:xfs_trans_cancel (tp); + out_unlock: +xfs_iunlock (ip,XFS_ILOCK_EXCL ); +xfs_iunlock (dp,XFS_ILOCK_EXCL ); std_return:return error; }
fs/xfs/xfs_trans.c +7 -2
@@ -1451,6 +1451,8 @@ xfs_trans_alloc_ichange(* The caller must ensure that the on-disk dquots attached to this inode have * already been allocated and initialized. The ILOCKs will be dropped when the * transaction is committed or cancelled. +* +* Caller is responsible for unlocking the inodes manually upon return */ int xfs_trans_alloc_dir(
@@ -1481,8 +1483,8 @@ xfs_trans_alloc_dir(xfs_lock_two_inodes (dp,XFS_ILOCK_EXCL , ip,XFS_ILOCK_EXCL ); -xfs_trans_ijoin (tp, dp,XFS_ILOCK_EXCL ); -xfs_trans_ijoin (tp, ip,XFS_ILOCK_EXCL ); +xfs_trans_ijoin (tp, dp,0 ); +xfs_trans_ijoin (tp, ip,0 ); error =xfs_qm_dqattach_locked (dp, false);if (error) {
@@ -1505,6 +1507,9 @@ xfs_trans_alloc_dir(if (error == -EDQUOT || error == -ENOSPC ) {if (!retried) {xfs_trans_cancel (tp); +xfs_iunlock (dp,XFS_ILOCK_EXCL ); +if (dp != ip) +xfs_iunlock (ip,XFS_ILOCK_EXCL );xfs_blockgc_free_quota (dp,0 ); retried = true; goto retry;
PATCH 5/7 xfs: Hold inode locks in xfs_rename
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Modify xfs_rename to hold all inode locks across a rename operation We will need this later when we add parent pointers
--- fs/xfs/xfs_inode.c | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-)
fs/xfs/xfs_inode.c +33 -12
@@ -2707,6 +2707,21 @@ xfs_remove(return error; } +static inline void +xfs_iunlock_rename ( +struct xfs_inode **i_tab, +int num_inodes) +{ +int i; + +for (i = num_inodes -1 ; i >=0 ; i--) { +/* Skip duplicate inodes if src and target dps are the same */ +if (!i_tab[i] || (i >0 && i_tab[i] == i_tab[i -1 ])) +continue ; +xfs_iunlock (i_tab[i],XFS_ILOCK_EXCL ); + } +} +/* * Enter all inodes for a rename transaction into a sorted array. */
@@ -3016,8 +3031,10 @@ xfs_rename(* Attach the dquots to the inodes */ error =xfs_qm_vop_rename_dqattach (inodes); -if (error) - goto out_trans_cancel; +if (error) { +xfs_trans_cancel (tp); + goto out_release_wip; + }/* * Lock all the participating inodes. Depending upon whether
@@ -3028,18 +3045,16 @@ xfs_rename(xfs_lock_inodes (inodes, num_inodes,XFS_ILOCK_EXCL );/* -* Join all the inodes to the transaction. From this point on, -* we can rely on either trans_commit or trans_cancel to unlock -* them. +* Join all the inodes to the transaction. */ -xfs_trans_ijoin (tp, src_dp,XFS_ILOCK_EXCL ); +xfs_trans_ijoin (tp, src_dp,0 );if (new_parent) -xfs_trans_ijoin (tp, target_dp,XFS_ILOCK_EXCL ); -xfs_trans_ijoin (tp, src_ip,XFS_ILOCK_EXCL ); +xfs_trans_ijoin (tp, target_dp,0 ); +xfs_trans_ijoin (tp, src_ip,0 );if (target_ip) -xfs_trans_ijoin (tp, target_ip,XFS_ILOCK_EXCL ); +xfs_trans_ijoin (tp, target_ip,0 );if (wip) -xfs_trans_ijoin (tp, wip,XFS_ILOCK_EXCL ); +xfs_trans_ijoin (tp, wip,0 );/* * If we are using project inheritance, we only allow renames
@@ -3053,10 +3068,13 @@ xfs_rename( }/* RENAME_EXCHANGE is unique from here on. */ -if (flags &RENAME_EXCHANGE ) -return xfs_cross_rename (tp, src_dp, src_name, src_ip, +if (flags &RENAME_EXCHANGE ) { + error =xfs_cross_rename (tp, src_dp, src_name, src_ip, target_dp, target_name, target_ip, spaceres); +xfs_iunlock_rename (inodes, num_inodes); +return error; + }/* * Try to reserve quota to handle an expansion of the target directory.
@@ -3070,6 +3088,7 @@ xfs_rename(if (error == -EDQUOT || error == -ENOSPC ) {if (!retried) {xfs_trans_cancel (tp); +xfs_iunlock_rename (inodes, num_inodes);xfs_blockgc_free_quota (target_dp,0 ); retried = true; goto retry;
@@ -3296,12 +3315,14 @@ xfs_rename(xfs_dir_update_hook (src_dp, wip,1 , src_name); error =xfs_finish_rename (tp); +xfs_iunlock_rename (inodes, num_inodes);if (wip)xfs_irele (wip);return error; out_trans_cancel:xfs_trans_cancel (tp); +xfs_iunlock_rename (inodes, num_inodes); out_release_wip:if (wip)xfs_irele (wip);
PATCH 6/7 xfs: don't pick up IOLOCK during rmapbt repair scan
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Now that we've fixed the directory operations to hold the ILOCK until they're finished with rmapbt updates for directory shape changes, we no longer need to take this lock when scanning directories for rmapbt records.
--- fs/xfs/scrub/rmap_repair.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
fs/xfs/scrub/rmap_repair.c +1 -15
@@ -567,23 +567,9 @@ xrep_rmap_scan_inode(struct xrep_rmap *rr, struct xfs_inode *ip) { - unsigned int lock_mode = 0; + unsigned int lock_mode = xrep_rmap_scan_ilock(ip);int error; -/* -* Directory updates (create/link/unlink/rename) drop the directory's -* ILOCK before finishing any rmapbt updates associated with directory -* shape changes. For this scan to coordinate correctly with the live -* update hook, we must take the only lock (i_rwsem) that is held all -* the way to dir op completion. This will get fixed by the parent -* pointer patchset. -*/ -if (S_ISDIR (VFS_I (ip)->i_mode)) { - lock_mode =XFS_IOLOCK_SHARED ; -xfs_ilock (ip, lock_mode); - } - lock_mode |=xrep_rmap_scan_ilock (ip); -/* Check the data fork. */ error =xrep_rmap_scan_ifork (rr, ip,XFS_DATA_FORK );if (error)
PATCH 7/7 xfs: unlock new repair tempfiles after creation
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
After creation, drop the ILOCK on temporary files that have been created to stage a repair.
--- fs/xfs/scrub/tempfile.c | 2 ++ 1 file changed, 2 insertions(+)
fs/xfs/scrub/tempfile.c +2 -0
@@ -145,6 +145,7 @@ xrep_tempfile_create(xfs_qm_dqrele (pdqp);/* Finish setting up the incore / vfs context. */ +xfs_iunlock (sc->tempip,XFS_ILOCK_EXCL );xfs_setup_iops (sc->tempip);xfs_finish_inode_setup (sc->tempip);
@@ -160,6 +161,7 @@ xrep_tempfile_create(* transactions and deadlocks from xfs_inactive. */ if (sc->tempip) { +xfs_iunlock (sc->tempip,XFS_ILOCK_EXCL );xfs_finish_inode_setup (sc->tempip);xchk_irele (sc, sc->tempip); }
cover xfs: name-value xattr lookups
In reply to Darrick J. WongHi all,
Directory parent pointers are stored as namespaced extended attributes of a file. Because parent pointers can consume up to 267 bytes of space and xattr names are 255 bytes at most, we cannot use the usual attr name lookup functions to find a parent pointer. This is solvable by introducing a new lookup mode that checks both the name and the value of the xattr.
Therefore, introduce this new lookup mode. Because all parent pointer updates are logged, we must extend the xattr logging code to capture the VLOOKUP variants, and restore them when recovering logged operations. These new log formats are protected by the sb_incompat PARENT flag, so they do not need a separate log_incompat feature flag.
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
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=pptrs-attr-nvlookups
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=pptrs-attr-nvlookups
--- fs/xfs/libxfs/xfs_attr.c | 57 +++++-- fs/xfs/libxfs/xfs_attr.h | 9 + fs/xfs/libxfs/xfs_attr_leaf.c | 45 ++++- fs/xfs/libxfs/xfs_da_btree.h | 10 + fs/xfs/libxfs/xfs_log_format.h | 29 +++ fs/xfs/xfs_attr_item.c | 347 ++++++++++++++++++++++++++++++++++------ fs/xfs/xfs_attr_item.h | 2 fs/xfs/xfs_xattr.c | 5 + 8 files changed, 425 insertions(+), 79 deletions(-)
PATCH 1/12 xfs: check opcode and iovec count match in xlog_recover_attri_commit_pass2
From: Darrick J. Wong <[email protected]>
Check that the number of recovered log iovecs is what is expected for the xattri opcode is expecting.
--- fs/xfs/xfs_attr_item.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
fs/xfs/xfs_attr_item.c +27 -0
@@ -711,6 +711,7 @@ xlog_recover_attri_commit_pass2(const void *attr_value =NULL ;const void *attr_name;size_t len; +unsigned int op; attri_formatp = item->ri_buf[0 ].i_addr; attr_name = item->ri_buf[1 ].i_addr;
@@ -729,6 +730,32 @@ xlog_recover_attri_commit_pass2(return -EFSCORRUPTED ; } +/* Check the number of log iovecs makes sense for the op code. */ + op = attri_formatp->alfi_op_flags &XFS_ATTRI_OP_FLAGS_TYPE_MASK ; +switch (op) { +case XFS_ATTRI_OP_FLAGS_SET : +case XFS_ATTRI_OP_FLAGS_REPLACE : +/* Log item, attr name, attr value */ +if (item->ri_total !=3 ) { +XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, + attri_formatp, len); +return -EFSCORRUPTED ; + } +break ; +case XFS_ATTRI_OP_FLAGS_REMOVE : +/* Log item, attr name */ +if (item->ri_total !=2 ) { +XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, + attri_formatp, len); +return -EFSCORRUPTED ; + } +break ; +default : +XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, + attri_formatp, len); +return -EFSCORRUPTED ; + } +/* Validate the attr name */ if (item->ri_buf[1 ].i_len !=xlog_calc_iovec_len (attri_formatp->alfi_name_len)) {
PATCH 2/12 xfs: make xfs_attr_set require XFS_DA_OP_REMOVE
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Quite a few patches from now, we're going to change the parent pointer xattr format to encode as much of the dirent name in the xattr name as fits, and spill the rest of it to the xattr value. To make this work correctly, we'll be adding the ability to look up xattrs based on name /and/ value.
Internally, the xattr data structure supports attributes with a zero length value, which is how we're going to store parent pointers for short dirent names. The parent pointer repair code uses xfs_attr_set to add missing and remove dangling parent pointers, so that interface must be capable of setting an xattr with args->value == NULL.
The userspace API doesn't support this, so xfs_attr_set currently treats a NULL args->value as a request to remove an attr. However, that's a quirk of the existing callers and the interface. Make the callers of xfs_attr_set to declare explicitly that they want to remove an xattr.
--- fs/xfs/libxfs/xfs_attr.c | 9 +++++---- fs/xfs/xfs_xattr.c | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-)
fs/xfs/libxfs/xfs_attr.c +5 -4
@@ -967,6 +967,7 @@ xfs_attr_set(struct xfs_mount *mp = dp->i_mount;struct xfs_trans_res tres;bool rsvd = (args->attr_filter &XFS_ATTR_ROOT ); +bool is_remove = args->op_flags &XFS_DA_OP_REMOVE ;int error, local;int rmt_blks =0 ;unsigned int total;
@@ -991,7 +992,7 @@ xfs_attr_set( args->op_flags =XFS_DA_OP_OKNOENT | (args->op_flags &XFS_DA_OP_LOGGED ); -if (args->value) { +if (!is_remove) {XFS_STATS_INC (mp, xs_attr_set); args->total =xfs_attr_calc_size (args, &local);
@@ -1025,7 +1026,7 @@ xfs_attr_set(if (error)return error; -if (args->value ||xfs_inode_hasattr (dp)) { +if (!is_remove ||xfs_inode_hasattr (dp)) { error =xfs_iext_count_may_overflow (dp,XFS_ATTR_FORK ,XFS_IEXT_ATTR_MANIP_CNT (rmt_blks));if (error == -EFBIG )
@@ -1039,7 +1040,7 @@ xfs_attr_set(switch (error) {case -EEXIST :/* if no value, we are performing a remove operation */ -if (!args->value) { +if (is_remove) { error =xfs_attr_defer_remove (args);break ; }
@@ -1051,7 +1052,7 @@ xfs_attr_set(break ;case -ENOATTR :/* Can't remove what isn't there. */ -if (!args->value) +if (is_remove) goto out_trans_cancel;/* Pure replace fails if no existing attr to replace. */
fs/xfs/xfs_xattr.c +5 -0
@@ -103,6 +103,11 @@ xfs_attr_change( use_logging = true; } +if (args->value) + args->op_flags &= ~XFS_DA_OP_REMOVE ; +else + args->op_flags |=XFS_DA_OP_REMOVE ; + error =xfs_attr_set (args);if (use_logging)
PATCH 3/12 xfs: allow xattr matching on name and value for local/sf attrs
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add a new NVLOOKUP flag to signal that the caller wants to look up an extended attribute by name and value. This only works with shortform and local attributes. Only parent pointers need this functionality and parent pointers cannot be remote xattrs, so this limitation is ok for now.
--- fs/xfs/libxfs/xfs_attr_leaf.c | 45 ++++++++++++++++++++++++++++++++++------- fs/xfs/libxfs/xfs_da_btree.h | 4 +++- 2 files changed, 40 insertions(+), 9 deletions(-)
fs/xfs/libxfs/xfs_attr_leaf.c +37 -8
@@ -508,10 +508,12 @@ xfs_attr3_leaf_read(*/ static bool xfs_attr_match ( -struct xfs_da_args *args, -uint8_t namelen, -unsigned char *name, -int flags) +const struct xfs_da_args *args, +uint8_t namelen, +const unsigned char *name, +unsigned int valuelen, +const void *value, +int flags) {if (args->namelen != namelen)
@@ -519,6 +521,23 @@ xfs_attr_match(if (memcmp (args->name, name, namelen) !=0 )return false; +if (args->op_flags &XFS_DA_OP_NVLOOKUP ) { +if (args->valuelen != valuelen) +return false; +if (args->valuelen && !value) { +/* not implemented for remote values */ +ASSERT (0 ); +return false; + } +if (valuelen && !args->value) { +/* caller gave us valuelen > 0 but no value?? */ +ASSERT (0 ); +return false; + } +if (valuelen >0 &&memcmp (args->value, value, valuelen) !=0 ) +return false; + } +/* Recovery ignores the INCOMPLETE flag. */ if ((args->op_flags &XFS_DA_OP_RECOVERY ) && args->attr_filter == (flags &XFS_ATTR_NSP_ONDISK_MASK ))
@@ -537,6 +556,10 @@ xfs_attr_copy_value( unsigned char *value, int valuelen) { +/* vlookups already supplied the attr value; don't copy anything */ +if (args->op_flags &XFS_DA_OP_NVLOOKUP ) +return 0 ; +/* * No copy if all we have to do is get the length */
@@ -761,6 +784,7 @@ xfs_attr_sf_findname( base += size, i++) { size =xfs_attr_sf_entsize (sfe);if (!xfs_attr_match (args, sfe->namelen, sfe->nameval, + sfe->valuelen, &sfe->nameval[sfe->namelen], sfe->flags))continue ;break ;
@@ -929,6 +953,7 @@ xfs_attr_shortform_lookup(xfs_da_args_t *args)for (i =0 ; i < sf->hdr.count; sfe =xfs_attr_sf_nextentry (sfe), i++) {if (xfs_attr_match (args, sfe->namelen, sfe->nameval, + sfe->valuelen, &sfe->nameval[sfe->namelen], sfe->flags))return -EEXIST ; }
@@ -956,6 +981,7 @@ xfs_attr_shortform_getvalue(for (i =0 ; i < sf->hdr.count; sfe =xfs_attr_sf_nextentry (sfe), i++) {if (xfs_attr_match (args, sfe->namelen, sfe->nameval, + sfe->valuelen, &sfe->nameval[sfe->namelen], sfe->flags))return xfs_attr_copy_value (args, &sfe->nameval[args->namelen], sfe->valuelen);
@@ -1008,7 +1034,7 @@ xfs_attr_shortform_to_leaf( nargs.total = args->total; nargs.whichfork =XFS_ATTR_FORK ; nargs.trans = args->trans; - nargs.op_flags =XFS_DA_OP_OKNOENT ; + nargs.op_flags =XFS_DA_OP_OKNOENT |XFS_DA_OP_NVLOOKUP ; nargs.owner = args->owner; sfe = &sf->list[0 ];
@@ -1229,7 +1255,7 @@ xfs_attr3_leaf_to_shortform( nargs.total = args->total; nargs.whichfork =XFS_ATTR_FORK ; nargs.trans = args->trans; - nargs.op_flags =XFS_DA_OP_OKNOENT ; + nargs.op_flags =XFS_DA_OP_OKNOENT |XFS_DA_OP_NVLOOKUP ; nargs.owner = args->owner;for (i =0 ; i < ichdr.count; entry++, i++) {
@@ -2532,14 +2558,17 @@ xfs_attr3_leaf_lookup_int(if (entry->flags &XFS_ATTR_LOCAL ) { name_loc =xfs_attr3_leaf_name_local (leaf, probe);if (!xfs_attr_match (args, name_loc->namelen, - name_loc->nameval, entry->flags)) + name_loc->nameval, +be16_to_cpu (name_loc->valuelen), + &name_loc->nameval[name_loc->namelen], + entry->flags))continue ; args->index = probe;return -EEXIST ; }else { name_rmt =xfs_attr3_leaf_name_remote (leaf, probe);if (!xfs_attr_match (args, name_rmt->namelen, - name_rmt->name, entry->flags)) + name_rmt->name,0 ,NULL , entry->flags))continue ; args->index = probe; args->rmtvaluelen =be32_to_cpu (name_rmt->valuelen);
fs/xfs/libxfs/xfs_da_btree.h +3 -1
@@ -94,6 +94,7 @@ typedef struct xfs_da_args {#define XFS_DA_OP_REMOVE (1u << 6)/* this is a remove operation */ #define XFS_DA_OP_RECOVERY (1u << 7)/* Log recovery operation */ #define XFS_DA_OP_LOGGED (1u << 8)/* Use intent items to track op */ +#define XFS_DA_OP_NVLOOKUP (1u << 9)/* Match local attr on name+value */ #define XFS_DA_OP_FLAGS \ { XFS_DA_OP_JUSTCHECK, "JUSTCHECK" }, \
@@ -104,7 +105,8 @@ typedef struct xfs_da_args { { XFS_DA_OP_NOTIME, "NOTIME" }, \ { XFS_DA_OP_REMOVE, "REMOVE" }, \ { XFS_DA_OP_RECOVERY, "RECOVERY" }, \ - { XFS_DA_OP_LOGGED, "LOGGED" } + { XFS_DA_OP_LOGGED, "LOGGED" }, \ + { XFS_DA_OP_NVLOOKUP, "NVLOOKUP" }/* * Storage for holding state during Btree searches and split/join ops.
PATCH 4/12 xfs: preserve NVLOOKUP in xfs_attr_set
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Preserve the attr-value lookup flag when calling xfs_attr_set. Normal xattr users will never use this, but parent pointer fsck will.
--- fs/xfs/libxfs/xfs_attr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/xfs/libxfs/xfs_attr.c +4 -4
@@ -986,11 +986,11 @@ xfs_attr_set(/* * We have no control over the attribute names that userspace passes us * to remove, so we have to allow the name lookup prior to attribute -* removal to fail as well. Preserve the logged flag, since we need -* to pass that through to the logging code. +* removal to fail as well. Preserve the logged and vlookup flags, +* since we need to pass them through to the lower levels. */ - args->op_flags =XFS_DA_OP_OKNOENT | - (args->op_flags &XFS_DA_OP_LOGGED ); + args->op_flags &= (XFS_DA_OP_LOGGED |XFS_DA_OP_NVLOOKUP ); + args->op_flags |=XFS_DA_OP_OKNOENT ;if (!is_remove) {XFS_STATS_INC (mp, xs_attr_set);
PATCH 5/12 xfs: restructure xfs_attr_complete_op a bit
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Reduce the indentation in this function by flattening the nested if statements. We're going to add more code later to this function later, hence the early cleanup. No functional changes.
--- fs/xfs/libxfs/xfs_attr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/xfs/libxfs/xfs_attr.c +5 -5
@@ -421,11 +421,11 @@ xfs_attr_complete_op(bool do_replace = args->op_flags &XFS_DA_OP_REPLACE ; args->op_flags &= ~XFS_DA_OP_REPLACE ; -if (do_replace) { - args->attr_filter &= ~XFS_ATTR_INCOMPLETE ; -return replace_state; - } -return XFS_DAS_DONE ; +if (!do_replace) +return XFS_DAS_DONE ; + + args->attr_filter &= ~XFS_ATTR_INCOMPLETE ; +return replace_state; } static int
PATCH 6/12 xfs: use helpers to extract xattr op from opflags
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Create helper functions to extract the xattr op from the ondisk xattri log item and the incore attr intent item. These will get more use in the patches that follow.
--- fs/xfs/libxfs/xfs_attr.h | 5 +++++ fs/xfs/xfs_attr_item.c | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-)
fs/xfs/libxfs/xfs_attr.h +5 -0
@@ -529,6 +529,11 @@ struct xfs_attr_intent {struct xfs_bmbt_irec xattri_map; }; +static inline unsigned int +xfs_attr_intent_op (const struct xfs_attr_intent *attr) +{ +return attr->xattri_op_flags &XFS_ATTRI_OP_FLAGS_TYPE_MASK ; +}/*======================================================================== * Function prototypes for the kernel.
fs/xfs/xfs_attr_item.c +10 -6
@@ -351,6 +351,12 @@ xfs_xattri_finish_update(return error; } +static inline unsigned int +xfs_attr_log_item_op (const struct xfs_attri_log_format *attrp) +{ +return attrp->alfi_op_flags &XFS_ATTRI_OP_FLAGS_TYPE_MASK ; +} +/* Log an attr to the intent item. */ STATIC void xfs_attr_log_item(
@@ -500,8 +506,7 @@ xfs_attri_validate(struct xfs_mount *mp, struct xfs_attri_log_format *attrp) { - unsigned int op = attrp->alfi_op_flags & -XFS_ATTRI_OP_FLAGS_TYPE_MASK ; + unsigned int op = xfs_attr_log_item_op(attrp);if (attrp->__pad !=0 )return false;
@@ -573,8 +578,7 @@ xfs_attri_item_recover( args = (struct xfs_da_args *)(attr +1 ); attr->xattri_da_args = args; - attr->xattri_op_flags = attrp->alfi_op_flags & -XFS_ATTRI_OP_FLAGS_TYPE_MASK ; + attr->xattri_op_flags =xfs_attr_log_item_op (attrp);/* * We're reconstructing the deferred work state structure from the
@@ -597,7 +601,7 @@ xfs_attri_item_recover(ASSERT (xfs_sb_version_haslogxattrs (&mp->m_sb)); -switch (attr->xattri_op_flags) { +switch (xfs_attr_intent_op (attr)) {case XFS_ATTRI_OP_FLAGS_SET :case XFS_ATTRI_OP_FLAGS_REPLACE : args->value = nv->value.i_addr;
@@ -731,7 +735,7 @@ xlog_recover_attri_commit_pass2( }/* Check the number of log iovecs makes sense for the op code. */ - op = attri_formatp->alfi_op_flags &XFS_ATTRI_OP_FLAGS_TYPE_MASK ; + op =xfs_attr_log_item_op (attri_formatp);switch (op) {case XFS_ATTRI_OP_FLAGS_SET :case XFS_ATTRI_OP_FLAGS_REPLACE :
PATCH 7/12 xfs: validate recovered name buffers when recovering xattr items
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Strengthen the xattri log item recovery code by checking that we actually have the required name and newname buffers for whatever operation we're replaying.
--- fs/xfs/xfs_attr_item.c | 58 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 11 deletions(-)
fs/xfs/xfs_attr_item.c +47 -11
@@ -715,22 +715,20 @@ xlog_recover_attri_commit_pass2(const void *attr_value =NULL ;const void *attr_name;size_t len; -unsigned int op; - - attri_formatp = item->ri_buf[0 ].i_addr; - attr_name = item->ri_buf[1 ].i_addr; +unsigned int op, i =0 ;/* Validate xfs_attri_log_format before the large memory allocation */ len =sizeof (struct xfs_attri_log_format ); -if (item->ri_buf[0 ].i_len != len) { +if (item->ri_buf[i].i_len != len) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, item->ri_buf[0 ].i_addr, item->ri_buf[0 ].i_len);return -EFSCORRUPTED ; } + attri_formatp = item->ri_buf[i].i_addr;if (!xfs_attri_validate (mp, attri_formatp)) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, - item->ri_buf[0 ].i_addr, item->ri_buf[0 ].i_len); + attri_formatp, len);return -EFSCORRUPTED ; }
@@ -759,31 +757,69 @@ xlog_recover_attri_commit_pass2( attri_formatp, len);return -EFSCORRUPTED ; } + i++;/* Validate the attr name */ -if (item->ri_buf[1 ].i_len != +if (item->ri_buf[i].i_len !=xlog_calc_iovec_len (attri_formatp->alfi_name_len)) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, - item->ri_buf[0 ].i_addr, item->ri_buf[0 ].i_len); + attri_formatp, len);return -EFSCORRUPTED ; } + attr_name = item->ri_buf[i].i_addr;if (!xfs_attr_namecheck (attr_name, attri_formatp->alfi_name_len)) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, - item->ri_buf[1 ].i_addr, item->ri_buf[1 ].i_len); + attri_formatp, len);return -EFSCORRUPTED ; } + i++;/* Validate the attr value, if present */ if (attri_formatp->alfi_value_len !=0 ) { -if (item->ri_buf[2 ].i_len !=xlog_calc_iovec_len (attri_formatp->alfi_value_len)) { +if (item->ri_buf[i].i_len !=xlog_calc_iovec_len (attri_formatp->alfi_value_len)) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, item->ri_buf[0 ].i_addr, item->ri_buf[0 ].i_len);return -EFSCORRUPTED ; } - attr_value = item->ri_buf[2 ].i_addr; + attr_value = item->ri_buf[i].i_addr; + i++; + } + +/* +* Make sure we got the correct number of buffers for the operation +* that we just loaded. +*/ +if (i != item->ri_total) { +XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, + attri_formatp, len); +return -EFSCORRUPTED ; + } + +switch (op) { +case XFS_ATTRI_OP_FLAGS_REMOVE : +/* Regular remove operations operate only on names. */ +if (attr_value !=NULL || attri_formatp->alfi_value_len !=0 ) { +XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, + attri_formatp, len); +return -EFSCORRUPTED ; + } + fallthrough; +case XFS_ATTRI_OP_FLAGS_SET : +case XFS_ATTRI_OP_FLAGS_REPLACE : +/* +* Regular xattr set/remove/replace operations require a name +* and do not take a newname. Values are optional for set and +* replace. +*/ +if (attr_name ==NULL || attri_formatp->alfi_name_len ==0 ) { +XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, + attri_formatp, len); +return -EFSCORRUPTED ; + } +break ; }/*
PATCH 8/12 xfs: always set args->value in xfs_attri_item_recover
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Always set args->value to the recovered value buffer. This reduces the amount of code in the switch statement, and hence the amount of thinking that I have to do. We validated the recovered buffers, supposedly.
--- fs/xfs/xfs_attr_item.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/xfs/xfs_attr_item.c +2 -2
@@ -594,6 +594,8 @@ xfs_attri_item_recover( args->name = nv->name.i_addr; args->namelen = nv->name.i_len; args->hashval =xfs_da_hashname (args->name, args->namelen); + args->value = nv->value.i_addr; + args->valuelen = nv->value.i_len; args->attr_filter = attrp->alfi_attr_filter &XFS_ATTRI_FILTER_MASK ; args->op_flags =XFS_DA_OP_RECOVERY |XFS_DA_OP_OKNOENT |XFS_DA_OP_LOGGED ;
@@ -604,8 +606,6 @@ xfs_attri_item_recover(switch (xfs_attr_intent_op (attr)) {case XFS_ATTRI_OP_FLAGS_SET :case XFS_ATTRI_OP_FLAGS_REPLACE : - args->value = nv->value.i_addr; - args->valuelen = nv->value.i_len; args->total =xfs_attr_calc_size (args, &local);if (xfs_inode_hasattr (args->dp)) attr->xattri_dela_state =xfs_attr_init_replace_state (args);
PATCH 9/12 xfs: use local variables for name and value length in _attri_commit_pass2
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
We're about to start using tagged unions in the xattr log format, so create a bunch of local variables in the recovery function so we only have to decode the log item fields once.
--- fs/xfs/xfs_attr_item.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
fs/xfs/xfs_attr_item.c +14 -11
@@ -712,9 +712,11 @@ xlog_recover_attri_commit_pass2(struct xfs_attri_log_item *attrip;struct xfs_attri_log_format *attri_formatp;struct xfs_attri_log_nameval *nv; -const void *attr_value =NULL ;const void *attr_name; +const void *attr_value =NULL ;size_t len; +unsigned int name_len =0 ; +unsigned int value_len =0 ;unsigned int op, i =0 ;/* Validate xfs_attri_log_format before the large memory allocation */
@@ -743,6 +745,8 @@ xlog_recover_attri_commit_pass2( attri_formatp, len);return -EFSCORRUPTED ; } + name_len = attri_formatp->alfi_name_len; + value_len = attri_formatp->alfi_value_len;break ;case XFS_ATTRI_OP_FLAGS_REMOVE :/* Log item, attr name */
@@ -751,6 +755,7 @@ xlog_recover_attri_commit_pass2( attri_formatp, len);return -EFSCORRUPTED ; } + name_len = attri_formatp->alfi_name_len;break ;default : XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
@@ -760,15 +765,14 @@ xlog_recover_attri_commit_pass2( i++;/* Validate the attr name */ -if (item->ri_buf[i].i_len != -xlog_calc_iovec_len (attri_formatp->alfi_name_len)) { +if (item->ri_buf[i].i_len !=xlog_calc_iovec_len (name_len)) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, attri_formatp, len);return -EFSCORRUPTED ; } attr_name = item->ri_buf[i].i_addr; -if (!xfs_attr_namecheck (attr_name, attri_formatp->alfi_name_len)) { +if (!xfs_attr_namecheck (attr_name, name_len)) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, attri_formatp, len);return -EFSCORRUPTED ;
@@ -776,8 +780,8 @@ xlog_recover_attri_commit_pass2( i++;/* Validate the attr value, if present */ -if (attri_formatp->alfi_value_len !=0 ) { -if (item->ri_buf[i].i_len !=xlog_calc_iovec_len (attri_formatp->alfi_value_len)) { +if (value_len !=0 ) { +if (item->ri_buf[i].i_len !=xlog_calc_iovec_len (value_len)) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, item->ri_buf[0 ].i_addr, item->ri_buf[0 ].i_len);
@@ -801,7 +805,7 @@ xlog_recover_attri_commit_pass2(switch (op) {case XFS_ATTRI_OP_FLAGS_REMOVE :/* Regular remove operations operate only on names. */ -if (attr_value !=NULL || attri_formatp->alfi_value_len !=0 ) { +if (attr_value !=NULL || value_len !=0 ) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, attri_formatp, len);return -EFSCORRUPTED ;
@@ -814,7 +818,7 @@ xlog_recover_attri_commit_pass2(* and do not take a newname. Values are optional for set and * replace. */ -if (attr_name ==NULL || attri_formatp->alfi_name_len ==0 ) { +if (attr_name ==NULL || name_len ==0 ) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, attri_formatp, len);return -EFSCORRUPTED ;
@@ -827,9 +831,8 @@ xlog_recover_attri_commit_pass2(* name/value buffer to the recovered incore log item and drop our * reference. */ - nv =xfs_attri_log_nameval_alloc (attr_name, - attri_formatp->alfi_name_len, attr_value, - attri_formatp->alfi_value_len); + nv =xfs_attri_log_nameval_alloc (attr_name, name_len, + attr_value, value_len); attrip =xfs_attri_init (mp, nv);memcpy (&attrip->attri_format, attri_formatp, len);
PATCH 10/12 xfs: log NVLOOKUP xattr removal operations
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
If high level code wants to do a deferred xattr remove operation with the NVLOOKUP flag set, we need to push this through the log.
--- fs/xfs/libxfs/xfs_attr.c | 6 +++++- fs/xfs/libxfs/xfs_log_format.h | 1 + fs/xfs/xfs_attr_item.c | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_attr.c +5 -1
@@ -942,9 +942,13 @@ xfs_attr_defer_remove( {struct xfs_attr_intent *new; +int op_flag =XFS_ATTRI_OP_FLAGS_REMOVE ;int error; - error =xfs_attr_intent_init (args,XFS_ATTRI_OP_FLAGS_REMOVE , &new); +if (args->op_flags &XFS_DA_OP_NVLOOKUP ) + op_flag =XFS_ATTRI_OP_FLAGS_NVREMOVE ; + + error =xfs_attr_intent_init (args, op_flag, &new);if (error)return error;
fs/xfs/libxfs/xfs_log_format.h +1 -0
@@ -1036,6 +1036,7 @@ struct xfs_icreate_log {#define XFS_ATTRI_OP_FLAGS_SET 1/* Set the attribute */ #define XFS_ATTRI_OP_FLAGS_REMOVE 2/* Remove the attribute */ #define XFS_ATTRI_OP_FLAGS_REPLACE 3/* Replace the attribute */ +#define XFS_ATTRI_OP_FLAGS_NVREMOVE 4/* Remove attr w/ vlookup */ #define XFS_ATTRI_OP_FLAGS_TYPE_MASK 0xFF/* Flags type mask */ /*
fs/xfs/xfs_attr_item.c +18 -0
@@ -522,6 +522,7 @@ xfs_attri_validate(case XFS_ATTRI_OP_FLAGS_SET :case XFS_ATTRI_OP_FLAGS_REPLACE :case XFS_ATTRI_OP_FLAGS_REMOVE : +case XFS_ATTRI_OP_FLAGS_NVREMOVE :break ;default :return false;
@@ -612,6 +613,9 @@ xfs_attri_item_recover(else attr->xattri_dela_state =xfs_attr_init_add_state (args);break ; +case XFS_ATTRI_OP_FLAGS_NVREMOVE : + args->op_flags |=XFS_DA_OP_NVLOOKUP ; + fallthrough;case XFS_ATTRI_OP_FLAGS_REMOVE :if (!xfs_inode_hasattr (args->dp)) goto out;
@@ -737,6 +741,16 @@ xlog_recover_attri_commit_pass2(/* Check the number of log iovecs makes sense for the op code. */ op =xfs_attr_log_item_op (attri_formatp);switch (op) { +case XFS_ATTRI_OP_FLAGS_NVREMOVE : +/* Log item, attr name, optional attr value */ +if (item->ri_total !=3 && item->ri_total !=2 ) { +XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, + attri_formatp, len); +return -EFSCORRUPTED ; + } + name_len = attri_formatp->alfi_name_len; + value_len = attri_formatp->alfi_value_len; +break ;case XFS_ATTRI_OP_FLAGS_SET :case XFS_ATTRI_OP_FLAGS_REPLACE :/* Log item, attr name, attr value */
@@ -811,12 +825,16 @@ xlog_recover_attri_commit_pass2(return -EFSCORRUPTED ; } fallthrough; +case XFS_ATTRI_OP_FLAGS_NVREMOVE :case XFS_ATTRI_OP_FLAGS_SET :case XFS_ATTRI_OP_FLAGS_REPLACE :/* * Regular xattr set/remove/replace operations require a name * and do not take a newname. Values are optional for set and * replace. +* +* Name-value remove operations must have a name, do not +* take a newname, and can take a value. */ if (attr_name ==NULL || name_len ==0 ) { XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
PATCH 11/12 xfs: log NVLOOKUP xattr setting operations
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
If high level code wants to do a deferred xattr set operation with the NVLOOKUP flag set, we need to push this through the log.
--- fs/xfs/libxfs/xfs_attr.c | 6 +++++- fs/xfs/libxfs/xfs_log_format.h | 1 + fs/xfs/xfs_attr_item.c | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-)
fs/xfs/libxfs/xfs_attr.c +5 -1
@@ -903,9 +903,13 @@ xfs_attr_defer_add( struct xfs_da_args *args) {struct xfs_attr_intent *new; +int op_flag =XFS_ATTRI_OP_FLAGS_SET ;int error =0 ; - error =xfs_attr_intent_init (args,XFS_ATTRI_OP_FLAGS_SET , &new); +if (args->op_flags &XFS_DA_OP_NVLOOKUP ) + op_flag =XFS_ATTRI_OP_FLAGS_NVSET ; + + error =xfs_attr_intent_init (args, op_flag, &new);if (error)return error;
fs/xfs/libxfs/xfs_log_format.h +1 -0
@@ -1037,6 +1037,7 @@ struct xfs_icreate_log {#define XFS_ATTRI_OP_FLAGS_REMOVE 2/* Remove the attribute */ #define XFS_ATTRI_OP_FLAGS_REPLACE 3/* Replace the attribute */ #define XFS_ATTRI_OP_FLAGS_NVREMOVE 4/* Remove attr w/ vlookup */ +#define XFS_ATTRI_OP_FLAGS_NVSET 5/* Set attr with w/ vlookup */ #define XFS_ATTRI_OP_FLAGS_TYPE_MASK 0xFF/* Flags type mask */ /*
fs/xfs/xfs_attr_item.c +7 -1
@@ -523,6 +523,7 @@ xfs_attri_validate(case XFS_ATTRI_OP_FLAGS_REPLACE :case XFS_ATTRI_OP_FLAGS_REMOVE :case XFS_ATTRI_OP_FLAGS_NVREMOVE : +case XFS_ATTRI_OP_FLAGS_NVSET :break ;default :return false;
@@ -605,6 +606,9 @@ xfs_attri_item_recover(ASSERT (xfs_sb_version_haslogxattrs (&mp->m_sb));switch (xfs_attr_intent_op (attr)) { +case XFS_ATTRI_OP_FLAGS_NVSET : + args->op_flags |=XFS_DA_OP_NVLOOKUP ; + fallthrough;case XFS_ATTRI_OP_FLAGS_SET :case XFS_ATTRI_OP_FLAGS_REPLACE : args->total =xfs_attr_calc_size (args, &local);
@@ -741,6 +745,7 @@ xlog_recover_attri_commit_pass2(/* Check the number of log iovecs makes sense for the op code. */ op =xfs_attr_log_item_op (attri_formatp);switch (op) { +case XFS_ATTRI_OP_FLAGS_NVSET :case XFS_ATTRI_OP_FLAGS_NVREMOVE :/* Log item, attr name, optional attr value */ if (item->ri_total !=3 && item->ri_total !=2 ) {
@@ -825,6 +830,7 @@ xlog_recover_attri_commit_pass2(return -EFSCORRUPTED ; } fallthrough; +case XFS_ATTRI_OP_FLAGS_NVSET :case XFS_ATTRI_OP_FLAGS_NVREMOVE :case XFS_ATTRI_OP_FLAGS_SET :case XFS_ATTRI_OP_FLAGS_REPLACE :
@@ -833,7 +839,7 @@ xlog_recover_attri_commit_pass2(* and do not take a newname. Values are optional for set and * replace. * -* Name-value remove operations must have a name, do not +* Name-value set/remove operations must have a name, do not * take a newname, and can take a value. */ if (attr_name ==NULL || name_len ==0 ) {
PATCH 12/12 xfs: log NVLOOKUP xattr nvreplace operations
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
(Formerly titled "xfs: Add new name to attri/d" and described as follows:
This patch adds two new fields to the atti/d. They are nname and nnamelen. This will be used for parent pointer updates since a rename operation may cause the parent pointer to update both the name and value. So we need to carry both the new name as well as the target name in the attri/d.)
If high level code wants to do a deferred xattr nvreplace operation with the NVLOOKUP flag set, we need to push this through the log. This log item records the old name/value pair and the new name/value pair, and completely replaces one with the other. Parent pointers will need this ability to handle rename moving a child file between parents.
--- fs/xfs/libxfs/xfs_attr.c | 20 ++++ fs/xfs/libxfs/xfs_attr.h | 4 - fs/xfs/libxfs/xfs_da_btree.h | 6 + fs/xfs/libxfs/xfs_log_format.h | 27 ++++- fs/xfs/xfs_attr_item.c | 207 +++++++++++++++++++++++++++++++++++----- fs/xfs/xfs_attr_item.h | 2 6 files changed, 233 insertions(+), 33 deletions(-)
fs/xfs/libxfs/xfs_attr.c +19 -1
@@ -425,6 +425,20 @@ xfs_attr_complete_op(return XFS_DAS_DONE ; args->attr_filter &= ~XFS_ATTR_INCOMPLETE ; +if (xfs_attr_intent_op (attr) !=XFS_ATTRI_OP_FLAGS_NVREPLACE ) +return replace_state; + +/* +* NVREPLACE operations require the caller to set the old and new names +* and values explicitly. +*/ +ASSERT (args->new_namelen >0 ); + + args->name = args->new_name; + args->namelen = args->new_namelen; + args->hashval =xfs_da_hashname (args->name, args->namelen); + args->value = args->new_value; + args->valuelen = args->new_valuelen;return replace_state; }
@@ -926,9 +940,13 @@ xfs_attr_defer_replace( struct xfs_da_args *args) {struct xfs_attr_intent *new; +int op_flag =XFS_ATTRI_OP_FLAGS_REPLACE ;int error =0 ; - error =xfs_attr_intent_init (args,XFS_ATTRI_OP_FLAGS_REPLACE , &new); +if (args->op_flags &XFS_DA_OP_NVLOOKUP ) + op_flag =XFS_ATTRI_OP_FLAGS_NVREPLACE ; + + error =xfs_attr_intent_init (args, op_flag, &new);if (error)return error;
fs/xfs/libxfs/xfs_attr.h +2 -2
@@ -510,8 +510,8 @@ struct xfs_attr_intent {struct xfs_da_args *xattri_da_args;/* -* Shared buffer containing the attr name and value so that the logging -* code can share large memory buffers between log items. +* Shared buffer containing the attr name, new name, and value so that +* the logging code can share large memory buffers between log items. */ struct xfs_attri_log_nameval *xattri_nameval;
fs/xfs/libxfs/xfs_da_btree.h +5 -1
@@ -54,11 +54,15 @@ enum xfs_dacmp {*/ typedef struct xfs_da_args { struct xfs_da_geometry *geo; /* da block geometry */ - const uint8_t *name; /* string (maybe not NULL terminated) */ + const uint8_t *name; /* string (maybe not NULL terminated) */ + const uint8_t *new_name; /* new attr name */ int namelen; /* length of string (maybe no NULL) */ + int new_namelen; /* new attr name len */ uint8_t filetype; /* filetype of inode for directories */ void *value; /* set of bytes (maybe contain NULLs) */ + void *new_value; /* new xattr value (may contain NULLs) */ int valuelen; /* length of value */ + int new_valuelen; /* length of new attr value */ unsigned int attr_filter; /* XFS_ATTR_{ROOT,SECURE,INCOMPLETE} */ unsigned int attr_flags; /* XATTR_{CREATE,REPLACE} */ xfs_dahash_t hashval; /* hash value of name */
fs/xfs/libxfs/xfs_log_format.h +23 -4
@@ -115,11 +115,13 @@ struct xfs_unmount_log_format {#define XLOG_REG_TYPE_BUD_FORMAT 26#define XLOG_REG_TYPE_ATTRI_FORMAT 27#define XLOG_REG_TYPE_ATTRD_FORMAT 28 -#define XLOG_REG_TYPE_ATTR_NAME 29 +#define XLOG_REG_TYPE_ATTR_NAME 29#define XLOG_REG_TYPE_ATTR_VALUE 30#define XLOG_REG_TYPE_SXI_FORMAT 31#define XLOG_REG_TYPE_SXD_FORMAT 32 -#define XLOG_REG_TYPE_MAX 32 +#define XLOG_REG_TYPE_ATTR_NEWNAME 33 +#define XLOG_REG_TYPE_ATTR_NEWVALUE 34 +#define XLOG_REG_TYPE_MAX 34/* * Flags to log operation header
@@ -1038,6 +1040,7 @@ struct xfs_icreate_log {#define XFS_ATTRI_OP_FLAGS_REPLACE 3/* Replace the attribute */ #define XFS_ATTRI_OP_FLAGS_NVREMOVE 4/* Remove attr w/ vlookup */ #define XFS_ATTRI_OP_FLAGS_NVSET 5/* Set attr with w/ vlookup */ +#define XFS_ATTRI_OP_FLAGS_NVREPLACE 6/* Replace attr name and val */ #define XFS_ATTRI_OP_FLAGS_TYPE_MASK 0xFF/* Flags type mask */ /*
@@ -1055,11 +1058,27 @@ struct xfs_icreate_log {struct xfs_attri_log_format {uint16_t alfi_type;/* attri log item type */ uint16_t alfi_size;/* size of this item */ -uint32_t __pad;/* pad to 64 bit aligned */ + +/* +* For NVREPLACE, this is the length of the new xattr value. +* alfi_value_len contains the length of the old xattr value. +*/ +uint32_t alfi_new_value_len; +uint64_t alfi_id;/* attri identifier */ uint64_t alfi_ino;/* the inode for this attr operation */ uint32_t alfi_op_flags;/* marks the op as a set or remove */ -uint32_t alfi_name_len;/* attr name length */ +union { +uint32_t alfi_name_len;/* attr name length */ +struct { +/* +* For NVREPLACE, these are the lengths of the old and +* new attr name. +*/ +uint16_t alfi_old_name_len; +uint16_t alfi_new_name_len; + }; + };uint32_t alfi_value_len;/* attr value length */ uint32_t alfi_attr_filter;/* attr filter flags */ };
fs/xfs/xfs_attr_item.c +182 -25
352 lines not on this page · raw message
fs/xfs/xfs_attr_item.h +2 -0
@@ -13,7 +13,9 @@ struct kmem_zone;struct xfs_attri_log_nameval {struct xfs_log_iovec name; +struct xfs_log_iovec new_name;/* NVREPLACE only */ struct xfs_log_iovec value; +struct xfs_log_iovec new_value;/* NVREPLACE only */ refcount_t refcount;/* name and value follow the end of this struct */
cover xfs: Parent Pointers
In reply to Darrick J. WongHi all,
This is the latest parent pointer attributes for xfs. The goal of this patch set is to add a parent pointer attribute to each inode. The attribute name containing the parent inode, generation, and directory offset, while the attribute value contains the file name. This feature will enable future optimizations for online scrub, shrink, nfs handles, verity, or any other feature that could make use of quickly deriving an inodes path from the mount point.
At this point, Allison is moving on to other things, so I've merged her patchset into djwong-dev for merging.
Updates since v11 [djwong]:
Rebase on 6.4-rc and make some tweaks and bugfixes to enable the repair prototypes. Merge with djwong-dev and make online repair actually work.
Updates since v10 [djwong]:
Merge in the ondisk format changes to get rid of the diroffset conflicts with the parent pointer repair code, rebase the entire series with the attr vlookup changes first, and merge all the other random fixes.
Updates since v9:
Reordered patches 2 and 3 to be 6 and 7
xfs: Add xfs_verify_pptr
moved parent pointer validators to xfs_parent
xfs: Add parent pointer ioctl
Extra validation checks for fs id
added missing release for the inode
use GFP_KERNEL flags for malloc/realloc reworked ioctl to use pptr listenty and flex array
NEW
xfs: don't remove the attr fork when parent pointers are enabled
NEW
directory lookups should return diroffsets too
NEW
xfs: move/add parent pointer validators to xfs_parent
Updates since v8:
xfs: parent pointer attribute creation
Fix xfs_parent_init to release log assist on alloc fail Add slab cache for xfs_parent_defer
Fix xfs_create to release after unlock
Add xfs_parent_start and xfs_parent_finish wrappers removed unused xfs_parent_name_irec and xfs_init_parent_name_irec
xfs: add parent attributes to link
Start/finish wrapper updates
Fix xfs_link to disallow reservationless quotas
xfs: add parent attributes to symlink
Fix xfs_symlink to release after unlock
Start/finish wrapper updates
xfs: remove parent pointers in unlink
Start/finish wrapper updates
Add missing parent free
xfs: Add parent pointers to rename
Start/finish wrapper updates
Fix rename to only grab logged xattr once Fix xfs_rename to disallow reservationless quotas Fix double unlock on dqattach fail
Move parent frees to out_release_wip
xfs: Add parent pointers to xfs_cross_rename
Hoist parent pointers into rename
Questions comments and feedback appreciated!
Thanks all!
Allison
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
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=pptrs
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=pptrs
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=pptrs
--- fs/xfs/Makefile | 3 fs/xfs/libxfs/xfs_attr.c | 21 ++- fs/xfs/libxfs/xfs_attr.h | 14 +- fs/xfs/libxfs/xfs_attr_leaf.c | 6 - fs/xfs/libxfs/xfs_attr_sf.h | 1 fs/xfs/libxfs/xfs_da_format.h | 34 ++++ fs/xfs/libxfs/xfs_format.h | 4 fs/xfs/libxfs/xfs_fs.h | 2 fs/xfs/libxfs/xfs_fs_staging.h | 66 ++++++++ fs/xfs/libxfs/xfs_log_format.h | 1 fs/xfs/libxfs/xfs_log_rlimit.c | 53 ++++++ fs/xfs/libxfs/xfs_parent.c | 324 +++++++++++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_parent.h | 101 ++++++++++++ fs/xfs/libxfs/xfs_sb.c | 4 fs/xfs/libxfs/xfs_trans_resv.c | 326 +++++++++++++++++++++++++++++++++------ fs/xfs/libxfs/xfs_trans_space.c | 121 ++++++++++++++ fs/xfs/libxfs/xfs_trans_space.h | 25 ++- fs/xfs/scrub/attr.c | 4 fs/xfs/scrub/dir_repair.c | 2 fs/xfs/scrub/orphanage.c | 6 - fs/xfs/scrub/parent_repair.c | 3 fs/xfs/scrub/symlink_repair.c | 2 fs/xfs/scrub/tempfile.c | 2 fs/xfs/xfs_attr_item.c | 24 +++ fs/xfs/xfs_attr_list.c | 25 ++- fs/xfs/xfs_inode.c | 266 +++++++++++++++++++++++++------- fs/xfs/xfs_ioctl.c | 135 ++++++++++++++++ fs/xfs/xfs_ondisk.h | 4 fs/xfs/xfs_parent_utils.c | 159 +++++++++++++++++++ fs/xfs/xfs_parent_utils.h | 20 ++ fs/xfs/xfs_super.c | 14 ++ fs/xfs/xfs_symlink.c | 29 +++ fs/xfs/xfs_trace.c | 1 fs/xfs/xfs_trace.h | 76 +++++++++ fs/xfs/xfs_xattr.c | 8 + fs/xfs/xfs_xattr.h | 2 36 files changed, 1722 insertions(+), 166 deletions(-) create mode 100644 fs/xfs/libxfs/xfs_parent.c create mode 100644 fs/xfs/libxfs/xfs_parent.h create mode 100644 fs/xfs/libxfs/xfs_trans_space.c create mode 100644 fs/xfs/xfs_parent_utils.c create mode 100644 fs/xfs/xfs_parent_utils.h
PATCH 1/18 xfs: add parent pointer support to attribute code
From: Allison Henderson <[email protected]>
Add the new parent attribute type. XFS_ATTR_PARENT is used only for parent pointer entries; it uses reserved blocks like XFS_ATTR_ROOT.
--- fs/xfs/libxfs/xfs_attr.c | 3 ++- fs/xfs/libxfs/xfs_da_format.h | 5 ++++- fs/xfs/libxfs/xfs_log_format.h | 1 + fs/xfs/scrub/attr.c | 2 +- fs/xfs/xfs_trace.h | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-)
fs/xfs/libxfs/xfs_attr.c +2 -1
@@ -992,7 +992,8 @@ xfs_attr_set(struct xfs_inode *dp = args->dp;struct xfs_mount *mp = dp->i_mount;struct xfs_trans_res tres; -bool rsvd = (args->attr_filter &XFS_ATTR_ROOT ); +bool rsvd = (args->attr_filter & (XFS_ATTR_ROOT | +XFS_ATTR_PARENT ));bool is_remove = args->op_flags &XFS_DA_OP_REMOVE ;int error, local;int rmt_blks =0 ;
fs/xfs/libxfs/xfs_da_format.h +4 -1
@@ -699,12 +699,15 @@ struct xfs_attr3_leafblock {#define XFS_ATTR_LOCAL_BIT 0/* attr is stored locally */ #define XFS_ATTR_ROOT_BIT 1/* limit access to trusted attrs */ #define XFS_ATTR_SECURE_BIT 2/* limit access to secure attrs */ +#define XFS_ATTR_PARENT_BIT 3/* parent pointer attrs */ #define XFS_ATTR_INCOMPLETE_BIT 7/* attr in middle of create/delete */ #define XFS_ATTR_LOCAL (1u << XFS_ATTR_LOCAL_BIT)#define XFS_ATTR_ROOT (1u << XFS_ATTR_ROOT_BIT)#define XFS_ATTR_SECURE (1u << XFS_ATTR_SECURE_BIT) +#define XFS_ATTR_PARENT (1u << XFS_ATTR_PARENT_BIT)#define XFS_ATTR_INCOMPLETE (1u << XFS_ATTR_INCOMPLETE_BIT) -#define XFS_ATTR_NSP_ONDISK_MASK (XFS_ATTR_ROOT | XFS_ATTR_SECURE) +#define XFS_ATTR_NSP_ONDISK_MASK \ + (XFS_ATTR_ROOT | XFS_ATTR_SECURE | XFS_ATTR_PARENT)#define XFS_ATTR_NAMESPACE_STR \ { XFS_ATTR_LOCAL, "local" }, \
fs/xfs/libxfs/xfs_log_format.h +1 -0
@@ -1049,6 +1049,7 @@ struct xfs_icreate_log {*/ #define XFS_ATTRI_FILTER_MASK (XFS_ATTR_ROOT | \ XFS_ATTR_SECURE | \ + XFS_ATTR_PARENT | \ XFS_ATTR_INCOMPLETE)/*
fs/xfs/scrub/attr.c +1 -1
@@ -513,7 +513,7 @@ xchk_xattr_rec(/* Retrieve the entry and check it. */ hash =be32_to_cpu (ent->hashval); badflags = ~(XFS_ATTR_LOCAL |XFS_ATTR_ROOT |XFS_ATTR_SECURE | -XFS_ATTR_INCOMPLETE ); +XFS_ATTR_INCOMPLETE |XFS_ATTR_PARENT );if ((ent->flags & badflags) !=0 )xchk_da_set_corrupt (ds, level);if (ent->flags &XFS_ATTR_LOCAL ) {
fs/xfs/xfs_trace.h +2 -1
@@ -87,7 +87,8 @@ struct xfs_swapext_req;#define XFS_ATTR_FILTER_FLAGS \ { XFS_ATTR_ROOT, "ROOT" }, \ { XFS_ATTR_SECURE, "SECURE" }, \ - { XFS_ATTR_INCOMPLETE, "INCOMPLETE" } + { XFS_ATTR_INCOMPLETE, "INCOMPLETE" }, \ + { XFS_ATTR_PARENT, "PARENT" } DECLARE_EVENT_CLASS(xfs_attr_list_class, TP_PROTO(struct xfs_attr_list_context *ctx),
PATCH 2/18 xfs: define parent pointer ondisk extended attribute format
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
We need to define the parent pointer attribute format before we start adding support for it into all the code that needs to use it. The EA format we will use encodes the following information:
name={parent inode #, parent inode generation, dirent namehash}
value={dirent name}The inode/gen gives all the information we need to reliably identify the parent without requiring child->parent lock ordering, and allows userspace to do pathname component level reconstruction without the kernel ever needing to verify the parent itself as part of ioctl calls. Storing the dirent name hash in the key reduces hash collisions if a file is hardlinked multiple times in the same directory.
By using the NVLOOKUP mode in the extended attribute code to match parent pointers using both the xattr name and value, we can identify the exact parent pointer EA we need to modify/remove in rename/unlink operations without searching the entire EA space.
By storing the dirent name, we have enough information to be able to validate and reconstruct damaged directory trees. Earlier iterations of this patchset encoded the directory offset in the parent pointer key, but this format required repair to keep that in sync across directory rebuilds, which is unnecessary complexity.
--- fs/xfs/libxfs/xfs_da_format.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
fs/xfs/libxfs/xfs_da_format.h +21 -0
@@ -821,4 +821,25 @@ static inline unsigned int xfs_dir2_dirblock_bytes(struct xfs_sb *sbp)xfs_failaddr_t xfs_da3_blkinfo_verify (struct xfs_buf *bp,struct xfs_da3_blkinfo *hdr3); +/* +* Parent pointer attribute format definition +* +* The xattr name encodes the parent inode number, generation and the crc32c +* hash of the dirent name. +* +* The xattr value contains the dirent name. +*/ +struct xfs_parent_name_rec { +__be64 p_ino; +__be32 p_gen; +__be32 p_namehash; +}; + +/* +* Maximum size of the dirent name that can be stored in a parent pointer. +* This matches the maximum dirent name length. +*/ +#define XFS_PARENT_DIRENT_NAME_MAX_SIZE \ + (MAXNAMELEN - 1) +#endif /* __XFS_DA_FORMAT_H__ */
PATCH 3/18 xfs: add parent pointer validator functions
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Attribute names of parent pointers are not strings. So we need to modify attr_namecheck to verify parent pointer records when the XFS_ATTR_PARENT flag is set. At the same time, we need to validate attr values during log recovery if the xattr is really a parent pointer.
--- fs/xfs/Makefile | 1 fs/xfs/libxfs/xfs_attr.c | 10 ++++ fs/xfs/libxfs/xfs_attr.h | 3 + fs/xfs/libxfs/xfs_da_format.h | 8 ++++ fs/xfs/libxfs/xfs_parent.c | 92 +++++++++++++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_parent.h | 16 +++++++ fs/xfs/scrub/attr.c | 2 - fs/xfs/xfs_attr_item.c | 24 +++++++++-- fs/xfs/xfs_attr_list.c | 17 +++++--- 9 files changed, 161 insertions(+), 12 deletions(-) create mode 100644 fs/xfs/libxfs/xfs_parent.c create mode 100644 fs/xfs/libxfs/xfs_parent.h
fs/xfs/Makefile +1 -0
@@ -41,6 +41,7 @@ xfs-y += $(addprefix libxfs/, \ xfs_inode_buf.o \ xfs_log_rlimit.o \ xfs_ag_resv.o \ + xfs_parent.o \ xfs_rmap.o \ xfs_rmap_btree.o \ xfs_refcount.o \
fs/xfs/libxfs/xfs_attr.c +8 -2
@@ -26,6 +26,7 @@#include "xfs_trace.h" #include "xfs_attr_item.h" #include "xfs_xattr.h" +#include "xfs_parent.h" struct kmem_cache *xfs_attr_intent_cache;
@@ -1596,9 +1597,14 @@ xfs_attr_node_get(/* Returns true if the attribute entry name is valid. */ bool xfs_attr_namecheck ( -const void *name, -size_t length) +struct xfs_mount *mp, +const void *name, +size_t length, +unsigned int flags) { +if (flags &XFS_ATTR_PARENT ) +return xfs_parent_namecheck (mp, name, length, flags); +/* * MAXNAMELEN includes the trailing null, but (name/length) leave it * out, so use >= for the length check.
fs/xfs/libxfs/xfs_attr.h +2 -1
@@ -552,7 +552,8 @@ int xfs_attr_get(struct xfs_da_args *args);int xfs_attr_set (struct xfs_da_args *args);int xfs_attr_set_iter (struct xfs_attr_intent *attr);int xfs_attr_remove_iter (struct xfs_attr_intent *attr); -bool xfs_attr_namecheck (const void *name,size_t length); +bool xfs_attr_namecheck (struct xfs_mount *mp,const void *name,size_t length, +unsigned int flags);int xfs_attr_calc_size (struct xfs_da_args *args,int *local);void xfs_init_attr_trans (struct xfs_da_args *args,struct xfs_trans_res *tres,unsigned int *total);
fs/xfs/libxfs/xfs_da_format.h +8 -0
@@ -747,6 +747,14 @@ xfs_attr3_leaf_name(xfs_attr_leafblock_t *leafp, int idx)return &((char *)leafp)[be16_to_cpu (entries[idx].nameidx)]; } +static inline int +xfs_attr3_leaf_flags (xfs_attr_leafblock_t *leafp,int idx) +{ +struct xfs_attr_leaf_entry *entries =xfs_attr3_leaf_entryp (leafp); + +return entries[idx].flags; +} +static inline xfs_attr_leaf_name_remote_t *xfs_attr3_leaf_name_remote (xfs_attr_leafblock_t *leafp,int idx) {
fs/xfs/libxfs/xfs_parent.c new file +92 -0
92 lines not on this page · raw message
fs/xfs/libxfs/xfs_parent.h new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2022-2023 Oracle, Inc. +* All Rights Reserved. +*/ +#ifndef __XFS_PARENT_H__ +#define __XFS_PARENT_H__ + +/* Metadata validators */ +bool xfs_parent_namecheck (struct xfs_mount *mp, +const struct xfs_parent_name_rec *rec,size_t reclen, +unsigned int attr_flags); +bool xfs_parent_valuecheck (struct xfs_mount *mp,const void *value, +size_t valuelen); + +#endif /* __XFS_PARENT_H__ */
fs/xfs/scrub/attr.c +1 -1
@@ -206,7 +206,7 @@ xchk_xattr_actor( }/* Does this name make sense? */ -if (!xfs_attr_namecheck (name, namelen)) { +if (!xfs_attr_namecheck (sc->mp, name, namelen, attr_flags)) {xchk_fblock_set_corrupt (sc,XFS_ATTR_FORK , args.blkno);return -ECANCELED ; }
fs/xfs/xfs_attr_item.c +21 -3
@@ -27,6 +27,7 @@#include "xfs_error.h" #include "xfs_log_priv.h" #include "xfs_log_recover.h" +#include "xfs_parent.h" struct kmem_cache *xfs_attri_cache;struct kmem_cache *xfs_attrd_cache;
@@ -644,7 +645,8 @@ xfs_attri_item_recover(*/ attrp = &attrip->attri_format;if (!xfs_attri_validate (mp, attrp) || - !xfs_attr_namecheck (nv->name.i_addr, nv->name.i_len)) + !xfs_attr_namecheck (mp, nv->name.i_addr, nv->name.i_len, + attrp->alfi_attr_filter))return -EFSCORRUPTED ; error =xlog_recover_iget (mp, attrp->alfi_ino, &ip);
@@ -899,7 +901,8 @@ xlog_recover_attri_commit_pass2( } attr_name = item->ri_buf[i].i_addr; -if (!xfs_attr_namecheck (attr_name, name_len)) { +if (!xfs_attr_namecheck (mp, attr_name, name_len, + attri_formatp->alfi_attr_filter)) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, attri_formatp, len);return -EFSCORRUPTED ;
@@ -916,7 +919,8 @@ xlog_recover_attri_commit_pass2( } attr_new_name = item->ri_buf[i].i_addr; -if (!xfs_attr_namecheck (attr_new_name, new_name_len)) { +if (!xfs_attr_namecheck (mp, attr_new_name, new_name_len, + attri_formatp->alfi_attr_filter)) {XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, item->ri_buf[i].i_addr, item->ri_buf[i].i_len);
@@ -934,6 +938,13 @@ xlog_recover_attri_commit_pass2( } attr_value = item->ri_buf[i].i_addr; +if ((attri_formatp->alfi_attr_filter &XFS_ATTR_PARENT ) && + !xfs_parent_valuecheck (mp, attr_value, value_len)) { +XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, + item->ri_buf[i].i_addr, + item->ri_buf[i].i_len); +return -EFSCORRUPTED ; + } i++; }
@@ -946,6 +957,13 @@ xlog_recover_attri_commit_pass2( } attr_new_value = item->ri_buf[i].i_addr; +if ((attri_formatp->alfi_attr_filter &XFS_ATTR_PARENT ) && + !xfs_parent_valuecheck (mp, attr_new_value, new_value_len)) { +XFS_CORRUPTION_ERROR (__func__,XFS_ERRLEVEL_LOW , mp, + item->ri_buf[i].i_addr, + item->ri_buf[i].i_len); +return -EFSCORRUPTED ; + } i++; }
fs/xfs/xfs_attr_list.c +12 -5
@@ -59,9 +59,13 @@ xfs_attr_shortform_list(struct xfs_attr_sf_sort *sbuf, *sbp;struct xfs_attr_shortform *sf;struct xfs_attr_sf_entry *sfe; +struct xfs_mount *mp;int sbsize, nsbuf, count, i;int error =0 ; +ASSERT (context !=NULL ); +ASSERT (dp !=NULL ); + mp = dp->i_mount; sf = (struct xfs_attr_shortform *)dp->i_af.if_u1.if_data;ASSERT (sf !=NULL );if (!sf->hdr.count)
@@ -83,8 +87,9 @@ xfs_attr_shortform_list( (dp->i_af.if_bytes + sf->hdr.count * 16) < context->bufsize)) {for (i =0 , sfe = &sf->list[0 ]; i < sf->hdr.count; i++) {if (XFS_IS_CORRUPT (context->dp->i_mount, - !xfs_attr_namecheck (sfe->nameval, - sfe->namelen))) { + !xfs_attr_namecheck (mp, sfe->nameval, + sfe->namelen, + sfe->flags))) {xfs_dirattr_mark_sick (context->dp,XFS_ATTR_FORK );return -EFSCORRUPTED ; }
@@ -178,8 +183,9 @@ xfs_attr_shortform_list( cursor->offset =0 ; }if (XFS_IS_CORRUPT (context->dp->i_mount, - !xfs_attr_namecheck (sbp->name, - sbp->namelen))) { + !xfs_attr_namecheck (mp, sbp->name, + sbp->namelen, + sbp->flags))) {xfs_dirattr_mark_sick (context->dp,XFS_ATTR_FORK ); error = -EFSCORRUPTED ; goto out;
@@ -503,7 +509,8 @@ xfs_attr3_leaf_list_int( }if (XFS_IS_CORRUPT (context->dp->i_mount, - !xfs_attr_namecheck (name, namelen))) { + !xfs_attr_namecheck (mp, name, namelen, + entry->flags))) {xfs_dirattr_mark_sick (context->dp,XFS_ATTR_FORK );return -EFSCORRUPTED ; }
PATCH 4/18 xfs: extend transaction reservations for parent attributes
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
We need to add, remove or modify parent pointer attributes during create/link/unlink/rename operations atomically with the dirents in the parent directories being modified. This means they need to be modified in the same transaction as the parent directories, and so we need to add the required space for the attribute modifications to the transaction reservations.
--- fs/xfs/libxfs/xfs_trans_resv.c | 326 ++++++++++++++++++++++++++++++++++------ 1 file changed, 274 insertions(+), 52 deletions(-)
fs/xfs/libxfs/xfs_trans_resv.c +274 -52
@@ -19,6 +19,9 @@#include "xfs_trans.h" #include "xfs_qm.h" #include "xfs_trans_space.h" +#include "xfs_attr_item.h" +#include "xfs_log.h" +#include "xfs_da_format.h" #define _ALLOC true#define _FREE false
@@ -420,29 +423,110 @@ xfs_calc_itruncate_reservation_minlogsize(return xfs_calc_itruncate_reservation (mp, true); } +static inline unsigned int xfs_calc_pptr_link_overhead (void ) +{ +return sizeof (struct xfs_attri_log_format ) + +xlog_calc_iovec_len (sizeof (struct xfs_parent_name_rec )) + +xlog_calc_iovec_len (XFS_PARENT_DIRENT_NAME_MAX_SIZE ); +} +static inline unsigned int xfs_calc_pptr_unlink_overhead (void ) +{ +return sizeof (struct xfs_attri_log_format ) + +xlog_calc_iovec_len (sizeof (struct xfs_parent_name_rec )) + +xlog_calc_iovec_len (XFS_PARENT_DIRENT_NAME_MAX_SIZE ); +} +static inline unsigned int xfs_calc_pptr_replace_overhead (void ) +{ +return sizeof (struct xfs_attri_log_format ) + +xlog_calc_iovec_len (sizeof (struct xfs_parent_name_rec )) + +xlog_calc_iovec_len (XFS_PARENT_DIRENT_NAME_MAX_SIZE ) + +xlog_calc_iovec_len (sizeof (struct xfs_parent_name_rec )) + +xlog_calc_iovec_len (XFS_PARENT_DIRENT_NAME_MAX_SIZE ); +} +/* * In renaming a files we can modify: * the five inodes involved: 5 * inode size * the two directory btrees: 2 * (max depth + v2) * dir block size * the two directory bmap btrees: 2 * max depth * block size * And the bmap_finish transaction can free dir and bmap blocks (two sets -* of bmap blocks) giving: +* of bmap blocks) giving (t2): * the agf for the ags in which the blocks live: 3 * sector size * the agfl for the ags in which the blocks live: 3 * sector size * the superblock for the free block count: sector size * the allocation btrees: 3 exts * 2 trees * (2 * max depth - 1) * block size +* If parent pointers are enabled (t3), then each transaction in the chain +* must be capable of setting or removing the extended attribute +* containing the parent information. It must also be able to handle +* the three xattr intent items that track the progress of the parent +* pointer update. */ STATIC uintxfs_calc_rename_reservation (struct xfs_mount *mp) { -return XFS_DQUOT_LOGRES (mp) + -max ((xfs_calc_inode_res (mp,5 ) + -xfs_calc_buf_res (2 *XFS_DIROP_LOG_COUNT (mp), -XFS_FSB_TO_B (mp,1 ))), - (xfs_calc_buf_res (7 , mp->m_sb.sb_sectsize) + -xfs_calc_buf_res (xfs_allocfree_block_count (mp,3 ), -XFS_FSB_TO_B (mp,1 )))); +unsigned int overhead =XFS_DQUOT_LOGRES (mp); +struct xfs_trans_resv *resp =M_RES (mp); +unsigned int t1, t2, t3 =0 ; + + t1 =xfs_calc_inode_res (mp,5 ) + +xfs_calc_buf_res (2 *XFS_DIROP_LOG_COUNT (mp), +XFS_FSB_TO_B (mp,1 )); + + t2 =xfs_calc_buf_res (7 , mp->m_sb.sb_sectsize) + +xfs_calc_buf_res (xfs_allocfree_block_count (mp,3 ), +XFS_FSB_TO_B (mp,1 )); + +if (xfs_has_parent (mp)) { +unsigned int rename_overhead, exchange_overhead; + + t3 =max (resp->tr_attrsetm.tr_logres, + resp->tr_attrrm.tr_logres); + +/* +* For a standard rename, the three xattr intent log items +* are (1) replacing the pptr for the source file; (2) +* removing the pptr on the dest file; and (3) adding a +* pptr for the whiteout file in the src dir. +* +* For an RENAME_EXCHANGE, there are two xattr intent +* items to replace the pptr for both src and dest +* files. Link counts don't change and there is no +* whiteout. +* +* In the worst case we can end up relogging all log +* intent items to allow the log tail to move ahead, so +* they become overhead added to each transaction in a +* processing chain. +*/ + rename_overhead =xfs_calc_pptr_replace_overhead () + +xfs_calc_pptr_unlink_overhead () + +xfs_calc_pptr_link_overhead (); + exchange_overhead =2 *xfs_calc_pptr_replace_overhead (); + + overhead +=max (rename_overhead, exchange_overhead); + } + +return overhead +max3 (t1, t2, t3); +} + +static inline unsigned int +xfs_rename_log_count ( +struct xfs_mount *mp, +struct xfs_trans_resv *resp) +{ +/* One for the rename, one more for freeing blocks */ +unsigned int ret =XFS_RENAME_LOG_COUNT ; + +/* +* Pre-reserve enough log reservation to handle the transaction +* rolling needed to remove or add one parent pointer. +*/ +if (xfs_has_parent (mp)) + ret +=max (resp->tr_attrsetm.tr_logcount, + resp->tr_attrrm.tr_logcount); + +return ret; }/*
@@ -459,6 +543,23 @@ xfs_calc_iunlink_remove_reservation(2 *M_IGEO (mp)->inode_cluster_size; } +static inline unsigned int +xfs_link_log_count ( +struct xfs_mount *mp, +struct xfs_trans_resv *resp) +{ +unsigned int ret =XFS_LINK_LOG_COUNT ; + +/* +* Pre-reserve enough log reservation to handle the transaction +* rolling needed to add one parent pointer. +*/ +if (xfs_has_parent (mp)) + ret += resp->tr_attrsetm.tr_logcount; + +return ret; +} +/* * For creating a link to an inode: * the parent directory inode: inode size
@@ -475,14 +576,23 @@ STATIC uintxfs_calc_link_reservation ( struct xfs_mount *mp) { -return XFS_DQUOT_LOGRES (mp) + -xfs_calc_iunlink_remove_reservation (mp) + -max ((xfs_calc_inode_res (mp,2 ) + -xfs_calc_buf_res (XFS_DIROP_LOG_COUNT (mp), -XFS_FSB_TO_B (mp,1 ))), - (xfs_calc_buf_res (3 , mp->m_sb.sb_sectsize) + -xfs_calc_buf_res (xfs_allocfree_block_count (mp,1 ), -XFS_FSB_TO_B (mp,1 )))); +unsigned int overhead =XFS_DQUOT_LOGRES (mp); +struct xfs_trans_resv *resp =M_RES (mp); +unsigned int t1, t2, t3 =0 ; + + overhead +=xfs_calc_iunlink_remove_reservation (mp); + t1 =xfs_calc_inode_res (mp,2 ) + +xfs_calc_buf_res (XFS_DIROP_LOG_COUNT (mp),XFS_FSB_TO_B (mp,1 )); + t2 =xfs_calc_buf_res (3 , mp->m_sb.sb_sectsize) + +xfs_calc_buf_res (xfs_allocfree_block_count (mp,1 ), +XFS_FSB_TO_B (mp,1 )); + +if (xfs_has_parent (mp)) { + t3 = resp->tr_attrsetm.tr_logres; + overhead +=xfs_calc_pptr_link_overhead (); + } + +return overhead +max3 (t1, t2, t3); }/*
@@ -497,6 +607,23 @@ xfs_calc_iunlink_add_reservation(xfs_mount_t *mp)M_IGEO (mp)->inode_cluster_size; } +static inline unsigned int +xfs_remove_log_count ( +struct xfs_mount *mp, +struct xfs_trans_resv *resp) +{ +unsigned int ret =XFS_REMOVE_LOG_COUNT ; + +/* +* Pre-reserve enough log reservation to handle the transaction +* rolling needed to add one parent pointer. +*/ +if (xfs_has_parent (mp)) + ret += resp->tr_attrrm.tr_logcount; + +return ret; +} +/* * For removing a directory entry we can modify: * the parent directory inode: inode size
@@ -513,14 +640,24 @@ STATIC uintxfs_calc_remove_reservation ( struct xfs_mount *mp) { -return XFS_DQUOT_LOGRES (mp) + -xfs_calc_iunlink_add_reservation (mp) + -max ((xfs_calc_inode_res (mp,2 ) + -xfs_calc_buf_res (XFS_DIROP_LOG_COUNT (mp), -XFS_FSB_TO_B (mp,1 ))), - (xfs_calc_buf_res (4 , mp->m_sb.sb_sectsize) + -xfs_calc_buf_res (xfs_allocfree_block_count (mp,2 ), -XFS_FSB_TO_B (mp,1 )))); +unsigned int overhead =XFS_DQUOT_LOGRES (mp); +struct xfs_trans_resv *resp =M_RES (mp); +unsigned int t1, t2, t3 =0 ; + + overhead +=xfs_calc_iunlink_add_reservation (mp); + + t1 =xfs_calc_inode_res (mp,2 ) + +xfs_calc_buf_res (XFS_DIROP_LOG_COUNT (mp),XFS_FSB_TO_B (mp,1 )); + t2 =xfs_calc_buf_res (4 , mp->m_sb.sb_sectsize) + +xfs_calc_buf_res (xfs_allocfree_block_count (mp,2 ), +XFS_FSB_TO_B (mp,1 )); + +if (xfs_has_parent (mp)) { + t3 = resp->tr_attrrm.tr_logres; + overhead +=xfs_calc_pptr_unlink_overhead (); + } + +return overhead +max3 (t1, t2, t3); }/*
@@ -569,12 +706,40 @@ xfs_calc_icreate_resv_alloc(xfs_calc_finobt_res (mp); } +static inline unsigned int +xfs_icreate_log_count ( +struct xfs_mount *mp, +struct xfs_trans_resv *resp) +{ +unsigned int ret =XFS_CREATE_LOG_COUNT ; + +/* +* Pre-reserve enough log reservation to handle the transaction +* rolling needed to add one parent pointer. +*/ +if (xfs_has_parent (mp)) + ret += resp->tr_attrsetm.tr_logcount; + +return ret; +} + STATIC uint -xfs_calc_icreate_reservation (xfs_mount_t *mp) +xfs_calc_icreate_reservation ( +struct xfs_mount *mp) { -return XFS_DQUOT_LOGRES (mp) + -max (xfs_calc_icreate_resv_alloc (mp), -xfs_calc_create_resv_modify (mp)); +struct xfs_trans_resv *resp =M_RES (mp); +unsigned int overhead =XFS_DQUOT_LOGRES (mp); +unsigned int t1, t2, t3 =0 ; + + t1 =xfs_calc_icreate_resv_alloc (mp); + t2 =xfs_calc_create_resv_modify (mp); + +if (xfs_has_parent (mp)) { + t3 = resp->tr_attrsetm.tr_logres; + overhead +=xfs_calc_pptr_link_overhead (); + } + +return overhead +max3 (t1, t2, t3); }STATIC uint
@@ -587,6 +752,23 @@ xfs_calc_create_tmpfile_reservation(return res +xfs_calc_iunlink_add_reservation (mp); } +static inline unsigned int +xfs_mkdir_log_count ( +struct xfs_mount *mp, +struct xfs_trans_resv *resp) +{ +unsigned int ret =XFS_MKDIR_LOG_COUNT ; + +/* +* Pre-reserve enough log reservation to handle the transaction +* rolling needed to add one parent pointer. +*/ +if (xfs_has_parent (mp)) + ret += resp->tr_attrsetm.tr_logcount; + +return ret; +} +/* * Making a new directory is the same as creating a new file. */
@@ -597,6 +779,22 @@ xfs_calc_mkdir_reservation(return xfs_calc_icreate_reservation (mp); } +static inline unsigned int +xfs_symlink_log_count ( +struct xfs_mount *mp, +struct xfs_trans_resv *resp) +{ +unsigned int ret =XFS_SYMLINK_LOG_COUNT ; + +/* +* Pre-reserve enough log reservation to handle the transaction +* rolling needed to add one parent pointer. +*/ +if (xfs_has_parent (mp)) + ret += resp->tr_attrsetm.tr_logcount; + +return ret; +}/* * Making a new symplink is the same as creating a new file, but
@@ -909,6 +1107,52 @@ xfs_calc_sb_reservation(return xfs_calc_buf_res (1 , mp->m_sb.sb_sectsize); } +/* +* Namespace reservations. +* +* These get tricky when parent pointers are enabled as we have attribute +* modifications occurring from within these transactions. Rather than confuse +* each of these reservation calculations with the conditional attribute +* reservations, add them here in a clear and concise manner. This requires that +* the attribute reservations have already been calculated. +* +* Note that we only include the static attribute reservation here; the runtime +* reservation will have to be modified by the size of the attributes being +* added/removed/modified. See the comments on the attribute reservation +* calculations for more details. +*/ +STATIC void +xfs_calc_namespace_reservations ( +struct xfs_mount *mp, +struct xfs_trans_resv *resp) +{ +ASSERT (resp->tr_attrsetm.tr_logres >0 ); + + resp->tr_rename.tr_logres =xfs_calc_rename_reservation (mp); + resp->tr_rename.tr_logcount =xfs_rename_log_count (mp, resp); + resp->tr_rename.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; + + resp->tr_link.tr_logres =xfs_calc_link_reservation (mp); + resp->tr_link.tr_logcount =xfs_link_log_count (mp, resp); + resp->tr_link.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; + + resp->tr_remove.tr_logres =xfs_calc_remove_reservation (mp); + resp->tr_remove.tr_logcount =xfs_remove_log_count (mp, resp); + resp->tr_remove.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; + + resp->tr_symlink.tr_logres =xfs_calc_symlink_reservation (mp); + resp->tr_symlink.tr_logcount =xfs_symlink_log_count (mp, resp); + resp->tr_symlink.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; + + resp->tr_create.tr_logres =xfs_calc_icreate_reservation (mp); + resp->tr_create.tr_logcount =xfs_icreate_log_count (mp, resp); + resp->tr_create.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; + + resp->tr_mkdir.tr_logres =xfs_calc_mkdir_reservation (mp); + resp->tr_mkdir.tr_logcount =xfs_mkdir_log_count (mp, resp); + resp->tr_mkdir.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; +} + void xfs_trans_resv_calc( struct xfs_mount *mp,
@@ -928,35 +1172,11 @@ xfs_trans_resv_calc( resp->tr_itruncate.tr_logcount =XFS_ITRUNCATE_LOG_COUNT ; resp->tr_itruncate.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; - resp->tr_rename.tr_logres =xfs_calc_rename_reservation (mp); - resp->tr_rename.tr_logcount =XFS_RENAME_LOG_COUNT ; - resp->tr_rename.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; - - resp->tr_link.tr_logres =xfs_calc_link_reservation (mp); - resp->tr_link.tr_logcount =XFS_LINK_LOG_COUNT ; - resp->tr_link.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; - - resp->tr_remove.tr_logres =xfs_calc_remove_reservation (mp); - resp->tr_remove.tr_logcount =XFS_REMOVE_LOG_COUNT ; - resp->tr_remove.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; - - resp->tr_symlink.tr_logres =xfs_calc_symlink_reservation (mp); - resp->tr_symlink.tr_logcount =XFS_SYMLINK_LOG_COUNT ; - resp->tr_symlink.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; - - resp->tr_create.tr_logres =xfs_calc_icreate_reservation (mp); - resp->tr_create.tr_logcount =XFS_CREATE_LOG_COUNT ; - resp->tr_create.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; - resp->tr_create_tmpfile.tr_logres =xfs_calc_create_tmpfile_reservation (mp); resp->tr_create_tmpfile.tr_logcount =XFS_CREATE_TMPFILE_LOG_COUNT ; resp->tr_create_tmpfile.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; - resp->tr_mkdir.tr_logres =xfs_calc_mkdir_reservation (mp); - resp->tr_mkdir.tr_logcount =XFS_MKDIR_LOG_COUNT ; - resp->tr_mkdir.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; - resp->tr_ifree.tr_logres =xfs_calc_ifree_reservation (mp); resp->tr_ifree.tr_logcount =XFS_INACTIVE_LOG_COUNT ; resp->tr_ifree.tr_logflags |=XFS_TRANS_PERM_LOG_RES ;
@@ -986,6 +1206,8 @@ xfs_trans_resv_calc( resp->tr_qm_dqalloc.tr_logcount =XFS_WRITE_LOG_COUNT ; resp->tr_qm_dqalloc.tr_logflags |=XFS_TRANS_PERM_LOG_RES ; +xfs_calc_namespace_reservations (mp, resp); +/* * The following transactions are logged in logical format with * a default log count.
PATCH 5/18 xfs: parent pointer attribute creation
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Add parent pointer attribute during xfs_create, and subroutines to initialize attributes
--- fs/xfs/Makefile | 1 fs/xfs/libxfs/xfs_attr.c | 4 +- fs/xfs/libxfs/xfs_attr.h | 4 +- fs/xfs/libxfs/xfs_parent.c | 101 +++++++++++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_parent.h | 41 +++++++++++++++- fs/xfs/libxfs/xfs_trans_space.c | 52 ++++++++++++++++++++ fs/xfs/libxfs/xfs_trans_space.h | 9 ++- fs/xfs/scrub/tempfile.c | 2 - fs/xfs/xfs_inode.c | 33 ++++++++++--- fs/xfs/xfs_super.c | 10 ++++ fs/xfs/xfs_xattr.c | 4 +- fs/xfs/xfs_xattr.h | 2 + 12 files changed, 246 insertions(+), 17 deletions(-) create mode 100644 fs/xfs/libxfs/xfs_trans_space.c
fs/xfs/Makefile +1 -0
@@ -51,6 +51,7 @@ xfs-y += $(addprefix libxfs/, \ xfs_symlink_remote.o \ xfs_trans_inode.o \ xfs_trans_resv.o \ + xfs_trans_space.o \ xfs_types.o \ ) # xfs_rtbitmap is shared with libxfs
fs/xfs/libxfs/xfs_attr.c +2 -2
@@ -895,7 +895,7 @@ xfs_attr_lookup(return error; } -static int +int xfs_attr_intent_init( struct xfs_da_args *args, unsigned int op_flags, /* op flag (set or remove) */
@@ -913,7 +913,7 @@ xfs_attr_intent_init( }/* Sets an attribute for an inode as a deferred operation */ -static int +int xfs_attr_defer_add (struct xfs_da_args *args) {
fs/xfs/libxfs/xfs_attr.h +3 -1
@@ -549,6 +549,7 @@ int xfs_inode_hasattr(struct xfs_inode *ip);bool xfs_attr_is_leaf (struct xfs_inode *ip);int xfs_attr_get_ilocked (struct xfs_da_args *args);int xfs_attr_get (struct xfs_da_args *args); +int xfs_attr_defer_add (struct xfs_da_args *args);int xfs_attr_set (struct xfs_da_args *args);int xfs_attr_set_iter (struct xfs_attr_intent *attr);int xfs_attr_remove_iter (struct xfs_attr_intent *attr);
@@ -557,7 +558,8 @@ bool xfs_attr_namecheck(struct xfs_mount *mp, const void *name, size_t length,int xfs_attr_calc_size (struct xfs_da_args *args,int *local);void xfs_init_attr_trans (struct xfs_da_args *args,struct xfs_trans_res *tres,unsigned int *total); - +int xfs_attr_intent_init (struct xfs_da_args *args,unsigned int op_flags, +struct xfs_attr_intent **attr);/* * Check to see if the attr should be upgraded from non-existent or shortform to * single-leaf-block attribute list.
fs/xfs/libxfs/xfs_parent.c +101 -0
110 lines not on this page · raw message
fs/xfs/libxfs/xfs_parent.h +40 -1
44 lines not on this page · raw message
fs/xfs/libxfs/xfs_trans_space.c new file +52 -0
52 lines not on this page · raw message
fs/xfs/libxfs/xfs_trans_space.h +5 -4
@@ -80,8 +80,6 @@/* This macro is not used - see inline code in xfs_attr_set */ #define XFS_ATTRSET_SPACE_RES (mp, v) \ (XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK) + XFS_B_TO_FSB(mp, v)) -#define XFS_CREATE_SPACE_RES (mp,nl) \ - (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))#define XFS_DIOSTRAT_SPACE_RES (mp, v) \ (XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + (v))#define XFS_GROWFS_SPACE_RES (mp) \
@@ -90,8 +88,6 @@ ((b) + XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK))#define XFS_LINK_SPACE_RES (mp,nl) \ XFS_DIRENTER_SPACE_RES(mp,nl) -#define XFS_MKDIR_SPACE_RES (mp,nl) \ - (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))#define XFS_QM_DQALLOC_SPACE_RES (mp) \ (XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + \ XFS_DQUOT_CLUSTER_SIZE_FSB)
@@ -106,5 +102,10 @@#define XFS_IFREE_SPACE_RES (mp) \ (xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0) +unsigned int xfs_parent_calc_space_res (struct xfs_mount *mp, +unsigned int namelen); + +unsigned int xfs_create_space_res (struct xfs_mount *mp,unsigned int namelen); +unsigned int xfs_mkdir_space_res (struct xfs_mount *mp,unsigned int namelen);#endif /* __XFS_TRANS_SPACE_H__ */
fs/xfs/scrub/tempfile.c +1 -1
@@ -71,7 +71,7 @@ xrep_tempfile_create(return error;if (is_dir) { - resblks =XFS_MKDIR_SPACE_RES (mp,0 ); + resblks =xfs_mkdir_space_res (mp,0 ); tres = &M_RES (mp)->tr_mkdir; }else { resblks =XFS_IALLOC_SPACE_RES (mp);
fs/xfs/xfs_inode.c +27 -6
@@ -40,6 +40,8 @@#include "xfs_log_priv.h" #include "xfs_health.h" #include "xfs_pnfs.h" +#include "xfs_parent.h" +#include "xfs_xattr.h" struct kmem_cache *xfs_inode_cache;
@@ -1018,7 +1020,7 @@ xfs_dir_hook_del( int xfs_create( struct mnt_idmap *idmap, - xfs_inode_t *dp, + struct xfs_inode *dp, struct xfs_name *name, umode_t mode, dev_t rdev,
@@ -1030,7 +1032,7 @@ xfs_create(struct xfs_inode *ip =NULL ;struct xfs_trans *tp =NULL ;int error; -bool unlock_dp_on_error = false; +bool unlock_dp_on_error = false;prid_t prid;struct xfs_dquot *udqp =NULL ;struct xfs_dquot *gdqp =NULL ;
@@ -1038,6 +1040,7 @@ xfs_create(struct xfs_trans_res *tres;uint resblks;xfs_ino_t ino; +struct xfs_parent_defer *parent;trace_xfs_create (dp, name);
@@ -1057,13 +1060,17 @@ xfs_create(return error;if (is_dir) { - resblks =XFS_MKDIR_SPACE_RES (mp, name->len); + resblks =xfs_mkdir_space_res (mp, name->len); tres = &M_RES (mp)->tr_mkdir; }else { - resblks =XFS_CREATE_SPACE_RES (mp, name->len); + resblks =xfs_create_space_res (mp, name->len); tres = &M_RES (mp)->tr_create; } + error =xfs_parent_start (mp, &parent); +if (error) + goto out_release_dquots; +/* * Initially assume that the file does not exist and * reserve the resources for that case. If that is not
@@ -1079,7 +1086,7 @@ xfs_create( resblks, &tp); }if (error) - goto out_release_dquots; + goto out_parent;xfs_ilock (dp,XFS_ILOCK_EXCL |XFS_ILOCK_PARENT ); unlock_dp_on_error = true;
@@ -1089,6 +1096,7 @@ xfs_create(* entry pointing to them, but a directory also the "." entry * pointing to itself. */ + init_xattrs = init_xattrs ||xfs_has_parent (mp); error =xfs_dialloc (&tp, dp->i_ino, mode, &ino);if (!error) error = xfs_init_new_inode(idmap, tp, dp, ino, mode,
@@ -1122,6 +1130,16 @@ xfs_create(xfs_bumplink (tp, dp); } +/* +* If we have parent pointers, we need to add the attribute containing +* the parent information now. +*/ +if (parent) { + error =xfs_parent_add (tp, parent, dp, name, ip); +if (error) + goto out_trans_cancel; + } +/* * Create ip with a reference from dp, and add '.' and '..' references * if it's a directory.
@@ -1154,6 +1172,7 @@ xfs_create( *ipp = ip;xfs_iunlock (ip,XFS_ILOCK_EXCL );xfs_iunlock (dp,XFS_ILOCK_EXCL ); +xfs_parent_finish (mp, parent);return 0 ; out_trans_cancel:
@@ -1169,6 +1188,8 @@ xfs_create(xfs_finish_inode_setup (ip);xfs_irele (ip); } + out_parent: +xfs_parent_finish (mp, parent); out_release_dquots:xfs_qm_dqrele (udqp);xfs_qm_dqrele (gdqp);
@@ -1224,7 +1245,7 @@ xfs_create_tmpfile( error =xfs_dialloc (&tp, dp->i_ino, mode, &ino);if (!error) error =xfs_init_new_inode (idmap, tp, dp, ino, mode, -0 ,0 , prid, false, &ip); +0 ,0 , prid,xfs_has_parent (mp), &ip);if (error) goto out_trans_cancel;
fs/xfs/xfs_super.c +10 -0
@@ -44,6 +44,7 @@#include "xfs_dahash_test.h" #include "scrub/rcbag_btree.h" #include "xfs_swapext_item.h" +#include "xfs_parent.h" #include <linux/magic.h> #include <linux/fs_context.h>
@@ -2157,8 +2158,16 @@ xfs_init_caches(void)if (!xfs_sxi_cache) goto out_destroy_sxd_cache; + xfs_parent_intent_cache =kmem_cache_create ("xfs_parent_intent" , +sizeof (struct xfs_parent_defer ), +0 ,0 ,NULL ); +if (!xfs_parent_intent_cache) + goto out_destroy_sxi_cache; +return 0 ; + out_destroy_sxi_cache: +kmem_cache_destroy (xfs_sxi_cache); out_destroy_sxd_cache:kmem_cache_destroy (xfs_sxd_cache); out_destroy_iul_cache:
@@ -2219,6 +2228,7 @@ xfs_destroy_caches(void)* destroy caches. */ rcu_barrier (); +kmem_cache_destroy (xfs_parent_intent_cache);kmem_cache_destroy (xfs_sxd_cache);kmem_cache_destroy (xfs_sxi_cache);kmem_cache_destroy (xfs_iunlink_cache);
fs/xfs/xfs_xattr.c +2 -2
@@ -27,7 +27,7 @@* they must release the permission by calling xlog_drop_incompat_feat * when they're done. */ -static inline int +int xfs_attr_grab_log_assist (struct xfs_mount *mp) {
@@ -61,7 +61,7 @@ xfs_attr_grab_log_assist(return error; } -static inline void +void xfs_attr_rele_log_assist (struct xfs_mount *mp) {
fs/xfs/xfs_xattr.h +2 -0
@@ -7,6 +7,8 @@#define __XFS_XATTR_H__int xfs_attr_change (struct xfs_da_args *args); +int xfs_attr_grab_log_assist (struct xfs_mount *mp); +void xfs_attr_rele_log_assist (struct xfs_mount *mp);extern const struct xattr_handler *xfs_xattr_handlers[];
PATCH 6/18 xfs: add parent attributes to link
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
This patch modifies xfs_link to add a parent pointer to the inode.
--- fs/xfs/libxfs/xfs_trans_space.c | 14 +++++++++++++ fs/xfs/libxfs/xfs_trans_space.h | 3 +-- fs/xfs/scrub/dir_repair.c | 2 +- fs/xfs/scrub/orphanage.c | 2 +- fs/xfs/xfs_inode.c | 43 ++++++++++++++++++++++++++++++++++----- 5 files changed, 54 insertions(+), 10 deletions(-)
fs/xfs/libxfs/xfs_trans_space.c +14 -0
@@ -50,3 +50,17 @@ xfs_mkdir_space_res( {return xfs_create_space_res (mp, namelen); } + +unsigned int +xfs_link_space_res ( +struct xfs_mount *mp, +unsigned int namelen) +{ +unsigned int ret; + + ret =XFS_DIRENTER_SPACE_RES (mp, namelen); +if (xfs_has_parent (mp)) + ret +=xfs_parent_calc_space_res (mp, namelen); + +return ret; +}
fs/xfs/libxfs/xfs_trans_space.h +1 -2
@@ -86,8 +86,6 @@ (2 * (mp)->m_alloc_maxlevels)#define XFS_GROWFSRT_SPACE_RES (mp,b) \ ((b) + XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK)) -#define XFS_LINK_SPACE_RES (mp,nl) \ - XFS_DIRENTER_SPACE_RES(mp,nl)#define XFS_QM_DQALLOC_SPACE_RES (mp) \ (XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + \ XFS_DQUOT_CLUSTER_SIZE_FSB)
@@ -107,5 +105,6 @@ unsigned int xfs_parent_calc_space_res(struct xfs_mount *mp,unsigned int xfs_create_space_res (struct xfs_mount *mp,unsigned int namelen);unsigned int xfs_mkdir_space_res (struct xfs_mount *mp,unsigned int namelen); +unsigned int xfs_link_space_res (struct xfs_mount *mp,unsigned int namelen);#endif /* __XFS_TRANS_SPACE_H__ */
fs/xfs/scrub/dir_repair.c +1 -1
@@ -701,7 +701,7 @@ xrep_dir_replay_update(uint resblks;int error; - resblks =XFS_LINK_SPACE_RES (mp, dirent->namelen); + resblks =xfs_link_space_res (mp, dirent->namelen); error =xchk_trans_alloc (rd->sc, resblks);if (error)return error;
fs/xfs/scrub/orphanage.c +1 -1
@@ -262,7 +262,7 @@ xrep_adoption_init(unsigned int child_blkres =0 ; adopt->sc = sc; - adopt->orphanage_blkres =XFS_LINK_SPACE_RES (mp,MAXNAMELEN ); + adopt->orphanage_blkres =xfs_link_space_res (mp,MAXNAMELEN );if (S_ISDIR (VFS_I (sc->ip)->i_mode)) child_blkres =XFS_RENAME_SPACE_RES (sc->mp, xfs_name_dotdot.len);
fs/xfs/xfs_inode.c +37 -6
80 lines not on this page · raw message
PATCH 7/18 xfs: add parent attributes to symlink
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
This patch modifies xfs_symlink to add a parent pointer to the inode.
--- fs/xfs/libxfs/xfs_trans_space.c | 17 +++++++++++++++++ fs/xfs/libxfs/xfs_trans_space.h | 4 ++-- fs/xfs/scrub/symlink_repair.c | 2 +- fs/xfs/xfs_symlink.c | 29 ++++++++++++++++++++++++----- 4 files changed, 44 insertions(+), 8 deletions(-)
fs/xfs/libxfs/xfs_trans_space.c +17 -0
@@ -64,3 +64,20 @@ xfs_link_space_res(return ret; } + +unsigned int +xfs_symlink_space_res ( +struct xfs_mount *mp, +unsigned int namelen, +unsigned int fsblocks) +{ +unsigned int ret; + + ret =XFS_IALLOC_SPACE_RES (mp) +XFS_DIRENTER_SPACE_RES (mp, namelen) + + fsblocks; + +if (xfs_has_parent (mp)) + ret +=xfs_parent_calc_space_res (mp, namelen); + +return ret; +}
fs/xfs/libxfs/xfs_trans_space.h +2 -2
@@ -95,8 +95,6 @@ XFS_DIRREMOVE_SPACE_RES(mp)#define XFS_RENAME_SPACE_RES (mp,nl) \ (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl)) -#define XFS_SYMLINK_SPACE_RES (mp,nl,b) \ - (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl) + (b))#define XFS_IFREE_SPACE_RES (mp) \ (xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0)
@@ -106,5 +104,7 @@ unsigned int xfs_parent_calc_space_res(struct xfs_mount *mp,unsigned int xfs_create_space_res (struct xfs_mount *mp,unsigned int namelen);unsigned int xfs_mkdir_space_res (struct xfs_mount *mp,unsigned int namelen);unsigned int xfs_link_space_res (struct xfs_mount *mp,unsigned int namelen); +unsigned int xfs_symlink_space_res (struct xfs_mount *mp,unsigned int namelen, +unsigned int fsblocks);#endif /* __XFS_TRANS_SPACE_H__ */
fs/xfs/scrub/symlink_repair.c +1 -1
@@ -382,7 +382,7 @@ xrep_symlink_rebuild(* unlikely. */ fs_blocks =xfs_symlink_blocks (sc->mp, target_len); - resblks =XFS_SYMLINK_SPACE_RES (sc->mp, target_len, fs_blocks); + resblks =xfs_symlink_space_res (sc->mp, target_len, fs_blocks); error =xfs_trans_reserve_quota_nblks (sc->tp, sc->tempip, resblks,0 , true);if (error)
fs/xfs/xfs_symlink.c +24 -5
@@ -25,6 +25,8 @@#include "xfs_error.h" #include "xfs_health.h" #include "xfs_symlink_remote.h" +#include "xfs_parent.h" +#include "xfs_defer.h" /* ----- Kernel only functions below ----- */ int
@@ -99,6 +101,7 @@ xfs_symlink(struct xfs_dquot *pdqp =NULL ;uint resblks;xfs_ino_t ino; +struct xfs_parent_defer *parent; *ipp =NULL ;
@@ -129,18 +132,24 @@ xfs_symlink(/* * The symlink will fit into the inode data fork? -* There can't be any attributes so we get the whole variable part. +* If there are no parent pointers, then there wont't be any attributes. +* So we get the whole variable part, and do not need to reserve extra +* blocks. Otherwise, we need to reserve the blocks. */ -if (pathlen <=XFS_LITINO (mp)) +if (pathlen <=XFS_LITINO (mp) && !xfs_has_parent (mp)) fs_blocks =0 ;else fs_blocks =xfs_symlink_blocks (mp, pathlen); - resblks =XFS_SYMLINK_SPACE_RES (mp, link_name->len, fs_blocks); + resblks =xfs_symlink_space_res (mp, link_name->len, fs_blocks); + + error =xfs_parent_start (mp, &parent); +if (error) + goto out_release_dquots; error =xfs_trans_alloc_icreate (mp, &M_RES (mp)->tr_symlink, udqp, gdqp, pdqp, resblks, &tp);if (error) - goto out_release_dquots; + goto out_parent;xfs_ilock (dp,XFS_ILOCK_EXCL |XFS_ILOCK_PARENT ); unlock_dp_on_error = true;
@@ -160,7 +169,7 @@ xfs_symlink(if (!error) error =xfs_init_new_inode (idmap, tp, dp, ino,S_IFLNK | (mode & ~S_IFMT ),1 ,0 , prid, - false, &ip); +xfs_has_parent (mp), &ip);if (error) goto out_trans_cancel;
@@ -194,6 +203,13 @@ xfs_symlink( goto out_trans_cancel;xfs_trans_ichgtime (tp, dp,XFS_ICHGTIME_MOD |XFS_ICHGTIME_CHG );xfs_trans_log_inode (tp, dp,XFS_ILOG_CORE ); + +if (parent) { + error =xfs_parent_add (tp, parent, dp, link_name, ip); +if (error) + goto out_trans_cancel; + } +xfs_dir_update_hook (dp, ip,1 , link_name);/*
@@ -215,6 +231,7 @@ xfs_symlink( *ipp = ip;xfs_iunlock (ip,XFS_ILOCK_EXCL );xfs_iunlock (dp,XFS_ILOCK_EXCL ); +xfs_parent_finish (mp, parent);return 0 ; out_trans_cancel:
@@ -230,6 +247,8 @@ xfs_symlink(xfs_finish_inode_setup (ip);xfs_irele (ip); } +out_parent: +xfs_parent_finish (mp, parent); out_release_dquots:xfs_qm_dqrele (udqp);xfs_qm_dqrele (gdqp);
PATCH 8/18 xfs: remove parent pointers in unlink
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
This patch removes the parent pointer attribute during unlink
--- fs/xfs/libxfs/xfs_attr.c | 2 +- fs/xfs/libxfs/xfs_attr.h | 1 + fs/xfs/libxfs/xfs_parent.c | 33 +++++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_parent.h | 4 ++++ fs/xfs/libxfs/xfs_trans_space.c | 13 +++++++++++++ fs/xfs/libxfs/xfs_trans_space.h | 3 +-- fs/xfs/xfs_inode.c | 26 ++++++++++++++++++++------ 7 files changed, 73 insertions(+), 9 deletions(-)
fs/xfs/libxfs/xfs_attr.c +1 -1
@@ -959,7 +959,7 @@ xfs_attr_defer_replace( }/* Removes an attribute for an inode as a deferred operation */ -static int +int xfs_attr_defer_remove (struct xfs_da_args *args) {
fs/xfs/libxfs/xfs_attr.h +1 -0
@@ -550,6 +550,7 @@ bool xfs_attr_is_leaf(struct xfs_inode *ip);int xfs_attr_get_ilocked (struct xfs_da_args *args);int xfs_attr_get (struct xfs_da_args *args);int xfs_attr_defer_add (struct xfs_da_args *args); +int xfs_attr_defer_remove (struct xfs_da_args *args);int xfs_attr_set (struct xfs_da_args *args);int xfs_attr_set_iter (struct xfs_attr_intent *attr);int xfs_attr_remove_iter (struct xfs_attr_intent *attr);
fs/xfs/libxfs/xfs_parent.c +33 -0
@@ -27,6 +27,7 @@#include "xfs_xattr.h" #include "xfs_parent.h" #include "xfs_trans_space.h" +#include "xfs_health.h" struct kmem_cache *xfs_parent_intent_cache;
@@ -182,6 +183,38 @@ xfs_parent_add(return xfs_attr_defer_add (args); } +/* Remove a parent pointer to reflect a dirent removal. */ +int +xfs_parent_remove ( +struct xfs_trans *tp, +struct xfs_parent_defer *parent, +struct xfs_inode *dp, +const struct xfs_name *parent_name, +struct xfs_inode *child) +{ +struct xfs_da_args *args = &parent->args; + +/* +* For regular attrs, removing an attr from a !hasattr inode is a nop. +* For parent pointers, we require that the pointer must exist if the +* caller wants us to remove the pointer. +*/ +if (XFS_IS_CORRUPT (child->i_mount, !xfs_inode_hasattr (child))) { +xfs_inode_mark_sick (child,XFS_SICK_INO_PARENT ); +return -EFSCORRUPTED ; + } + +xfs_init_parent_name_rec (&parent->rec, dp, parent_name, child); + args->hashval =xfs_parent_hashname (dp, parent); + + args->trans = tp; + args->dp = child; + +xfs_init_parent_davalue (&parent->args, parent_name); + +return xfs_attr_defer_remove (args); +} +/* Cancel a parent pointer operation. */ void __xfs_parent_cancel(
fs/xfs/libxfs/xfs_parent.h +4 -0
@@ -41,6 +41,10 @@ xfs_parent_start(int xfs_parent_add (struct xfs_trans *tp,struct xfs_parent_defer *parent,struct xfs_inode *dp,const struct xfs_name *parent_name,struct xfs_inode *child); +int xfs_parent_remove (struct xfs_trans *tp,struct xfs_parent_defer *parent, +struct xfs_inode *dp,const struct xfs_name *parent_name, +struct xfs_inode *child); +void __xfs_parent_cancel (struct xfs_mount *mp,struct xfs_parent_defer *parent); static inline void
fs/xfs/libxfs/xfs_trans_space.c +13 -0
@@ -81,3 +81,16 @@ xfs_symlink_space_res(return ret; } + +unsigned int +xfs_remove_space_res ( +struct xfs_mount *mp, +unsigned int namelen) +{ +unsigned int ret =XFS_DIRREMOVE_SPACE_RES (mp); + +if (xfs_has_parent (mp)) + ret +=xfs_parent_calc_space_res (mp, namelen); + +return ret; +}
fs/xfs/libxfs/xfs_trans_space.h +1 -2
@@ -91,8 +91,6 @@ XFS_DQUOT_CLUSTER_SIZE_FSB)#define XFS_QM_QINOCREATE_SPACE_RES (mp) \ XFS_IALLOC_SPACE_RES(mp) -#define XFS_REMOVE_SPACE_RES (mp) \ - XFS_DIRREMOVE_SPACE_RES(mp)#define XFS_RENAME_SPACE_RES (mp,nl) \ (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))#define XFS_IFREE_SPACE_RES (mp) \
@@ -106,5 +104,6 @@ unsigned int xfs_mkdir_space_res(struct xfs_mount *mp, unsigned int namelen);unsigned int xfs_link_space_res (struct xfs_mount *mp,unsigned int namelen);unsigned int xfs_symlink_space_res (struct xfs_mount *mp,unsigned int namelen,unsigned int fsblocks); +unsigned int xfs_remove_space_res (struct xfs_mount *mp,unsigned int namelen);#endif /* __XFS_TRANS_SPACE_H__ */
fs/xfs/xfs_inode.c +20 -6
@@ -2625,16 +2625,17 @@ xfs_iunpin_wait(*/ int xfs_remove ( -xfs_inode_t *dp, +struct xfs_inode *dp,struct xfs_name *name, -xfs_inode_t *ip) +struct xfs_inode *ip) { -xfs_mount_t *mp = dp->i_mount; -xfs_trans_t *tp =NULL ; +struct xfs_mount *mp = dp->i_mount; +struct xfs_trans *tp =NULL ;int is_dir =S_ISDIR (VFS_I (ip)->i_mode);int dontcare;int error =0 ;uint resblks; +struct xfs_parent_defer *parent =NULL ;trace_xfs_remove (dp, name);
@@ -2649,6 +2650,10 @@ xfs_remove(if (error) goto std_return; + error =xfs_parent_start (mp, &parent); +if (error) + goto std_return; +/* * We try to get the real space reservation first, allowing for * directory btree deletion(s) implying possible bmap insert(s). If we
@@ -2660,12 +2665,12 @@ xfs_remove(* the directory code can handle a reservationless update and we don't * want to prevent a user from trying to free space by deleting things. */ - resblks =XFS_REMOVE_SPACE_RES (mp); + resblks =xfs_remove_space_res (mp, name->len); error =xfs_trans_alloc_dir (dp, &M_RES (mp)->tr_remove, ip, &resblks, &tp, &dontcare);if (error) {ASSERT (error != -ENOSPC ); - goto std_return; + goto out_parent; }/*
@@ -2725,6 +2730,12 @@ xfs_remove( goto out_trans_cancel; } +if (parent) { + error =xfs_parent_remove (tp, parent, dp, name, ip); +if (error) + goto out_trans_cancel; + } +/* * Drop the link from dp to ip, and if ip was a directory, remove the * '.' and '..' references since we freed the directory.
@@ -2748,6 +2759,7 @@ xfs_remove(xfs_iunlock (ip,XFS_ILOCK_EXCL );xfs_iunlock (dp,XFS_ILOCK_EXCL ); +xfs_parent_finish (mp, parent);return 0 ; out_trans_cancel:
@@ -2755,6 +2767,8 @@ xfs_remove( out_unlock:xfs_iunlock (ip,XFS_ILOCK_EXCL );xfs_iunlock (dp,XFS_ILOCK_EXCL ); + out_parent: +xfs_parent_finish (mp, parent); std_return:return error; }
PATCH 9/18 xfs: Indent xfs_rename
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Indent variables and parameters in xfs_rename in preparation for parent pointer modifications. White space only, no functional changes. This will make reviewing new code easier on reviewers.
--- fs/xfs/xfs_inode.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-)
fs/xfs/xfs_inode.c +20 -19
@@ -3036,26 +3036,27 @@ xfs_rename_alloc_whiteout(*/ int xfs_rename ( -struct mnt_idmap *idmap, -struct xfs_inode *src_dp, -struct xfs_name *src_name, -struct xfs_inode *src_ip, -struct xfs_inode *target_dp, -struct xfs_name *target_name, -struct xfs_inode *target_ip, -unsigned int flags) +struct mnt_idmap *idmap, +struct xfs_inode *src_dp, +struct xfs_name *src_name, +struct xfs_inode *src_ip, +struct xfs_inode *target_dp, +struct xfs_name *target_name, +struct xfs_inode *target_ip, +unsigned int flags) { -struct xfs_mount *mp = src_dp->i_mount; -struct xfs_trans *tp; -struct xfs_inode *wip =NULL ;/* whiteout inode */ -struct xfs_inode *inodes[__XFS_SORT_INODES]; -int i; -int num_inodes = __XFS_SORT_INODES; -bool new_parent = (src_dp != target_dp); -bool src_is_directory =S_ISDIR (VFS_I (src_ip)->i_mode); -int spaceres; -bool retried = false; -int error, nospace_error =0 ; +struct xfs_mount *mp = src_dp->i_mount; +struct xfs_trans *tp; +struct xfs_inode *wip =NULL ;/* whiteout inode */ +struct xfs_inode *inodes[__XFS_SORT_INODES]; +int i; +int num_inodes = __XFS_SORT_INODES; +bool new_parent = (src_dp != target_dp); +bool src_is_directory = +S_ISDIR (VFS_I (src_ip)->i_mode); +int spaceres; +bool retried = false; +int error, nospace_error =0 ;trace_xfs_rename (src_dp, target_dp, src_name, target_name);
PATCH 10/18 xfs: Add parent pointers to rename
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
This patch removes the old parent pointer attribute during the rename operation, and re-adds the updated parent pointer.
--- fs/xfs/libxfs/xfs_attr.c | 2 + fs/xfs/libxfs/xfs_attr.h | 1 + fs/xfs/libxfs/xfs_parent.c | 68 ++++++++++++++++++++++++++++++++-- fs/xfs/libxfs/xfs_parent.h | 23 +++++++++++- fs/xfs/libxfs/xfs_trans_space.c | 25 +++++++++++++ fs/xfs/libxfs/xfs_trans_space.h | 6 ++- fs/xfs/scrub/orphanage.c | 4 +- fs/xfs/scrub/parent_repair.c | 3 +- fs/xfs/xfs_inode.c | 78 ++++++++++++++++++++++++++++++++++++--- 9 files changed, 190 insertions(+), 20 deletions(-)
fs/xfs/libxfs/xfs_attr.c +1 -1
@@ -936,7 +936,7 @@ xfs_attr_defer_add( }/* Sets an attribute for an inode as a deferred operation */ -static int +int xfs_attr_defer_replace (struct xfs_da_args *args) {
fs/xfs/libxfs/xfs_attr.h +1 -0
@@ -551,6 +551,7 @@ int xfs_attr_get_ilocked(struct xfs_da_args *args);int xfs_attr_get (struct xfs_da_args *args);int xfs_attr_defer_add (struct xfs_da_args *args);int xfs_attr_defer_remove (struct xfs_da_args *args); +int xfs_attr_defer_replace (struct xfs_da_args *args);int xfs_attr_set (struct xfs_da_args *args);int xfs_attr_set_iter (struct xfs_attr_intent *attr);int xfs_attr_remove_iter (struct xfs_attr_intent *attr);
fs/xfs/libxfs/xfs_parent.c +63 -5
103 lines not on this page · raw message
fs/xfs/libxfs/xfs_parent.h +21 -2
@@ -21,10 +21,13 @@ extern struct kmem_cache *xfs_parent_intent_cache;*/ struct xfs_parent_defer {struct xfs_parent_name_rec rec; +struct xfs_parent_name_rec new_rec;struct xfs_da_args args; +bool have_log; }; -int __xfs_parent_init (struct xfs_mount *mp,struct xfs_parent_defer **parentp); +int __xfs_parent_init (struct xfs_mount *mp,bool grab_log, +struct xfs_parent_defer **parentp);static inline int xfs_parent_start(
@@ -34,7 +37,19 @@ xfs_parent_start( *pp =NULL ;if (xfs_has_parent (mp)) -return __xfs_parent_init (mp, pp); +return __xfs_parent_init (mp, true, pp); +return 0 ; +} + +static inline int +xfs_parent_start_locked ( +struct xfs_mount *mp, +struct xfs_parent_defer **pp) +{ + *pp =NULL ; + +if (xfs_has_parent (mp)) +return __xfs_parent_init (mp, false, pp);return 0 ; }
@@ -44,6 +59,10 @@ int xfs_parent_add(struct xfs_trans *tp, struct xfs_parent_defer *parent,int xfs_parent_remove (struct xfs_trans *tp,struct xfs_parent_defer *parent,struct xfs_inode *dp,const struct xfs_name *parent_name,struct xfs_inode *child); +int xfs_parent_replace (struct xfs_trans *tp,struct xfs_parent_defer *parent, +struct xfs_inode *old_dp,const struct xfs_name *old_name, +struct xfs_inode *new_dp,const struct xfs_name *new_name, +struct xfs_inode *child);void __xfs_parent_cancel (struct xfs_mount *mp,struct xfs_parent_defer *parent);
fs/xfs/libxfs/xfs_trans_space.c +25 -0
@@ -94,3 +94,28 @@ xfs_remove_space_res(return ret; } + +unsigned int +xfs_rename_space_res ( +struct xfs_mount *mp, +unsigned int src_namelen, +bool target_exists, +unsigned int target_namelen, +bool has_whiteout) +{ +unsigned int ret; + + ret =XFS_DIRREMOVE_SPACE_RES (mp) + +XFS_DIRENTER_SPACE_RES (mp, target_namelen); + +if (xfs_has_parent (mp)) { +if (has_whiteout) + ret +=xfs_parent_calc_space_res (mp, src_namelen); + ret +=2 *xfs_parent_calc_space_res (mp, target_namelen); + } + +if (target_exists) + ret +=xfs_parent_calc_space_res (mp, target_namelen); + +return ret; +}
fs/xfs/libxfs/xfs_trans_space.h +4 -2
@@ -91,8 +91,6 @@ XFS_DQUOT_CLUSTER_SIZE_FSB)#define XFS_QM_QINOCREATE_SPACE_RES (mp) \ XFS_IALLOC_SPACE_RES(mp) -#define XFS_RENAME_SPACE_RES (mp,nl) \ - (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))#define XFS_IFREE_SPACE_RES (mp) \ (xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0)
@@ -106,4 +104,8 @@ unsigned int xfs_symlink_space_res(struct xfs_mount *mp, unsigned int namelen, unsigned int fsblocks);unsigned int xfs_remove_space_res (struct xfs_mount *mp,unsigned int namelen); +unsigned int xfs_rename_space_res (struct xfs_mount *mp, +unsigned int src_namelen,bool target_exists, +unsigned int target_namelen,bool has_whiteout); +#endif /* __XFS_TRANS_SPACE_H__ */
fs/xfs/scrub/orphanage.c +2 -2
@@ -264,8 +264,8 @@ xrep_adoption_init( adopt->sc = sc; adopt->orphanage_blkres =xfs_link_space_res (mp,MAXNAMELEN );if (S_ISDIR (VFS_I (sc->ip)->i_mode)) - child_blkres =XFS_RENAME_SPACE_RES (sc->mp, - xfs_name_dotdot.len); + child_blkres =xfs_rename_space_res (mp,0 , false, + xfs_name_dotdot.len, false); adopt->child_blkres = child_blkres;return 0 ; }
fs/xfs/scrub/parent_repair.c +2 -1
@@ -169,7 +169,8 @@ xrep_parent_reset_dotdot(* Reserve more space just in case we have to expand the dir. We're * allowed to exceed quota to repair inconsistent metadata. */ - spaceres =XFS_RENAME_SPACE_RES (sc->mp, xfs_name_dotdot.len); + spaceres =xfs_rename_space_res (sc->mp,0 , false, xfs_name_dotdot.len, + false); error =xfs_trans_reserve_more_inode (sc->tp, sc->ip, spaceres,0 , true);if (error)
fs/xfs/xfs_inode.c +71 -7
126 lines not on this page · raw message
PATCH 11/18 xfs: Add parent pointers to xfs_cross_rename
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Cross renames are handled separately from standard renames, and need different handling to update the parent attributes correctly.
--- fs/xfs/xfs_inode.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-)
fs/xfs/xfs_inode.c +31 -16
@@ -2869,19 +2869,22 @@ xfs_finish_rename(*/ STATIC intxfs_cross_rename ( -struct xfs_trans *tp, -struct xfs_inode *dp1, -struct xfs_name *name1, -struct xfs_inode *ip1, -struct xfs_inode *dp2, -struct xfs_name *name2, -struct xfs_inode *ip2, -int spaceres) +struct xfs_trans *tp, +struct xfs_inode *dp1, +struct xfs_name *name1, +struct xfs_inode *ip1, +struct xfs_parent_defer *ip1_pptr, +struct xfs_inode *dp2, +struct xfs_name *name2, +struct xfs_inode *ip2, +struct xfs_parent_defer *ip2_pptr, +int spaceres) { -int error =0 ; -int ip1_flags =0 ; -int ip2_flags =0 ; -int dp2_flags =0 ; +struct xfs_mount *mp = dp1->i_mount; +int error =0 ; +int ip1_flags =0 ; +int ip2_flags =0 ; +int dp2_flags =0 ;/* Swap inode number for dirent in first parent */ error =xfs_dir_replace (tp, dp1, name1, ip2->i_ino, spaceres);
@@ -2950,6 +2953,18 @@ xfs_cross_rename( } } +if (xfs_has_parent (mp)) { + error =xfs_parent_replace (tp, ip1_pptr, dp1, name1, dp2, + name2, ip1); +if (error) + goto out_trans_abort; + + error =xfs_parent_replace (tp, ip2_pptr, dp2, name2, dp1, + name1, ip2); +if (error) + goto out_trans_abort; + } +if (ip1_flags) {xfs_trans_ichgtime (tp, ip1, ip1_flags);xfs_trans_log_inode (tp, ip1,XFS_ILOG_CORE );
@@ -3167,10 +3182,10 @@ xfs_rename(/* RENAME_EXCHANGE is unique from here on. */ if (flags &RENAME_EXCHANGE ) { error =xfs_cross_rename (tp, src_dp, src_name, src_ip, - target_dp, target_name, target_ip, - spaceres); -xfs_iunlock_rename (inodes, num_inodes); -return error; + src_ip_pptr, target_dp, target_name, target_ip, + tgt_ip_pptr, spaceres); + nospace_error =0 ; + goto out_unlock; }/*
PATCH 12/18 xfs: Filter XFS_ATTR_PARENT for getfattr
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Parent pointers returned to the get_fattr tool cause errors since the tool cannot parse parent pointers. Fix this by filtering parent parent pointers from xfs_xattr_put_listent.
--- fs/xfs/xfs_xattr.c | 3 +++ 1 file changed, 3 insertions(+)
fs/xfs/xfs_xattr.c +3 -0
@@ -237,6 +237,9 @@ xfs_xattr_put_listent(ASSERT (context->count >=0 ); +if (flags &XFS_ATTR_PARENT ) +return ; +if (flags &XFS_ATTR_ROOT ) {#ifdef CONFIG_XFS_POSIX_ACL if (namelen == SGI_ACL_FILE_SIZE &&
PATCH 13/18 xfs: pass the attr value to put_listent when possible
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Pass the attr value to put_listent when we have local xattrs or shortform xattrs.
--- fs/xfs/libxfs/xfs_attr.h | 5 +++-- fs/xfs/libxfs/xfs_attr_sf.h | 1 + fs/xfs/xfs_attr_list.c | 8 +++++++- fs/xfs/xfs_ioctl.c | 1 + fs/xfs/xfs_xattr.c | 1 + 5 files changed, 13 insertions(+), 3 deletions(-)
fs/xfs/libxfs/xfs_attr.h +3 -2
@@ -47,8 +47,9 @@ struct xfs_attrlist_cursor_kern {/* void; state communicated via *context */ -typedef void (*put_listent_func_t )(struct xfs_attr_list_context *,int , -unsigned char *,int ,int ); +typedef void (*put_listent_func_t )(struct xfs_attr_list_context *context, +int flags,unsigned char *name,int namelen,void *value, +int valuelen);struct xfs_attr_list_context {struct xfs_trans *tp;
fs/xfs/libxfs/xfs_attr_sf.h +1 -0
@@ -24,6 +24,7 @@ typedef struct xfs_attr_sf_sort {uint8_t flags;/* flags bits (see xfs_attr_leaf.h) */ xfs_dahash_t hash;/* this entry's hash value */ unsigned char *name;/* name value, pointer into buffer */ +void *value; } xfs_attr_sf_sort_t;#define XFS_ATTR_SF_ENTSIZE_MAX /* max space for name&value */ \
fs/xfs/xfs_attr_list.c +7 -1
@@ -97,6 +97,7 @@ xfs_attr_shortform_list( sfe->flags, sfe->nameval, (int )sfe->namelen, + &sfe->nameval[sfe->namelen], (int)sfe->valuelen);/* * Either search callback finished early or
@@ -143,6 +144,7 @@ xfs_attr_shortform_list( sbp->name = sfe->nameval; sbp->namelen = sfe->namelen;/* These are bytes, and both on-disk, don't endian-flip */ + sbp->value = &sfe->nameval[sfe->namelen], sbp->valuelen = sfe->valuelen; sbp->flags = sfe->flags; sfe =xfs_attr_sf_nextentry (sfe);
@@ -194,6 +196,7 @@ xfs_attr_shortform_list( sbp->flags, sbp->name, sbp->namelen, + sbp->value, sbp->valuelen);if (context->seen_enough)break ;
@@ -481,6 +484,7 @@ xfs_attr3_leaf_list_int(*/ for (; i < ichdr.count; entry++, i++) {char *name; +void *value;int namelen, valuelen;if (be32_to_cpu (entry->hashval) != cursor->hashval) {
@@ -498,6 +502,7 @@ xfs_attr3_leaf_list_int( name_loc =xfs_attr3_leaf_name_local (leaf, i); name = name_loc->nameval; namelen = name_loc->namelen; + value = &name_loc->nameval[name_loc->namelen]; valuelen =be16_to_cpu (name_loc->valuelen); }else {xfs_attr_leaf_name_remote_t *name_rmt;
@@ -505,6 +510,7 @@ xfs_attr3_leaf_list_int( name_rmt =xfs_attr3_leaf_name_remote (leaf, i); name = name_rmt->name; namelen = name_rmt->namelen; + value =NULL ; valuelen =be32_to_cpu (name_rmt->valuelen); }
@@ -515,7 +521,7 @@ xfs_attr3_leaf_list_int(return -EFSCORRUPTED ; } context->put_listent (context, entry->flags, - name, namelen, valuelen); + name, namelen, value, valuelen);if (context->seen_enough)break ; cursor->offset++;
fs/xfs/xfs_ioctl.c +1 -0
@@ -309,6 +309,7 @@ xfs_ioc_attr_put_listent(int flags, unsigned char *name, int namelen, + void *value, int valuelen) { struct xfs_attrlist *alist = context->buffer;
fs/xfs/xfs_xattr.c +1 -0
@@ -230,6 +230,7 @@ xfs_xattr_put_listent(int flags, unsigned char *name, int namelen, + void *value, int valuelen) { char *prefix;
PATCH 14/18 xfs: Add parent pointer ioctl
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
This patch adds a new file ioctl to retrieve the parent pointer of a given inode
--- fs/xfs/Makefile | 1 fs/xfs/libxfs/xfs_fs.h | 1 fs/xfs/libxfs/xfs_fs_staging.h | 66 +++++++++++++++++ fs/xfs/libxfs/xfs_parent.c | 40 ++++++++++ fs/xfs/libxfs/xfs_parent.h | 23 ++++++ fs/xfs/xfs_ioctl.c | 134 +++++++++++++++++++++++++++++++++- fs/xfs/xfs_ondisk.h | 4 + fs/xfs/xfs_parent_utils.c | 159 ++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_parent_utils.h | 20 +++++ fs/xfs/xfs_trace.c | 1 fs/xfs/xfs_trace.h | 73 ++++++++++++++++++ 11 files changed, 521 insertions(+), 1 deletion(-) create mode 100644 fs/xfs/xfs_parent_utils.c create mode 100644 fs/xfs/xfs_parent_utils.h
fs/xfs/Makefile +1 -0
@@ -89,6 +89,7 @@ xfs-y += xfs_aops.o \ xfs_mount.o \ xfs_mru_cache.o \ xfs_pwork.o \ + xfs_parent_utils.o \ xfs_reflink.o \ xfs_stats.o \ xfs_super.o \
fs/xfs/libxfs/xfs_fs.h +1 -0
@@ -807,6 +807,7 @@ struct xfs_scrub_metadata {/* XFS_IOC_GETFSMAP ------ hoisted 59 */ #define XFS_IOC_SCRUB_METADATA _IOWR('X', 60, struct xfs_scrub_metadata)#define XFS_IOC_AG_GEOMETRY _IOWR('X', 61, struct xfs_ag_geometry) +/* XFS_IOC_GETPARENTS ---- staging 62 */ /* * ioctl commands that replace IRIX syssgi()'s
fs/xfs/libxfs/xfs_fs_staging.h +66 -0
70 lines not on this page · raw message
fs/xfs/libxfs/xfs_parent.c +40 -0
@@ -282,3 +282,43 @@ __xfs_parent_cancel(xlog_drop_incompat_feat (mp->m_log,XLOG_INCOMPAT_FEAT_XATTRS );kmem_cache_free (xfs_parent_intent_cache, parent); } + +/* Convert an ondisk parent pointer to the incore format. */ +void +xfs_parent_irec_from_disk ( +struct xfs_parent_name_irec *irec, +const struct xfs_parent_name_rec *rec, +const void *value, +unsigned int valuelen) +{ + irec->p_ino =be64_to_cpu (rec->p_ino); + irec->p_gen =be32_to_cpu (rec->p_gen); + irec->p_namehash =be32_to_cpu (rec->p_namehash); + irec->p_namelen = valuelen; +memcpy (irec->p_name, value, valuelen); +} + +/* Convert an incore parent pointer to the ondisk attr name format. */ +void +xfs_parent_irec_to_disk ( +struct xfs_parent_name_rec *rec, +const struct xfs_parent_name_irec *irec) +{ + rec->p_ino =cpu_to_be64 (irec->p_ino); + rec->p_gen =cpu_to_be32 (irec->p_gen); + rec->p_namehash =cpu_to_be32 (irec->p_namehash); +} + +/* Compute p_namehash for the this parent pointer. */ +void +xfs_parent_irec_hashname ( +struct xfs_mount *mp, +struct xfs_parent_name_irec *irec) +{ +struct xfs_name dname = { + .name = irec->p_name, + .len = irec->p_namelen, + }; + + irec->p_namehash =xfs_dir2_hashname (mp, &dname); +}
fs/xfs/libxfs/xfs_parent.h +23 -0
@@ -75,4 +75,27 @@ xfs_parent_finish( __xfs_parent_cancel(mp, p); } +/* +* Incore version of a parent pointer, also contains dirent name so callers +* can pass/obtain all the parent pointer information in a single structure +*/ +struct xfs_parent_name_irec { +/* Parent pointer attribute name fields */ +xfs_ino_t p_ino; +uint32_t p_gen; +xfs_dahash_t p_namehash; + +/* Parent pointer attribute value fields */ +uint8_t p_namelen; +unsigned char p_name[MAXNAMELEN ]; +}; + +void xfs_parent_irec_from_disk (struct xfs_parent_name_irec *irec, +const struct xfs_parent_name_rec *rec,const void *value, +unsigned int valuelen); +void xfs_parent_irec_to_disk (struct xfs_parent_name_rec *rec, +const struct xfs_parent_name_irec *irec); +void xfs_parent_irec_hashname (struct xfs_mount *mp, +struct xfs_parent_name_irec *irec); +#endif /* __XFS_PARENT_H__ */
fs/xfs/xfs_ioctl.c +133 -1
152 lines not on this page · raw message
fs/xfs/xfs_ondisk.h +4 -0
@@ -150,6 +150,10 @@ xfs_check_ondisk_structs(void) XFS_CHECK_OFFSET(struct xfs_efi_log_format_32, efi_extents, 16); XFS_CHECK_OFFSET(struct xfs_efi_log_format_64, efi_extents, 16); +/* parent pointer ioctls */ + XFS_CHECK_STRUCT_SIZE(struct xfs_getparents_rec, 24); + XFS_CHECK_STRUCT_SIZE(struct xfs_getparents, 96); +/* * The v5 superblock format extended several v4 header structures with * additional data. While new fields are only accessible on v5
fs/xfs/xfs_parent_utils.c new file +159 -0
159 lines not on this page · raw message
fs/xfs/xfs_parent_utils.h new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2022-2023 Oracle, Inc. +* All rights reserved. +*/ +#ifndef __XFS_PARENT_UTILS_H__ +#define __XFS_PARENT_UTILS_H__ + +static inline unsigned int +xfs_getparents_arraytop ( +const struct xfs_getparents *ppi, +unsigned int nr) +{ +return sizeof (struct xfs_getparents ) + + (nr *sizeof (ppi->gp_offsets[0 ])); +} + +int xfs_getparent_pointers (struct xfs_inode *ip,struct xfs_getparents *ppi); + +#endif /* __XFS_PARENT_UTILS_H__ */
fs/xfs/xfs_trace.c +1 -0
@@ -42,6 +42,7 @@#include "xfs_bmap.h" #include "xfs_swapext.h" #include "xfs_xchgrange.h" +#include "xfs_parent.h" /* * We include this last to have the helpers above available for the trace
fs/xfs/xfs_trace.h +73 -0
85 lines not on this page · raw message
PATCH 15/18 xfs: fix unit conversion error in xfs_log_calc_max_attrsetm_res
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Dave and I were discussing some recent test regressions as a result of me turning on nrext64=1 on realtime filesystems, when we noticed that the minimum log size of a 32M filesystem jumped from 954 blocks to 4287 blocks.
Digging through xfs_log_calc_max_attrsetm_res, Dave noticed that @size contains the maximum estimated amount of space needed for a local format xattr, in bytes, but we feed this quantity to XFS_NEXTENTADD_SPACE_RES, which requires units of blocks. This has resulted in an overestimation of the minimum log size over the years.
We should nominally correct this, but there's a backwards compatibility problem -- if we enable it now, the minimum log size will decrease. If a corrected mkfs formats a filesystem with this new smaller log size, a user will encounter mount failures on an uncorrected kernel due to the larger minimum log size computations there.
However, the large extent counters feature is still EXPERIMENTAL, so we can gate the correction on that feature (or any features that get added after that) being enabled. Any filesystem with nrext64 or any of the as-yet-undefined feature bits turned on will be rejected by old uncorrected kernels, so this should be safe even in the upgrade case.
--- fs/xfs/libxfs/xfs_log_rlimit.c | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)
fs/xfs/libxfs/xfs_log_rlimit.c +43 -0
@@ -16,6 +16,39 @@#include "xfs_bmap_btree.h" #include "xfs_trace.h" +/* +* Decide if the filesystem has the parent pointer feature or any feature +* added after that. +*/ +static inline bool +xfs_has_parent_or_newer_feature ( +struct xfs_mount *mp) +{ +if (!xfs_sb_is_v5 (&mp->m_sb)) +return false; + +if (xfs_sb_has_compat_feature (&mp->m_sb, ~0 )) +return true; + +if (xfs_sb_has_ro_compat_feature (&mp->m_sb, + ~(XFS_SB_FEAT_RO_COMPAT_FINOBT | +XFS_SB_FEAT_RO_COMPAT_RMAPBT | +XFS_SB_FEAT_RO_COMPAT_REFLINK | +XFS_SB_FEAT_RO_COMPAT_INOBTCNT ))) +return true; + +if (xfs_sb_has_incompat_feature (&mp->m_sb, + ~(XFS_SB_FEAT_INCOMPAT_FTYPE | +XFS_SB_FEAT_INCOMPAT_SPINODES | +XFS_SB_FEAT_INCOMPAT_META_UUID | +XFS_SB_FEAT_INCOMPAT_BIGTIME | +XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR | +XFS_SB_FEAT_INCOMPAT_NREXT64 ))) +return true; + +return false; +} +/* * Calculate the maximum length in bytes that would be required for a local * attribute value as large attributes out of line are not logged.
@@ -31,6 +64,16 @@ xfs_log_calc_max_attrsetm_res(MAXNAMELEN -1 ; nblks =XFS_DAENTER_SPACE_RES (mp,XFS_ATTR_FORK ); nblks +=XFS_B_TO_FSB (mp, size); + +/* +* Starting with the parent pointer feature, every new fs feature +* corrects a unit conversion error in the xattr transaction +* reservation code that resulted in oversized minimum log size +* computations. +*/ +if (xfs_has_parent_or_newer_feature (mp)) + size =XFS_B_TO_FSB (mp, size); + nblks +=XFS_NEXTENTADD_SPACE_RES (mp, size,XFS_ATTR_FORK ); return M_RES(mp)->tr_attrsetm.tr_logres +
PATCH 16/18 xfs: drop compatibility minimum log size computations for reflink
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Having established that we can reduce the minimum log size computation for filesystems with parent pointers or any newer feature, we should also drop the compat minlogsize code that we added when we reduced the transaction reservation size for rmap and reflink.
--- fs/xfs/libxfs/xfs_log_rlimit.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/xfs/libxfs/xfs_log_rlimit.c +10 -0
@@ -91,6 +91,16 @@ xfs_log_calc_trans_resv_for_minlogblocks( {unsigned int rmap_maxlevels = mp->m_rmap_maxlevels; +/* +* Starting with the parent pointer feature, every new fs feature +* drops the oversized minimum log size computation introduced by the +* original reflink code. +*/ +if (xfs_has_parent_or_newer_feature (mp)) { +xfs_trans_resv_calc (mp, resv); +return ; + } +/* * In the early days of rmap+reflink, we always set the rmap maxlevels * to 9 even if the AG was small enough that it would never grow to
PATCH 17/18 xfs: don't remove the attr fork when parent pointers are enabled
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
When an inode is removed, it may also cause the attribute fork to be removed if it is the last attribute. This transaction gets flushed to the log, but if the system goes down before we could inactivate the symlink, the log recovery tries to inactivate this inode (since it is on the unlinked list) but the verifier trips over the remote value and leaks it.
Hence we ended up with a file in this odd state on a "clean" mount. The "obvious" fix is to prohibit erasure of the attr fork to avoid tripping over the verifiers when pptrs are enabled.
--- fs/xfs/libxfs/xfs_attr_leaf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/xfs/libxfs/xfs_attr_leaf.c +4 -2
@@ -913,7 +913,8 @@ xfs_attr_sf_removename( totsize -= size;if (totsize ==sizeof (xfs_attr_sf_hdr_t) &&xfs_has_attr2 (mp) && (dp->i_df.if_format !=XFS_DINODE_FMT_BTREE ) && - !(args->op_flags & (XFS_DA_OP_ADDNAME |XFS_DA_OP_REPLACE ))) { + !(args->op_flags & (XFS_DA_OP_ADDNAME |XFS_DA_OP_REPLACE )) && + !xfs_has_parent (mp)) {xfs_attr_fork_remove (dp, args->trans); }else {xfs_idata_realloc (dp, -size,XFS_ATTR_FORK );
@@ -922,7 +923,8 @@ xfs_attr_sf_removename(ASSERT (totsize >sizeof (xfs_attr_sf_hdr_t) || (args->op_flags &XFS_DA_OP_ADDNAME ) || !xfs_has_attr2 (mp) || - dp->i_df.if_format ==XFS_DINODE_FMT_BTREE ); + dp->i_df.if_format ==XFS_DINODE_FMT_BTREE || +xfs_has_parent (mp));xfs_trans_log_inode (args->trans, dp,XFS_ILOG_CORE |XFS_ILOG_ADATA ); }
PATCH 18/18 xfs: Add the parent pointer support to the superblock version 5.
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Add the parent pointer superblock flag so that we can actually mount filesystems with this feature enabled.
--- fs/xfs/libxfs/xfs_format.h | 4 +++- fs/xfs/libxfs/xfs_fs.h | 1 + fs/xfs/libxfs/xfs_sb.c | 4 ++++ fs/xfs/xfs_super.c | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_format.h +3 -1
@@ -373,13 +373,15 @@ xfs_sb_has_ro_compat_feature(#define XFS_SB_FEAT_INCOMPAT_BIGTIME (1 << 3)/* large timestamps */ #define XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR (1 << 4)/* needs xfs_repair */ #define XFS_SB_FEAT_INCOMPAT_NREXT64 (1 << 5)/* large extent counters */ +#define XFS_SB_FEAT_INCOMPAT_PARENT (1 << 6)/* parent pointers */ #define XFS_SB_FEAT_INCOMPAT_ALL \ (XFS_SB_FEAT_INCOMPAT_FTYPE| \ XFS_SB_FEAT_INCOMPAT_SPINODES| \ XFS_SB_FEAT_INCOMPAT_META_UUID| \ XFS_SB_FEAT_INCOMPAT_BIGTIME| \ XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR| \ - XFS_SB_FEAT_INCOMPAT_NREXT64) + XFS_SB_FEAT_INCOMPAT_NREXT64| \ + XFS_SB_FEAT_INCOMPAT_PARENT)#define XFS_SB_FEAT_INCOMPAT_UNKNOWN ~XFS_SB_FEAT_INCOMPAT_ALL static inline bool
fs/xfs/libxfs/xfs_fs.h +1 -0
@@ -239,6 +239,7 @@ typedef struct xfs_fsop_resblks {#define XFS_FSOP_GEOM_FLAGS_BIGTIME (1 << 21)/* 64-bit nsec timestamps */ #define XFS_FSOP_GEOM_FLAGS_INOBTCNT (1 << 22)/* inobt btree counter */ #define XFS_FSOP_GEOM_FLAGS_NREXT64 (1 << 23)/* large extent counters */ +#define XFS_FSOP_GEOM_FLAGS_PARENT (1U << 30)/* parent pointers */ #define XFS_FSOP_GEOM_FLAGS_ATOMIC_SWAP (1U << 31)/* atomic file extent swap */ /*
fs/xfs/libxfs/xfs_sb.c +4 -0
@@ -175,6 +175,8 @@ xfs_sb_version_to_features( features |=XFS_FEAT_NEEDSREPAIR ;if (sbp->sb_features_incompat &XFS_SB_FEAT_INCOMPAT_NREXT64 ) features |=XFS_FEAT_NREXT64 ; +if (sbp->sb_features_incompat &XFS_SB_FEAT_INCOMPAT_PARENT ) + features |=XFS_FEAT_PARENT ;return features; }
@@ -1192,6 +1194,8 @@ xfs_fs_geometry( geo->flags |=XFS_FSOP_GEOM_FLAGS_BIGTIME ;if (xfs_has_inobtcounts (mp)) geo->flags |=XFS_FSOP_GEOM_FLAGS_INOBTCNT ; +if (xfs_has_parent (mp)) + geo->flags |=XFS_FSOP_GEOM_FLAGS_PARENT ;if (xfs_has_sector (mp)) { geo->flags |=XFS_FSOP_GEOM_FLAGS_SECTOR ; geo->logsectsize = sbp->sb_logsectsize;
fs/xfs/xfs_super.c +4 -0
@@ -1689,6 +1689,10 @@ xfs_fs_fill_super( goto out_filestream_unmount; } +if (xfs_has_parent (mp)) +xfs_warn (mp, +"EXPERIMENTAL parent pointer feature enabled. Use at your own risk!" ); + error =xfs_mountfs (mp);if (error) goto out_filestream_unmount;
cover xfs: fsck for parent pointers
In reply to Darrick J. WongHi all,
This series implements online checking and repair for directory parent pointer metadata. The checking half is fairly straightforward -- for each outgoing directory link (forward or backwards), grab the inode at the other end, and confirm that there's a corresponding link. If we can't grab an inode or lock it, we'll save that link for a slower loop that cycles all the locks, confirms the continued existence of the link, and rechecks the link if it's actually still there.
Repairs are a bit more involved -- for directories, we walk the entire filesystem to rebuild the dirents from parent pointer information. Parent pointer repairs do the same walk but rebuild the pptrs from the dirent information, but with the added twist that it duplicates all the xattrs so that it can use the atomic extent swapping code to commit the repairs atomically.
This introduces an added twist to the xattr repair code -- because the VFS doesn't take i_rwsem on directory children when moving them from one parent to another, we use dirent hooks to detect a colliding update to the pptr data; if one is detected, we restart the xattr salvaging process but this time hold all the ILOCKs until the end of the scan.
For offline repair, the phase6 directory connectivity scan generates an index of all the expected parent pointers in the filesystem. Then it walks each file and compares the parent pointers attached to that file against the index generated, and resyncs the results as necessary.
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
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=pptrs-fsck
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=pptrs-fsck
--- fs/xfs/Makefile | 2 fs/xfs/libxfs/xfs_bmap.c | 2 fs/xfs/libxfs/xfs_dir2.c | 2 fs/xfs/libxfs/xfs_dir2.h | 2 fs/xfs/libxfs/xfs_parent.c | 86 +++ fs/xfs/libxfs/xfs_parent.h | 18 + fs/xfs/scrub/attr.c | 2 fs/xfs/scrub/attr_repair.c | 496 +++++++++++++++++ fs/xfs/scrub/attr_repair.h | 4 fs/xfs/scrub/dir.c | 341 ++++++++++++ fs/xfs/scrub/dir_repair.c | 564 +++++++++++++++++++- fs/xfs/scrub/findparent.c | 60 ++ fs/xfs/scrub/findparent.h | 12 fs/xfs/scrub/listxattr.c | 10 fs/xfs/scrub/listxattr.h | 4 fs/xfs/scrub/orphanage.c | 66 ++ fs/xfs/scrub/orphanage.h | 2 fs/xfs/scrub/parent.c | 599 +++++++++++++++++++++ fs/xfs/scrub/parent_repair.c | 1207 +++++++++++++++++++++++++++++++++++++++++- fs/xfs/scrub/scrub.c | 6 fs/xfs/scrub/scrub.h | 8 fs/xfs/scrub/trace.c | 1 fs/xfs/scrub/trace.h | 190 +++++++ 23 files changed, 3605 insertions(+), 79 deletions(-)
PATCH 1/17 xfs: check dirents have parent pointers
From: Darrick J. Wong <[email protected]>
If the fs has parent pointers, we need to check that each child dirent points to a file that has a parent pointer pointing back at us.
--- fs/xfs/libxfs/xfs_parent.c | 42 ++++++++++++++++ fs/xfs/libxfs/xfs_parent.h | 10 ++++ fs/xfs/scrub/dir.c | 117 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 168 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_parent.c +42 -0
@@ -322,3 +322,45 @@ xfs_parent_irec_hashname( irec->p_namehash =xfs_dir2_hashname (mp, &dname); } + +static inline void +xfs_parent_scratch_init ( +struct xfs_trans *tp, +struct xfs_inode *ip, +const struct xfs_parent_name_irec *pptr, +struct xfs_parent_scratch *scr) +{ +memset (&scr->args,0 ,sizeof (struct xfs_da_args )); + scr->args.attr_filter =XFS_ATTR_PARENT ; + scr->args.dp = ip; + scr->args.geo = ip->i_mount->m_attr_geo; + scr->args.name = (const unsigned char *)&scr->rec; + scr->args.namelen =sizeof (struct xfs_parent_name_rec ); + scr->args.op_flags =XFS_DA_OP_NVLOOKUP ; + scr->args.trans = tp; + scr->args.value = (void *)pptr->p_name; + scr->args.valuelen = pptr->p_namelen; + scr->args.whichfork =XFS_ATTR_FORK ; + scr->args.hashval =xfs_da_hashname ((const void *)&scr->rec, +sizeof (struct xfs_parent_name_rec )); +} + +/* +* Look up the @name associated with the parent pointer (@pptr) of @ip. +* Caller must hold at least ILOCK_SHARED. Returns 0 if the pointer is found, +* -ENOATTR if there is no match, or a negative errno. The scratchpad need not +* be initialized. +*/ +int +xfs_parent_lookup ( +struct xfs_trans *tp, +struct xfs_inode *ip, +const struct xfs_parent_name_irec *pptr, +struct xfs_parent_scratch *scr) +{ +xfs_parent_irec_to_disk (&scr->rec, pptr); +xfs_parent_scratch_init (tp, ip, pptr, scr); + scr->args.op_flags |=XFS_DA_OP_OKNOENT ; + +return xfs_attr_get_ilocked (&scr->args); +}
fs/xfs/libxfs/xfs_parent.h +10 -0
@@ -98,4 +98,14 @@ void xfs_parent_irec_to_disk(struct xfs_parent_name_rec *rec,void xfs_parent_irec_hashname (struct xfs_mount *mp,struct xfs_parent_name_irec *irec); +/* Scratchpad memory so that raw parent operations don't burn stack space. */ +struct xfs_parent_scratch { +struct xfs_parent_name_rec rec; +struct xfs_da_args args; +}; + +int xfs_parent_lookup (struct xfs_trans *tp,struct xfs_inode *ip, +const struct xfs_parent_name_irec *pptr, +struct xfs_parent_scratch *scratch); +#endif /* __XFS_PARENT_H__ */
fs/xfs/scrub/dir.c +116 -1
162 lines not on this page · raw message
PATCH 2/17 xfs: deferred scrub of dirents
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
If the trylock-based parent pointer check fails, retain those dirents and check them at the end. This may involve dropping the locks on the file being scanned, so yay.
--- fs/xfs/scrub/dir.c | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/scrub/trace.h | 33 +++++++ 2 files changed, 259 insertions(+), 2 deletions(-)
fs/xfs/scrub/dir.c +226 -2
@@ -22,6 +22,10 @@#include "scrub/dabtree.h" #include "scrub/readdir.h" #include "scrub/repair.h" +#include "scrub/trace.h" +#include "scrub/xfile.h" +#include "scrub/xfarray.h" +#include "scrub/xfblob.h" /* Set us up to scrub directories. */ int
@@ -41,6 +45,18 @@ xchk_setup_directory(/* Directories */ +/* Deferred directory entry that we saved for later. */ +struct xchk_dirent { +/* Cookie for retrieval of the dirent name. */ +xfblob_cookie name_cookie; + +/* Child inode number. */ +xfs_ino_t ino; + +/* Length of the pptr name. */ +uint8_t namelen; +}; +struct xchk_dir {struct xfs_scrub *sc;
@@ -50,6 +66,15 @@ struct xchk_dir {/* xattr key and da args for parent pointer validation. */ struct xfs_parent_scratch pptr_scratch; +/* Fixed-size array of xchk_dirent structures. */ +struct xfarray *dir_entries; + +/* Blobs containing dirent names. */ +struct xfblob *dir_names; + +/* If we've cycled the ILOCK, we must revalidate deferred dirents. */ +bool need_revalidate; +/* Name buffer for dirent revalidation. */ uint8_t namebuf[MAXNAMELEN ];
@@ -150,8 +175,26 @@ xchk_dir_check_pptr_fast(/* Try to lock the inode. */ lockmode =xchk_dir_lock_child (sc, ip);if (!lockmode) { -xchk_set_incomplete (sc); -return -ECANCELED ; +struct xchk_dirent save_de = { + .namelen = name->len, + .ino = ip->i_ino, + }; + +/* Couldn't lock the inode, so save the dirent for later. */ +trace_xchk_dir_defer (sc->ip, name->name, name->len, ip->i_ino); + + error =xfblob_store (sd->dir_names, &save_de.name_cookie, + name->name, name->len); +if (xchk_fblock_xref_process_error (sc,XFS_DATA_FORK ,0 , + &error)) +return error; + + error =xfarray_append (sd->dir_entries, &save_de); +if (xchk_fblock_xref_process_error (sc,XFS_DATA_FORK ,0 , + &error)) +return error; + +return 0 ; } error =xchk_dir_parent_pointer (sd, name, ip);
@@ -867,6 +910,156 @@ xchk_directory_blocks(return error; } +/* +* Revalidate a dirent that we collected in the past but couldn't check because +* of lock contention. Returns 0 if the dirent is still valid, -ENOENT if it +* has gone away on us, or a negative errno. +*/ +STATIC int +xchk_dir_revalidate_dirent ( +struct xchk_dir *sd, +const struct xfs_name *xname, +xfs_ino_t ino) +{ +struct xfs_scrub *sc = sd->sc; +xfs_ino_t child_ino; +int error; + +/* +* Look up the directory entry. If we get -ENOENT, the directory entry +* went away and there's nothing to revalidate. Return any other +* error. +*/ + error =xchk_dir_lookup (sc, sc->ip, xname, &child_ino); +if (error) +return error; + +/* The inode number changed, nothing to revalidate. */ +if (ino != child_ino) +return -ENOENT ; + +return 0 ; +} + +/* +* Check a directory entry's parent pointers the slow way, which means we cycle +* locks a bunch and put up with revalidation until we get it done. +*/ +STATIC int +xchk_dir_slow_dirent ( +struct xchk_dir *sd, +struct xchk_dirent *dirent) +{ +struct xfs_name xname = { + .name = sd->namebuf, + .len = dirent->namelen, + }; +struct xfs_scrub *sc = sd->sc; +struct xfs_inode *ip; +unsigned int lockmode; +int error; + +/* Check that the deferred dirent still exists. */ +if (sd->need_revalidate) { + error =xchk_dir_revalidate_dirent (sd, &xname, dirent->ino); +if (error == -ENOENT ) +return 0 ; +if (!xchk_fblock_xref_process_error (sc,XFS_DATA_FORK ,0 , + &error)) +return error; + } + + error =xchk_iget (sc, dirent->ino, &ip); +if (error == -EINVAL || error == -ENOENT ) { +xchk_fblock_set_corrupt (sc,XFS_DATA_FORK ,0 ); +return 0 ; + } +if (!xchk_fblock_xref_process_error (sc,XFS_DATA_FORK ,0 , &error)) +return error; + +/* +* If we can grab both IOLOCK and ILOCK of the alleged child, we can +* proceed with the validation. +*/ + lockmode =xchk_dir_lock_child (sc, ip); +if (lockmode) + goto check_pptr; + +/* +* We couldn't lock the child file. Drop all the locks and try to +* get them again, one at a time. +*/ +xchk_iunlock (sc, sc->ilock_flags); + sd->need_revalidate = true; + +trace_xchk_dir_slowpath (sc->ip, xname.name, xname.len, ip->i_ino); + +while (true) { +xchk_ilock (sc,XFS_IOLOCK_EXCL ); +if (xfs_ilock_nowait (ip,XFS_IOLOCK_SHARED )) { +xchk_ilock (sc,XFS_ILOCK_EXCL ); +if (xfs_ilock_nowait (ip,XFS_ILOCK_EXCL )) { +break ; + } +xchk_iunlock (sc,XFS_ILOCK_EXCL ); + } +xchk_iunlock (sc,XFS_IOLOCK_EXCL ); + +if (xchk_should_terminate (sc, &error)) + goto out_rele; + +delay (1 ); + } + lockmode =XFS_IOLOCK_SHARED |XFS_ILOCK_EXCL ; + +/* Revalidate, since we just cycled the locks. */ + error =xchk_dir_revalidate_dirent (sd, &xname, dirent->ino); +if (error == -ENOENT ) + goto out_unlock; +if (!xchk_fblock_xref_process_error (sc,XFS_DATA_FORK ,0 , &error)) + goto out_unlock; + +check_pptr: + error =xchk_dir_parent_pointer (sd, &xname, ip); +out_unlock: +xfs_iunlock (ip, lockmode); +out_rele: +xchk_irele (sc, ip); +return error; +} + +/* Check all the dirents that we deferred the first time around. */ +STATIC int +xchk_dir_finish_slow_dirents ( +struct xchk_dir *sd) +{ +xfarray_idx_t array_cur; +int error; + + foreach_xfarray_idx(sd->dir_entries, array_cur) { +struct xchk_dirent dirent; + +if (sd->sc->sm->sm_flags &XFS_SCRUB_OFLAG_CORRUPT ) +return 0 ; + + error =xfarray_load (sd->dir_entries, array_cur, &dirent); +if (error) +return error; + + error =xfblob_load (sd->dir_names, dirent.name_cookie, + sd->namebuf, dirent.namelen); +if (error) +return error; + sd->namebuf[MAXNAMELEN -1 ] =0 ; + + error =xchk_dir_slow_dirent (sd, &dirent); +if (error) +return error; + } + +return 0 ; +} +/* Scrub a whole directory. */ int xchk_directory(
@@ -905,11 +1098,42 @@ xchk_directory(return -ENOMEM ; sd->sc = sc; +if (xfs_has_parent (sc->mp)) { +/* +* Set up some staging memory for dirents that we can't check +* due to locking contention. +*/ + error =xfarray_create (sc->mp,"slow directory entries" ,0 , +sizeof (struct xchk_dirent ), &sd->dir_entries); +if (error) + goto out_sd; + + error =xfblob_create (sc->mp,"slow directory entry names" , + &sd->dir_names); +if (error) + goto out_entries; + } +/* Look up every name in this directory by hash. */ error =xchk_dir_walk (sc, sc->ip, xchk_dir_actor, sd);if (error == -ECANCELED ) error =0 ; +if (error) + goto out_names; +if (xfs_has_parent (sc->mp)) { + error =xchk_dir_finish_slow_dirents (sd); +if (error) + goto out_names; + } + +out_names: +if (sd->dir_names) +xfblob_destroy (sd->dir_names); +out_entries: +if (sd->dir_entries) +xfarray_destroy (sd->dir_entries); +out_sd:kvfree (sd);return error; }
fs/xfs/scrub/trace.h +33 -0
@@ -1417,6 +1417,39 @@ DEFINE_EVENT(xchk_nlinks_diff_class, name, \ TP_ARGS(mp, ip, live))DEFINE_SCRUB_NLINKS_DIFF_EVENT (xchk_nlinks_compare_inode); +DECLARE_EVENT_CLASS (xchk_pptr_class, + TP_PROTO(struct xfs_inode *ip, const unsigned char *name, + unsigned int namelen, xfs_ino_t parent_ino), +TP_ARGS (ip, name, namelen, parent_ino), +TP_STRUCT__entry ( + __field(dev_t, dev) + __field(xfs_ino_t, ino) + __field(unsigned int, namelen) + __dynamic_array(char, name, namelen) +__field (xfs_ino_t, parent_ino) + ), +TP_fast_assign ( + __entry->dev = ip->i_mount->m_super->s_dev; + __entry->ino = ip->i_ino; + __entry->namelen = namelen; + memcpy(__get_str(name), name, namelen); + __entry->parent_ino = parent_ino; + ), +TP_printk ("dev %d:%d ino 0x%llx name '%.*s' parent_ino 0x%llx" , +MAJOR (__entry->dev),MINOR (__entry->dev), + __entry->ino, + __entry->namelen, +__get_str (name), + __entry->parent_ino) +) +#define DEFINE_XCHK_PPTR_CLASS (name) \ +DEFINE_EVENT(xchk_pptr_class, name, \ + TP_PROTO(struct xfs_inode *ip, const unsigned char *name, \ + unsigned int namelen, xfs_ino_t parent_ino), \ + TP_ARGS(ip, name, namelen, parent_ino)) +DEFINE_XCHK_PPTR_CLASS (xchk_dir_defer); +DEFINE_XCHK_PPTR_CLASS (xchk_dir_slowpath); +/* repair tracepoints */ #if IS_ENABLED (CONFIG_XFS_ONLINE_REPAIR )
PATCH 3/17 xfs: scrub parent pointers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Actually check parent pointers now.
--- fs/xfs/scrub/parent.c | 341 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 341 insertions(+)
fs/xfs/scrub/parent.c +341 -0
@@ -15,11 +15,15 @@#include "xfs_icache.h" #include "xfs_dir2.h" #include "xfs_dir2_priv.h" +#include "xfs_attr.h" +#include "xfs_parent.h" #include "scrub/scrub.h" #include "scrub/common.h" #include "scrub/readdir.h" #include "scrub/tempfile.h" #include "scrub/repair.h" +#include "scrub/listxattr.h" +#include "scrub/trace.h" /* Set us up to scrub parents. */ int
@@ -197,6 +201,340 @@ xchk_parent_validate(return error; } +/* +* Checking of Parent Pointers +* =========================== +* +* On filesystems with directory parent pointers, we check the referential +* integrity by visiting each parent pointer of a child file and checking that +* the directory referenced by the pointer actually has a dirent pointing +* forward to the child file. +*/ + +struct xchk_pptrs { +struct xfs_scrub *sc; + +/* Scratch buffer for scanning pptr xattrs */ +struct xfs_parent_name_irec pptr; + +/* How many parent pointers did we find at the end? */ +unsigned long long pptrs_found; + +/* Parent of this directory. */ +xfs_ino_t parent_ino; +}; + +/* Look up the dotdot entry so that we can check it as we walk the pptrs. */ +STATIC int +xchk_parent_dotdot ( +struct xchk_pptrs *pp) +{ +struct xfs_scrub *sc = pp->sc; +int error; + +if (!S_ISDIR (VFS_I (sc->ip)->i_mode)) { + pp->parent_ino =NULLFSINO ; +return 0 ; + } + +/* Look up '..' */ + error =xchk_dir_lookup (sc, sc->ip, &xfs_name_dotdot, &pp->parent_ino); +if (!xchk_fblock_process_error (sc,XFS_DATA_FORK ,0 , &error)) +return error; +if (!xfs_verify_dir_ino (sc->mp, pp->parent_ino)) { +xchk_fblock_set_corrupt (sc,XFS_DATA_FORK ,0 ); +return 0 ; + } + +/* Is this the root dir? Then '..' must point to itself. */ +if (sc->ip == sc->mp->m_rootip && sc->ip->i_ino != pp->parent_ino) +xchk_fblock_set_corrupt (sc,XFS_DATA_FORK ,0 ); + +return 0 ; +} + +/* +* Try to lock a parent directory for checking dirents. Returns the inode +* flags for the locks we now hold, or zero if we failed. +*/ +STATIC unsigned int +xchk_parent_lock_dir ( +struct xfs_scrub *sc, +struct xfs_inode *dp) +{ +if (!xfs_ilock_nowait (dp,XFS_IOLOCK_SHARED )) +return 0 ; + +if (!xfs_ilock_nowait (dp,XFS_ILOCK_SHARED )) { +xfs_iunlock (dp,XFS_IOLOCK_SHARED ); +return 0 ; + } + +if (!xfs_need_iread_extents (&dp->i_df)) +return XFS_IOLOCK_SHARED |XFS_ILOCK_SHARED ; + +xfs_iunlock (dp,XFS_ILOCK_SHARED ); + +if (!xfs_ilock_nowait (dp,XFS_ILOCK_EXCL )) { +xfs_iunlock (dp,XFS_IOLOCK_SHARED ); +return 0 ; + } + +return XFS_IOLOCK_SHARED |XFS_ILOCK_EXCL ; +} + +/* Check the forward link (dirent) associated with this parent pointer. */ +STATIC int +xchk_parent_dirent ( +struct xchk_pptrs *pp, +struct xfs_inode *dp) +{ +struct xfs_name xname = { + .name = pp->pptr.p_name, + .len = pp->pptr.p_namelen, + }; +struct xfs_scrub *sc = pp->sc; +xfs_ino_t child_ino; +int error; + +/* +* Use the name attached to this parent pointer to look up the +* directory entry in the alleged parent. +*/ + error =xchk_dir_lookup (sc, dp, &xname, &child_ino); +if (error == -ENOENT ) { +xchk_fblock_xref_set_corrupt (sc,XFS_ATTR_FORK ,0 ); +return 0 ; + } +if (!xchk_fblock_xref_process_error (sc,XFS_ATTR_FORK ,0 , &error)) +return error; + +/* Does the inode number match? */ +if (child_ino != sc->ip->i_ino) { +xchk_fblock_xref_set_corrupt (sc,XFS_ATTR_FORK ,0 ); +return 0 ; + } + +/* +* If we're scanning a directory, we should only ever encounter a +* single parent pointer, and it should match the dotdot entry. We set +* the parent_ino from the dotdot entry before the scan, so compare it +* now. +*/ +if (!S_ISDIR (VFS_I (sc->ip)->i_mode)) +return 0 ; + +if (pp->parent_ino != dp->i_ino) { +xchk_fblock_set_corrupt (sc,XFS_ATTR_FORK ,0 ); +return 0 ; + } + + pp->parent_ino =NULLFSINO ; +return 0 ; +} + +/* Try to grab a parent directory. */ +STATIC int +xchk_parent_iget ( +struct xchk_pptrs *pp, +struct xfs_inode **dpp) +{ +struct xfs_scrub *sc = pp->sc; +struct xfs_inode *ip; +int error; + +/* Validate inode number. */ + error =xfs_dir_ino_validate (sc->mp, pp->pptr.p_ino); +if (error) { +xchk_fblock_set_corrupt (sc,XFS_ATTR_FORK ,0 ); +return -ECANCELED ; + } + + error =xchk_iget (sc, pp->pptr.p_ino, &ip); +if (error == -EINVAL || error == -ENOENT ) { +xchk_fblock_set_corrupt (sc,XFS_ATTR_FORK ,0 ); +return -ECANCELED ; + } +if (!xchk_fblock_xref_process_error (sc,XFS_ATTR_FORK ,0 , &error)) +return error; + +/* The parent must be a directory. */ +if (!S_ISDIR (VFS_I (ip)->i_mode)) { +xchk_fblock_xref_set_corrupt (sc,XFS_ATTR_FORK ,0 ); + goto out_rele; + } + +/* Validate generation number. */ +if (VFS_I (ip)->i_generation != pp->pptr.p_gen) { +xchk_fblock_xref_set_corrupt (sc,XFS_ATTR_FORK ,0 ); + goto out_rele; + } + + *dpp = ip; +return 0 ; +out_rele: +xchk_irele (sc, ip); +return 0 ; +} + +/* +* Walk an xattr of a file. If this xattr is a parent pointer, follow it up +* to a parent directory and check that the parent has a dirent pointing back +* to us. +*/ +STATIC int +xchk_parent_scan_attr ( +struct xfs_scrub *sc, +struct xfs_inode *ip, +unsigned int attr_flags, +const unsigned char *name, +unsigned int namelen, +const void *value, +unsigned int valuelen, +void *priv) +{ +struct xfs_name dname = { + .name = value, + .len = valuelen, + }; +struct xchk_pptrs *pp = priv; +struct xfs_inode *dp =NULL ; +const struct xfs_parent_name_rec *rec = (const void *)name; +unsigned int lockmode; +xfs_dahash_t computed_hash; +int error; + +/* Ignore incomplete xattrs */ +if (attr_flags &XFS_ATTR_INCOMPLETE ) +return 0 ; + +/* Ignore anything that isn't a parent pointer. */ +if (!(attr_flags &XFS_ATTR_PARENT )) +return 0 ; + +/* Does the ondisk parent pointer structure make sense? */ +if (!xfs_parent_namecheck (sc->mp, rec, namelen, attr_flags)) { +xchk_fblock_set_corrupt (sc,XFS_ATTR_FORK ,0 ); +return -ECANCELED ; + } + +if (!xfs_parent_valuecheck (sc->mp, value, valuelen)) { +xchk_fblock_set_corrupt (sc,XFS_ATTR_FORK ,0 ); +return -ECANCELED ; + } + +xfs_parent_irec_from_disk (&pp->pptr, rec, value, valuelen); + +/* +* If the namehash of the dirent name encoded in the parent pointer +* attr value doesn't match the namehash in the parent pointer key, +* the parent pointer is corrupt. +*/ + computed_hash =xfs_dir2_hashname (ip->i_mount, &dname); +if (pp->pptr.p_namehash != computed_hash) { +xchk_fblock_set_corrupt (sc,XFS_ATTR_FORK ,0 ); +return -ECANCELED ; + } + pp->pptrs_found++; + + error =xchk_parent_iget (pp, &dp); +if (error) +return error; +if (!dp) +return 0 ; + +/* Try to lock the inode. */ + lockmode =xchk_parent_lock_dir (sc, dp); +if (!lockmode) { +xchk_set_incomplete (sc); + error = -ECANCELED ; + goto out_rele; + } + + error =xchk_parent_dirent (pp, dp); +if (error) + goto out_unlock; + +out_unlock: +xfs_iunlock (dp, lockmode); +out_rele: +xchk_irele (sc, dp); +return error; +} + +/* +* Compare the number of parent pointers to the link count. For +* non-directories these should be the same. For unlinked directories the +* count should be zero; for linked directories, it should be nonzero. +*/ +STATIC int +xchk_parent_count_pptrs ( +struct xchk_pptrs *pp) +{ +struct xfs_scrub *sc = pp->sc; + +if (S_ISDIR (VFS_I (sc->ip)->i_mode)) { +if (sc->ip == sc->mp->m_rootip) + pp->pptrs_found++; + +if (VFS_I (sc->ip)->i_nlink ==0 && pp->pptrs_found >0 ) +xchk_ino_set_corrupt (sc, sc->ip->i_ino); +else if (VFS_I (sc->ip)->i_nlink >0 && + pp->pptrs_found ==0 ) +xchk_ino_set_corrupt (sc, sc->ip->i_ino); + }else { +if (VFS_I (sc->ip)->i_nlink != pp->pptrs_found) +xchk_ino_set_corrupt (sc, sc->ip->i_ino); + } + +return 0 ; +} + +/* Check parent pointers of a file. */ +STATIC int +xchk_parent_pptr ( +struct xfs_scrub *sc) +{ +struct xchk_pptrs *pp; +int error; + + pp =kvzalloc (sizeof (struct xchk_pptrs ),XCHK_GFP_FLAGS ); +if (!pp) +return -ENOMEM ; + pp->sc = sc; + +/* +* Check all the parent pointers of this file, including the dotdot +* entry if there is one. +*/ + error =xchk_parent_dotdot (pp); +if (error) + goto out_pp; + + error =xchk_xattr_walk (sc, sc->ip, xchk_parent_scan_attr, pp); +if (error == -ECANCELED ) { + error =0 ; + goto out_pp; + } +if (error) + goto out_pp; + +if (pp->sc->sm->sm_flags &XFS_SCRUB_OFLAG_CORRUPT ) + goto out_pp; + +/* +* If the parent pointers aren't corrupt, complain if the number of +* parent pointers doesn't match the link count. +*/ + error =xchk_parent_count_pptrs (pp); +if (error) + goto out_pp; + +out_pp: +kvfree (pp); +return error; +} +/* Scrub a parent pointer. */ int xchk_parent(
@@ -206,6 +544,9 @@ xchk_parent(xfs_ino_t parent_ino;int error =0 ; +if (xfs_has_parent (mp)) +return xchk_parent_pptr (sc); +/* * If we're a directory, check that the '..' link points up to * a directory that has one entry pointing to us.
PATCH 4/17 xfs: deferred scrub of parent pointers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
If the trylock-based dirent check fails, retain those parent pointers and check them at the end. This may involve dropping the locks on the file being scanned, so yay.
--- fs/xfs/Makefile | 2 fs/xfs/scrub/parent.c | 269 ++++++++++++++++++++++++++++++++++++++++++++++++- fs/xfs/scrub/trace.h | 2 3 files changed, 266 insertions(+), 7 deletions(-)
fs/xfs/Makefile +1 -1
@@ -176,6 +176,7 @@ xfs-y += $(addprefix scrub/, \ scrub.o \ symlink.o \ xfarray.o \ + xfblob.o \ xfile.o \ )
@@ -214,7 +215,6 @@ xfs-y += $(addprefix scrub/, \ rmap_repair.o \ symlink_repair.o \ tempfile.o \ - xfblob.o \ xfbtree.o \ )
fs/xfs/scrub/parent.c +263 -6
330 lines not on this page · raw message
fs/xfs/scrub/trace.h +2 -0
@@ -1449,6 +1449,8 @@ DEFINE_EVENT(xchk_pptr_class, name, \ TP_ARGS(ip, name, namelen, parent_ino))DEFINE_XCHK_PPTR_CLASS (xchk_dir_defer);DEFINE_XCHK_PPTR_CLASS (xchk_dir_slowpath); +DEFINE_XCHK_PPTR_CLASS (xchk_parent_defer); +DEFINE_XCHK_PPTR_CLASS (xchk_parent_slowpath);/* repair tracepoints */ #if IS_ENABLED (CONFIG_XFS_ONLINE_REPAIR )
PATCH 5/17 xfs: add raw parent pointer apis to support repair
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add a couple of utility functions to set or remove parent pointers from a file. These functions will be used by repair code, hence they skip the xattr logging that regular parent pointer updates use.
--- fs/xfs/libxfs/xfs_dir2.c | 2 +- fs/xfs/libxfs/xfs_dir2.h | 2 +- fs/xfs/libxfs/xfs_parent.c | 37 +++++++++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_parent.h | 8 ++++++++ 4 files changed, 47 insertions(+), 2 deletions(-)
fs/xfs/libxfs/xfs_dir2.c +1 -1
@@ -440,7 +440,7 @@ intxfs_dir_removename ( struct xfs_trans *tp, struct xfs_inode *dp, - struct xfs_name *name, + const struct xfs_name *name, xfs_ino_t ino, xfs_extlen_t total) /* bmap's total block count */ {
fs/xfs/libxfs/xfs_dir2.h +1 -1
@@ -55,7 +55,7 @@ extern int xfs_dir_lookup(struct xfs_trans *tp, struct xfs_inode *dp, const struct xfs_name *name, xfs_ino_t *inum, struct xfs_name *ci_name);extern int xfs_dir_removename (struct xfs_trans *tp,struct xfs_inode *dp, -struct xfs_name *name,xfs_ino_t ino, +const struct xfs_name *name,xfs_ino_t ino,xfs_extlen_t tot); extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp, const struct xfs_name *name, xfs_ino_t inum,
fs/xfs/libxfs/xfs_parent.c +37 -0
@@ -364,3 +364,40 @@ xfs_parent_lookup(return xfs_attr_get_ilocked (&scr->args); } + +/* +* Attach the parent pointer (@pptr -> @name) to @ip immediately. Caller must +* not have a transaction or hold the ILOCK. The update will not use logged +* xattrs. This is for specialized repair functions only. The scratchpad need +* not be initialized. +*/ +int +xfs_parent_set ( +struct xfs_inode *ip, +const struct xfs_parent_name_irec *pptr, +struct xfs_parent_scratch *scr) +{ +xfs_parent_irec_to_disk (&scr->rec, pptr); +xfs_parent_scratch_init (NULL , ip, pptr, scr); + +return xfs_attr_set (&scr->args); +} + +/* +* Remove the parent pointer (@rec -> @name) from @ip immediately. Caller must +* not have a transaction or hold the ILOCK. The update will not use logged +* xattrs. This is for specialized repair functions only. The scratchpad need +* not be initialized. +*/ +int +xfs_parent_unset ( +struct xfs_inode *ip, +const struct xfs_parent_name_irec *pptr, +struct xfs_parent_scratch *scr) +{ +xfs_parent_irec_to_disk (&scr->rec, pptr); +xfs_parent_scratch_init (NULL , ip, pptr, scr); + scr->args.op_flags |=XFS_DA_OP_REMOVE ; + +return xfs_attr_set (&scr->args); +}
fs/xfs/libxfs/xfs_parent.h +8 -0
@@ -108,4 +108,12 @@ int xfs_parent_lookup(struct xfs_trans *tp, struct xfs_inode *ip,const struct xfs_parent_name_irec *pptr, struct xfs_parent_scratch *scratch); +int xfs_parent_set (struct xfs_inode *ip, +const struct xfs_parent_name_irec *pptr, +struct xfs_parent_scratch *scratch); + +int xfs_parent_unset (struct xfs_inode *ip, +const struct xfs_parent_name_irec *rec, +struct xfs_parent_scratch *scratch); +#endif /* __XFS_PARENT_H__ */
PATCH 6/17 xfs: set child file owner in xfs_da_args when changing parent pointers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Now that struct xfs_da_args has an explicit file owner field, we must set it when modifying parent pointers.
--- fs/xfs/libxfs/xfs_parent.c | 13 ++++++++++--- fs/xfs/libxfs/xfs_parent.h | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-)
fs/xfs/libxfs/xfs_parent.c +10 -3
@@ -195,6 +195,7 @@ xfs_parent_add( args->trans = tp; args->dp = child; + args->owner = child->i_ino;xfs_init_parent_davalue (&parent->args, parent_name);
@@ -227,6 +228,7 @@ xfs_parent_remove( args->trans = tp; args->dp = child; + args->owner = child->i_ino;xfs_init_parent_davalue (&parent->args, parent_name);
@@ -265,6 +267,7 @@ xfs_parent_replace( args->trans = tp; args->dp = child; + args->owner = child->i_ino;xfs_init_parent_davalue (&parent->args, old_name);xfs_init_parent_danewvalue (&parent->args, new_name);
@@ -327,6 +330,7 @@ static inline voidxfs_parent_scratch_init ( struct xfs_trans *tp, struct xfs_inode *ip, + xfs_ino_t owner, const struct xfs_parent_name_irec *pptr, struct xfs_parent_scratch *scr) {
@@ -343,6 +347,7 @@ xfs_parent_scratch_init( scr->args.whichfork =XFS_ATTR_FORK ; scr->args.hashval =xfs_da_hashname ((const void *)&scr->rec,sizeof (struct xfs_parent_name_rec )); + scr->args.owner = owner; }/*
@@ -359,7 +364,7 @@ xfs_parent_lookup( struct xfs_parent_scratch *scr) {xfs_parent_irec_to_disk (&scr->rec, pptr); -xfs_parent_scratch_init (tp, ip, pptr, scr); +xfs_parent_scratch_init (tp, ip, ip->i_ino, pptr, scr); scr->args.op_flags |=XFS_DA_OP_OKNOENT ;return xfs_attr_get_ilocked (&scr->args);
@@ -374,11 +379,12 @@ xfs_parent_lookup(int xfs_parent_set (struct xfs_inode *ip, +xfs_ino_t owner,const struct xfs_parent_name_irec *pptr,struct xfs_parent_scratch *scr) {xfs_parent_irec_to_disk (&scr->rec, pptr); -xfs_parent_scratch_init (NULL , ip, pptr, scr); +xfs_parent_scratch_init (NULL , ip, owner, pptr, scr);return xfs_attr_set (&scr->args); }
@@ -392,11 +398,12 @@ xfs_parent_set(int xfs_parent_unset (struct xfs_inode *ip, +xfs_ino_t owner,const struct xfs_parent_name_irec *pptr,struct xfs_parent_scratch *scr) {xfs_parent_irec_to_disk (&scr->rec, pptr); -xfs_parent_scratch_init (NULL , ip, pptr, scr); +xfs_parent_scratch_init (NULL , ip, owner, pptr, scr); scr->args.op_flags |=XFS_DA_OP_REMOVE ;return xfs_attr_set (&scr->args);
fs/xfs/libxfs/xfs_parent.h +2 -2
@@ -108,11 +108,11 @@ int xfs_parent_lookup(struct xfs_trans *tp, struct xfs_inode *ip,const struct xfs_parent_name_irec *pptr, struct xfs_parent_scratch *scratch); -int xfs_parent_set (struct xfs_inode *ip, +int xfs_parent_set (struct xfs_inode *ip,xfs_ino_t owner,const struct xfs_parent_name_irec *pptr,struct xfs_parent_scratch *scratch); -int xfs_parent_unset (struct xfs_inode *ip, +int xfs_parent_unset (struct xfs_inode *ip,xfs_ino_t owner,const struct xfs_parent_name_irec *rec,struct xfs_parent_scratch *scratch);
PATCH 7/17 xfs: salvage parent pointers when rebuilding xattr structures
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
When we're salvaging extended attributes, make sure we validate the ones that claim to be parent pointers before adding them to the salvage pile.
--- fs/xfs/scrub/attr_repair.c | 41 ++++++++++++++++++++++++++++++++--------- fs/xfs/scrub/trace.c | 1 + fs/xfs/scrub/trace.h | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 9 deletions(-)
fs/xfs/scrub/attr_repair.c +32 -9
@@ -28,6 +28,7 @@#include "xfs_swapext.h" #include "xfs_xchgrange.h" #include "xfs_acl.h" +#include "xfs_parent.h" #include "scrub/xfs_scrub.h" #include "scrub/scrub.h" #include "scrub/common.h"
@@ -124,6 +125,13 @@ xrep_xattr_want_salvage(return false;if (valuelen >XATTR_SIZE_MAX || valuelen <0 )return false; +if (attr_flags &XFS_ATTR_PARENT ) { +if (!xfs_parent_namecheck (rx->sc->mp, name, namelen, + attr_flags)) +return false; +if (!xfs_parent_valuecheck (rx->sc->mp, value, valuelen)) +return false; + }return true; }
@@ -151,14 +159,21 @@ xrep_xattr_salvage_key(* Truncate the name to the first character that would trip namecheck. * If we no longer have a name after that, ignore this attribute. */ -while (i < namelen && name[i] !=0 ) - i++; -if (i ==0 ) -return 0 ; - key.namelen = i; +if (flags &XFS_ATTR_PARENT ) { + key.namelen = namelen; -trace_xrep_xattr_salvage_rec (rx->sc->ip, flags, name, key.namelen, - valuelen); +trace_xrep_xattr_salvage_pptr (rx->sc->ip, flags, name, + key.namelen, value, valuelen); + }else { +while (i < namelen && name[i] !=0 ) + i++; +if (i ==0 ) +return 0 ; + key.namelen = i; + +trace_xrep_xattr_salvage_rec (rx->sc->ip, flags, name, + key.namelen, valuelen); + } error =xfblob_store (rx->xattr_blobs, &key.name_cookie, name, key.namelen);
@@ -562,6 +577,9 @@ xrep_xattr_insert_rec(struct xchk_xattr_buf *ab = rx->sc->buf;int error; +if (key->flags &XFS_ATTR_PARENT ) + args.op_flags |=XFS_DA_OP_NVLOOKUP ; +/* * Grab pointers to the scrub buffer so that we can use them to insert * attrs into the temp file.
@@ -595,8 +613,13 @@ xrep_xattr_insert_rec( ab->name[key->namelen] =0 ; -trace_xrep_xattr_insert_rec (rx->sc->tempip, key->flags, ab->name, - key->namelen, key->valuelen); +if (key->flags &XFS_ATTR_PARENT ) +trace_xrep_xattr_insert_pptr (rx->sc->tempip, key->flags, + ab->name, key->namelen, ab->value, + key->valuelen); +else +trace_xrep_xattr_insert_rec (rx->sc->tempip, key->flags, + ab->name, key->namelen, key->valuelen);/* * xfs_attr_set creates and commits its own transaction. If the attr
fs/xfs/scrub/trace.c +1 -0
@@ -18,6 +18,7 @@#include "xfs_dir2.h" #include "xfs_da_format.h" #include "xfs_rmap.h" +#include "xfs_parent.h" #include "scrub/scrub.h" #include "scrub/xfile.h" #include "scrub/xfarray.h"
fs/xfs/scrub/trace.h +40 -0
@@ -2481,6 +2481,46 @@ DEFINE_EVENT(xrep_xattr_salvage_class, name, \DEFINE_XREP_XATTR_SALVAGE_EVENT (xrep_xattr_salvage_rec);DEFINE_XREP_XATTR_SALVAGE_EVENT (xrep_xattr_insert_rec); +DECLARE_EVENT_CLASS (xrep_pptr_salvage_class, + TP_PROTO(struct xfs_inode *ip, unsigned int flags, const void *name, + unsigned int namelen, const void *value, unsigned int valuelen), +TP_ARGS (ip, flags, name, namelen, value, valuelen), +TP_STRUCT__entry ( + __field(dev_t, dev) + __field(xfs_ino_t, ino) + __field(xfs_ino_t, parent_ino) + __field(unsigned int, parent_gen) + __field(unsigned int, namelen) +__dynamic_array (char, name, valuelen) + ), +TP_fast_assign ( + struct xfs_parent_name_irec pptr; + + xfs_parent_irec_from_disk(&pptr, name, value, valuelen); + + __entry->dev = ip->i_mount->m_super->s_dev; + __entry->ino = ip->i_ino; + __entry->parent_ino = pptr.p_ino; + __entry->parent_gen = pptr.p_gen; + __entry->namelen = pptr.p_namelen; + memcpy(__get_str(name), pptr.p_name, pptr.p_namelen); + ), +TP_printk ("dev %d:%d ino 0x%llx parent_ino 0x%llx parent_gen 0x%x name '%.*s'" , +MAJOR (__entry->dev),MINOR (__entry->dev), + __entry->ino, + __entry->parent_ino, + __entry->parent_gen, + __entry->namelen, +__get_str (name)) +) +#define DEFINE_XREP_PPTR_SALVAGE_CLASS (name) \ +DEFINE_EVENT(xrep_pptr_salvage_class, name, \ + TP_PROTO(struct xfs_inode *ip, unsigned int flags, const void *name, \ + unsigned int namelen, const void *value, unsigned int valuelen), \ + TP_ARGS(ip, flags, name, namelen, value, valuelen)) +DEFINE_XREP_PPTR_SALVAGE_CLASS (xrep_xattr_salvage_pptr); +DEFINE_XREP_PPTR_SALVAGE_CLASS (xrep_xattr_insert_pptr); + TRACE_EVENT(xrep_xattr_class, TP_PROTO(struct xfs_inode *ip, struct xfs_inode *arg_ip), TP_ARGS(ip, arg_ip),
PATCH 8/17 xfs: teach the adoption code about parent pointers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Teach the online fsck file adoption code how to create parent pointers for files that are moved to /lost+found. In addition to the parent pointer creation itself, we must also turn on logged xattrs during scrub setup.
--- fs/xfs/scrub/orphanage.c | 66 +++++++++++++++++++++++++++++++++++++++++++--- fs/xfs/scrub/orphanage.h | 2 + fs/xfs/scrub/scrub.c | 6 ++++ fs/xfs/scrub/scrub.h | 8 +++--- fs/xfs/scrub/trace.h | 1 + 5 files changed, 75 insertions(+), 8 deletions(-)
fs/xfs/scrub/orphanage.c +61 -5
@@ -19,6 +19,10 @@#include "xfs_icache.h" #include "xfs_bmap.h" #include "xfs_bmap_btree.h" +#include "xfs_parent.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" +#include "xfs_xattr.h" #include "scrub/scrub.h" #include "scrub/common.h" #include "scrub/repair.h"
@@ -97,6 +101,31 @@ xrep_chown_orphanage(return error; } +/* +* Enable logged extended attributes for parent pointers. This must get done +* before we create transactions and start making changes. +*/ +STATIC int +xrep_adoption_grab_log_assist ( +struct xfs_scrub *sc) +{ +int error; + +if (!xfs_has_parent (sc->mp)) +return 0 ; + +ASSERT (!(sc->flags &XREP_FSGATES_LARP )); + + error =xfs_attr_grab_log_assist (sc->mp); +if (error) +return error; + +trace_xchk_fsgates_enable (sc,XREP_FSGATES_LARP ); + + sc->flags |=XREP_FSGATES_LARP ; +return 0 ; +} +#define ORPHANAGE "lost+found"/* Create the orphanage directory, and set sc->orphanage to it. */
@@ -188,6 +217,12 @@ xrep_orphanage_create( out_dput_root:dput (root_dentry); out: +/* +* Turn on whatever log features are required for an adoption to be +* committed correctly. +*/ +if (!error) + error =xrep_adoption_grab_log_assist (sc);return error; }
@@ -267,6 +302,14 @@ xrep_adoption_init( child_blkres =xfs_rename_space_res (mp,0 , false, xfs_name_dotdot.len, false); adopt->child_blkres = child_blkres; + +if (xfs_has_parent (mp)) { +ASSERT (sc->flags &XREP_FSGATES_LARP ); +return xfs_parent_start_locked (mp, &adopt->parent); + }else { + adopt->parent =NULL ; + } +return 0 ; }
@@ -466,7 +509,7 @@ xrep_adoption_commit( error =xrep_orphanage_check_dcache (adopt);if (error) -return error; + goto out_parent;/* * Create the new name in the orphanage, and bump the link count of
@@ -475,7 +518,7 @@ xrep_adoption_commit( error =xfs_dir_createname (sc->tp, sc->orphanage, xname, sc->ip->i_ino, adopt->orphanage_blkres);if (error) -return error; + goto out_parent;xfs_trans_ichgtime (sc->tp, sc->orphanage,XFS_ICHGTIME_MOD |XFS_ICHGTIME_CHG );
@@ -488,7 +531,15 @@ xrep_adoption_commit( error =xfs_dir_replace (sc->tp, sc->ip, &xfs_name_dotdot, sc->orphanage->i_ino, adopt->child_blkres);if (error) -return error; + goto out_parent; + } + +/* Add a parent pointer from the file back to the lost+found. */ +if (adopt->parent) { + error =xfs_parent_add (sc->tp, adopt->parent, sc->orphanage, + xname, sc->ip); +if (error) + goto out_parent; }/*
@@ -499,11 +550,14 @@ xrep_adoption_commit(xfs_dir_update_hook (sc->orphanage, sc->ip,1 , xname); error =xrep_defer_finish (sc);if (error) -return error; + goto out_parent;/* Remove negative dentries from the lost+found's dcache */ xrep_orphanage_zap_dcache (adopt); -return 0 ; +out_parent: +xfs_parent_finish (sc->mp, adopt->parent); + adopt->parent =NULL ; +return error; }/* Cancel a proposed relocation of a file to the orphanage. */
@@ -521,6 +575,8 @@ xrep_adoption_cancel(* state to manage, we'll need to give that back. */ trace_xrep_adoption_cancel (sc->orphanage, sc->ip, error); +xfs_parent_finish (sc->mp, adopt->parent); + adopt->parent =NULL ; }/* Release the orphanage. */
fs/xfs/scrub/orphanage.h +2 -0
@@ -47,6 +47,8 @@ struct xrep_adoption {struct xfs_scrub *sc; +struct xfs_parent_defer *parent; +/* Block reservations for orphanage and child (if directory). */ unsigned int orphanage_blkres;unsigned int child_blkres;
fs/xfs/scrub/scrub.c +6 -0
@@ -21,6 +21,9 @@#include "xfs_rmap.h" #include "xfs_xchgrange.h" #include "xfs_swapext.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" +#include "xfs_xattr.h" #include "scrub/scrub.h" #include "scrub/common.h" #include "scrub/trace.h"
@@ -177,6 +180,9 @@ xchk_fsgates_disable(if (sc->flags &XREP_FSGATES_ATOMIC_XCHG )xfs_xchg_range_rele_log_assist (sc->mp); +if (sc->flags &XREP_FSGATES_LARP ) +xfs_attr_rele_log_assist (sc->mp); + sc->flags &= ~FSGATES_MASK ; }#undef FSGATES_MASK
fs/xfs/scrub/scrub.h +5 -3
@@ -135,6 +135,7 @@ struct xfs_scrub {#define XCHK_FSGATES_QUOTA (1 << 4)/* quota live update enabled */ #define XCHK_FSGATES_DIRENTS (1 << 5)/* directory live update enabled */ #define XCHK_FSGATES_RMAP (1 << 6)/* rmapbt live update enabled */ +#define XREP_FSGATES_LARP (1 << 28)/* logged xattr updates */ #define XREP_FSGATES_ATOMIC_XCHG (1 << 29)/* uses atomic file content exchange */ #define XREP_RESET_PERAG_RESV (1 << 30)/* must reset AG space reservation */ #define XREP_ALREADY_FIXED (1 << 31)/* checking our repair work */
@@ -151,10 +152,11 @@ struct xfs_scrub { XCHK_FSGATES_RMAP)/* -* The sole XREP_FSGATES* flag reflects a log intent item that is protected -* by a log-incompat feature flag. No code patching in use here. +* The sole XREP_FSGATES* flag reflects log intent items protected by +* log-incompat feature flags. No code patching in use here. */ -#define XREP_FSGATES_ALL (XREP_FSGATES_ATOMIC_XCHG) +#define XREP_FSGATES_ALL (XREP_FSGATES_ATOMIC_XCHG | \ + XREP_FSGATES_LARP)/* Metadata scrubbers */ int xchk_tester (struct xfs_scrub *sc);
fs/xfs/scrub/trace.h +1 -0
@@ -124,6 +124,7 @@ TRACE_DEFINE_ENUM(XFS_SCRUB_TYPE_HEALTHY); { XCHK_FSGATES_QUOTA, "fsgates_quota" }, \ { XCHK_FSGATES_DIRENTS, "fsgates_dirents" }, \ { XCHK_FSGATES_RMAP, "fsgates_rmap" }, \ + { XREP_FSGATES_LARP, "fsgates_larp" }, \ { XREP_FSGATES_ATOMIC_XCHG, "fsgates_atomic_swapext" }, \ { XREP_RESET_PERAG_RESV, "reset_perag_resv" }, \ { XREP_ALREADY_FIXED, "already_fixed" }
PATCH 9/17 xfs: replace namebuf with parent pointer in directory repair
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Replace the dirent name buffer at the end of struct xrep_dir with a xfs_parent_name_irec object. The namebuf and p_name usage do not overlap, so we can save 256 bytes of memory by allowing them to overlap. Doing so makes the code a bit more complex, so this is called out separately.
--- fs/xfs/scrub/dir_repair.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
fs/xfs/scrub/dir_repair.c +13 -6
@@ -28,6 +28,7 @@#include "xfs_swapext.h" #include "xfs_xchgrange.h" #include "xfs_ag.h" +#include "xfs_parent.h" #include "scrub/xfs_scrub.h" #include "scrub/scrub.h" #include "scrub/common.h"
@@ -131,8 +132,14 @@ struct xrep_dir {/* Should we move this directory to the orphanage? */ bool move_orphanage; -/* Directory entry name, plus the trailing null. */ -unsigned char namebuf[MAXNAMELEN ]; +/* +* Scratch buffer for reading parent pointers from child files. The +* p_name field is used to flush stashed dirents into the temporary +* directory in between parent pointers. At the very end of the +* repair, it can also be used to compute the lost+found filename +* if we need to reparent the directory. +*/ +struct xfs_parent_name_irec pptr; };/* Tear down all the incore stuff we created. */
@@ -694,7 +701,7 @@ xrep_dir_replay_update(struct xfs_name name = { .len = dirent->namelen, .type = dirent->ftype, - .name = rd->namebuf, + .name = rd->pptr.p_name, };struct xfs_mount *mp = rd->sc->mp;xfs_ino_t ino;
@@ -769,10 +776,10 @@ xrep_dir_replay_updates(/* The dirent name is stored in the in-core buffer. */ error =xfblob_load (rd->dir_names, dirent.name_cookie, - rd->namebuf, dirent.namelen); + rd->pptr.p_name, dirent.namelen);if (error)return error; - rd->namebuf[MAXNAMELEN -1 ] =0 ; + rd->pptr.p_name[MAXNAMELEN -1 ] =0 ; error =xrep_dir_replay_update (rd, &dirent);if (error)
@@ -1406,7 +1413,7 @@ xrep_dir_move_to_orphanage(if (error) goto err_adoption; - error =xrep_adoption_compute_name (&rd->adoption, rd->namebuf); + error =xrep_adoption_compute_name (&rd->adoption, rd->pptr.p_name);if (error) goto err_adoption;
PATCH 10/17 xfs: repair directories by scanning directory parent pointers
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
For filesystems with parent pointers, scan the entire filesystem looking for parent pointers that target the directory we're rebuilding instead of trying to salvage whatever we can from the directory data blocks. This will be more robust than salvaging, but there's more code to come.
--- fs/xfs/scrub/dir_repair.c | 323 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 320 insertions(+), 3 deletions(-)
fs/xfs/scrub/dir_repair.c +320 -3
@@ -44,6 +44,7 @@#include "scrub/reap.h" #include "scrub/findparent.h" #include "scrub/orphanage.h" +#include "scrub/listxattr.h" /* * Directory Repair
@@ -58,6 +59,15 @@* being repaired and the temporary directory, and will later become important * for parent pointer scanning. * +* If parent pointers are enabled on this filesystem, we instead reconstruct +* the directory by visiting each parent pointer of each file in the filesystem +* and translating the relevant parent pointer records into dirents. In this +* case, it is advantageous to stash all directory entries created from parent +* pointers for a single child file before replaying them into the temporary +* directory. To save memory, the live filesystem scan reuses the findparent +* fields. Directory repair chooses either parent pointer scanning or +* directory entry salvaging, but not both. +* * Directory entries added to the temporary directory do not elevate the link * counts of the inodes found. When salvaging completes, the remaining stashed * entries are replayed to the temporary directory. An atomic extent swap is
@@ -113,7 +123,15 @@ struct xrep_dir {/* * Information used to scan the filesystem to find the inumber of the -* dotdot entry for this directory. +* dotdot entry for this directory. For directory salvaging when +* parent pointers are not enabled, we use the findparent_* functions +* on this object and access only the parent_ino field directly. +* +* When parent pointers are enabled, however, the pptr scanner uses the +* iscan, hooks, lock, and parent_ino fields of this object directly. +* @pscan.lock coordinates access to dir_entries, dir_names, +* parent_ino, subdirs, dirents, and args. This reduces the memory +* requirements of this structure. */ struct xrep_parent_scan_info pscan;
@@ -999,6 +1017,259 @@ xrep_dir_salvage_entries( } +/* +* Examine an xattr of a file. If this xattr is a parent pointer that leads us +* back to the directory that we're rebuilding, create an incore dirent from +* the parent pointer and stash it. +*/ +STATIC int +xrep_dir_scan_parent_pointer ( +struct xfs_scrub *sc, +struct xfs_inode *ip, +unsigned int attr_flags, +const unsigned char *name, +unsigned int namelen, +const void *value, +unsigned int valuelen, +void *priv) +{ +struct xfs_name xname; +struct xrep_dir *rd = priv; +const struct xfs_parent_name_rec *rec = (const void *)name; +int error; + +/* Ignore incomplete xattrs */ +if (attr_flags &XFS_ATTR_INCOMPLETE ) +return 0 ; + +/* Ignore anything that isn't a parent pointer. */ +if (!(attr_flags &XFS_ATTR_PARENT )) +return 0 ; + +/* Does the ondisk parent pointer structure make sense? */ +if (!xfs_parent_namecheck (sc->mp, rec, namelen, attr_flags) || + !xfs_parent_valuecheck (sc->mp, value, valuelen)) +return -EFSCORRUPTED ; + +xfs_parent_irec_from_disk (&rd->pptr, rec, value, valuelen); + +/* Ignore parent pointers that point back to a different dir. */ +if (rd->pptr.p_ino != sc->ip->i_ino || + rd->pptr.p_gen !=VFS_I (sc->ip)->i_generation) +return 0 ; + +/* +* Transform this parent pointer into a dirent and queue it for later +* addition to the temporary directory. +*/ + xname.name = rd->pptr.p_name; + xname.len = rd->pptr.p_namelen; + xname.type =xfs_mode_to_ftype (VFS_I (ip)->i_mode); + +mutex_lock (&rd->pscan.lock); + error =xrep_dir_stash_createname (rd, &xname, ip->i_ino); +mutex_unlock (&rd->pscan.lock); +return error; +} + +/* +* If this child dirent points to the directory being repaired, remember that +* fact so that we can reset the dotdot entry if necessary. +*/ +STATIC int +xrep_dir_scan_dirent ( +struct xfs_scrub *sc, +struct xfs_inode *dp, +xfs_dir2_dataptr_t dapos, +const struct xfs_name *name, +xfs_ino_t ino, +void *priv) +{ +struct xrep_dir *rd = priv; + +/* Dirent doesn't point to this directory. */ +if (ino != rd->sc->ip->i_ino) +return 0 ; + +/* Ignore garbage inum. */ +if (!xfs_verify_dir_ino (rd->sc->mp, ino)) +return 0 ; + +/* No weird looking names. */ +if (name->len >=MAXNAMELEN || name->len <=0 ) +return 0 ; + +/* Don't pick up dot or dotdot entries; we only want child dirents. */ +if (xfs_dir2_samename (name, &xfs_name_dotdot) || +xfs_dir2_samename (name, &xfs_name_dot)) +return 0 ; + +trace_xrep_dir_stash_createname (sc->tempip, &xfs_name_dotdot, + dp->i_ino); + +xrep_findparent_scan_found (&rd->pscan, dp->i_ino); +return 0 ; +} + +/* +* Decide if we want to look for child dirents or parent pointers in this file. +* Skip the dir being repaired and any files being used to stage repairs. +*/ +static inline bool +xrep_dir_want_scan ( +struct xrep_dir *rd, +const struct xfs_inode *ip) +{ +return ip != rd->sc->ip && !xrep_is_tempfile (ip); +} + +/* +* Take ILOCK on a file that we want to scan. +* +* Select ILOCK_EXCL if the file is a directory with an unloaded data bmbt or +* has an unloaded attr bmbt. Otherwise, take ILOCK_SHARED. +*/ +static inline unsigned int +xrep_dir_scan_ilock ( +struct xrep_dir *rd, +struct xfs_inode *ip) +{ +uint lock_mode =XFS_ILOCK_SHARED ; + +/* Need to take the shared ILOCK to advance the iscan cursor. */ +if (!xrep_dir_want_scan (rd, ip)) + goto lock; + +if (S_ISDIR (VFS_I (ip)->i_mode) &&xfs_need_iread_extents (&ip->i_df)) { + lock_mode =XFS_ILOCK_EXCL ; + goto lock; + } + +if (xfs_inode_has_attr_fork (ip) &&xfs_need_iread_extents (&ip->i_af)) + lock_mode =XFS_ILOCK_EXCL ; + +lock: +xfs_ilock (ip, lock_mode); +return lock_mode; +} + +/* +* Scan this file for relevant child dirents or parent pointers that point to +* the directory we're rebuilding. +*/ +STATIC int +xrep_dir_scan_file ( +struct xrep_dir *rd, +struct xfs_inode *ip) +{ +unsigned int lock_mode; +int error =0 ; + + lock_mode =xrep_dir_scan_ilock (rd, ip); + +if (!xrep_dir_want_scan (rd, ip)) + goto scan_done; + + error =xchk_xattr_walk (rd->sc, ip, xrep_dir_scan_parent_pointer, rd); +if (error) + goto scan_done; + +if (S_ISDIR (VFS_I (ip)->i_mode)) { + error =xchk_dir_walk (rd->sc, ip, xrep_dir_scan_dirent, rd); +if (error) + goto scan_done; + } + +scan_done: +xchk_iscan_mark_visited (&rd->pscan.iscan, ip); +xfs_iunlock (ip, lock_mode); +return error; +} + +/* +* Scan all files in the filesystem for parent pointers that we can turn into +* replacement dirents, and a dirent that we can use to set the dotdot pointer. +*/ +STATIC int +xrep_dir_scan_dirtree ( +struct xrep_dir *rd) +{ +struct xfs_scrub *sc = rd->sc; +struct xfs_inode *ip; +int error; + +/* Roots of directory trees are their own parents. */ +if (sc->ip == sc->mp->m_rootip) +xrep_findparent_scan_found (&rd->pscan, sc->ip->i_ino); + +/* +* Filesystem scans are time consuming. Drop the directory ILOCK and +* all other resources for the duration of the scan and hope for the +* best. The live update hooks will keep our scan information up to +* date even though we've dropped the locks. +*/ +xchk_trans_cancel (sc); +if (sc->ilock_flags & (XFS_ILOCK_SHARED |XFS_ILOCK_EXCL )) +xchk_iunlock (sc, sc->ilock_flags & (XFS_ILOCK_SHARED | +XFS_ILOCK_EXCL )); + error =xchk_trans_alloc_empty (sc); +if (error) +return error; + +while ((error =xchk_iscan_iter (&rd->pscan.iscan, &ip)) ==1 ) { +bool flush; + + error =xrep_dir_scan_file (rd, ip); +xchk_irele (sc, ip); +if (error) +break ; + +/* Flush stashed dirent updates to constrain memory usage. */ +mutex_lock (&rd->pscan.lock); + flush =xrep_dir_want_flush_stashed (rd); +mutex_unlock (&rd->pscan.lock); +if (flush) { +xchk_trans_cancel (sc); + + error =xrep_tempfile_iolock_polled (sc); +if (error) +break ; + +mutex_lock (&rd->pscan.lock); + error =xrep_dir_replay_updates (rd); +mutex_unlock (&rd->pscan.lock); +xrep_tempfile_iounlock (sc); +if (error) +break ; + + error =xchk_trans_alloc_empty (sc); +if (error) +break ; + } + +if (xchk_should_terminate (sc, &error)) +break ; + } +xchk_iscan_iter_finish (&rd->pscan.iscan); +if (error) { +/* +* If we couldn't grab an inode that was busy with a state +* change, change the error code so that we exit to userspace +* as quickly as possible. +*/ +if (error == -EBUSY ) +return -ECANCELED ; +return error; + } + +/* +* Cancel the empty transaction so that we can (later) use the atomic +* extent swap helpers to lock files and commit the new directory. +*/ +xchk_trans_cancel (rd->sc); +return 0 ; +} +/* * Free all the directory blocks and reset the data fork. The caller must * join the inode to the transaction. This function returns with the inode
@@ -1198,6 +1469,44 @@ xrep_dir_set_nlink(return 0 ; } +/* +* Finish replaying stashed dirent updates, allocate a transaction for swapping +* extents, and take the ILOCKs of both directories before we commit the new +* directory structure. +*/ +STATIC int +xrep_dir_finalize_tempdir ( +struct xrep_dir *rd) +{ +struct xfs_scrub *sc = rd->sc; +int error; + +if (!xfs_has_parent (sc->mp)) +return xrep_tempswap_trans_alloc (sc,XFS_DATA_FORK , &rd->tx); + +do { + error =xrep_dir_replay_updates (rd); +if (error) +return error; + + error =xrep_tempswap_trans_alloc (sc,XFS_DATA_FORK , &rd->tx); +if (error) +return error; + +/* +* We rely on the ILOCK to quiesce all directory updates +* because the VFS does not take the IOLOCK when moving a +* directory child during a rename. +*/ +if (xfarray_length (rd->dir_entries) ==0 ) +break ; + +xchk_trans_cancel (sc); +xrep_tempfile_iunlock_both (sc); + }while (!xchk_should_terminate (sc, &error)); +return error; +} +/* Swap the temporary directory's data fork with the one being repaired. */ STATIC int xrep_dir_swap(
@@ -1297,7 +1606,12 @@ xrep_dir_rebuild_tree(if (error)return error; - error =xrep_tempswap_trans_alloc (sc,XFS_DATA_FORK , &rd->tx); +/* +* Allocate transaction, lock inodes, and make sure that we've replayed +* all the stashed dirent updates to the tempdir. After this point, +* we're ready to swapext. +*/ + error =xrep_dir_finalize_tempdir (rd);if (error)return error;
@@ -1464,7 +1778,10 @@ xrep_directory(if (error)return error; - error =xrep_dir_salvage_entries (rd); +if (xfs_has_parent (sc->mp)) + error =xrep_dir_scan_dirtree (rd); +else + error =xrep_dir_salvage_entries (rd);if (error) goto out_teardown;
PATCH 11/17 xfs: implement live updates for directory repairs
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
While we're scanning the filesystem for parent pointers that we can turn into dirents, we cannot hold the IOLOCK or ILOCK of the directory being repaired. Therefore, we need to set up a dirent hook so that we can keep the temporary directory up to date with the rest of the filesystem. Hence we add the ability to *remove* entries from the temporary dir.
--- fs/xfs/scrub/dir_repair.c | 221 +++++++++++++++++++++++++++++++++++++++++---- fs/xfs/scrub/findparent.c | 8 +- fs/xfs/scrub/findparent.h | 10 ++ fs/xfs/scrub/trace.h | 2 4 files changed, 218 insertions(+), 23 deletions(-)
fs/xfs/scrub/dir_repair.c +203 -18
@@ -85,6 +85,12 @@* updates from other threads. */ +/* Create a dirent in the tempdir. */ +#define XREP_DIRENT_ADD (1) + +/* Remove a dirent from the tempdir. */ +#define XREP_DIRENT_REMOVE (2) +/* Directory entry to be restored in the new directory. */ struct xrep_dirent {/* Cookie for retrieval of the dirent name. */
@@ -98,6 +104,9 @@ struct xrep_dirent {/* File type of the dirent. */ uint8_t ftype; + +/* XREP_DIRENT_{ADD,REMOVE} */ +uint8_t action; };/*
@@ -339,6 +348,7 @@ xrep_dir_stash_createname( xfs_ino_t ino) {struct xrep_dirent dirent = { + .action =XREP_DIRENT_ADD , .ino = ino, .namelen = name->len, .ftype = name->type,
@@ -355,6 +365,34 @@ xrep_dir_stash_createname(return xfarray_append (rd->dir_entries, &dirent); } +/* +* Remember that we want to remove a dirent from the tempdir. These stashed +* actions will be replayed later. +*/ +STATIC int +xrep_dir_stash_removename ( +struct xrep_dir *rd, +const struct xfs_name *name, +xfs_ino_t ino) +{ +struct xrep_dirent dirent = { + .action =XREP_DIRENT_REMOVE , + .ino = ino, + .namelen = name->len, + .ftype = name->type, + }; +int error; + +trace_xrep_dir_stash_removename (rd->sc->tempip, name, ino); + + error =xfblob_store (rd->dir_names, &dirent.name_cookie, name->name, + name->len); +if (error) +return error; + +return xfarray_append (rd->dir_entries, &dirent); +} +/* Allocate an in-core record to hold entries while we rebuild the dir data. */ STATIC int xrep_dir_salvage_entry(
@@ -706,6 +744,43 @@ xrep_dir_replay_createname(return xfs_dir2_node_addname (&rd->args); } +/* Replay a stashed removename onto the temporary directory. */ +STATIC int +xrep_dir_replay_removename ( +struct xrep_dir *rd, +const struct xfs_name *name, +xfs_extlen_t total) +{ +struct xfs_inode *dp = rd->args.dp; +bool is_block, is_leaf; +int error; + +ASSERT (S_ISDIR (VFS_I (dp)->i_mode)); + +xrep_dir_init_args (rd, dp, name); + rd->args.op_flags =0 ; + rd->args.total = total; + +trace_xrep_dir_replay_removename (dp, name,0 ); + +if (dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) +return xfs_dir2_sf_removename (&rd->args); + + error =xfs_dir2_isblock (&rd->args, &is_block); +if (error) +return error; +if (is_block) +return xfs_dir2_block_removename (&rd->args); + + error =xfs_dir2_isleaf (&rd->args, &is_leaf); +if (error) +return error; +if (is_leaf) +return xfs_dir2_leaf_removename (&rd->args); + +return xfs_dir2_node_removename (&rd->args); +} +/* * Add this stashed incore directory entry to the temporary directory. * The caller must hold the tempdir's IOLOCK, must not hold any ILOCKs, and
@@ -735,26 +810,64 @@ xrep_dir_replay_update(xrep_tempfile_ilock (rd->sc);xfs_trans_ijoin (rd->sc->tp, rd->sc->tempip,0 ); -/* -* Create a replacement dirent in the temporary directory. Note that -* _createname doesn't check for existing entries. There shouldn't be -* any in the temporary dir, but we'll verify this in debug mode. -*/ +switch (dirent->action) { +case XREP_DIRENT_ADD : +/* +* Create a replacement dirent in the temporary directory. +* Note that _createname doesn't check for existing entries. +* There shouldn't be any in the temporary dir, but we'll +* verify this in debug mode. +*/ #ifdef DEBUG - error =xchk_dir_lookup (rd->sc, rd->sc->tempip, &name, &ino); -if (error != -ENOENT ) { -ASSERT (error != -ENOENT ); + error =xchk_dir_lookup (rd->sc, rd->sc->tempip, &name, &ino); +if (error != -ENOENT ) { +ASSERT (error != -ENOENT ); + goto out_cancel; + } +#endif + + error =xrep_dir_replay_createname (rd, &name, dirent->ino, + resblks); +if (error) + goto out_cancel; + +if (name.type ==XFS_DIR3_FT_DIR ) + rd->subdirs++; + rd->dirents++; +break ; +case XREP_DIRENT_REMOVE : +/* +* Remove a dirent from the temporary directory. Note that +* _removename doesn't check the inode target of the exist +* entry. There should be a perfect match in the temporary +* dir, but we'll verify this in debug mode. +*/ +#ifdef DEBUG + error =xchk_dir_lookup (rd->sc, rd->sc->tempip, &name, &ino); +if (error) { +ASSERT (error !=0 ); + goto out_cancel; + } +if (ino != dirent->ino) { +ASSERT (ino == dirent->ino); + error = -EIO ; + goto out_cancel; + } +#endif + + error =xrep_dir_replay_removename (rd, &name, resblks); +if (error) + goto out_cancel; + +if (name.type ==XFS_DIR3_FT_DIR ) + rd->subdirs--; + rd->dirents--; +break ; +default : +ASSERT (0 ); + error = -EIO ; goto out_cancel; } -#endif - - error =xrep_dir_replay_createname (rd, &name, dirent->ino, resblks); -if (error) - goto out_cancel; - -if (name.type ==XFS_DIR3_FT_DIR ) - rd->subdirs++; - rd->dirents++;/* Commit and unlock. */ error =xrep_trans_commit (rd->sc);
@@ -1270,6 +1383,71 @@ xrep_dir_scan_dirtree(return 0 ; } +/* +* Capture dirent updates being made by other threads which are relevant to the +* directory being repaired. +*/ +STATIC int +xrep_dir_live_update ( +struct notifier_block *nb, +unsigned long action, +void *data) +{ +struct xfs_dir_update_params *p = data; +struct xrep_dir *rd; +struct xfs_scrub *sc; +int error =0 ; + + rd = container_of(nb, struct xrep_dir, pscan.hooks.dirent_hook.nb); + sc = rd->sc; + +/* +* This thread updated a child dirent in the directory that we're +* rebuilding. Stash the update for replay against the temporary +* directory. +*/ +if (p->dp->i_ino == sc->ip->i_ino && +xchk_iscan_want_live_update (&rd->pscan.iscan, p->ip->i_ino)) { +mutex_lock (&rd->pscan.lock); +if (p->delta >0 ) + error =xrep_dir_stash_createname (rd, p->name, + p->ip->i_ino); +else + error =xrep_dir_stash_removename (rd, p->name, + p->ip->i_ino); +mutex_unlock (&rd->pscan.lock); +if (error) + goto out_abort; + } + +/* +* This thread updated another directory's child dirent that points to +* the directory that we're rebuilding, so remember the new dotdot +* target. +*/ +if (p->ip->i_ino == sc->ip->i_ino && +xchk_iscan_want_live_update (&rd->pscan.iscan, p->dp->i_ino)) { +if (p->delta >0 ) { +trace_xrep_dir_stash_createname (sc->tempip, + &xfs_name_dotdot, + p->dp->i_ino); + +xrep_findparent_scan_found (&rd->pscan, p->dp->i_ino); + }else { +trace_xrep_dir_stash_removename (sc->tempip, + &xfs_name_dotdot, + rd->pscan.parent_ino); + +xrep_findparent_scan_found (&rd->pscan,NULLFSINO ); + } + } + +return NOTIFY_DONE ; +out_abort: +xchk_iscan_abort (&rd->pscan.iscan); +return NOTIFY_DONE ; +} +/* * Free all the directory blocks and reset the data fork. The caller must * join the inode to the transaction. This function returns with the inode
@@ -1615,6 +1793,9 @@ xrep_dir_rebuild_tree(if (error)return error; +if (xchk_iscan_aborted (&rd->pscan.iscan)) +return -ECANCELED ; +/* * Swap the tempdir's data fork with the file being repaired. This * recreates the transaction and re-takes the ILOCK in the scrub
@@ -1650,7 +1831,11 @@ xrep_dir_setup_scan(if (error) goto out_xfarray; - error =xrep_findparent_scan_start (sc, &rd->pscan); +if (xfs_has_parent (sc->mp)) + error =__xrep_findparent_scan_start (sc, &rd->pscan, + xrep_dir_live_update); +else + error =xrep_findparent_scan_start (sc, &rd->pscan);if (error) goto out_xfblob;
fs/xfs/scrub/findparent.c +5 -3
@@ -240,9 +240,10 @@ xrep_findparent_live_update(* will be called when there is a dotdot update for the inode being repaired. */ int -xrep_findparent_scan_start ( +__xrep_findparent_scan_start (struct xfs_scrub *sc, -struct xrep_parent_scan_info *pscan) +struct xrep_parent_scan_info *pscan, +notifier_fn_t custom_fn) {int error;
@@ -264,7 +265,8 @@ xrep_findparent_scan_start(* ILOCK, which means that any in-progress inode updates will finish * before we can scan the inode. */ -xfs_hook_setup (&pscan->hooks.dirent_hook, xrep_findparent_live_update); +xfs_hook_setup (&pscan->hooks.dirent_hook, + custom_fn ? custom_fn : xrep_findparent_live_update); error =xfs_dir_hook_add (sc->mp, &pscan->hooks);if (error) goto out_iscan;
fs/xfs/scrub/findparent.h +8 -2
@@ -24,8 +24,14 @@ struct xrep_parent_scan_info {bool lookup_parent; }; -int xrep_findparent_scan_start (struct xfs_scrub *sc, -struct xrep_parent_scan_info *pscan); +int __xrep_findparent_scan_start (struct xfs_scrub *sc, +struct xrep_parent_scan_info *pscan, +notifier_fn_t custom_fn); +static inline int xrep_findparent_scan_start (struct xfs_scrub *sc, +struct xrep_parent_scan_info *pscan) +{ +return __xrep_findparent_scan_start (sc, pscan,NULL ); +}int xrep_findparent_scan (struct xrep_parent_scan_info *pscan);void xrep_findparent_scan_teardown (struct xrep_parent_scan_info *pscan);
fs/xfs/scrub/trace.h +2 -0
@@ -2636,6 +2636,8 @@ DEFINE_XREP_DIRENT_CLASS(xrep_dir_salvage_entry);DEFINE_XREP_DIRENT_CLASS (xrep_dir_stash_createname);DEFINE_XREP_DIRENT_CLASS (xrep_dir_replay_createname);DEFINE_XREP_DIRENT_CLASS (xrep_adoption_commit); +DEFINE_XREP_DIRENT_CLASS (xrep_dir_stash_removename); +DEFINE_XREP_DIRENT_CLASS (xrep_dir_replay_removename); TRACE_EVENT(xrep_adoption_cancel, TP_PROTO(struct xfs_inode *dp, struct xfs_inode *ip, int error),
PATCH 12/17 xfs: replay unlocked parent pointer updates that accrue during xattr repair
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
There are a few places where the extended attribute repair code drops the ILOCK to apply stashed xattrs to the temporary file. Although setxattr and removexattr are still locked out because we retain our hold on the IOLOCK, this doesn't prevent renames from updating parent pointers, because the VFS doesn't take i_rwsem on children that are being moved.
Therefore, set up a dirent hook to capture parent pointer updates for this file, and replay(?) the updates.
--- fs/xfs/scrub/attr_repair.c | 451 ++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/scrub/trace.h | 72 +++++++ 2 files changed, 521 insertions(+), 2 deletions(-)
fs/xfs/scrub/attr_repair.c +449 -2
@@ -95,6 +95,56 @@ struct xrep_xattr {/* Number of attributes that we are salvaging. */ unsigned long long attrs_found; + +/* Can we flush stashed attrs to the tempfile? */ +bool can_flush; + +/* Did the live update fail, and hence the repair is now out of date? */ +bool live_update_aborted; + +/* Lock protecting parent pointer updates */ +struct mutex lock; + +/* Fixed-size array of xrep_xattr_pptr structures. */ +struct xfarray *pptr_recs; + +/* Blobs containing parent pointer names. */ +struct xfblob *pptr_names; + +/* Hook to capture parent pointer updates. */ +struct xfs_dir_hook hooks; + +/* xattr key and da args for parent pointer replay. */ +struct xfs_parent_scratch pptr_scratch; + +/* +* Scratch buffer for scanning dirents to create pptr xattrs. At the +* very end of the repair, it can also be used to compute the +* lost+found filename if we need to reparent the file. +*/ +struct xfs_parent_name_irec pptr; +}; + +/* Create a parent pointer in the tempfile. */ +#define XREP_XATTR_PPTR_ADD (1) + +/* Remove a parent pointer from the tempfile. */ +#define XREP_XATTR_PPTR_REMOVE (2) + +/* A stashed parent pointer update. */ +struct xrep_xattr_pptr { +/* Cookie for retrieval of the pptr name. */ +xfblob_cookie name_cookie; + +/* Parent pointer attr key. */ +xfs_ino_t p_ino; +uint32_t p_gen; + +/* Length of the pptr name. */ +uint8_t namelen; + +/* XREP_XATTR_PPTR_{ADD,REMOVE} */ +uint8_t action; };/* Set up to recreate the extended attributes. */
@@ -102,6 +152,9 @@ intxrep_setup_xattr ( struct xfs_scrub *sc) { +if (xfs_has_parent (sc->mp)) +xchk_fsgates_enable (sc,XCHK_FSGATES_DIRENTS ); +return xrep_tempfile_create (sc,S_IFREG ); }
@@ -712,11 +765,122 @@ xrep_xattr_want_flush_stashed( {unsigned long long bytes; +if (!rx->can_flush) +return false; + bytes =xfarray_bytes (rx->xattr_records) +xfblob_bytes (rx->xattr_blobs);return bytes >XREP_XATTR_MAX_STASH_BYTES ; } +/* +* Did we observe rename changing parent pointer xattrs while we were flushing +* salvaged attrs? +*/ +static inline bool +xrep_xattr_saw_pptr_conflict ( +struct xrep_xattr *rx) +{ +bool ret; + +ASSERT (rx->can_flush); + +if (!xfs_has_parent (rx->sc->mp)) +return false; + +ASSERT (xfs_isilocked (rx->sc->ip,XFS_ILOCK_EXCL )); + +mutex_lock (&rx->lock); + ret =xfarray_bytes (rx->pptr_recs) >0 ; +mutex_unlock (&rx->lock); + +return ret; +} + +/* +* Reset the entire repair state back to initial conditions, now that we've +* detected a parent pointer update to the attr structure while we were +* flushing salvaged attrs. See the locking notes in dir_repair.c for more +* information on why this is all necessary. +*/ +STATIC int +xrep_xattr_full_reset ( +struct xrep_xattr *rx) +{ +struct xfs_scrub *sc = rx->sc; +struct xfs_attr_sf_hdr *hdr; +struct xfs_ifork *ifp = &sc->tempip->i_af; +int error; + +trace_xrep_xattr_full_reset (sc->ip, sc->tempip); + +/* The temporary file's data fork had better not be in btree format. */ +if (sc->tempip->i_df.if_format ==XFS_DINODE_FMT_BTREE ) { +ASSERT (0 ); +return -EIO ; + } + +/* +* We begin in transaction context with sc->ip ILOCKed but not joined +* to the transaction. To reset to the initial state, we must hold +* sc->ip's ILOCK to prevent rename from updating parent pointer +* information and the tempfile's ILOCK to clear its contents. +*/ +xchk_iunlock (rx->sc,XFS_ILOCK_EXCL ); +xrep_tempfile_ilock_both (sc); +xfs_trans_ijoin (sc->tp, sc->ip,0 ); +xfs_trans_ijoin (sc->tp, sc->tempip,0 ); + +/* +* Free all the blocks of the attr fork of the temp file, and reset +* it back to local format. +*/ +if (xfs_ifork_has_extents (&sc->tempip->i_af)) { + error =xrep_reap_ifork (sc, sc->tempip,XFS_ATTR_FORK ); +if (error) +return error; + +ASSERT (ifp->if_bytes ==0 ); + ifp->if_format =XFS_DINODE_FMT_LOCAL ; +xfs_idata_realloc (sc->tempip,sizeof (*hdr),XFS_ATTR_FORK ); + } + +/* Reinitialize the attr fork to an empty shortform structure. */ + hdr = (struct xfs_attr_sf_hdr *)ifp->if_u1.if_data; +memset (hdr,0 ,sizeof (*hdr)); + hdr->totsize =cpu_to_be16 (sizeof (*hdr)); +xfs_trans_log_inode (sc->tp, sc->tempip,XFS_ILOG_CORE |XFS_ILOG_ADATA ); + +/* +* Roll this transaction to commit our reset ondisk. The tempfile +* should no longer be joined to the transaction, so we drop its ILOCK. +* This should leave us in transaction context with sc->ip ILOCKed but +* not joined to the transaction. +*/ + error =xrep_roll_trans (sc); +if (error) +return error; +xrep_tempfile_iunlock (sc); + +/* +* Erase any accumulated parent pointer updates now that we've erased +* the tempfile's attr fork. We're resetting the entire repair state +* back to where we were initially, except now we won't flush salvaged +* xattrs until the very end. +*/ +mutex_lock (&rx->lock); +xfarray_truncate (rx->pptr_recs); +xfblob_truncate (rx->pptr_names); +mutex_unlock (&rx->lock); + + rx->can_flush = false; + rx->attrs_found =0 ; + +ASSERT (xfarray_bytes (rx->xattr_records) ==0 ); +ASSERT (xfblob_bytes (rx->xattr_blobs) ==0 ); +return 0 ; +} +/* Extract as many attribute keys and values as we can. */ STATIC int xrep_xattr_recover(
@@ -731,6 +895,7 @@ xrep_xattr_recover(int nmap;int error; +restart:/* * Iterate each xattr leaf block in the attr fork to scan them for any * attributes that we might salvage.
@@ -769,6 +934,14 @@ xrep_xattr_recover( error =xrep_xattr_flush_stashed (rx);if (error)return error; + +if (xrep_xattr_saw_pptr_conflict (rx)) { + error =xrep_xattr_full_reset (rx); +if (error) +return error; + + goto restart; + } } } }
@@ -933,6 +1106,195 @@ xrep_xattr_salvage_attributes(return xrep_xattr_flush_stashed (rx); } +/* +* Add this stashed incore parent pointer to the temporary file. +* The caller must hold the tempdir's IOLOCK, must not hold any ILOCKs, and +* must not be in transaction context. +*/ +STATIC int +xrep_xattr_replay_pptr_update ( +struct xrep_xattr *rx, +const struct xrep_xattr_pptr *pptr) +{ +struct xfs_scrub *sc = rx->sc; +int error; + + rx->pptr.p_ino = pptr->p_ino; + rx->pptr.p_gen = pptr->p_gen; + rx->pptr.p_namelen = pptr->namelen; +xfs_parent_irec_hashname (sc->mp, &rx->pptr); + +switch (pptr->action) { +case XREP_XATTR_PPTR_ADD : +/* Create parent pointer. */ +trace_xrep_xattr_replay_parentadd (sc->tempip, &rx->pptr); + + error =xfs_parent_set (sc->tempip, sc->ip->i_ino, &rx->pptr, + &rx->pptr_scratch); +if (error) { +ASSERT (error != -EEXIST ); +return error; + } +break ; +case XREP_XATTR_PPTR_REMOVE : +/* Remove parent pointer. */ +trace_xrep_xattr_replay_parentremove (sc->tempip, &rx->pptr); + + error =xfs_parent_unset (sc->tempip, sc->ip->i_ino, &rx->pptr, + &rx->pptr_scratch); +if (error) { +ASSERT (error != -ENOATTR ); +return error; + } +break ; +default : +ASSERT (0 ); +return -EIO ; + } + +return 0 ; +} + +/* +* Flush stashed parent pointer updates that have been recorded by the scanner. +* This is done to reduce the memory requirements of the parent pointer +* rebuild, since files can have a lot of hardlinks and the fs can be busy. +* +* Caller must not hold transactions or ILOCKs. Caller must hold the tempfile +* IOLOCK. +*/ +STATIC int +xrep_xattr_replay_pptr_updates ( +struct xrep_xattr *rx) +{ +xfarray_idx_t array_cur; +int error; + +mutex_lock (&rx->lock); + foreach_xfarray_idx(rx->pptr_recs, array_cur) { +struct xrep_xattr_pptr pptr; + + error =xfarray_load (rx->pptr_recs, array_cur, &pptr); +if (error) + goto out_unlock; + + error =xfblob_load (rx->pptr_names, pptr.name_cookie, + rx->pptr.p_name, pptr.namelen); +if (error) + goto out_unlock; + rx->pptr.p_name[MAXNAMELEN -1 ] =0 ; +mutex_unlock (&rx->lock); + + error =xrep_xattr_replay_pptr_update (rx, &pptr); +if (error) +return error; + +mutex_lock (&rx->lock); + } + +/* Empty out both arrays now that we've added the entries. */ +xfarray_truncate (rx->pptr_recs); +xfblob_truncate (rx->pptr_names); +mutex_unlock (&rx->lock); +return 0 ; +out_unlock: +mutex_unlock (&rx->lock); +return error; +} + +/* +* Remember that we want to create a parent pointer in the tempfile. These +* stashed actions will be replayed later. +*/ +STATIC int +xrep_xattr_stash_parentadd ( +struct xrep_xattr *rx, +const struct xfs_name *name, +const struct xfs_inode *dp) +{ +struct xrep_xattr_pptr pptr = { + .action =XREP_XATTR_PPTR_ADD , + .namelen = name->len, + .p_ino = dp->i_ino, + .p_gen =VFS_IC (dp)->i_generation, + }; +int error; + +trace_xrep_xattr_stash_parentadd (rx->sc->tempip, dp, name); + + error =xfblob_store (rx->pptr_names, &pptr.name_cookie, name->name, + name->len); +if (error) +return error; + +return xfarray_append (rx->pptr_recs, &pptr); +} + +/* +* Remember that we want to remove a parent pointer from the tempfile. These +* stashed actions will be replayed later. +*/ +STATIC int +xrep_xattr_stash_parentremove ( +struct xrep_xattr *rx, +const struct xfs_name *name, +const struct xfs_inode *dp) +{ +struct xrep_xattr_pptr pptr = { + .action =XREP_XATTR_PPTR_REMOVE , + .namelen = name->len, + .p_ino = dp->i_ino, + .p_gen =VFS_IC (dp)->i_generation, + }; +int error; + +trace_xrep_xattr_stash_parentremove (rx->sc->tempip, dp, name); + + error =xfblob_store (rx->pptr_names, &pptr.name_cookie, name->name, + name->len); +if (error) +return error; + +return xfarray_append (rx->pptr_recs, &pptr); +} + +/* +* Capture dirent updates being made by other threads. We will have to replay +* the parent pointer updates before swapping attr forks. +*/ +STATIC int +xrep_xattr_live_dirent_update ( +struct notifier_block *nb, +unsigned long action, +void *data) +{ +struct xfs_dir_update_params *p = data; +struct xrep_xattr *rx; +struct xfs_scrub *sc; +int error; + + rx = container_of(nb, struct xrep_xattr, hooks.dirent_hook.nb); + sc = rx->sc; + +/* +* This thread updated a dirent that points to the file that we're +* repairing, so stash the update for replay against the temporary +* file. +*/ +if (p->ip->i_ino != sc->ip->i_ino) +return NOTIFY_DONE ; + +mutex_lock (&rx->lock); +if (p->delta >0 ) + error =xrep_xattr_stash_parentadd (rx, p->name, p->dp); +else + error =xrep_xattr_stash_parentremove (rx, p->name, p->dp); +if (error) + rx->live_update_aborted = true; +mutex_unlock (&rx->lock); +return NOTIFY_DONE ; +} +/* * Prepare both inodes' attribute forks for extent swapping. Promote the * tempfile from short format to leaf format, and if the file being repaired
@@ -1035,6 +1397,44 @@ xrep_xattr_swap(return xrep_tempswap_contents (sc, tx); } +/* +* Finish replaying stashed parent pointer updates, allocate a transaction for +* swapping extents, and take the ILOCKs of both files before we commit the new +* extended attribute structure. +*/ +STATIC int +xrep_xattr_finalize_tempfile ( +struct xrep_xattr *rx) +{ +struct xfs_scrub *sc = rx->sc; +int error; + +if (!xfs_has_parent (sc->mp)) +return xrep_tempswap_trans_alloc (sc,XFS_ATTR_FORK , &rx->tx); + +do { + error =xrep_xattr_replay_pptr_updates (rx); +if (error) +return error; + + error =xrep_tempswap_trans_alloc (sc,XFS_ATTR_FORK , &rx->tx); +if (error) +return error; + +/* +* We rely on the ILOCK to quiesce all parent pointer updates +* because the VFS does not take the IOLOCK when moving a +* directory child during a rename. +*/ +if (xfarray_length (rx->pptr_recs) ==0 ) +break ; + +xchk_trans_cancel (sc); +xrep_tempfile_iunlock_both (sc); + }while (!xchk_should_terminate (sc, &error)); +return error; +} +/* * Swap the new extended attribute data (which we created in the tempfile) into * the file being repaired.
@@ -1086,8 +1486,12 @@ xrep_xattr_rebuild_tree(if (error)return error; -/* Allocate swapext transaction and lock both inodes. */ - error =xrep_tempswap_trans_alloc (rx->sc,XFS_ATTR_FORK , &rx->tx); +/* +* Allocate transaction, lock inodes, and make sure that we've replayed +* all the stashed parent pointer updates to the temp file. After this +* point, we're ready to swapext. +*/ + error =xrep_xattr_finalize_tempfile (rx);if (error)return error;
@@ -1116,8 +1520,15 @@ STATIC voidxrep_xattr_teardown ( struct xrep_xattr *rx) { +if (xfs_has_parent (rx->sc->mp)) +xfs_dir_hook_del (rx->sc->mp, &rx->hooks); +if (rx->pptr_names) +xfblob_destroy (rx->pptr_names); +if (rx->pptr_recs) +xfarray_destroy (rx->pptr_recs);xfblob_destroy (rx->xattr_blobs);xfarray_destroy (rx->xattr_records); +mutex_destroy (&rx->lock);kfree (rx); }
@@ -1135,6 +1546,9 @@ xrep_xattr_setup_scan(if (!rx)return -ENOMEM ; rx->sc = sc; + rx->can_flush = true; + +mutex_init (&rx->lock);/* * Allocate enough memory to handle loading local attr values from the
@@ -1158,11 +1572,39 @@ xrep_xattr_setup_scan(if (error) goto out_keys; +if (xfs_has_parent (sc->mp)) { +ASSERT (sc->flags &XCHK_FSGATES_DIRENTS ); + + error =xfarray_create (sc->mp,"xattr parent pointer entries" , +0 ,sizeof (struct xrep_xattr_pptr ), + &rx->pptr_recs); +if (error) + goto out_values; + + error =xfblob_create (sc->mp,"xattr parent pointer names" , + &rx->pptr_names); +if (error) + goto out_pprecs; + +xfs_hook_setup (&rx->hooks.dirent_hook, + xrep_xattr_live_dirent_update); + error =xfs_dir_hook_add (sc->mp, &rx->hooks); +if (error) + goto out_ppnames; + } + *rxp = rx;return 0 ; +out_ppnames: +xfblob_destroy (rx->pptr_names); +out_pprecs: +xfarray_destroy (rx->pptr_recs); +out_values: +xfblob_destroy (rx->xattr_blobs); out_keys:xfarray_destroy (rx->xattr_records); out_rx: +mutex_destroy (&rx->lock);kfree (rx);return error; }
@@ -1199,6 +1641,11 @@ xrep_xattr(if (error) goto out_scan; +if (rx->live_update_aborted) { + error = -EIO ; + goto out_scan; + } +/* Last chance to abort before we start committing fixes. */ if (xchk_should_terminate (sc, &error)) goto out_scan;
fs/xfs/scrub/trace.h +72 -0
90 lines not on this page · raw message
PATCH 13/17 xfs: replace namebuf with parent pointer in parent pointer repair
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Replace the dirent name buffer at the end of struct xrep_parent with a xfs_parent_name_irec object. The namebuf and p_name usage do not overlap, so we can save 256 bytes of memory by allowing them to overlap. Doing so makes the code a bit more complex, so this is called out separately.
--- fs/xfs/scrub/parent_repair.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
fs/xfs/scrub/parent_repair.c +8 -3
@@ -24,6 +24,7 @@#include "xfs_trans_space.h" #include "xfs_health.h" #include "xfs_swapext.h" +#include "xfs_parent.h" #include "scrub/xfs_scrub.h" #include "scrub/scrub.h" #include "scrub/common.h"
@@ -63,8 +64,12 @@ struct xrep_parent {/* Orphanage reparenting request. */ struct xrep_adoption adoption; -/* Directory entry name, plus the trailing null. */ -unsigned char namebuf[MAXNAMELEN ]; +/* +* Scratch buffer for scanning dirents to create pptr xattrs. At the +* very end of the repair, it can also be used to compute the +* lost+found filename if we need to reparent the file. +*/ +struct xfs_parent_name_irec pptr; };/* Tear down all the incore stuff we created. */
@@ -234,7 +239,7 @@ xrep_parent_move_to_orphanage(if (error) goto err_adoption; - error =xrep_adoption_compute_name (&rp->adoption, rp->namebuf); + error =xrep_adoption_compute_name (&rp->adoption, rp->pptr.p_name);if (error) goto err_adoption;
PATCH 14/17 xfs: repair directory parent pointers by scanning for dirents
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
If parent pointers are enabled on the filesystem, we can repair the entire dataset by walking the directories of the filesystem looking for dirents that we can turn into parent pointers. Once we have a full incore dataset, we'll figure out what to do with it, but that's for a subsequent patch.
--- fs/xfs/scrub/parent_repair.c | 403 ++++++++++++++++++++++++++++++++++++++++++ fs/xfs/scrub/trace.h | 36 ++++ 2 files changed, 436 insertions(+), 3 deletions(-)
fs/xfs/scrub/parent_repair.c +400 -3
@@ -35,6 +35,9 @@#include "scrub/readdir.h" #include "scrub/tempfile.h" #include "scrub/orphanage.h" +#include "scrub/xfile.h" +#include "scrub/xfarray.h" +#include "scrub/xfblob.h" /* * Repairing The Directory Parent Pointer
@@ -50,20 +53,71 @@* See the section on locking issues in dir_repair.c for more information about * conflicts with the VFS. The findparent code wll keep our incore parent * inode up to date. +* +* If parent pointers are enabled, we instead reconstruct the parent pointer +* information by visiting every directory entry of every directory in the +* system and translating the relevant dirents into parent pointers. In this +* case, it is advantageous to stash all parent pointers created from dirents +* from a single parent file before replaying them into the temporary file. To +* save memory, the live filesystem scan reuses the findparent object. Parent +* pointer repair chooses either directory scanning or findparent, but not +* both. +* +* When salvaging completes, the remaining stashed entries are replayed to the +* temporary file. All non-parent pointer extended attributes are copied to +* the temporary file's extended attributes. An atomic extent swap is used to +* commit the new directory blocks to the directory being repaired. This will +* disrupt attrmulti cursors. */ +/* A stashed parent pointer update. */ +struct xrep_pptr { +/* Cookie for retrieval of the pptr name. */ +xfblob_cookie name_cookie; + +/* Parent pointer attr key. */ +xfs_ino_t p_ino; +uint32_t p_gen; + +/* Length of the pptr name. */ +uint8_t namelen; +}; + +/* +* Stash up to 8 pages of recovered parent pointers in pptr_recs and +* pptr_names before we write them to the temp file. +*/ +#define XREP_PARENT_MAX_STASH_BYTES (PAGE_SIZE * 8) +struct xrep_parent {struct xfs_scrub *sc; +/* Fixed-size array of xrep_pptr structures. */ +struct xfarray *pptr_recs; + +/* Blobs containing parent pointer names. */ +struct xfblob *pptr_names; +/* * Information used to scan the filesystem to find the inumber of the -* dotdot entry for this directory. +* dotdot entry for this directory. On filesystems without parent +* pointers, we use the findparent_* functions on this object and +* access only the parent_ino field directly. +* +* When parent pointers are enabled, the directory entry scanner uses +* the iscan, hooks, and lock fields of this object directly. +* @pscan.lock coordinates access to pptr_recs, pptr_names, pptr, and +* pptr_scratch. This reduces the memory requirements of this +* structure. */ struct xrep_parent_scan_info pscan;/* Orphanage reparenting request. */ struct xrep_adoption adoption; +/* xattr key and da args for parent pointer replay. */ +struct xfs_parent_scratch pptr_scratch; +/* * Scratch buffer for scanning dirents to create pptr xattrs. At the * very end of the repair, it can also be used to compute the
@@ -78,6 +132,12 @@ xrep_parent_teardown( struct xrep_parent *rp) {xrep_findparent_scan_teardown (&rp->pscan); +if (rp->pptr_names) +xfblob_destroy (rp->pptr_names); + rp->pptr_names =NULL ; +if (rp->pptr_recs) +xfarray_destroy (rp->pptr_recs); + rp->pptr_recs =NULL ; }/* Set up for a parent repair. */
@@ -86,6 +146,7 @@ xrep_setup_parent( struct xfs_scrub *sc) {struct xrep_parent *rp; +int error;xchk_fsgates_enable (sc,XCHK_FSGATES_DIRENTS );
@@ -95,6 +156,10 @@ xrep_setup_parent( rp->sc = sc; sc->buf = rp; + error =xrep_tempfile_create (sc,S_IFREG ); +if (error) +return error; +return xrep_orphanage_try_create (sc); }
@@ -150,6 +215,309 @@ xrep_parent_find_dotdot(return error; } +/* +* Add this stashed incore parent pointer to the temporary file. +* The caller must hold the tempdir's IOLOCK, must not hold any ILOCKs, and +* must not be in transaction context. +*/ +STATIC int +xrep_parent_replay_update ( +struct xrep_parent *rp, +const struct xrep_pptr *pptr) +{ +struct xfs_scrub *sc = rp->sc; +int error; + + rp->pptr.p_ino = pptr->p_ino; + rp->pptr.p_gen = pptr->p_gen; + rp->pptr.p_namelen = pptr->namelen; +xfs_parent_irec_hashname (sc->mp, &rp->pptr); + +/* Create parent pointer. */ +trace_xrep_parent_replay_parentadd (sc->tempip, &rp->pptr); + + error =xfs_parent_set (sc->tempip, sc->ip->i_ino, &rp->pptr, + &rp->pptr_scratch); +if (error) +return error; + +return 0 ; +} + +/* +* Flush stashed parent pointer updates that have been recorded by the scanner. +* This is done to reduce the memory requirements of the parent pointer +* rebuild, since files can have a lot of hardlinks and the fs can be busy. +* +* Caller must not hold transactions or ILOCKs. Caller must hold the tempfile +* IOLOCK. +*/ +STATIC int +xrep_parent_replay_updates ( +struct xrep_parent *rp) +{ +xfarray_idx_t array_cur; +int error; + +mutex_lock (&rp->pscan.lock); + foreach_xfarray_idx(rp->pptr_recs, array_cur) { +struct xrep_pptr pptr; + + error =xfarray_load (rp->pptr_recs, array_cur, &pptr); +if (error) + goto out_unlock; + + error =xfblob_load (rp->pptr_names, pptr.name_cookie, + rp->pptr.p_name, pptr.namelen); +if (error) + goto out_unlock; + rp->pptr.p_name[MAXNAMELEN -1 ] =0 ; +mutex_unlock (&rp->pscan.lock); + + error =xrep_parent_replay_update (rp, &pptr); +if (error) +return error; + +mutex_lock (&rp->pscan.lock); + } + +/* Empty out both arrays now that we've added the entries. */ +xfarray_truncate (rp->pptr_recs); +xfblob_truncate (rp->pptr_names); +mutex_unlock (&rp->pscan.lock); +return 0 ; +out_unlock: +mutex_unlock (&rp->pscan.lock); +return error; +} + +/* +* Remember that we want to create a parent pointer in the tempfile. These +* stashed actions will be replayed later. +*/ +STATIC int +xrep_parent_stash_parentadd ( +struct xrep_parent *rp, +const struct xfs_name *name, +const struct xfs_inode *dp) +{ +struct xrep_pptr pptr = { + .namelen = name->len, + .p_ino = dp->i_ino, + .p_gen =VFS_IC (dp)->i_generation, + }; +int error; + +trace_xrep_parent_stash_parentadd (rp->sc->tempip, dp, name); + + error =xfblob_store (rp->pptr_names, &pptr.name_cookie, name->name, + name->len); +if (error) +return error; + +return xfarray_append (rp->pptr_recs, &pptr); +} + +/* +* Examine an entry of a directory. If this dirent leads us back to the file +* whose parent pointers we're rebuilding, add a pptr to the temporary +* directory. +*/ +STATIC int +xrep_parent_scan_dirent ( +struct xfs_scrub *sc, +struct xfs_inode *dp, +xfs_dir2_dataptr_t dapos, +const struct xfs_name *name, +xfs_ino_t ino, +void *priv) +{ +struct xrep_parent *rp = priv; +int error; + +/* Dirent doesn't point to this directory. */ +if (ino != rp->sc->ip->i_ino) +return 0 ; + +/* No weird looking names. */ +if (!xfs_dir2_namecheck (name->name, name->len)) +return -EFSCORRUPTED ; + +/* No mismatching ftypes. */ +if (name->type !=xfs_mode_to_ftype (VFS_I (sc->ip)->i_mode)) +return -EFSCORRUPTED ; + +/* Don't pick up dot or dotdot entries; we only want child dirents. */ +if (xfs_dir2_samename (name, &xfs_name_dotdot) || +xfs_dir2_samename (name, &xfs_name_dot)) +return 0 ; + +/* +* Transform this dirent into a parent pointer and queue it for later +* addition to the temporary file. +*/ +mutex_lock (&rp->pscan.lock); + error =xrep_parent_stash_parentadd (rp, name, dp); +mutex_unlock (&rp->pscan.lock); +return error; +} + +/* +* Decide if we want to look for dirents in this directory. Skip the file +* being repaired and any files being used to stage repairs. +*/ +static inline bool +xrep_parent_want_scan ( +struct xrep_parent *rp, +const struct xfs_inode *ip) +{ +return ip != rp->sc->ip && !xrep_is_tempfile (ip); +} + +/* +* Take ILOCK on a file that we want to scan. +* +* Select ILOCK_EXCL if the file is a directory with an unloaded data bmbt. +* Otherwise, take ILOCK_SHARED. +*/ +static inline unsigned int +xrep_parent_scan_ilock ( +struct xrep_parent *rp, +struct xfs_inode *ip) +{ +uint lock_mode =XFS_ILOCK_SHARED ; + +/* Still need to take the shared ILOCK to advance the iscan cursor. */ +if (!xrep_parent_want_scan (rp, ip)) + goto lock; + +if (S_ISDIR (VFS_I (ip)->i_mode) &&xfs_need_iread_extents (&ip->i_df)) { + lock_mode =XFS_ILOCK_EXCL ; + goto lock; + } + +lock: +xfs_ilock (ip, lock_mode); +return lock_mode; +} + +/* +* Scan this file for relevant child dirents that point to the file whose +* parent pointers we're rebuilding. +*/ +STATIC int +xrep_parent_scan_file ( +struct xrep_parent *rp, +struct xfs_inode *ip) +{ +unsigned int lock_mode; +int error =0 ; + + lock_mode =xrep_parent_scan_ilock (rp, ip); + +if (!xrep_parent_want_scan (rp, ip)) + goto scan_done; + +if (S_ISDIR (VFS_I (ip)->i_mode)) { + error =xchk_dir_walk (rp->sc, ip, xrep_parent_scan_dirent, rp); +if (error) + goto scan_done; + } + +scan_done: +xchk_iscan_mark_visited (&rp->pscan.iscan, ip); +xfs_iunlock (ip, lock_mode); +return error; +} + +/* Decide if we've stashed too much pptr data in memory. */ +static inline bool +xrep_parent_want_flush_stashed ( +struct xrep_parent *rp) +{ +unsigned long long bytes; + + bytes =xfarray_bytes (rp->pptr_recs) +xfblob_bytes (rp->pptr_names); +return bytes >XREP_PARENT_MAX_STASH_BYTES ; +} + +/* +* Scan all directories in the filesystem to look for dirents that we can turn +* into parent pointers. +*/ +STATIC int +xrep_parent_scan_dirtree ( +struct xrep_parent *rp) +{ +struct xfs_scrub *sc = rp->sc; +struct xfs_inode *ip; +int error; + +/* +* Filesystem scans are time consuming. Drop the file ILOCK and all +* other resources for the duration of the scan and hope for the best. +* The live update hooks will keep our scan information up to date. +*/ +xchk_trans_cancel (sc); +if (sc->ilock_flags & (XFS_ILOCK_SHARED |XFS_ILOCK_EXCL )) +xchk_iunlock (sc, sc->ilock_flags & (XFS_ILOCK_SHARED | +XFS_ILOCK_EXCL )); + error =xchk_trans_alloc_empty (sc); +if (error) +return error; + +while ((error =xchk_iscan_iter (&rp->pscan.iscan, &ip)) ==1 ) { +bool flush; + + error =xrep_parent_scan_file (rp, ip); +xchk_irele (sc, ip); +if (error) +break ; + +/* Flush stashed pptr updates to constrain memory usage. */ +mutex_lock (&rp->pscan.lock); + flush =xrep_parent_want_flush_stashed (rp); +mutex_unlock (&rp->pscan.lock); +if (flush) { +xchk_trans_cancel (sc); + + error =xrep_tempfile_iolock_polled (sc); +if (error) +break ; + + error =xrep_parent_replay_updates (rp); +xrep_tempfile_iounlock (sc); +if (error) +break ; + + error =xchk_trans_alloc_empty (sc); +if (error) +break ; + } + +if (xchk_should_terminate (sc, &error)) +break ; + } +xchk_iscan_iter_finish (&rp->pscan.iscan); +if (error) { +/* +* If we couldn't grab an inode that was busy with a state +* change, change the error code so that we exit to userspace +* as quickly as possible. +*/ +if (error == -EBUSY ) +return -ECANCELED ; +return error; + } + +/* +* Cancel the empty transaction so that we can (later) use the atomic +* extent swap helpers to lock files and commit the new directory. +*/ +xchk_trans_cancel (rp->sc); +return 0 ; +} +/* Reset a directory's dotdot entry, if needed. */ STATIC int xrep_parent_reset_dotdot(
@@ -283,8 +651,34 @@ xrep_parent_setup_scan( struct xrep_parent *rp) {struct xfs_scrub *sc = rp->sc; +int error; -return xrep_findparent_scan_start (sc, &rp->pscan); +if (!xfs_has_parent (sc->mp)) +return xrep_findparent_scan_start (sc, &rp->pscan); + +/* Set up some staging memory for logging parent pointer updates. */ + error =xfarray_create (sc->mp,"parent pointer entries" ,0 , +sizeof (struct xrep_pptr ), &rp->pptr_recs); +if (error) +return error; + + error =xfblob_create (sc->mp,"parent pointer names" , &rp->pptr_names); +if (error) + goto out_recs; + + error =xrep_findparent_scan_start (sc, &rp->pscan); +if (error) + goto out_names; + +return 0 ; + +out_names: +xfblob_destroy (rp->pptr_names); + rp->pptr_names =NULL ; +out_recs: +xfarray_destroy (rp->pptr_recs); + rp->pptr_recs =NULL ; +return error; }int
@@ -298,7 +692,10 @@ xrep_parent(if (error)return error; - error =xrep_parent_find_dotdot (rp); +if (xfs_has_parent (sc->mp)) + error =xrep_parent_scan_dirtree (rp); +else + error =xrep_parent_find_dotdot (rp);if (error) goto out_teardown;
fs/xfs/scrub/trace.h +36 -0
@@ -2758,6 +2758,42 @@ DEFINE_EVENT(xrep_pptr_class, name, \ TP_ARGS(ip, pptr))DEFINE_XREP_PPTR_CLASS (xrep_xattr_replay_parentadd);DEFINE_XREP_PPTR_CLASS (xrep_xattr_replay_parentremove); +DEFINE_XREP_PPTR_CLASS (xrep_parent_replay_parentadd); + +DECLARE_EVENT_CLASS (xrep_pptr_scan_class, + TP_PROTO(struct xfs_inode *ip, const struct xfs_inode *dp, + const struct xfs_name *name), +TP_ARGS (ip, dp, name), +TP_STRUCT__entry ( + __field(dev_t, dev) + __field(xfs_ino_t, ino) + __field(xfs_ino_t, parent_ino) + __field(unsigned int, parent_gen) + __field(unsigned int, namelen) +__dynamic_array (char, name, name->len) + ), +TP_fast_assign ( + __entry->dev = ip->i_mount->m_super->s_dev; + __entry->ino = ip->i_ino; + __entry->parent_ino = dp->i_ino; + __entry->parent_gen = VFS_IC(dp)->i_generation; + __entry->namelen = name->len; + memcpy(__get_str(name), name->name, name->len); + ), +TP_printk ("dev %d:%d ino 0x%llx parent_ino 0x%llx parent_gen 0x%x name '%.*s'" , +MAJOR (__entry->dev),MINOR (__entry->dev), + __entry->ino, + __entry->parent_ino, + __entry->parent_gen, + __entry->namelen, +__get_str (name)) +) +#define DEFINE_XREP_PPTR_SCAN_CLASS (name) \ +DEFINE_EVENT(xrep_pptr_scan_class, name, \ + TP_PROTO(struct xfs_inode *ip, const struct xfs_inode *dp, \ + const struct xfs_name *name), \ + TP_ARGS(ip, dp, name)) +DEFINE_XREP_PPTR_SCAN_CLASS (xrep_parent_stash_parentadd); TRACE_EVENT(xrep_nlinks_set_record, TP_PROTO(struct xfs_mount *mp, xfs_ino_t ino,
PATCH 15/17 xfs: implement live updates for parent pointer repairs
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
While we're scanning the filesystem for dirents that we can turn into parent pointers, we cannot hold the IOLOCK or ILOCK of the file being repaired. Therefore, we need to set up a dirent hook so that we can keep the temporary file's parent pionters up to date with the rest of the filesystem. Hence we add the ability to *remove* pptrs from the temporary file.
--- fs/xfs/scrub/parent_repair.c | 111 +++++++++++++++++++++++++++++++++++++++--- fs/xfs/scrub/trace.h | 2 + 2 files changed, 106 insertions(+), 7 deletions(-)
fs/xfs/scrub/parent_repair.c +104 -7
@@ -70,6 +70,12 @@* disrupt attrmulti cursors. */ +/* Create a parent pointer in the tempfile. */ +#define XREP_PPTR_ADD (1) + +/* Remove a parent pointer from the tempfile. */ +#define XREP_PPTR_REMOVE (2) +/* A stashed parent pointer update. */ struct xrep_pptr {/* Cookie for retrieval of the pptr name. */
@@ -81,6 +87,9 @@ struct xrep_pptr {/* Length of the pptr name. */ uint8_t namelen; + +/* XREP_PPTR_{ADD,REMOVE} */ +uint8_t action; };/*
@@ -233,13 +242,29 @@ xrep_parent_replay_update( rp->pptr.p_namelen = pptr->namelen;xfs_parent_irec_hashname (sc->mp, &rp->pptr); -/* Create parent pointer. */ -trace_xrep_parent_replay_parentadd (sc->tempip, &rp->pptr); +switch (pptr->action) { +case XREP_PPTR_ADD : +/* Create parent pointer. */ +trace_xrep_parent_replay_parentadd (sc->tempip, &rp->pptr); - error =xfs_parent_set (sc->tempip, sc->ip->i_ino, &rp->pptr, - &rp->pptr_scratch); -if (error) -return error; + error =xfs_parent_set (sc->tempip, sc->ip->i_ino, &rp->pptr, + &rp->pptr_scratch); +if (error) +return error; +break ; +case XREP_PPTR_REMOVE : +/* Remove parent pointer. */ +trace_xrep_parent_replay_parentremove (sc->tempip, &rp->pptr); + + error =xfs_parent_unset (sc->tempip, sc->ip->i_ino, &rp->pptr, + &rp->pptr_scratch); +if (error) +return error; +break ; +default : +ASSERT (0 ); +return -EIO ; + }return 0 ; }
@@ -302,6 +327,7 @@ xrep_parent_stash_parentadd( const struct xfs_inode *dp) {struct xrep_pptr pptr = { + .action =XREP_PPTR_ADD , .namelen = name->len, .p_ino = dp->i_ino, .p_gen =VFS_IC (dp)->i_generation,
@@ -318,6 +344,34 @@ xrep_parent_stash_parentadd(return xfarray_append (rp->pptr_recs, &pptr); } +/* +* Remember that we want to remove a parent pointer from the tempfile. These +* stashed actions will be replayed later. +*/ +STATIC int +xrep_parent_stash_parentremove ( +struct xrep_parent *rp, +const struct xfs_name *name, +const struct xfs_inode *dp) +{ +struct xrep_pptr pptr = { + .action =XREP_PPTR_REMOVE , + .namelen = name->len, + .p_ino = dp->i_ino, + .p_gen =VFS_IC (dp)->i_generation, + }; +int error; + +trace_xrep_parent_stash_parentremove (rp->sc->tempip, dp, name); + + error =xfblob_store (rp->pptr_names, &pptr.name_cookie, name->name, + name->len); +if (error) +return error; + +return xfarray_append (rp->pptr_recs, &pptr); +} +/* * Examine an entry of a directory. If this dirent leads us back to the file * whose parent pointers we're rebuilding, add a pptr to the temporary
@@ -518,6 +572,48 @@ xrep_parent_scan_dirtree(return 0 ; } +/* +* Capture dirent updates being made by other threads which are relevant to the +* file being repaired. +*/ +STATIC int +xrep_parent_live_update ( +struct notifier_block *nb, +unsigned long action, +void *data) +{ +struct xfs_dir_update_params *p = data; +struct xrep_parent *rp; +struct xfs_scrub *sc; +int error; + + rp = container_of(nb, struct xrep_parent, pscan.hooks.dirent_hook.nb); + sc = rp->sc; + +/* +* This thread updated a dirent that points to the file that we're +* repairing, so stash the update for replay against the temporary +* file. +*/ +if (p->ip->i_ino == sc->ip->i_ino && +xchk_iscan_want_live_update (&rp->pscan.iscan, p->dp->i_ino)) { +mutex_lock (&rp->pscan.lock); +if (p->delta >0 ) + error =xrep_parent_stash_parentadd (rp, p->name, p->dp); +else + error =xrep_parent_stash_parentremove (rp, p->name, + p->dp); +mutex_unlock (&rp->pscan.lock); +if (error) + goto out_abort; + } + +return NOTIFY_DONE ; +out_abort: +xchk_iscan_abort (&rp->pscan.iscan); +return NOTIFY_DONE ; +} +/* Reset a directory's dotdot entry, if needed. */ STATIC int xrep_parent_reset_dotdot(
@@ -666,7 +762,8 @@ xrep_parent_setup_scan(if (error) goto out_recs; - error =xrep_findparent_scan_start (sc, &rp->pscan); + error =__xrep_findparent_scan_start (sc, &rp->pscan, + xrep_parent_live_update);if (error) goto out_names;
fs/xfs/scrub/trace.h +2 -0
@@ -2759,6 +2759,7 @@ DEFINE_EVENT(xrep_pptr_class, name, \DEFINE_XREP_PPTR_CLASS (xrep_xattr_replay_parentadd);DEFINE_XREP_PPTR_CLASS (xrep_xattr_replay_parentremove);DEFINE_XREP_PPTR_CLASS (xrep_parent_replay_parentadd); +DEFINE_XREP_PPTR_CLASS (xrep_parent_replay_parentremove); DECLARE_EVENT_CLASS(xrep_pptr_scan_class, TP_PROTO(struct xfs_inode *ip, const struct xfs_inode *dp,
@@ -2794,6 +2795,7 @@ DEFINE_EVENT(xrep_pptr_scan_class, name, \ const struct xfs_name *name), \ TP_ARGS(ip, dp, name)) DEFINE_XREP_PPTR_SCAN_CLASS(xrep_parent_stash_parentadd); +DEFINE_XREP_PPTR_SCAN_CLASS (xrep_parent_stash_parentremove); TRACE_EVENT(xrep_nlinks_set_record, TP_PROTO(struct xfs_mount *mp, xfs_ino_t ino,
PATCH 16/17 xfs: remove pointless unlocked assertion
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Remove this assertion about the inode not having an attr fork from xfs_bmap_add_attrfork because the function handles that case just fine. Weirder still, the function actually /requires/ the caller not to hold the ILOCK, which means that its accesses are not stabilized.
--- fs/xfs/libxfs/xfs_bmap.c | 2 -- 1 file changed, 2 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +0 -2
@@ -1017,8 +1017,6 @@ xfs_bmap_add_attrfork(int logflags;/* logging flags */ int error;/* error return value */ -ASSERT (xfs_inode_has_attr_fork (ip) ==0 ); - mp = ip->i_mount;ASSERT (!XFS_NOT_DQATTACHED (mp, ip));
PATCH 17/17 xfs: actually rebuild the parent pointer xattrs
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Once we've assembled all the parent pointers for a file, we need to commit the new dataset atomically to that file. Parent pointer records are embedded in the xattr structure, which means that we must write a new extended attribute structure, again, atomically. Therefore, we must copy the non-parent-pointer attributes from the file being repaired into the temporary file's extended attributes and then call the atomic extent swap mechanism to exchange the blocks.
--- fs/xfs/scrub/attr.c | 2 fs/xfs/scrub/attr_repair.c | 4 fs/xfs/scrub/attr_repair.h | 4 fs/xfs/scrub/dir_repair.c | 3 fs/xfs/scrub/findparent.c | 52 +++ fs/xfs/scrub/findparent.h | 2 fs/xfs/scrub/listxattr.c | 10 + fs/xfs/scrub/listxattr.h | 4 fs/xfs/scrub/parent.c | 5 fs/xfs/scrub/parent_repair.c | 706 +++++++++++++++++++++++++++++++++++++++++- fs/xfs/scrub/trace.h | 2 11 files changed, 770 insertions(+), 24 deletions(-)
fs/xfs/scrub/attr.c +1 -1
@@ -647,7 +647,7 @@ xchk_xattr(* iteration, which doesn't really follow the usual buffer * locking order. */ - error =xchk_xattr_walk (sc, sc->ip, xchk_xattr_actor,NULL ); + error =xchk_xattr_walk (sc, sc->ip, xchk_xattr_actor,NULL ,NULL );if (!xchk_fblock_process_error (sc,XFS_ATTR_FORK ,0 , &error))return error;
fs/xfs/scrub/attr_repair.c +2 -2
@@ -1036,7 +1036,7 @@ xrep_xattr_reset_fork(* fork. The caller must ILOCK the tempfile and join it to the transaction. * This function returns with the inode joined to a clean scrub transaction. */ -STATIC int +int xrep_xattr_reset_tempfile_fork (struct xfs_scrub *sc) {
@@ -1360,7 +1360,7 @@ xrep_xattr_swap_prep( }/* Swap the temporary file's attribute fork with the one being repaired. */ -STATIC int +int xrep_xattr_swap (struct xfs_scrub *sc,struct xrep_tempswap *tx)
fs/xfs/scrub/attr_repair.h +4 -0
@@ -6,6 +6,10 @@#ifndef __XFS_SCRUB_ATTR_REPAIR_H__#define __XFS_SCRUB_ATTR_REPAIR_H__ +struct xrep_tempswap ; + +int xrep_xattr_swap (struct xfs_scrub *sc,struct xrep_tempswap *tx);int xrep_xattr_reset_fork (struct xfs_scrub *sc); +int xrep_xattr_reset_tempfile_fork (struct xfs_scrub *sc);#endif /* __XFS_SCRUB_ATTR_REPAIR_H__ */
fs/xfs/scrub/dir_repair.c +2 -1
@@ -1283,7 +1283,8 @@ xrep_dir_scan_file(if (!xrep_dir_want_scan (rd, ip)) goto scan_done; - error =xchk_xattr_walk (rd->sc, ip, xrep_dir_scan_parent_pointer, rd); + error =xchk_xattr_walk (rd->sc, ip, xrep_dir_scan_parent_pointer,NULL , + rd);if (error) goto scan_done;
fs/xfs/scrub/findparent.c +52 -0
67 lines not on this page · raw message
fs/xfs/scrub/findparent.h +2 -0
@@ -53,4 +53,6 @@ int xrep_findparent_confirm(struct xfs_scrub *sc, xfs_ino_t *parent_ino);xfs_ino_t xrep_findparent_self_reference (struct xfs_scrub *sc);xfs_ino_t xrep_findparent_from_dcache (struct xfs_scrub *sc); +int xrep_findparent_from_pptrs (struct xfs_scrub *sc,xfs_ino_t *inop); +#endif /* __XFS_SCRUB_FINDPARENT_H__ */
fs/xfs/scrub/listxattr.c +9 -1
@@ -220,6 +220,7 @@ xchk_xattr_walk_node(struct xfs_scrub *sc, struct xfs_inode *ip, xchk_xattr_fn attr_fn, + xchk_xattrleaf_fn leaf_fn, void *priv) { struct xfs_attr3_icleaf_hdr leafhdr;
@@ -251,6 +252,12 @@ xchk_xattr_walk_node(xfs_trans_brelse (sc->tp, leaf_bp); +if (leaf_fn) { + error =leaf_fn (sc, priv); +if (error) + goto out_bitmap; + } +/* Make sure we haven't seen this new leaf already. */ len =1 ;if (xbitmap_test (&seen_blocks, leafhdr.forw, &len))
@@ -285,6 +292,7 @@ xchk_xattr_walk(struct xfs_scrub *sc, struct xfs_inode *ip, xchk_xattr_fn attr_fn, + xchk_xattrleaf_fn leaf_fn, void *priv) { int error;
@@ -305,5 +313,5 @@ xchk_xattr_walk(if (xfs_attr_is_leaf (ip))return xchk_xattr_walk_leaf (sc, ip, attr_fn, priv); -return xchk_xattr_walk_node (sc, ip, attr_fn, priv); +return xchk_xattr_walk_node (sc, ip, attr_fn, leaf_fn, priv); }
fs/xfs/scrub/listxattr.h +3 -1
@@ -11,7 +11,9 @@ typedef int (*xchk_xattr_fn)(struct xfs_scrub *sc, struct xfs_inode *ip, unsigned int namelen, const void *value, unsigned int valuelen, void *priv); +typedef int (*xchk_xattrleaf_fn )(struct xfs_scrub *sc,void *priv); +int xchk_xattr_walk (struct xfs_scrub *sc,struct xfs_inode *ip, -xchk_xattr_fn attr_fn,void *priv); +xchk_xattr_fn attr_fn,xchk_xattrleaf_fn leaf_fn,void *priv);#endif /* __XFS_SCRUB_LISTXATTR_H__ */
fs/xfs/scrub/parent.c +3 -2
@@ -701,7 +701,8 @@ xchk_parent_count_pptrs(*/ if (pp->need_revalidate) { pp->pptrs_found =0 ; - error =xchk_xattr_walk (sc, sc->ip, xchk_parent_count_pptr, pp); + error =xchk_xattr_walk (sc, sc->ip, xchk_parent_count_pptr, +NULL , pp);if (error == -ECANCELED )return 0 ;if (error)
@@ -760,7 +761,7 @@ xchk_parent_pptr(if (error) goto out_entries; - error =xchk_xattr_walk (sc, sc->ip, xchk_parent_scan_attr, pp); + error =xchk_xattr_walk (sc, sc->ip, xchk_parent_scan_attr,NULL , pp);if (error == -ECANCELED ) { error =0 ; goto out_names;
fs/xfs/scrub/parent_repair.c +690 -16
831 lines not on this page · raw message
fs/xfs/scrub/trace.h +2 -0
@@ -2482,6 +2482,8 @@ DEFINE_EVENT(xrep_xattr_salvage_class, name, \ TP_ARGS(ip, flags, name, namelen, valuelen))DEFINE_XREP_XATTR_SALVAGE_EVENT (xrep_xattr_salvage_rec);DEFINE_XREP_XATTR_SALVAGE_EVENT (xrep_xattr_insert_rec); +DEFINE_XREP_XATTR_SALVAGE_EVENT (xrep_parent_stash_xattr); +DEFINE_XREP_XATTR_SALVAGE_EVENT (xrep_parent_insert_xattr); DECLARE_EVENT_CLASS(xrep_pptr_salvage_class, TP_PROTO(struct xfs_inode *ip, unsigned int flags, const void *name,
cover xfsprogs: retain ILOCK during directory updates
In reply to Darrick J. WongHi all,
This series changes the directory update code to retain the ILOCK on all files involved in a rename until the end of the operation. The upcoming parent pointers patchset applies parent pointers in a separate chained update from the actual directory update, which is why it is now necessary to keep the ILOCK instead of dropping it after the first transaction in the chain.
As a side effect, we no longer need to hold the IOLOCK during an rmapbt scan of inodes to serialize the scan with ongoing directory updates.
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
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=retain-ilock-during-dir-ops
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=retain-ilock-during-dir-ops
--- libxfs/libxfs_priv.h | 2 ++ libxfs/xfs_defer.c | 6 +++++- libxfs/xfs_defer.h | 8 +++++++- 3 files changed, 14 insertions(+), 2 deletions(-)
PATCH 1/1 xfs: Increase XFS_DEFER_OPS_NR_INODES to 5
From: Allison Henderson <[email protected]>
Renames that generate parent pointer updates can join up to 5 inodes locked in sorted order. So we need to increase the number of defer ops inodes and relock them in the same way.
--- libxfs/libxfs_priv.h | 2 ++ libxfs/xfs_defer.c | 6 +++++- libxfs/xfs_defer.h | 8 +++++++- 3 files changed, 14 insertions(+), 2 deletions(-)
libxfs/libxfs_priv.h +2 -0
@@ -498,6 +498,8 @@ void __xfs_buf_mark_corrupt(struct xfs_buf *bp, xfs_failaddr_t fa); __mode = __mode;/* no set-but-unused warning */ \ })#define xfs_lock_two_inodes (ip0,mode0,ip1,mode1) ((void) 0) +#define xfs_lock_inodes (i_tab, nr, mode) ((void) 0) +#define xfs_sort_inodes (i_tab, nr) ((void) 0)/* space allocation */ #define XFS_EXTENT_BUSY_DISCARDED 0x01/* undergoing a discard op. */
libxfs/xfs_defer.c +5 -1
@@ -825,7 +825,11 @@ xfs_defer_ops_continue(ASSERT (!(tp->t_flags &XFS_TRANS_DIRTY ));/* Lock the captured resources to the new transaction. */ -if (dfc->dfc_held.dr_inos ==2 ) +if (dfc->dfc_held.dr_inos >2 ) { +xfs_sort_inodes (dfc->dfc_held.dr_ip, dfc->dfc_held.dr_inos); +xfs_lock_inodes (dfc->dfc_held.dr_ip, dfc->dfc_held.dr_inos, +XFS_ILOCK_EXCL ); + }else if (dfc->dfc_held.dr_inos ==2 )xfs_lock_two_inodes (dfc->dfc_held.dr_ip[0 ],XFS_ILOCK_EXCL , dfc->dfc_held.dr_ip[1 ],XFS_ILOCK_EXCL );else if (dfc->dfc_held.dr_inos ==1 )
libxfs/xfs_defer.h +7 -1
@@ -71,7 +71,13 @@ extern const struct xfs_defer_op_type xfs_swapext_defer_type;/* * Deferred operation item relogging limits. */ -#define XFS_DEFER_OPS_NR_INODES 2/* join up to two inodes */ + +/* +* Rename w/ parent pointers can require up to 5 inodes with deferred ops to +* be joined to the transaction: src_dp, target_dp, src_ip, target_ip, and wip. +* These inodes are locked in sorted order by their inode numbers +*/ +#define XFS_DEFER_OPS_NR_INODES 5#define XFS_DEFER_OPS_NR_BUFS 2/* join up to two buffers */ /* Resources that must be held across a transaction roll. */
cover xfsprogs: name-value xattr lookups
In reply to Darrick J. WongHi all,
Directory parent pointers are stored as namespaced extended attributes of a file. Because parent pointers can consume up to 267 bytes of space and xattr names are 255 bytes at most, we cannot use the usual attr name lookup functions to find a parent pointer. This is solvable by introducing a new lookup mode that checks both the name and the value of the xattr.
Therefore, introduce this new lookup mode. Because all parent pointer updates are logged, we must extend the xattr logging code to capture the VLOOKUP variants, and restore them when recovering logged operations. These new log formats are protected by the sb_incompat PARENT flag, so they do not need a separate log_incompat feature flag.
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
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=pptrs-attr-nvlookups
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=pptrs-attr-nvlookups
--- db/attrset.c | 4 + libxfs/xfs_attr.c | 57 ++++++++++++++----- libxfs/xfs_attr.h | 9 ++- libxfs/xfs_attr_leaf.c | 45 +++++++++++++-- libxfs/xfs_da_btree.h | 10 +++ libxfs/xfs_log_format.h | 29 +++++++++- logprint/log_redo.c | 138 ++++++++++++++++++++++++++++++++++++++--------- logprint/logprint.h | 6 +- 8 files changed, 239 insertions(+), 59 deletions(-)
PATCH 1/10 xfs: make xfs_attr_set require XFS_DA_OP_REMOVE
From: Darrick J. Wong <[email protected]>
Quite a few patches from now, we're going to change the parent pointer xattr format to encode as much of the dirent name in the xattr name as fits, and spill the rest of it to the xattr value. To make this work correctly, we'll be adding the ability to look up xattrs based on name /and/ value.
Internally, the xattr data structure supports attributes with a zero length value, which is how we're going to store parent pointers for short dirent names. The parent pointer repair code uses xfs_attr_set to add missing and remove dangling parent pointers, so that interface must be capable of setting an xattr with args->value == NULL.
The userspace API doesn't support this, so xfs_attr_set currently treats a NULL args->value as a request to remove an attr. However, that's a quirk of the existing callers and the interface. Make the callers of xfs_attr_set to declare explicitly that they want to remove an xattr.
--- db/attrset.c | 4 +++- libxfs/xfs_attr.c | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-)
db/attrset.c +3 -1
@@ -185,7 +185,9 @@ attr_remove_f(int argc, char **argv) { - struct xfs_da_args args = { }; + struct xfs_da_args args = { + .op_flags =XFS_DA_OP_REMOVE , + };int c;if (cur_typ ==NULL ) {
libxfs/xfs_attr.c +5 -4
@@ -965,6 +965,7 @@ xfs_attr_set(struct xfs_mount *mp = dp->i_mount;struct xfs_trans_res tres;bool rsvd = (args->attr_filter &XFS_ATTR_ROOT ); +bool is_remove = args->op_flags &XFS_DA_OP_REMOVE ;int error, local;int rmt_blks =0 ;unsigned int total;
@@ -989,7 +990,7 @@ xfs_attr_set( args->op_flags =XFS_DA_OP_OKNOENT | (args->op_flags &XFS_DA_OP_LOGGED ); -if (args->value) { +if (!is_remove) {XFS_STATS_INC (mp, xs_attr_set); args->total =xfs_attr_calc_size (args, &local);
@@ -1023,7 +1024,7 @@ xfs_attr_set(if (error)return error; -if (args->value ||xfs_inode_hasattr (dp)) { +if (!is_remove ||xfs_inode_hasattr (dp)) { error =xfs_iext_count_may_overflow (dp,XFS_ATTR_FORK ,XFS_IEXT_ATTR_MANIP_CNT (rmt_blks));if (error == -EFBIG )
@@ -1037,7 +1038,7 @@ xfs_attr_set(switch (error) {case -EEXIST :/* if no value, we are performing a remove operation */ -if (!args->value) { +if (is_remove) { error =xfs_attr_defer_remove (args);break ; }
@@ -1049,7 +1050,7 @@ xfs_attr_set(break ;case -ENOATTR :/* Can't remove what isn't there. */ -if (!args->value) +if (is_remove) goto out_trans_cancel;/* Pure replace fails if no existing attr to replace. */
PATCH 2/10 xfs: allow xattr matching on name and value for local/sf attrs
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add a new NVLOOKUP flag to signal that the caller wants to look up an extended attribute by name and value. This only works with shortform and local attributes. Only parent pointers need this functionality and parent pointers cannot be remote xattrs, so this limitation is ok for now.
--- libxfs/xfs_attr_leaf.c | 45 +++++++++++++++++++++++++++++++++++++-------- libxfs/xfs_da_btree.h | 4 +++- 2 files changed, 40 insertions(+), 9 deletions(-)
libxfs/xfs_attr_leaf.c +37 -8
@@ -505,10 +505,12 @@ xfs_attr3_leaf_read(*/ static bool xfs_attr_match ( -struct xfs_da_args *args, -uint8_t namelen, -unsigned char *name, -int flags) +const struct xfs_da_args *args, +uint8_t namelen, +const unsigned char *name, +unsigned int valuelen, +const void *value, +int flags) {if (args->namelen != namelen)
@@ -516,6 +518,23 @@ xfs_attr_match(if (memcmp (args->name, name, namelen) !=0 )return false; +if (args->op_flags &XFS_DA_OP_NVLOOKUP ) { +if (args->valuelen != valuelen) +return false; +if (args->valuelen && !value) { +/* not implemented for remote values */ +ASSERT (0 ); +return false; + } +if (valuelen && !args->value) { +/* caller gave us valuelen > 0 but no value?? */ +ASSERT (0 ); +return false; + } +if (valuelen >0 &&memcmp (args->value, value, valuelen) !=0 ) +return false; + } +/* Recovery ignores the INCOMPLETE flag. */ if ((args->op_flags &XFS_DA_OP_RECOVERY ) && args->attr_filter == (flags &XFS_ATTR_NSP_ONDISK_MASK ))
@@ -534,6 +553,10 @@ xfs_attr_copy_value( unsigned char *value, int valuelen) { +/* vlookups already supplied the attr value; don't copy anything */ +if (args->op_flags &XFS_DA_OP_NVLOOKUP ) +return 0 ; +/* * No copy if all we have to do is get the length */
@@ -758,6 +781,7 @@ xfs_attr_sf_findname( base += size, i++) { size =xfs_attr_sf_entsize (sfe);if (!xfs_attr_match (args, sfe->namelen, sfe->nameval, + sfe->valuelen, &sfe->nameval[sfe->namelen], sfe->flags))continue ;break ;
@@ -926,6 +950,7 @@ xfs_attr_shortform_lookup(xfs_da_args_t *args)for (i =0 ; i < sf->hdr.count; sfe =xfs_attr_sf_nextentry (sfe), i++) {if (xfs_attr_match (args, sfe->namelen, sfe->nameval, + sfe->valuelen, &sfe->nameval[sfe->namelen], sfe->flags))return -EEXIST ; }
@@ -953,6 +978,7 @@ xfs_attr_shortform_getvalue(for (i =0 ; i < sf->hdr.count; sfe =xfs_attr_sf_nextentry (sfe), i++) {if (xfs_attr_match (args, sfe->namelen, sfe->nameval, + sfe->valuelen, &sfe->nameval[sfe->namelen], sfe->flags))return xfs_attr_copy_value (args, &sfe->nameval[args->namelen], sfe->valuelen);
@@ -1005,7 +1031,7 @@ xfs_attr_shortform_to_leaf( nargs.total = args->total; nargs.whichfork =XFS_ATTR_FORK ; nargs.trans = args->trans; - nargs.op_flags =XFS_DA_OP_OKNOENT ; + nargs.op_flags =XFS_DA_OP_OKNOENT |XFS_DA_OP_NVLOOKUP ; nargs.owner = args->owner; sfe = &sf->list[0 ];
@@ -1226,7 +1252,7 @@ xfs_attr3_leaf_to_shortform( nargs.total = args->total; nargs.whichfork =XFS_ATTR_FORK ; nargs.trans = args->trans; - nargs.op_flags =XFS_DA_OP_OKNOENT ; + nargs.op_flags =XFS_DA_OP_OKNOENT |XFS_DA_OP_NVLOOKUP ; nargs.owner = args->owner;for (i =0 ; i < ichdr.count; entry++, i++) {
@@ -2529,14 +2555,17 @@ xfs_attr3_leaf_lookup_int(if (entry->flags &XFS_ATTR_LOCAL ) { name_loc =xfs_attr3_leaf_name_local (leaf, probe);if (!xfs_attr_match (args, name_loc->namelen, - name_loc->nameval, entry->flags)) + name_loc->nameval, +be16_to_cpu (name_loc->valuelen), + &name_loc->nameval[name_loc->namelen], + entry->flags))continue ; args->index = probe;return -EEXIST ; }else { name_rmt =xfs_attr3_leaf_name_remote (leaf, probe);if (!xfs_attr_match (args, name_rmt->namelen, - name_rmt->name, entry->flags)) + name_rmt->name,0 ,NULL , entry->flags))continue ; args->index = probe; args->rmtvaluelen =be32_to_cpu (name_rmt->valuelen);
libxfs/xfs_da_btree.h +3 -1
@@ -94,6 +94,7 @@ typedef struct xfs_da_args {#define XFS_DA_OP_REMOVE (1u << 6)/* this is a remove operation */ #define XFS_DA_OP_RECOVERY (1u << 7)/* Log recovery operation */ #define XFS_DA_OP_LOGGED (1u << 8)/* Use intent items to track op */ +#define XFS_DA_OP_NVLOOKUP (1u << 9)/* Match local attr on name+value */ #define XFS_DA_OP_FLAGS \ { XFS_DA_OP_JUSTCHECK, "JUSTCHECK" }, \
@@ -104,7 +105,8 @@ typedef struct xfs_da_args { { XFS_DA_OP_NOTIME, "NOTIME" }, \ { XFS_DA_OP_REMOVE, "REMOVE" }, \ { XFS_DA_OP_RECOVERY, "RECOVERY" }, \ - { XFS_DA_OP_LOGGED, "LOGGED" } + { XFS_DA_OP_LOGGED, "LOGGED" }, \ + { XFS_DA_OP_NVLOOKUP, "NVLOOKUP" }/* * Storage for holding state during Btree searches and split/join ops.
PATCH 3/10 xfs: preserve NVLOOKUP in xfs_attr_set
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Preserve the attr-value lookup flag when calling xfs_attr_set. Normal xattr users will never use this, but parent pointer fsck will.
--- libxfs/xfs_attr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
libxfs/xfs_attr.c +4 -4
@@ -984,11 +984,11 @@ xfs_attr_set(/* * We have no control over the attribute names that userspace passes us * to remove, so we have to allow the name lookup prior to attribute -* removal to fail as well. Preserve the logged flag, since we need -* to pass that through to the logging code. +* removal to fail as well. Preserve the logged and vlookup flags, +* since we need to pass them through to the lower levels. */ - args->op_flags =XFS_DA_OP_OKNOENT | - (args->op_flags &XFS_DA_OP_LOGGED ); + args->op_flags &= (XFS_DA_OP_LOGGED |XFS_DA_OP_NVLOOKUP ); + args->op_flags |=XFS_DA_OP_OKNOENT ;if (!is_remove) {XFS_STATS_INC (mp, xs_attr_set);
PATCH 4/10 xfs: restructure xfs_attr_complete_op a bit
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Reduce the indentation in this function by flattening the nested if statements. We're going to add more code later to this function later, hence the early cleanup. No functional changes.
--- libxfs/xfs_attr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
libxfs/xfs_attr.c +5 -5
@@ -419,11 +419,11 @@ xfs_attr_complete_op(bool do_replace = args->op_flags &XFS_DA_OP_REPLACE ; args->op_flags &= ~XFS_DA_OP_REPLACE ; -if (do_replace) { - args->attr_filter &= ~XFS_ATTR_INCOMPLETE ; -return replace_state; - } -return XFS_DAS_DONE ; +if (!do_replace) +return XFS_DAS_DONE ; + + args->attr_filter &= ~XFS_ATTR_INCOMPLETE ; +return replace_state; } static int
PATCH 5/10 xfs: use helpers to extract xattr op from opflags
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Create helper functions to extract the xattr op from the ondisk xattri log item and the incore attr intent item. These will get more use in the patches that follow.
--- libxfs/xfs_attr.h | 5 +++++ 1 file changed, 5 insertions(+)
libxfs/xfs_attr.h +5 -0
@@ -529,6 +529,11 @@ struct xfs_attr_intent {struct xfs_bmbt_irec xattri_map; }; +static inline unsigned int +xfs_attr_intent_op (const struct xfs_attr_intent *attr) +{ +return attr->xattri_op_flags &XFS_ATTRI_OP_FLAGS_TYPE_MASK ; +}/*======================================================================== * Function prototypes for the kernel.
PATCH 6/10 xfs: log NVLOOKUP xattr removal operations
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
If high level code wants to do a deferred xattr remove operation with the NVLOOKUP flag set, we need to push this through the log.
--- libxfs/xfs_attr.c | 6 +++++- libxfs/xfs_log_format.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)
libxfs/xfs_attr.c +5 -1
@@ -940,9 +940,13 @@ xfs_attr_defer_remove( {struct xfs_attr_intent *new; +int op_flag =XFS_ATTRI_OP_FLAGS_REMOVE ;int error; - error =xfs_attr_intent_init (args,XFS_ATTRI_OP_FLAGS_REMOVE , &new); +if (args->op_flags &XFS_DA_OP_NVLOOKUP ) + op_flag =XFS_ATTRI_OP_FLAGS_NVREMOVE ; + + error =xfs_attr_intent_init (args, op_flag, &new);if (error)return error;
libxfs/xfs_log_format.h +1 -0
@@ -1036,6 +1036,7 @@ struct xfs_icreate_log {#define XFS_ATTRI_OP_FLAGS_SET 1/* Set the attribute */ #define XFS_ATTRI_OP_FLAGS_REMOVE 2/* Remove the attribute */ #define XFS_ATTRI_OP_FLAGS_REPLACE 3/* Replace the attribute */ +#define XFS_ATTRI_OP_FLAGS_NVREMOVE 4/* Remove attr w/ vlookup */ #define XFS_ATTRI_OP_FLAGS_TYPE_MASK 0xFF/* Flags type mask */ /*
PATCH 7/10 xfs: log NVLOOKUP xattr setting operations
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
If high level code wants to do a deferred xattr set operation with the NVLOOKUP flag set, we need to push this through the log.
--- libxfs/xfs_attr.c | 6 +++++- libxfs/xfs_log_format.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)
libxfs/xfs_attr.c +5 -1
@@ -901,9 +901,13 @@ xfs_attr_defer_add( struct xfs_da_args *args) {struct xfs_attr_intent *new; +int op_flag =XFS_ATTRI_OP_FLAGS_SET ;int error =0 ; - error =xfs_attr_intent_init (args,XFS_ATTRI_OP_FLAGS_SET , &new); +if (args->op_flags &XFS_DA_OP_NVLOOKUP ) + op_flag =XFS_ATTRI_OP_FLAGS_NVSET ; + + error =xfs_attr_intent_init (args, op_flag, &new);if (error)return error;
libxfs/xfs_log_format.h +1 -0
@@ -1037,6 +1037,7 @@ struct xfs_icreate_log {#define XFS_ATTRI_OP_FLAGS_REMOVE 2/* Remove the attribute */ #define XFS_ATTRI_OP_FLAGS_REPLACE 3/* Replace the attribute */ #define XFS_ATTRI_OP_FLAGS_NVREMOVE 4/* Remove attr w/ vlookup */ +#define XFS_ATTRI_OP_FLAGS_NVSET 5/* Set attr with w/ vlookup */ #define XFS_ATTRI_OP_FLAGS_TYPE_MASK 0xFF/* Flags type mask */ /*
PATCH 8/10 xfs: log NVLOOKUP xattr nvreplace operations
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
(Formerly titled "xfs: Add new name to attri/d" and described as follows:
This patch adds two new fields to the atti/d. They are nname and nnamelen. This will be used for parent pointer updates since a rename operation may cause the parent pointer to update both the name and value. So we need to carry both the new name as well as the target name in the attri/d.)
If high level code wants to do a deferred xattr nvreplace operation with the NVLOOKUP flag set, we need to push this through the log. This log item records the old name/value pair and the new name/value pair, and completely replaces one with the other. Parent pointers will need this ability to handle rename moving a child file between parents.
--- libxfs/xfs_attr.c | 20 +++++++++++++++++++- libxfs/xfs_attr.h | 4 ++-- libxfs/xfs_da_btree.h | 6 +++++- libxfs/xfs_log_format.h | 27 +++++++++++++++++++++++---- 4 files changed, 49 insertions(+), 8 deletions(-)
libxfs/xfs_attr.c +19 -1
@@ -423,6 +423,20 @@ xfs_attr_complete_op(return XFS_DAS_DONE ; args->attr_filter &= ~XFS_ATTR_INCOMPLETE ; +if (xfs_attr_intent_op (attr) !=XFS_ATTRI_OP_FLAGS_NVREPLACE ) +return replace_state; + +/* +* NVREPLACE operations require the caller to set the old and new names +* and values explicitly. +*/ +ASSERT (args->new_namelen >0 ); + + args->name = args->new_name; + args->namelen = args->new_namelen; + args->hashval =xfs_da_hashname (args->name, args->namelen); + args->value = args->new_value; + args->valuelen = args->new_valuelen;return replace_state; }
@@ -924,9 +938,13 @@ xfs_attr_defer_replace( struct xfs_da_args *args) {struct xfs_attr_intent *new; +int op_flag =XFS_ATTRI_OP_FLAGS_REPLACE ;int error =0 ; - error =xfs_attr_intent_init (args,XFS_ATTRI_OP_FLAGS_REPLACE , &new); +if (args->op_flags &XFS_DA_OP_NVLOOKUP ) + op_flag =XFS_ATTRI_OP_FLAGS_NVREPLACE ; + + error =xfs_attr_intent_init (args, op_flag, &new);if (error)return error;
libxfs/xfs_attr.h +2 -2
@@ -510,8 +510,8 @@ struct xfs_attr_intent {struct xfs_da_args *xattri_da_args;/* -* Shared buffer containing the attr name and value so that the logging -* code can share large memory buffers between log items. +* Shared buffer containing the attr name, new name, and value so that +* the logging code can share large memory buffers between log items. */ struct xfs_attri_log_nameval *xattri_nameval;
libxfs/xfs_da_btree.h +5 -1
@@ -54,11 +54,15 @@ enum xfs_dacmp {*/ typedef struct xfs_da_args { struct xfs_da_geometry *geo; /* da block geometry */ - const uint8_t *name; /* string (maybe not NULL terminated) */ + const uint8_t *name; /* string (maybe not NULL terminated) */ + const uint8_t *new_name; /* new attr name */ int namelen; /* length of string (maybe no NULL) */ + int new_namelen; /* new attr name len */ uint8_t filetype; /* filetype of inode for directories */ void *value; /* set of bytes (maybe contain NULLs) */ + void *new_value; /* new xattr value (may contain NULLs) */ int valuelen; /* length of value */ + int new_valuelen; /* length of new attr value */ unsigned int attr_filter; /* XFS_ATTR_{ROOT,SECURE,INCOMPLETE} */ unsigned int attr_flags; /* XATTR_{CREATE,REPLACE} */ xfs_dahash_t hashval; /* hash value of name */
libxfs/xfs_log_format.h +23 -4
@@ -115,11 +115,13 @@ struct xfs_unmount_log_format {#define XLOG_REG_TYPE_BUD_FORMAT 26#define XLOG_REG_TYPE_ATTRI_FORMAT 27#define XLOG_REG_TYPE_ATTRD_FORMAT 28 -#define XLOG_REG_TYPE_ATTR_NAME 29 +#define XLOG_REG_TYPE_ATTR_NAME 29#define XLOG_REG_TYPE_ATTR_VALUE 30#define XLOG_REG_TYPE_SXI_FORMAT 31#define XLOG_REG_TYPE_SXD_FORMAT 32 -#define XLOG_REG_TYPE_MAX 32 +#define XLOG_REG_TYPE_ATTR_NEWNAME 33 +#define XLOG_REG_TYPE_ATTR_NEWVALUE 34 +#define XLOG_REG_TYPE_MAX 34/* * Flags to log operation header
@@ -1038,6 +1040,7 @@ struct xfs_icreate_log {#define XFS_ATTRI_OP_FLAGS_REPLACE 3/* Replace the attribute */ #define XFS_ATTRI_OP_FLAGS_NVREMOVE 4/* Remove attr w/ vlookup */ #define XFS_ATTRI_OP_FLAGS_NVSET 5/* Set attr with w/ vlookup */ +#define XFS_ATTRI_OP_FLAGS_NVREPLACE 6/* Replace attr name and val */ #define XFS_ATTRI_OP_FLAGS_TYPE_MASK 0xFF/* Flags type mask */ /*
@@ -1055,11 +1058,27 @@ struct xfs_icreate_log {struct xfs_attri_log_format {uint16_t alfi_type;/* attri log item type */ uint16_t alfi_size;/* size of this item */ -uint32_t __pad;/* pad to 64 bit aligned */ + +/* +* For NVREPLACE, this is the length of the new xattr value. +* alfi_value_len contains the length of the old xattr value. +*/ +uint32_t alfi_new_value_len; +uint64_t alfi_id;/* attri identifier */ uint64_t alfi_ino;/* the inode for this attr operation */ uint32_t alfi_op_flags;/* marks the op as a set or remove */ -uint32_t alfi_name_len;/* attr name length */ +union { +uint32_t alfi_name_len;/* attr name length */ +struct { +/* +* For NVREPLACE, these are the lengths of the old and +* new attr name. +*/ +uint16_t alfi_old_name_len; +uint16_t alfi_new_name_len; + }; + };uint32_t alfi_value_len;/* attr value length */ uint32_t alfi_attr_filter;/* attr filter flags */ };
PATCH 9/10 xfs_logprint: dump new attr log item fields
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Dump the new extended attribute log item fields. This was split out from the previous patch to make libxfs resyncing easier. This code needs more cleaning, which we'll do in the next few patches before moving on to the parent pointer code.
--- logprint/log_redo.c | 132 +++++++++++++++++++++++++++++++++++++++++---------- logprint/logprint.h | 6 ++ 2 files changed, 111 insertions(+), 27 deletions(-)
logprint/log_redo.c +107 -25
@@ -674,6 +674,12 @@ xfs_attri_copy_log_format(return 1 ; } +static inline unsigned int +xfs_attr_log_item_op (const struct xfs_attri_log_format *attrp) +{ +return attrp->alfi_op_flags &XFS_ATTRI_OP_FLAGS_TYPE_MASK ; +} + int xlog_print_trans_attri( char **ptr,
@@ -683,6 +689,10 @@ xlog_print_trans_attri(struct xfs_attri_log_format *src_f =NULL ;xlog_op_header_t *head =NULL ;uint dst_len; +unsigned int name_len =0 ; +unsigned int new_name_len =0 ; +unsigned int value_len =0 ; +unsigned int new_value_len =0 ;int error =0 ; dst_len =sizeof (struct xfs_attri_log_format );
@@ -705,27 +715,67 @@ xlog_print_trans_attri(memmove ((char *)src_f, *ptr, src_len); *ptr += src_len; -printf (_ ("ATTRI: #regs: %d name_len: %d, value_len: %d id: 0x%llx\n" ), - src_f->alfi_size, src_f->alfi_name_len, src_f->alfi_value_len, - (unsigned long long )src_f->alfi_id); +if (xfs_attr_log_item_op (src_f) ==XFS_ATTRI_OP_FLAGS_NVREPLACE ) { + name_len = src_f->alfi_old_name_len; + new_name_len = src_f->alfi_new_name_len; + value_len = src_f->alfi_value_len; + new_value_len = src_f->alfi_new_value_len; + }else { + name_len = src_f->alfi_name_len; + value_len = src_f->alfi_value_len; + } + +printf (_ ("ATTRI: #regs: %d name_len: %u, new_name_len: %u, value_len: %u, new_value_len: %u id: 0x%llx\n" ), + src_f->alfi_size, + name_len, + new_name_len, + value_len, + new_value_len, + (unsigned long long )src_f->alfi_id); + +if (name_len >0 ) { +printf (_ ("\n" )); + (*i)++; + head = (xlog_op_header_t *)*ptr; +xlog_print_op_header (head, *i, ptr); + error =xlog_print_trans_attri_name (ptr, +be32_to_cpu (head->oh_len),"name" ); +if (error) + goto error; + } -if (src_f->alfi_name_len >0 ) { +if (new_name_len >0 ) {printf (_ ("\n" )); (*i)++; head = (xlog_op_header_t *)*ptr;xlog_print_op_header (head, *i, ptr); - error =xlog_print_trans_attri_name (ptr,be32_to_cpu (head->oh_len)); + error =xlog_print_trans_attri_name (ptr, +be32_to_cpu (head->oh_len),"newname" );if (error) goto error; } -if (src_f->alfi_value_len >0 ) { +if (value_len >0 ) {printf (_ ("\n" )); (*i)++; head = (xlog_op_header_t *)*ptr;xlog_print_op_header (head, *i, ptr); - error =xlog_print_trans_attri_value (ptr,be32_to_cpu (head->oh_len), - src_f->alfi_value_len); + error =xlog_print_trans_attri_value (ptr, +be32_to_cpu (head->oh_len), value_len,"value" ); +if (error) + goto error; + } + +if (new_value_len >0 ) { +printf (_ ("\n" )); + (*i)++; + head = (xlog_op_header_t *)*ptr; +xlog_print_op_header (head, *i, ptr); + error =xlog_print_trans_attri_value (ptr, +be32_to_cpu (head->oh_len), new_value_len, +"newvalue" ); +if (error) + goto error; } error:free (src_f);
@@ -736,31 +786,33 @@ xlog_print_trans_attri(int xlog_print_trans_attri_name (char **ptr, -uint src_len) +uint src_len, +const char *tag) { -printf (_ ("ATTRI: name len:%u\n" ), src_len); +printf (_ ("ATTRI: %s len:%u\n" ), tag, src_len);print_or_dump (*ptr, src_len); *ptr += src_len;return 0 ; -}/* xlog_print_trans_attri */ +}int xlog_print_trans_attri_value (char **ptr,uint src_len, -int value_len) +int value_len, +const char *tag) {int len =min (value_len, src_len); -printf (_ ("ATTRI: value len:%u\n" ), value_len); +printf (_ ("ATTRI: %s len:%u\n" ), tag, value_len);print_or_dump (*ptr, len); *ptr += src_len;return 0 ; -}/* xlog_print_trans_attri_value */ +}void xlog_recover_print_attri(
@@ -768,7 +820,10 @@ xlog_recover_print_attri( {struct xfs_attri_log_format *f, *src_f =NULL ;uint src_len, dst_len; - +unsigned int name_len =0 ; +unsigned int new_name_len =0 ; +unsigned int value_len =0 ; +unsigned int new_value_len =0 ;int region =0 ; src_f = (struct xfs_attri_log_format *)item->ri_buf[0 ].i_addr;
@@ -788,24 +843,51 @@ xlog_recover_print_attri(if (xfs_attri_copy_log_format ((char *)src_f, src_len, f)) goto out; -printf (_ ("ATTRI: #regs: %d name_len: %d, value_len: %d id: 0x%llx\n" ), - f->alfi_size, f->alfi_name_len, f->alfi_value_len, (unsigned long long )f->alfi_id); +if (xfs_attr_log_item_op (f) ==XFS_ATTRI_OP_FLAGS_NVREPLACE ) { + name_len = f->alfi_old_name_len; + new_name_len = f->alfi_new_name_len; + value_len = f->alfi_value_len; + new_value_len = f->alfi_new_value_len; + }else { + name_len = f->alfi_name_len; + value_len = f->alfi_value_len; + } + +printf (_ ("ATTRI: #regs: %d name_len: %u, new_name_len: %u, value_len: %d, new_value_len: %u id: 0x%llx\n" ), + f->alfi_size, + name_len, + new_name_len, + value_len, + new_value_len, + (unsigned long long )f->alfi_id); -if (f->alfi_name_len >0 ) { +if (name_len >0 ) { region++; -printf (_ ("ATTRI: name len:%u\n" ), f->alfi_name_len); +printf (_ ("ATTRI: name len:%u\n" ), name_len);print_or_dump ((char *)item->ri_buf[region].i_addr, - f->alfi_name_len); + name_len); } -if (f->alfi_value_len >0 ) { -int len = f->alfi_value_len; +if (new_name_len >0 ) { + region++; +printf (_ ("ATTRI: newname len:%u\n" ), new_name_len); +print_or_dump ((char *)item->ri_buf[region].i_addr, + new_name_len); + } + +if (value_len >0 ) { +int len =min (MAX_ATTR_VAL_PRINT , value_len); + + region++; +printf (_ ("ATTRI: value len:%u\n" ), value_len); +print_or_dump ((char *)item->ri_buf[region].i_addr, len); + } -if (len >MAX_ATTR_VAL_PRINT ) - len =MAX_ATTR_VAL_PRINT ; +if (new_value_len >0 ) { +int len =min (MAX_ATTR_VAL_PRINT , new_value_len); region++; -printf (_ ("ATTRI: value len:%u\n" ), f->alfi_value_len); +printf (_ ("ATTRI: newvalue len:%u\n" ), new_value_len);print_or_dump ((char *)item->ri_buf[region].i_addr, len); }
logprint/logprint.h +4 -2
@@ -59,8 +59,10 @@ extern void xlog_recover_print_bud(struct xlog_recover_item *item);#define MAX_ATTR_VAL_PRINT 128extern int xlog_print_trans_attri (char **ptr,uint src_len,int *i); -extern int xlog_print_trans_attri_name (char **ptr,uint src_len); -extern int xlog_print_trans_attri_value (char **ptr,uint src_len,int value_len); +extern int xlog_print_trans_attri_name (char **ptr,uint src_len, +const char *tag); +extern int xlog_print_trans_attri_value (char **ptr,uint src_len,int value_len, +const char *tag);extern void xlog_recover_print_attri (struct xlog_recover_item *item);extern int xlog_print_trans_attrd (char **ptr,uint len);extern void xlog_recover_print_attrd (struct xlog_recover_item *item);
PATCH 10/10 xfs_logprint: print missing attri header fields
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Not sure why logprint doesn't print the op flags, inode, or attr filter fields. Make it do that.
--- logprint/log_redo.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
logprint/log_redo.c +8 -2
@@ -725,8 +725,11 @@ xlog_print_trans_attri( value_len = src_f->alfi_value_len; } - printf(_("ATTRI: #regs: %d name_len: %u, new_name_len: %u, value_len: %u, new_value_len: %u id: 0x%llx\n"), + printf(_("ATTRI: #regs: %d f: 0x%x, ino: 0x%llx, attr_filter: 0x%x, name_len: %u, new_name_len: %u, value_len: %u, new_value_len: %u id: 0x%llx\n"), src_f->alfi_size, + src_f->alfi_op_flags, + (unsigned long long)src_f->alfi_ino, + src_f->alfi_attr_filter, name_len, new_name_len, value_len,
@@ -853,8 +856,11 @@ xlog_recover_print_attri( value_len = f->alfi_value_len; } - printf(_("ATTRI: #regs: %d name_len: %u, new_name_len: %u, value_len: %d, new_value_len: %u id: 0x%llx\n"), + printf(_("ATTRI: #regs: %d f: 0x%x, ino: 0x%llx, attr_filter: 0x%x, name_len: %u, new_name_len: %u, value_len: %u, new_value_len: %u id: 0x%llx\n"), f->alfi_size, + f->alfi_op_flags, + (unsigned long long)f->alfi_ino, + f->alfi_attr_filter, name_len, new_name_len, value_len,
cover xfsprogs: Parent Pointers
In reply to Darrick J. WongHi all,
This is the latest parent pointer attributes for xfs. The goal of this patch set is to add a parent pointer attribute to each inode. The attribute name containing the parent inode, generation, and directory offset, while the attribute value contains the file name. This feature will enable future optimizations for online scrub, shrink, nfs handles, verity, or any other feature that could make use of quickly deriving an inodes path from the mount point.
At this point, Allison is moving on to other things, so I've merged her patchset into djwong-dev for merging.
Updates since v11 [djwong]:
Rebase on 6.4-rc and make some tweaks and bugfixes to enable the repair prototypes. Merge with djwong-dev and make online repair actually work.
Updates since v10 [djwong]:
Merge in the ondisk format changes to get rid of the diroffset conflicts with the parent pointer repair code, rebase the entire series with the attr vlookup changes first, and merge all the other random fixes.
Updates since v9:
Reordered patches 2 and 3 to be 6 and 7
xfs: Add xfs_verify_pptr
moved parent pointer validators to xfs_parent
xfs: Add parent pointer ioctl
Extra validation checks for fs id
added missing release for the inode
use GFP_KERNEL flags for malloc/realloc reworked ioctl to use pptr listenty and flex array
NEW
xfs: don't remove the attr fork when parent pointers are enabled
NEW
directory lookups should return diroffsets too
NEW
xfs: move/add parent pointer validators to xfs_parent
Updates since v8:
xfs: parent pointer attribute creation
Fix xfs_parent_init to release log assist on alloc fail Add slab cache for xfs_parent_defer
Fix xfs_create to release after unlock
Add xfs_parent_start and xfs_parent_finish wrappers removed unused xfs_parent_name_irec and xfs_init_parent_name_irec
xfs: add parent attributes to link
Start/finish wrapper updates
Fix xfs_link to disallow reservationless quotas
xfs: add parent attributes to symlink
Fix xfs_symlink to release after unlock
Start/finish wrapper updates
xfs: remove parent pointers in unlink
Start/finish wrapper updates
Add missing parent free
xfs: Add parent pointers to rename
Start/finish wrapper updates
Fix rename to only grab logged xattr once Fix xfs_rename to disallow reservationless quotas Fix double unlock on dqattach fail
Move parent frees to out_release_wip
xfs: Add parent pointers to xfs_cross_rename
Hoist parent pointers into rename
Questions comments and feedback appreciated!
Thanks all!
Allison
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
kernel git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfs-linux.git/log/?h=pptrs
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=pptrs
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=pptrs
--- db/attr.c | 67 ++++++ db/attrshort.c | 51 ++++ db/metadump.c | 316 +++++++++++++++++++++++++++- db/namei.c | 335 +++++++++++++++++++++++++++++ include/handle.h | 1 include/libxfs.h | 1 include/xfs_inode.h | 6 + io/parent.c | 527 ++++++++++++++++------------------------------ libfrog/Makefile | 2 libfrog/fsgeom.c | 4 libfrog/getparents.c | 345 ++++++++++++++++++++++++++++++ libfrog/getparents.h | 36 +++ libfrog/paths.c | 167 +++++++++++++++ libfrog/paths.h | 25 ++ libhandle/handle.c | 7 - libxfs/Makefile | 3 libxfs/init.c | 7 + libxfs/libxfs_api_defs.h | 14 + libxfs/libxfs_priv.h | 6 - libxfs/util.c | 14 + libxfs/xfs_attr.c | 21 +- libxfs/xfs_attr.h | 14 + libxfs/xfs_attr_leaf.c | 6 - libxfs/xfs_attr_sf.h | 1 libxfs/xfs_da_format.h | 34 +++ libxfs/xfs_format.h | 4 libxfs/xfs_fs.h | 2 libxfs/xfs_fs_staging.h | 66 ++++++ libxfs/xfs_log_format.h | 1 libxfs/xfs_log_rlimit.c | 53 +++++ libxfs/xfs_parent.c | 325 ++++++++++++++++++++++++++++ libxfs/xfs_parent.h | 101 +++++++++ libxfs/xfs_sb.c | 4 libxfs/xfs_trans_resv.c | 324 ++++++++++++++++++++++++---- libxfs/xfs_trans_space.c | 121 +++++++++++ libxfs/xfs_trans_space.h | 25 +- logprint/log_redo.c | 81 +++++++ man/man3/xfsctl.3 | 63 +++++ man/man8/xfs_db.8 | 9 + man/man8/xfs_io.8 | 30 ++- man/man8/xfs_spaceman.8 | 7 + mkfs/proto.c | 63 ++++- mkfs/xfs_mkfs.c | 31 ++- repair/attr_repair.c | 25 +- repair/phase6.c | 14 + scrub/common.c | 41 +++- spaceman/Makefile | 4 spaceman/file.c | 7 + spaceman/health.c | 53 ++++- spaceman/space.h | 3 50 files changed, 2968 insertions(+), 499 deletions(-) create mode 100644 libfrog/getparents.c create mode 100644 libfrog/getparents.h create mode 100644 libxfs/xfs_parent.c create mode 100644 libxfs/xfs_parent.h create mode 100644 libxfs/xfs_trans_space.c
PATCH 1/30 xfs: add parent pointer support to attribute code
From: Allison Henderson <[email protected]>
Add the new parent attribute type. XFS_ATTR_PARENT is used only for parent pointer entries; it uses reserved blocks like XFS_ATTR_ROOT.
--- libxfs/xfs_attr.c | 3 ++- libxfs/xfs_da_format.h | 5 ++++- libxfs/xfs_log_format.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-)
libxfs/xfs_attr.c +2 -1
@@ -990,7 +990,8 @@ xfs_attr_set(struct xfs_inode *dp = args->dp;struct xfs_mount *mp = dp->i_mount;struct xfs_trans_res tres; -bool rsvd = (args->attr_filter &XFS_ATTR_ROOT ); +bool rsvd = (args->attr_filter & (XFS_ATTR_ROOT | +XFS_ATTR_PARENT ));bool is_remove = args->op_flags &XFS_DA_OP_REMOVE ;int error, local;int rmt_blks =0 ;
libxfs/xfs_da_format.h +4 -1
@@ -699,12 +699,15 @@ struct xfs_attr3_leafblock {#define XFS_ATTR_LOCAL_BIT 0/* attr is stored locally */ #define XFS_ATTR_ROOT_BIT 1/* limit access to trusted attrs */ #define XFS_ATTR_SECURE_BIT 2/* limit access to secure attrs */ +#define XFS_ATTR_PARENT_BIT 3/* parent pointer attrs */ #define XFS_ATTR_INCOMPLETE_BIT 7/* attr in middle of create/delete */ #define XFS_ATTR_LOCAL (1u << XFS_ATTR_LOCAL_BIT)#define XFS_ATTR_ROOT (1u << XFS_ATTR_ROOT_BIT)#define XFS_ATTR_SECURE (1u << XFS_ATTR_SECURE_BIT) +#define XFS_ATTR_PARENT (1u << XFS_ATTR_PARENT_BIT)#define XFS_ATTR_INCOMPLETE (1u << XFS_ATTR_INCOMPLETE_BIT) -#define XFS_ATTR_NSP_ONDISK_MASK (XFS_ATTR_ROOT | XFS_ATTR_SECURE) +#define XFS_ATTR_NSP_ONDISK_MASK \ + (XFS_ATTR_ROOT | XFS_ATTR_SECURE | XFS_ATTR_PARENT)#define XFS_ATTR_NAMESPACE_STR \ { XFS_ATTR_LOCAL, "local" }, \
libxfs/xfs_log_format.h +1 -0
@@ -1049,6 +1049,7 @@ struct xfs_icreate_log {*/ #define XFS_ATTRI_FILTER_MASK (XFS_ATTR_ROOT | \ XFS_ATTR_SECURE | \ + XFS_ATTR_PARENT | \ XFS_ATTR_INCOMPLETE)/*
PATCH 2/30 xfs: define parent pointer ondisk extended attribute format
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
We need to define the parent pointer attribute format before we start adding support for it into all the code that needs to use it. The EA format we will use encodes the following information:
name={parent inode #, parent inode generation, dirent namehash}
value={dirent name}The inode/gen gives all the information we need to reliably identify the parent without requiring child->parent lock ordering, and allows userspace to do pathname component level reconstruction without the kernel ever needing to verify the parent itself as part of ioctl calls. Storing the dirent name hash in the key reduces hash collisions if a file is hardlinked multiple times in the same directory.
By using the NVLOOKUP mode in the extended attribute code to match parent pointers using both the xattr name and value, we can identify the exact parent pointer EA we need to modify/remove in rename/unlink operations without searching the entire EA space.
By storing the dirent name, we have enough information to be able to validate and reconstruct damaged directory trees. Earlier iterations of this patchset encoded the directory offset in the parent pointer key, but this format required repair to keep that in sync across directory rebuilds, which is unnecessary complexity.
--- libxfs/xfs_da_format.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
libxfs/xfs_da_format.h +21 -0
@@ -821,4 +821,25 @@ static inline unsigned int xfs_dir2_dirblock_bytes(struct xfs_sb *sbp)xfs_failaddr_t xfs_da3_blkinfo_verify (struct xfs_buf *bp,struct xfs_da3_blkinfo *hdr3); +/* +* Parent pointer attribute format definition +* +* The xattr name encodes the parent inode number, generation and the crc32c +* hash of the dirent name. +* +* The xattr value contains the dirent name. +*/ +struct xfs_parent_name_rec { +__be64 p_ino; +__be32 p_gen; +__be32 p_namehash; +}; + +/* +* Maximum size of the dirent name that can be stored in a parent pointer. +* This matches the maximum dirent name length. +*/ +#define XFS_PARENT_DIRENT_NAME_MAX_SIZE \ + (MAXNAMELEN - 1) +#endif /* __XFS_DA_FORMAT_H__ */
PATCH 3/30 xfs: add parent pointer validator functions
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Attribute names of parent pointers are not strings. So we need to modify attr_namecheck to verify parent pointer records when the XFS_ATTR_PARENT flag is set. At the same time, we need to validate attr values during log recovery if the xattr is really a parent pointer.
--- libxfs/Makefile | 2 + libxfs/xfs_attr.c | 10 ++++- libxfs/xfs_attr.h | 3 +- libxfs/xfs_da_format.h | 8 ++++ libxfs/xfs_parent.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ libxfs/xfs_parent.h | 16 ++++++++ repair/attr_repair.c | 19 ++++++---- 7 files changed, 140 insertions(+), 10 deletions(-) create mode 100644 libxfs/xfs_parent.c create mode 100644 libxfs/xfs_parent.h
libxfs/Makefile +2 -0
@@ -49,6 +49,7 @@ HFILES = \ xfs_ialloc_btree.h \ xfs_inode_buf.h \ xfs_inode_fork.h \ + xfs_parent.h \ xfs_quota_defs.h \ xfs_refcount.h \ xfs_refcount_btree.h \
@@ -99,6 +100,7 @@ CFILES = cache.c \ xfs_inode_fork.c \ xfs_ialloc_btree.c \ xfs_log_rlimit.c \ + xfs_parent.c \ xfs_refcount.c \ xfs_refcount_btree.c \ xfs_rmap.c \
libxfs/xfs_attr.c +8 -2
@@ -24,6 +24,7 @@#include "xfs_quota_defs.h" #include "xfs_trans_space.h" #include "xfs_trace.h" +#include "xfs_parent.h" struct kmem_cache *xfs_attr_intent_cache;
@@ -1594,9 +1595,14 @@ xfs_attr_node_get(/* Returns true if the attribute entry name is valid. */ bool xfs_attr_namecheck ( -const void *name, -size_t length) +struct xfs_mount *mp, +const void *name, +size_t length, +unsigned int flags) { +if (flags &XFS_ATTR_PARENT ) +return xfs_parent_namecheck (mp, name, length, flags); +/* * MAXNAMELEN includes the trailing null, but (name/length) leave it * out, so use >= for the length check.
libxfs/xfs_attr.h +2 -1
@@ -552,7 +552,8 @@ int xfs_attr_get(struct xfs_da_args *args);int xfs_attr_set (struct xfs_da_args *args);int xfs_attr_set_iter (struct xfs_attr_intent *attr);int xfs_attr_remove_iter (struct xfs_attr_intent *attr); -bool xfs_attr_namecheck (const void *name,size_t length); +bool xfs_attr_namecheck (struct xfs_mount *mp,const void *name,size_t length, +unsigned int flags);int xfs_attr_calc_size (struct xfs_da_args *args,int *local);void xfs_init_attr_trans (struct xfs_da_args *args,struct xfs_trans_res *tres,unsigned int *total);
libxfs/xfs_da_format.h +8 -0
@@ -747,6 +747,14 @@ xfs_attr3_leaf_name(xfs_attr_leafblock_t *leafp, int idx)return &((char *)leafp)[be16_to_cpu (entries[idx].nameidx)]; } +static inline int +xfs_attr3_leaf_flags (xfs_attr_leafblock_t *leafp,int idx) +{ +struct xfs_attr_leaf_entry *entries =xfs_attr3_leaf_entryp (leafp); + +return entries[idx].flags; +} +static inline xfs_attr_leaf_name_remote_t *xfs_attr3_leaf_name_remote (xfs_attr_leafblock_t *leafp,int idx) {
libxfs/xfs_parent.c new file +92 -0
92 lines not on this page · raw message
libxfs/xfs_parent.h new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2022-2023 Oracle, Inc. +* All Rights Reserved. +*/ +#ifndef __XFS_PARENT_H__ +#define __XFS_PARENT_H__ + +/* Metadata validators */ +bool xfs_parent_namecheck (struct xfs_mount *mp, +const struct xfs_parent_name_rec *rec,size_t reclen, +unsigned int attr_flags); +bool xfs_parent_valuecheck (struct xfs_mount *mp,const void *value, +size_t valuelen); + +#endif /* __XFS_PARENT_H__ */
repair/attr_repair.c +12 -7
@@ -293,8 +293,9 @@ process_shortform_attr( }/* namecheck checks for null chars in attr names. */ -if (!libxfs_attr_namecheck (currententry->nameval, - currententry->namelen)) { +if (!libxfs_attr_namecheck (mp, currententry->nameval, + currententry->namelen, + currententry->flags)) {do_warn (_ ("entry contains illegal character in shortform attribute name\n" )); junkit =1 ;
@@ -454,12 +455,14 @@ process_leaf_attr_local( xfs_dablk_t da_bno, xfs_ino_t ino) { -xfs_attr_leaf_name_local_t *local; +xfs_attr_leaf_name_local_t *local; +int flags; local =xfs_attr3_leaf_name_local (leaf, i); + flags =xfs_attr3_leaf_flags (leaf, i);if (local->namelen ==0 || - !libxfs_attr_namecheck (local->nameval, - local->namelen)) { + !libxfs_attr_namecheck (mp, local->nameval, + local->namelen, flags)) {do_warn (_ ("attribute entry %d in attr block %u, inode %" PRIu64" has bad name (namelen = %d)\n" ), i, da_bno, ino, local->namelen);
@@ -510,12 +513,14 @@ process_leaf_attr_remote( {xfs_attr_leaf_name_remote_t *remotep;char * value; +int flags; remotep =xfs_attr3_leaf_name_remote (leaf, i); + flags =xfs_attr3_leaf_flags (leaf, i); if (remotep->namelen == 0 || - !libxfs_attr_namecheck(remotep->name, - remotep->namelen) || + !libxfs_attr_namecheck(mp, remotep->name, + remotep->namelen, flags) || be32_to_cpu(entry->hashval) != libxfs_da_hashname((unsigned char *)&remotep->name[0], remotep->namelen) ||
PATCH 4/30 xfs: extend transaction reservations for parent attributes
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
We need to add, remove or modify parent pointer attributes during create/link/unlink/rename operations atomically with the dirents in the parent directories being modified. This means they need to be modified in the same transaction as the parent directories, and so we need to add the required space for the attribute modifications to the transaction reservations.
--- libxfs/libxfs_priv.h | 1 libxfs/xfs_trans_resv.c | 324 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 273 insertions(+), 52 deletions(-)
libxfs/libxfs_priv.h +1 -0
@@ -544,6 +544,7 @@ static inline int retzero(void) { return 0; }#define xfs_icreate_log (tp, agno, agbno, cnt, isize, len, gen) ((void) 0)#define xfs_sb_validate_fsb_count (sbp, nblks) (0) +#define xlog_calc_iovec_len (len) roundup(len, sizeof(uint32_t))/* * Prototypes for kernel static functions that are aren't in their
libxfs/xfs_trans_resv.c +272 -52
418 lines not on this page · raw message
PATCH 5/30 xfs: parent pointer attribute creation
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Add parent pointer attribute during xfs_create, and subroutines to initialize attributes
--- include/libxfs.h | 1 include/xfs_inode.h | 6 +++ libxfs/Makefile | 1 libxfs/init.c | 3 + libxfs/libxfs_api_defs.h | 2 + libxfs/libxfs_priv.h | 5 +- libxfs/xfs_attr.c | 4 +- libxfs/xfs_attr.h | 4 +- libxfs/xfs_parent.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++ libxfs/xfs_parent.h | 41 ++++++++++++++++++ libxfs/xfs_trans_space.c | 52 +++++++++++++++++++++++ libxfs/xfs_trans_space.h | 9 ++-- repair/phase6.c | 8 ++-- 13 files changed, 224 insertions(+), 14 deletions(-) create mode 100644 libxfs/xfs_trans_space.c
include/libxfs.h +1 -0
@@ -83,6 +83,7 @@ struct iomap;#include "xfs_btree_staging.h" #include "xfs_symlink_remote.h" #include "xfs_ag_resv.h" +#include "xfs_parent.h" #ifndef ARRAY_SIZE #define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0]))
include/xfs_inode.h +6 -0
@@ -175,6 +175,12 @@ static inline struct inode *VFS_I(struct xfs_inode *ip)return &ip->i_vnode; } +/* convert from const xfs inode to const vfs inode */ +static inline const struct inode *VFS_IC (const struct xfs_inode *ip) +{ +return &ip->i_vnode; +} +/* We only have i_size in the xfs inode in userspace */ static inline loff_t i_size_read (struct inode *inode) {
libxfs/Makefile +1 -0
@@ -111,6 +111,7 @@ CFILES = cache.c \ xfs_symlink_remote.c \ xfs_trans_inode.c \ xfs_trans_resv.c \ + xfs_trans_space.c \ xfs_types.c #
libxfs/init.c +3 -0
@@ -258,6 +258,8 @@ init_caches(void) "xfs_extfree_item"); xfs_trans_cache =kmem_cache_init (sizeof (struct xfs_trans ),"xfs_trans" ); + xfs_parent_intent_cache =kmem_cache_init ( +sizeof (struct xfs_parent_defer ),"xfs_parent_defer" ); } static int
@@ -275,6 +277,7 @@ destroy_caches(void)xfs_btree_destroy_cur_caches (); leaked +=kmem_cache_destroy (xfs_extfree_item_cache); leaked +=kmem_cache_destroy (xfs_trans_cache); + leaked +=kmem_cache_destroy (xfs_parent_intent_cache);return leaked; }
libxfs/libxfs_api_defs.h +2 -0
@@ -87,6 +87,7 @@#define xfs_bunmapi libxfs_bunmapi#define xfs_bwrite libxfs_bwrite#define xfs_calc_dquots_per_chunk libxfs_calc_dquots_per_chunk +#define xfs_create_space_res libxfs_create_space_res#define xfs_da3_node_hdr_from_disk libxfs_da3_node_hdr_from_disk#define xfs_da_get_buf libxfs_da_get_buf#define xfs_da_hashname libxfs_da_hashname
@@ -172,6 +173,7 @@#define xfs_log_get_max_trans_res libxfs_log_get_max_trans_res#define xfs_log_sb libxfs_log_sb#define xfs_mode_to_ftype libxfs_mode_to_ftype +#define xfs_mkdir_space_res libxfs_mkdir_space_res#define xfs_perag_get libxfs_perag_get#define xfs_perag_put libxfs_perag_put#define xfs_prealloc_blocks libxfs_prealloc_blocks
libxfs/libxfs_priv.h +3 -2
@@ -639,8 +639,9 @@ int libxfs_zero_extent(struct xfs_inode *ip, xfs_fsblock_t start_fsb,/* xfs_log.c */ bool xfs_log_check_lsn (struct xfs_mount *,xfs_lsn_t );void xfs_log_item_init (struct xfs_mount *,struct xfs_log_item *,int ); -#define xfs_attr_use_log_assist (mp) (0) -#define xlog_drop_incompat_feat (log) do { } while (0) +#define xfs_attr_grab_log_assist (mp) (0) +#define xfs_attr_rele_log_assist (mp) ((void) 0) +#define xlog_drop_incompat_feat (log,w) do { } while (0)#define xfs_log_in_recovery (mp) (false)/* xfs_icache.c */
libxfs/xfs_attr.c +2 -2
@@ -893,7 +893,7 @@ xfs_attr_lookup(return error; } -static int +int xfs_attr_intent_init( struct xfs_da_args *args, unsigned int op_flags, /* op flag (set or remove) */
@@ -911,7 +911,7 @@ xfs_attr_intent_init( }/* Sets an attribute for an inode as a deferred operation */ -static int +int xfs_attr_defer_add (struct xfs_da_args *args) {
libxfs/xfs_attr.h +3 -1
@@ -549,6 +549,7 @@ int xfs_inode_hasattr(struct xfs_inode *ip);bool xfs_attr_is_leaf (struct xfs_inode *ip);int xfs_attr_get_ilocked (struct xfs_da_args *args);int xfs_attr_get (struct xfs_da_args *args); +int xfs_attr_defer_add (struct xfs_da_args *args);int xfs_attr_set (struct xfs_da_args *args);int xfs_attr_set_iter (struct xfs_attr_intent *attr);int xfs_attr_remove_iter (struct xfs_attr_intent *attr);
@@ -557,7 +558,8 @@ bool xfs_attr_namecheck(struct xfs_mount *mp, const void *name, size_t length,int xfs_attr_calc_size (struct xfs_da_args *args,int *local);void xfs_init_attr_trans (struct xfs_da_args *args,struct xfs_trans_res *tres,unsigned int *total); - +int xfs_attr_intent_init (struct xfs_da_args *args,unsigned int op_flags, +struct xfs_attr_intent **attr);/* * Check to see if the attr should be upgraded from non-existent or shortform to * single-leaf-block attribute list.
libxfs/xfs_parent.c +102 -0
117 lines not on this page · raw message
libxfs/xfs_parent.h +40 -1
44 lines not on this page · raw message
libxfs/xfs_trans_space.c new file +52 -0
52 lines not on this page · raw message
libxfs/xfs_trans_space.h +5 -4
@@ -80,8 +80,6 @@/* This macro is not used - see inline code in xfs_attr_set */ #define XFS_ATTRSET_SPACE_RES (mp, v) \ (XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK) + XFS_B_TO_FSB(mp, v)) -#define XFS_CREATE_SPACE_RES (mp,nl) \ - (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))#define XFS_DIOSTRAT_SPACE_RES (mp, v) \ (XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + (v))#define XFS_GROWFS_SPACE_RES (mp) \
@@ -90,8 +88,6 @@ ((b) + XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK))#define XFS_LINK_SPACE_RES (mp,nl) \ XFS_DIRENTER_SPACE_RES(mp,nl) -#define XFS_MKDIR_SPACE_RES (mp,nl) \ - (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))#define XFS_QM_DQALLOC_SPACE_RES (mp) \ (XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + \ XFS_DQUOT_CLUSTER_SIZE_FSB)
@@ -106,5 +102,10 @@#define XFS_IFREE_SPACE_RES (mp) \ (xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0) +unsigned int xfs_parent_calc_space_res (struct xfs_mount *mp, +unsigned int namelen); + +unsigned int xfs_create_space_res (struct xfs_mount *mp,unsigned int namelen); +unsigned int xfs_mkdir_space_res (struct xfs_mount *mp,unsigned int namelen);#endif /* __XFS_TRANS_SPACE_H__ */
repair/phase6.c +4 -4
@@ -908,7 +908,7 @@ mk_orphanage(xfs_mount_t *mp)/* * could not be found, create it */ - nres =XFS_MKDIR_SPACE_RES (mp, xname.len); + nres =libxfs_mkdir_space_res (mp, xname.len); i = -libxfs_trans_alloc (mp, &M_RES (mp)->tr_mkdir, nres,0 ,0 , &tp);if (i)res_failed (i);
@@ -1319,7 +1319,7 @@ longform_dir2_rebuild( p->name.name[1] == '.'))))continue ; - nres =XFS_CREATE_SPACE_RES (mp, p->name.len); + nres =libxfs_create_space_res (mp, p->name.len); error = -libxfs_trans_alloc (mp, &M_RES (mp)->tr_create, nres,0 ,0 , &tp);if (error)
@@ -2931,7 +2931,7 @@ _("error %d fixing shortform directory %llu\n"),do_warn (_ ("recreating root directory .. entry\n" )); - nres =XFS_MKDIR_SPACE_RES (mp,2 ); + nres =libxfs_mkdir_space_res (mp,2 ); error = -libxfs_trans_alloc (mp, &M_RES (mp)->tr_mkdir, nres,0 ,0 , &tp);if (error)
@@ -2986,7 +2986,7 @@ _("error %d fixing shortform directory %llu\n"),do_warn (_ ("creating missing \".\" entry in dir ino %" PRIu64"\n" ), ino); - nres =XFS_MKDIR_SPACE_RES (mp,1 ); + nres =libxfs_mkdir_space_res (mp,1 ); error = -libxfs_trans_alloc (mp, &M_RES (mp)->tr_mkdir, nres,0 ,0 , &tp);if (error)
PATCH 6/30 xfs: add parent attributes to link
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
This patch modifies xfs_link to add a parent pointer to the inode.
--- libxfs/xfs_trans_space.c | 14 ++++++++++++++ libxfs/xfs_trans_space.h | 3 +-- 2 files changed, 15 insertions(+), 2 deletions(-)
libxfs/xfs_trans_space.c +14 -0
@@ -50,3 +50,17 @@ xfs_mkdir_space_res( {return xfs_create_space_res (mp, namelen); } + +unsigned int +xfs_link_space_res ( +struct xfs_mount *mp, +unsigned int namelen) +{ +unsigned int ret; + + ret =XFS_DIRENTER_SPACE_RES (mp, namelen); +if (xfs_has_parent (mp)) + ret +=xfs_parent_calc_space_res (mp, namelen); + +return ret; +}
libxfs/xfs_trans_space.h +1 -2
@@ -86,8 +86,6 @@ (2 * (mp)->m_alloc_maxlevels)#define XFS_GROWFSRT_SPACE_RES (mp,b) \ ((b) + XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK)) -#define XFS_LINK_SPACE_RES (mp,nl) \ - XFS_DIRENTER_SPACE_RES(mp,nl)#define XFS_QM_DQALLOC_SPACE_RES (mp) \ (XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK) + \ XFS_DQUOT_CLUSTER_SIZE_FSB)
@@ -107,5 +105,6 @@ unsigned int xfs_parent_calc_space_res(struct xfs_mount *mp,unsigned int xfs_create_space_res (struct xfs_mount *mp,unsigned int namelen);unsigned int xfs_mkdir_space_res (struct xfs_mount *mp,unsigned int namelen); +unsigned int xfs_link_space_res (struct xfs_mount *mp,unsigned int namelen);#endif /* __XFS_TRANS_SPACE_H__ */
PATCH 7/30 xfs: add parent attributes to symlink
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
This patch modifies xfs_symlink to add a parent pointer to the inode.
--- libxfs/xfs_trans_space.c | 17 +++++++++++++++++ libxfs/xfs_trans_space.h | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-)
libxfs/xfs_trans_space.c +17 -0
@@ -64,3 +64,20 @@ xfs_link_space_res(return ret; } + +unsigned int +xfs_symlink_space_res ( +struct xfs_mount *mp, +unsigned int namelen, +unsigned int fsblocks) +{ +unsigned int ret; + + ret =XFS_IALLOC_SPACE_RES (mp) +XFS_DIRENTER_SPACE_RES (mp, namelen) + + fsblocks; + +if (xfs_has_parent (mp)) + ret +=xfs_parent_calc_space_res (mp, namelen); + +return ret; +}
libxfs/xfs_trans_space.h +2 -2
@@ -95,8 +95,6 @@ XFS_DIRREMOVE_SPACE_RES(mp)#define XFS_RENAME_SPACE_RES (mp,nl) \ (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl)) -#define XFS_SYMLINK_SPACE_RES (mp,nl,b) \ - (XFS_IALLOC_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl) + (b))#define XFS_IFREE_SPACE_RES (mp) \ (xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0)
@@ -106,5 +104,7 @@ unsigned int xfs_parent_calc_space_res(struct xfs_mount *mp,unsigned int xfs_create_space_res (struct xfs_mount *mp,unsigned int namelen);unsigned int xfs_mkdir_space_res (struct xfs_mount *mp,unsigned int namelen);unsigned int xfs_link_space_res (struct xfs_mount *mp,unsigned int namelen); +unsigned int xfs_symlink_space_res (struct xfs_mount *mp,unsigned int namelen, +unsigned int fsblocks);#endif /* __XFS_TRANS_SPACE_H__ */
PATCH 8/30 xfs: remove parent pointers in unlink
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
This patch removes the parent pointer attribute during unlink
--- libxfs/libxfs_api_defs.h | 1 + libxfs/xfs_attr.c | 2 +- libxfs/xfs_attr.h | 1 + libxfs/xfs_parent.c | 33 +++++++++++++++++++++++++++++++++ libxfs/xfs_parent.h | 4 ++++ libxfs/xfs_trans_space.c | 13 +++++++++++++ libxfs/xfs_trans_space.h | 3 +-- repair/phase6.c | 6 +++--- 8 files changed, 57 insertions(+), 6 deletions(-)
libxfs/libxfs_api_defs.h +1 -0
@@ -188,6 +188,7 @@#define xfs_refcountbt_stage_cursor libxfs_refcountbt_stage_cursor#define xfs_refcount_get_rec libxfs_refcount_get_rec#define xfs_refcount_lookup_le libxfs_refcount_lookup_le +#define xfs_remove_space_res libxfs_remove_space_res#define xfs_rmap_alloc libxfs_rmap_alloc#define xfs_rmapbt_calc_reserves libxfs_rmapbt_calc_reserves
libxfs/xfs_attr.c +1 -1
@@ -957,7 +957,7 @@ xfs_attr_defer_replace( }/* Removes an attribute for an inode as a deferred operation */ -static int +int xfs_attr_defer_remove (struct xfs_da_args *args) {
libxfs/xfs_attr.h +1 -0
@@ -550,6 +550,7 @@ bool xfs_attr_is_leaf(struct xfs_inode *ip);int xfs_attr_get_ilocked (struct xfs_da_args *args);int xfs_attr_get (struct xfs_da_args *args);int xfs_attr_defer_add (struct xfs_da_args *args); +int xfs_attr_defer_remove (struct xfs_da_args *args);int xfs_attr_set (struct xfs_da_args *args);int xfs_attr_set_iter (struct xfs_attr_intent *attr);int xfs_attr_remove_iter (struct xfs_attr_intent *attr);
libxfs/xfs_parent.c +33 -0
@@ -28,6 +28,7 @@#include "xfs_da_format.h" #include "xfs_format.h" #include "xfs_trans_space.h" +#include "xfs_health.h" struct kmem_cache *xfs_parent_intent_cache;
@@ -183,6 +184,38 @@ xfs_parent_add(return xfs_attr_defer_add (args); } +/* Remove a parent pointer to reflect a dirent removal. */ +int +xfs_parent_remove ( +struct xfs_trans *tp, +struct xfs_parent_defer *parent, +struct xfs_inode *dp, +const struct xfs_name *parent_name, +struct xfs_inode *child) +{ +struct xfs_da_args *args = &parent->args; + +/* +* For regular attrs, removing an attr from a !hasattr inode is a nop. +* For parent pointers, we require that the pointer must exist if the +* caller wants us to remove the pointer. +*/ +if (XFS_IS_CORRUPT (child->i_mount, !xfs_inode_hasattr (child))) { +xfs_inode_mark_sick (child,XFS_SICK_INO_PARENT ); +return -EFSCORRUPTED ; + } + +xfs_init_parent_name_rec (&parent->rec, dp, parent_name, child); + args->hashval =xfs_parent_hashname (dp, parent); + + args->trans = tp; + args->dp = child; + +xfs_init_parent_davalue (&parent->args, parent_name); + +return xfs_attr_defer_remove (args); +} +/* Cancel a parent pointer operation. */ void __xfs_parent_cancel(
libxfs/xfs_parent.h +4 -0
@@ -41,6 +41,10 @@ xfs_parent_start(int xfs_parent_add (struct xfs_trans *tp,struct xfs_parent_defer *parent,struct xfs_inode *dp,const struct xfs_name *parent_name,struct xfs_inode *child); +int xfs_parent_remove (struct xfs_trans *tp,struct xfs_parent_defer *parent, +struct xfs_inode *dp,const struct xfs_name *parent_name, +struct xfs_inode *child); +void __xfs_parent_cancel (struct xfs_mount *mp,struct xfs_parent_defer *parent); static inline void
libxfs/xfs_trans_space.c +13 -0
@@ -81,3 +81,16 @@ xfs_symlink_space_res(return ret; } + +unsigned int +xfs_remove_space_res ( +struct xfs_mount *mp, +unsigned int namelen) +{ +unsigned int ret =XFS_DIRREMOVE_SPACE_RES (mp); + +if (xfs_has_parent (mp)) + ret +=xfs_parent_calc_space_res (mp, namelen); + +return ret; +}
libxfs/xfs_trans_space.h +1 -2
@@ -91,8 +91,6 @@ XFS_DQUOT_CLUSTER_SIZE_FSB)#define XFS_QM_QINOCREATE_SPACE_RES (mp) \ XFS_IALLOC_SPACE_RES(mp) -#define XFS_REMOVE_SPACE_RES (mp) \ - XFS_DIRREMOVE_SPACE_RES(mp)#define XFS_RENAME_SPACE_RES (mp,nl) \ (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))#define XFS_IFREE_SPACE_RES (mp) \
@@ -106,5 +104,6 @@ unsigned int xfs_mkdir_space_res(struct xfs_mount *mp, unsigned int namelen);unsigned int xfs_link_space_res (struct xfs_mount *mp,unsigned int namelen);unsigned int xfs_symlink_space_res (struct xfs_mount *mp,unsigned int namelen,unsigned int fsblocks); +unsigned int xfs_remove_space_res (struct xfs_mount *mp,unsigned int namelen);#endif /* __XFS_TRANS_SPACE_H__ */
repair/phase6.c +3 -3
@@ -1259,7 +1259,7 @@ longform_dir2_rebuild( libxfs_dir_ino_validate(mp, pip.i_ino)) pip.i_ino = mp->m_sb.sb_rootino; - nres =XFS_REMOVE_SPACE_RES (mp); + nres =libxfs_remove_space_res (mp,0 ); error = -libxfs_trans_alloc (mp, &M_RES (mp)->tr_remove, nres,0 ,0 , &tp);if (error)res_failed (error);
@@ -1365,7 +1365,7 @@ dir2_kill_block(int nres;xfs_trans_t *tp; - nres =XFS_REMOVE_SPACE_RES (mp); + nres =libxfs_remove_space_res (mp,0 ); error = -libxfs_trans_alloc (mp, &M_RES (mp)->tr_remove, nres,0 ,0 , &tp);if (error)res_failed (error);
@@ -2884,7 +2884,7 @@ process_dir_inode(* inode but it's easier than wedging a * new define in ourselves. */ - nres = no_modify ?0 :XFS_REMOVE_SPACE_RES (mp); + nres = no_modify ?0 :libxfs_remove_space_res (mp,0 ); error = -libxfs_trans_alloc (mp, &M_RES (mp)->tr_remove, nres,0 ,0 , &tp);if (error)
PATCH 9/30 xfs: Add parent pointers to rename
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
This patch removes the old parent pointer attribute during the rename operation, and re-adds the updated parent pointer.
--- libxfs/xfs_attr.c | 2 + libxfs/xfs_attr.h | 1 + libxfs/xfs_parent.c | 68 +++++++++++++++++++++++++++++++++++++++++++--- libxfs/xfs_parent.h | 23 ++++++++++++++-- libxfs/xfs_trans_space.c | 25 +++++++++++++++++ libxfs/xfs_trans_space.h | 6 +++- 6 files changed, 115 insertions(+), 10 deletions(-)
libxfs/xfs_attr.c +1 -1
@@ -934,7 +934,7 @@ xfs_attr_defer_add( }/* Sets an attribute for an inode as a deferred operation */ -static int +int xfs_attr_defer_replace (struct xfs_da_args *args) {
libxfs/xfs_attr.h +1 -0
@@ -551,6 +551,7 @@ int xfs_attr_get_ilocked(struct xfs_da_args *args);int xfs_attr_get (struct xfs_da_args *args);int xfs_attr_defer_add (struct xfs_da_args *args);int xfs_attr_defer_remove (struct xfs_da_args *args); +int xfs_attr_defer_replace (struct xfs_da_args *args);int xfs_attr_set (struct xfs_da_args *args);int xfs_attr_set_iter (struct xfs_attr_intent *attr);int xfs_attr_remove_iter (struct xfs_attr_intent *attr);
libxfs/xfs_parent.c +63 -5
103 lines not on this page · raw message
libxfs/xfs_parent.h +21 -2
@@ -21,10 +21,13 @@ extern struct kmem_cache *xfs_parent_intent_cache;*/ struct xfs_parent_defer {struct xfs_parent_name_rec rec; +struct xfs_parent_name_rec new_rec;struct xfs_da_args args; +bool have_log; }; -int __xfs_parent_init (struct xfs_mount *mp,struct xfs_parent_defer **parentp); +int __xfs_parent_init (struct xfs_mount *mp,bool grab_log, +struct xfs_parent_defer **parentp);static inline int xfs_parent_start(
@@ -34,7 +37,19 @@ xfs_parent_start( *pp =NULL ;if (xfs_has_parent (mp)) -return __xfs_parent_init (mp, pp); +return __xfs_parent_init (mp, true, pp); +return 0 ; +} + +static inline int +xfs_parent_start_locked ( +struct xfs_mount *mp, +struct xfs_parent_defer **pp) +{ + *pp =NULL ; + +if (xfs_has_parent (mp)) +return __xfs_parent_init (mp, false, pp);return 0 ; }
@@ -44,6 +59,10 @@ int xfs_parent_add(struct xfs_trans *tp, struct xfs_parent_defer *parent,int xfs_parent_remove (struct xfs_trans *tp,struct xfs_parent_defer *parent,struct xfs_inode *dp,const struct xfs_name *parent_name,struct xfs_inode *child); +int xfs_parent_replace (struct xfs_trans *tp,struct xfs_parent_defer *parent, +struct xfs_inode *old_dp,const struct xfs_name *old_name, +struct xfs_inode *new_dp,const struct xfs_name *new_name, +struct xfs_inode *child);void __xfs_parent_cancel (struct xfs_mount *mp,struct xfs_parent_defer *parent);
libxfs/xfs_trans_space.c +25 -0
@@ -94,3 +94,28 @@ xfs_remove_space_res(return ret; } + +unsigned int +xfs_rename_space_res ( +struct xfs_mount *mp, +unsigned int src_namelen, +bool target_exists, +unsigned int target_namelen, +bool has_whiteout) +{ +unsigned int ret; + + ret =XFS_DIRREMOVE_SPACE_RES (mp) + +XFS_DIRENTER_SPACE_RES (mp, target_namelen); + +if (xfs_has_parent (mp)) { +if (has_whiteout) + ret +=xfs_parent_calc_space_res (mp, src_namelen); + ret +=2 *xfs_parent_calc_space_res (mp, target_namelen); + } + +if (target_exists) + ret +=xfs_parent_calc_space_res (mp, target_namelen); + +return ret; +}
libxfs/xfs_trans_space.h +4 -2
@@ -91,8 +91,6 @@ XFS_DQUOT_CLUSTER_SIZE_FSB)#define XFS_QM_QINOCREATE_SPACE_RES (mp) \ XFS_IALLOC_SPACE_RES(mp) -#define XFS_RENAME_SPACE_RES (mp,nl) \ - (XFS_DIRREMOVE_SPACE_RES(mp) + XFS_DIRENTER_SPACE_RES(mp,nl))#define XFS_IFREE_SPACE_RES (mp) \ (xfs_has_finobt(mp) ? M_IGEO(mp)->inobt_maxlevels : 0)
@@ -106,4 +104,8 @@ unsigned int xfs_symlink_space_res(struct xfs_mount *mp, unsigned int namelen, unsigned int fsblocks);unsigned int xfs_remove_space_res (struct xfs_mount *mp,unsigned int namelen); +unsigned int xfs_rename_space_res (struct xfs_mount *mp, +unsigned int src_namelen,bool target_exists, +unsigned int target_namelen,bool has_whiteout); +#endif /* __XFS_TRANS_SPACE_H__ */
PATCH 10/30 xfs: pass the attr value to put_listent when possible
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Pass the attr value to put_listent when we have local xattrs or shortform xattrs.
--- libxfs/xfs_attr.h | 5 +++-- libxfs/xfs_attr_sf.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)
libxfs/xfs_attr.h +3 -2
@@ -47,8 +47,9 @@ struct xfs_attrlist_cursor_kern {/* void; state communicated via *context */ -typedef void (*put_listent_func_t )(struct xfs_attr_list_context *,int , -unsigned char *,int ,int ); +typedef void (*put_listent_func_t )(struct xfs_attr_list_context *context, +int flags,unsigned char *name,int namelen,void *value, +int valuelen);struct xfs_attr_list_context {struct xfs_trans *tp;
libxfs/xfs_attr_sf.h +1 -0
@@ -24,6 +24,7 @@ typedef struct xfs_attr_sf_sort {uint8_t flags;/* flags bits (see xfs_attr_leaf.h) */ xfs_dahash_t hash;/* this entry's hash value */ unsigned char *name;/* name value, pointer into buffer */ +void *value; } xfs_attr_sf_sort_t;#define XFS_ATTR_SF_ENTSIZE_MAX /* max space for name&value */ \
PATCH 11/30 xfs: Add parent pointer ioctl
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
This patch adds a new file ioctl to retrieve the parent pointer of a given inode
--- libxfs/xfs_fs.h | 1 + libxfs/xfs_fs_staging.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++ libxfs/xfs_parent.c | 40 ++++++++++++++++++++++++++++ libxfs/xfs_parent.h | 23 ++++++++++++++++ man/man3/xfsctl.3 | 63 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 193 insertions(+)
libxfs/xfs_fs.h +1 -0
@@ -807,6 +807,7 @@ struct xfs_scrub_metadata {/* XFS_IOC_GETFSMAP ------ hoisted 59 */ #define XFS_IOC_SCRUB_METADATA _IOWR('X', 60, struct xfs_scrub_metadata)#define XFS_IOC_AG_GEOMETRY _IOWR('X', 61, struct xfs_ag_geometry) +/* XFS_IOC_GETPARENTS ---- staging 62 */ /* * ioctl commands that replace IRIX syssgi()'s
libxfs/xfs_fs_staging.h +66 -0
70 lines not on this page · raw message
libxfs/xfs_parent.c +40 -0
@@ -283,3 +283,43 @@ __xfs_parent_cancel(xlog_drop_incompat_feat (mp->m_log,XLOG_INCOMPAT_FEAT_XATTRS );kmem_cache_free (xfs_parent_intent_cache, parent); } + +/* Convert an ondisk parent pointer to the incore format. */ +void +xfs_parent_irec_from_disk ( +struct xfs_parent_name_irec *irec, +const struct xfs_parent_name_rec *rec, +const void *value, +unsigned int valuelen) +{ + irec->p_ino =be64_to_cpu (rec->p_ino); + irec->p_gen =be32_to_cpu (rec->p_gen); + irec->p_namehash =be32_to_cpu (rec->p_namehash); + irec->p_namelen = valuelen; +memcpy (irec->p_name, value, valuelen); +} + +/* Convert an incore parent pointer to the ondisk attr name format. */ +void +xfs_parent_irec_to_disk ( +struct xfs_parent_name_rec *rec, +const struct xfs_parent_name_irec *irec) +{ + rec->p_ino =cpu_to_be64 (irec->p_ino); + rec->p_gen =cpu_to_be32 (irec->p_gen); + rec->p_namehash =cpu_to_be32 (irec->p_namehash); +} + +/* Compute p_namehash for the this parent pointer. */ +void +xfs_parent_irec_hashname ( +struct xfs_mount *mp, +struct xfs_parent_name_irec *irec) +{ +struct xfs_name dname = { + .name = irec->p_name, + .len = irec->p_namelen, + }; + + irec->p_namehash =xfs_dir2_hashname (mp, &dname); +}
libxfs/xfs_parent.h +23 -0
@@ -75,4 +75,27 @@ xfs_parent_finish( __xfs_parent_cancel(mp, p); } +/* +* Incore version of a parent pointer, also contains dirent name so callers +* can pass/obtain all the parent pointer information in a single structure +*/ +struct xfs_parent_name_irec { +/* Parent pointer attribute name fields */ +xfs_ino_t p_ino; +uint32_t p_gen; +xfs_dahash_t p_namehash; + +/* Parent pointer attribute value fields */ +uint8_t p_namelen; +unsigned char p_name[MAXNAMELEN ]; +}; + +void xfs_parent_irec_from_disk (struct xfs_parent_name_irec *irec, +const struct xfs_parent_name_rec *rec,const void *value, +unsigned int valuelen); +void xfs_parent_irec_to_disk (struct xfs_parent_name_rec *rec, +const struct xfs_parent_name_irec *irec); +void xfs_parent_irec_hashname (struct xfs_mount *mp, +struct xfs_parent_name_irec *irec); +#endif /* __XFS_PARENT_H__ */
man/man3/xfsctl.3 +63 -0
69 lines not on this page · raw message
PATCH 12/30 xfs: fix unit conversion error in xfs_log_calc_max_attrsetm_res
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Dave and I were discussing some recent test regressions as a result of me turning on nrext64=1 on realtime filesystems, when we noticed that the minimum log size of a 32M filesystem jumped from 954 blocks to 4287 blocks.
Digging through xfs_log_calc_max_attrsetm_res, Dave noticed that @size contains the maximum estimated amount of space needed for a local format xattr, in bytes, but we feed this quantity to XFS_NEXTENTADD_SPACE_RES, which requires units of blocks. This has resulted in an overestimation of the minimum log size over the years.
We should nominally correct this, but there's a backwards compatibility problem -- if we enable it now, the minimum log size will decrease. If a corrected mkfs formats a filesystem with this new smaller log size, a user will encounter mount failures on an uncorrected kernel due to the larger minimum log size computations there.
However, the large extent counters feature is still EXPERIMENTAL, so we can gate the correction on that feature (or any features that get added after that) being enabled. Any filesystem with nrext64 or any of the as-yet-undefined feature bits turned on will be rejected by old uncorrected kernels, so this should be safe even in the upgrade case.
--- libxfs/xfs_log_rlimit.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)
libxfs/xfs_log_rlimit.c +43 -0
@@ -16,6 +16,39 @@#include "xfs_bmap_btree.h" #include "xfs_trace.h" +/* +* Decide if the filesystem has the parent pointer feature or any feature +* added after that. +*/ +static inline bool +xfs_has_parent_or_newer_feature ( +struct xfs_mount *mp) +{ +if (!xfs_sb_is_v5 (&mp->m_sb)) +return false; + +if (xfs_sb_has_compat_feature (&mp->m_sb, ~0 )) +return true; + +if (xfs_sb_has_ro_compat_feature (&mp->m_sb, + ~(XFS_SB_FEAT_RO_COMPAT_FINOBT | +XFS_SB_FEAT_RO_COMPAT_RMAPBT | +XFS_SB_FEAT_RO_COMPAT_REFLINK | +XFS_SB_FEAT_RO_COMPAT_INOBTCNT ))) +return true; + +if (xfs_sb_has_incompat_feature (&mp->m_sb, + ~(XFS_SB_FEAT_INCOMPAT_FTYPE | +XFS_SB_FEAT_INCOMPAT_SPINODES | +XFS_SB_FEAT_INCOMPAT_META_UUID | +XFS_SB_FEAT_INCOMPAT_BIGTIME | +XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR | +XFS_SB_FEAT_INCOMPAT_NREXT64 ))) +return true; + +return false; +} +/* * Calculate the maximum length in bytes that would be required for a local * attribute value as large attributes out of line are not logged.
@@ -31,6 +64,16 @@ xfs_log_calc_max_attrsetm_res(MAXNAMELEN -1 ; nblks =XFS_DAENTER_SPACE_RES (mp,XFS_ATTR_FORK ); nblks +=XFS_B_TO_FSB (mp, size); + +/* +* Starting with the parent pointer feature, every new fs feature +* corrects a unit conversion error in the xattr transaction +* reservation code that resulted in oversized minimum log size +* computations. +*/ +if (xfs_has_parent_or_newer_feature (mp)) + size =XFS_B_TO_FSB (mp, size); + nblks +=XFS_NEXTENTADD_SPACE_RES (mp, size,XFS_ATTR_FORK ); return M_RES(mp)->tr_attrsetm.tr_logres +
PATCH 13/30 xfs: drop compatibility minimum log size computations for reflink
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Having established that we can reduce the minimum log size computation for filesystems with parent pointers or any newer feature, we should also drop the compat minlogsize code that we added when we reduced the transaction reservation size for rmap and reflink.
--- libxfs/xfs_log_rlimit.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
libxfs/xfs_log_rlimit.c +10 -0
@@ -91,6 +91,16 @@ xfs_log_calc_trans_resv_for_minlogblocks( {unsigned int rmap_maxlevels = mp->m_rmap_maxlevels; +/* +* Starting with the parent pointer feature, every new fs feature +* drops the oversized minimum log size computation introduced by the +* original reflink code. +*/ +if (xfs_has_parent_or_newer_feature (mp)) { +xfs_trans_resv_calc (mp, resv); +return ; + } +/* * In the early days of rmap+reflink, we always set the rmap maxlevels * to 9 even if the AG was small enough that it would never grow to
PATCH 14/30 xfs: don't remove the attr fork when parent pointers are enabled
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
When an inode is removed, it may also cause the attribute fork to be removed if it is the last attribute. This transaction gets flushed to the log, but if the system goes down before we could inactivate the symlink, the log recovery tries to inactivate this inode (since it is on the unlinked list) but the verifier trips over the remote value and leaks it.
Hence we ended up with a file in this odd state on a "clean" mount. The "obvious" fix is to prohibit erasure of the attr fork to avoid tripping over the verifiers when pptrs are enabled.
--- libxfs/xfs_attr_leaf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
libxfs/xfs_attr_leaf.c +4 -2
@@ -910,7 +910,8 @@ xfs_attr_sf_removename( totsize -= size;if (totsize ==sizeof (xfs_attr_sf_hdr_t) &&xfs_has_attr2 (mp) && (dp->i_df.if_format !=XFS_DINODE_FMT_BTREE ) && - !(args->op_flags & (XFS_DA_OP_ADDNAME |XFS_DA_OP_REPLACE ))) { + !(args->op_flags & (XFS_DA_OP_ADDNAME |XFS_DA_OP_REPLACE )) && + !xfs_has_parent (mp)) {xfs_attr_fork_remove (dp, args->trans); }else {xfs_idata_realloc (dp, -size,XFS_ATTR_FORK );
@@ -919,7 +920,8 @@ xfs_attr_sf_removename(ASSERT (totsize >sizeof (xfs_attr_sf_hdr_t) || (args->op_flags &XFS_DA_OP_ADDNAME ) || !xfs_has_attr2 (mp) || - dp->i_df.if_format ==XFS_DINODE_FMT_BTREE ); + dp->i_df.if_format ==XFS_DINODE_FMT_BTREE || +xfs_has_parent (mp));xfs_trans_log_inode (args->trans, dp,XFS_ILOG_CORE |XFS_ILOG_ADATA ); }
PATCH 15/30 xfs: Add the parent pointer support to the superblock version 5.
In reply to Darrick J. WongFrom: Allison Henderson <[email protected]>
Add the parent pointer superblock flag so that we can actually mount filesystems with this feature enabled.
--- libfrog/fsgeom.c | 4 ++++ libxfs/xfs_format.h | 4 +++- libxfs/xfs_fs.h | 1 + libxfs/xfs_sb.c | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-)
libfrog/fsgeom.c +4 -0
@@ -31,6 +31,7 @@ xfs_report_geom(int bigtime_enabled;int inobtcount;int nrext64; +int parent; isint = geo->logstart >0 ; lazycount = geo->flags &XFS_FSOP_GEOM_FLAGS_LAZYSB ?1 :0 ;
@@ -49,12 +50,14 @@ xfs_report_geom( bigtime_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_BIGTIME ?1 :0 ; inobtcount = geo->flags &XFS_FSOP_GEOM_FLAGS_INOBTCNT ?1 :0 ; nrext64 = geo->flags &XFS_FSOP_GEOM_FLAGS_NREXT64 ?1 :0 ; + parent = geo->flags &XFS_FSOP_GEOM_FLAGS_PARENT ?1 :0 ; printf(_( "meta-data=%-22s isize=%-6d agcount=%u, agsize=%u blks\n" " =%-22s sectsz=%-5u attr=%u, projid32bit=%u\n" " =%-22s crc=%-8u finobt=%u, sparse=%u, rmapbt=%u\n" " =%-22s reflink=%-4u bigtime=%u inobtcount=%u nrext64=%u\n" +" =%-22s parent=%d\n" "data =%-22s bsize=%-6u blocks=%llu, imaxpct=%u\n" " =%-22s sunit=%-6u swidth=%u blks\n" "naming =version %-14u bsize=%-6u ascii-ci=%d, ftype=%d\n"
@@ -65,6 +68,7 @@ xfs_report_geom("" , geo->sectsize, attrversion, projid32bit,"" , crcs_enabled, finobt_enabled, spinodes, rmapbt_enabled,"" , reflink_enabled, bigtime_enabled, inobtcount, nrext64, +"" , parent,"" , geo->blocksize, (unsigned long long )geo->datablocks, geo->imaxpct, "", geo->sunit, geo->swidth,
libxfs/xfs_format.h +3 -1
@@ -373,13 +373,15 @@ xfs_sb_has_ro_compat_feature(#define XFS_SB_FEAT_INCOMPAT_BIGTIME (1 << 3)/* large timestamps */ #define XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR (1 << 4)/* needs xfs_repair */ #define XFS_SB_FEAT_INCOMPAT_NREXT64 (1 << 5)/* large extent counters */ +#define XFS_SB_FEAT_INCOMPAT_PARENT (1 << 6)/* parent pointers */ #define XFS_SB_FEAT_INCOMPAT_ALL \ (XFS_SB_FEAT_INCOMPAT_FTYPE| \ XFS_SB_FEAT_INCOMPAT_SPINODES| \ XFS_SB_FEAT_INCOMPAT_META_UUID| \ XFS_SB_FEAT_INCOMPAT_BIGTIME| \ XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR| \ - XFS_SB_FEAT_INCOMPAT_NREXT64) + XFS_SB_FEAT_INCOMPAT_NREXT64| \ + XFS_SB_FEAT_INCOMPAT_PARENT)#define XFS_SB_FEAT_INCOMPAT_UNKNOWN ~XFS_SB_FEAT_INCOMPAT_ALL static inline bool
libxfs/xfs_fs.h +1 -0
@@ -239,6 +239,7 @@ typedef struct xfs_fsop_resblks {#define XFS_FSOP_GEOM_FLAGS_BIGTIME (1 << 21)/* 64-bit nsec timestamps */ #define XFS_FSOP_GEOM_FLAGS_INOBTCNT (1 << 22)/* inobt btree counter */ #define XFS_FSOP_GEOM_FLAGS_NREXT64 (1 << 23)/* large extent counters */ +#define XFS_FSOP_GEOM_FLAGS_PARENT (1U << 30)/* parent pointers */ #define XFS_FSOP_GEOM_FLAGS_ATOMIC_SWAP (1U << 31)/* atomic file extent swap */ /*
libxfs/xfs_sb.c +4 -0
@@ -173,6 +173,8 @@ xfs_sb_version_to_features( features |=XFS_FEAT_NEEDSREPAIR ;if (sbp->sb_features_incompat &XFS_SB_FEAT_INCOMPAT_NREXT64 ) features |=XFS_FEAT_NREXT64 ; +if (sbp->sb_features_incompat &XFS_SB_FEAT_INCOMPAT_PARENT ) + features |=XFS_FEAT_PARENT ;return features; }
@@ -1190,6 +1192,8 @@ xfs_fs_geometry( geo->flags |=XFS_FSOP_GEOM_FLAGS_BIGTIME ;if (xfs_has_inobtcounts (mp)) geo->flags |=XFS_FSOP_GEOM_FLAGS_INOBTCNT ; +if (xfs_has_parent (mp)) + geo->flags |=XFS_FSOP_GEOM_FLAGS_PARENT ;if (xfs_has_sector (mp)) { geo->flags |=XFS_FSOP_GEOM_FLAGS_SECTOR ; geo->logsectsize = sbp->sb_logsectsize;
PATCH 16/30 libfrog: add parent pointer support code
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add some support code to libfrog so that client programs can walk file descriptors and handles upwards through the directory tree; and obtain a reasonable file path from a file descriptor/handle. This code will be used in xfsprogs utilities.
--- include/handle.h | 1 libfrog/Makefile | 2 libfrog/getparents.c | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++ libfrog/getparents.h | 36 +++++ libfrog/paths.c | 167 ++++++++++++++++++++++++ libfrog/paths.h | 25 ++++ libhandle/handle.c | 7 + 7 files changed, 580 insertions(+), 3 deletions(-) create mode 100644 libfrog/getparents.c create mode 100644 libfrog/getparents.h
include/handle.h +1 -0
@@ -17,6 +17,7 @@ struct parent;extern int path_to_handle (char *__path,void **__hanp,size_t *__hlen);extern int path_to_fshandle (char *__path,void **__fshanp,size_t *__fshlen);extern int fd_to_handle (int fd,void **hanp,size_t *hlen); +extern int handle_to_fsfd (void *,char **);extern int handle_to_fshandle (void *__hanp,size_t __hlen,void **__fshanp,size_t *__fshlen);extern void free_handle (void *__hanp,size_t __hlen);
libfrog/Makefile +2 -0
@@ -20,6 +20,7 @@ convert.c \ crc32.c \ file_exchange.c \ fsgeom.c \ +getparents.c \ histogram.c \ list_sort.c \ linux.c \
@@ -45,6 +46,7 @@ crc32table.h \ dahashselftest.h \ file_exchange.h \ fsgeom.h \ +getparents.h \ histogram.h \ logging.h \ paths.h \
libfrog/getparents.c new file +345 -0
345 lines not on this page · raw message
libfrog/getparents.h new file +36 -0
@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2023 Oracle. All Rights Reserved. +* Author: Darrick J. Wong <[email protected]> +*/ +#ifndef __LIBFROG_GETPARENTS_H_ +#define __LIBFROG_GETPARENTS_H_ + +struct path_list ; + +struct parent_rec { +uint64_t p_ino; +uint32_t p_gen; +uint32_t p_flags; +unsigned char p_name[MAXNAMELEN ]; +}; + +/* This is the root directory. */ +#define PARENT_IS_ROOT (1U << 0) + +typedef int (*walk_parent_fn )(const struct parent_rec *rec,void *arg); +typedef int (*walk_path_fn )(const char *mntpt,const struct path_list *path, +void *arg); + +int fd_walk_parents (int fd,walk_parent_fn fn,void *arg); +int handle_walk_parents (void *hanp,size_t hanlen,walk_parent_fn fn, +void *arg); + +int fd_walk_parent_paths (int fd,walk_path_fn fn,void *arg); +int handle_walk_parent_paths (void *hanp,size_t hanlen,walk_path_fn fn, +void *arg); + +int fd_to_path (int fd,char *path,size_t pathlen); +int handle_to_path (void *hanp,size_t hlen,char *path,size_t pathlen); + +#endif /* __LIBFROG_GETPARENTS_H_ */
libfrog/paths.c +167 -0
176 lines not on this page · raw message
libfrog/paths.h +25 -0
@@ -58,4 +58,29 @@ typedef struct fs_cursor {extern void fs_cursor_initialise (char *__dir,uint __flags,fs_cursor_t *__cp);extern fs_path_t *fs_cursor_next_entry (fs_cursor_t *__cp); +/* Path information. */ + +struct path_list ; +struct path_component ; + +struct path_component *path_component_init (const char *name,uint64_t ino); +void path_component_free (struct path_component *pc); +int path_component_change (struct path_component *pc,const void *name, +size_t namelen,uint64_t ino); + +struct path_list *path_list_init (void ); +void path_list_free (struct path_list *path); +void path_list_add_parent_component (struct path_list *path, +struct path_component *pc); +void path_list_add_component (struct path_list *path,struct path_component *pc); +void path_list_del_component (struct path_list *path,struct path_component *pc); + +ssize_t path_list_to_string (const struct path_list *path,char *buf, +size_t buflen); + +typedef int (*path_walk_fn_t )(const char *name,uint64_t ino,void *arg); + +int path_walk_components (const struct path_list *path,path_walk_fn_t fn, +void *arg); +#endif /* __LIBFROG_PATH_H__ */
libhandle/handle.c +4 -3
@@ -29,7 +29,6 @@ typedef union { } comarg_t;static int obj_to_handle (char *,int ,unsigned int ,comarg_t ,void **,size_t *); -static int handle_to_fsfd (void *,char **);static char *path_to_fspath (char *path);
@@ -203,8 +202,10 @@ handle_to_fshandle(return 0 ; } -static int -handle_to_fsfd (void *hanp,char **path) +int +handle_to_fsfd ( +void *hanp, +char **path) {struct fdhash *fdhp;