generic: add test for boundary in xfs_attr_shortform_verify
v3 cover generic: add test for boundary in xfs_attr_shortform_verify
Add test for XFS bug that corrupted metadata if extended attribute name of length 1 was used.
Pavel Reichl (1):
generic: add test for boundary in xfs_attr_shortform_verify
tests/generic/609 | 63 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/609.out | 4 +++ tests/generic/group | 1 + 3 files changed, 68 insertions(+) create mode 100755 tests/generic/609 create mode 100644 tests/generic/609.out
Signature · 1 line
2.26.2
PATCH v3 1/1 generic: add test for boundary in xfs_attr_shortform_verify
Add a regression test to check that the boundary test for the fixed-offset parts of xfs_attr_sf_entry in xfs_attr_shortform_verify is not off by one.
This can be shown by:
touch file
setfattr -n user.a file
With help from Zorro. Thanks very much.
--- tests/generic/609 | 63 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/609.out | 4 +++ tests/generic/group | 1 + 3 files changed, 68 insertions(+) create mode 100755 tests/generic/609 create mode 100644 tests/generic/609.out
tests/generic/609 new file +63 -0
@@ -0,0 +1,63 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test 609 +# +# Verify that metadata won't get corrupted when extended attribute +# name of size one is set. +# +# This test verifies the problem fixed in kernel with commit +# f4020438fab0 ("xfs: fix boundary test in xfs_attr_shortform_verify") + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +_supported_fs generic +_supported_os Linux +_require_scratch +_require_attrs + +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount + +localfile="${SCRATCH_MNT}/testfile" + +touch "${localfile}" +"${SETFATTR_PROG}" -n user.a "${localfile}" + +# Make sure that changes are written to disk +echo 3 > /proc/sys/vm/drop_caches +sleep 3 + +# If the target bug isn't fixed, getfattr fails +${GETFATTR_PROG} --absolute-names -n user.a $localfile | _filter_scratch + +# Make sure the filesystem isn't corrupted manually +_scratch_unmount +_check_scratch_fs + +status=0 +exit
tests/generic/609.out new file +4 -0
@@ -0,0 +1,4 @@ +QA output created by 609 +# file: SCRATCH_MNT/testfile +user.a="" +
tests/generic/group +1 -0
@@ -611,3 +611,4 @@ 606 auto attr quick dax 607 auto attr quick dax 608 auto attr quick dax +609 auto attr quick
Signature · 1 line
2.26.2
Quoted 6 lines · Pavel Reichl
Add a regression test to check that the boundary test for the fixed-offset parts of
xfs_attr_sf_entryinxfs_attr_shortform_verifyis not off by one.This can be shown by:
Quoted 7 lines
touch file
setfattr -n user.a fileWith help from Zorro. Thanks very much.
Signed-off-by Pavel Reichl <[email protected]>---
This looks good to me, if you don't tend to replace "drop cache" with "cycle mount" as Darrick suggested :) Both ways good to me, as you wish.
Thanks,
Zorro
Quoted 98 lines
tests/generic/609 | 63 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/609.out | 4 +++ tests/generic/group | 1 + 3 files changed, 68 insertions(+) create mode 100755 tests/generic/609 create mode 100644 tests/generic/609.outtests/generic/609 new file +63
-0@@ -0,0 +1,63 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test 609 +# +# Verify that metadata won't get corrupted when extended attribute +# name of size one is set. +# +# This test verifies the problem fixed in kernel with commit +# f4020438fab0 ("xfs: fix boundary test in xfs_attr_shortform_verify") + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +_supported_fs generic +_supported_os Linux +_require_scratch +_require_attrs + +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount + +localfile="${SCRATCH_MNT}/testfile" + +touch "${localfile}" +"${SETFATTR_PROG}" -n user.a "${localfile}" + +# Make sure that changes are written to disk +echo 3 > /proc/sys/vm/drop_caches +sleep 3 + +# If the target bug isn't fixed, getfattr fails +${GETFATTR_PROG} --absolute-names -n user.a $localfile | _filter_scratch + +# Make sure the filesystem isn't corrupted manually +_scratch_unmount +_check_scratch_fs + +status=0 +exittests/generic/609.out new file +4
-0@@ -0,0 +1,4 @@ +QA output created by 609 +# file: SCRATCH_MNT/testfile +user.a="" +tests/generic/group +1
-0@@ -611,3 +611,4 @@ 606 auto attr quick dax 607 auto attr quick dax 608 auto attr quick dax +609 auto attr quickSignature · 1 line
2.26.2
Quoted 10 lines · Zorro Lang
Quoted 9 lines · Pavel Reichl
Add a regression test to check that the boundary test for the fixed-offset parts of
xfs_attr_sf_entryinxfs_attr_shortform_verifyis not off by one.This can be shown by:
touch file
setfattr -n user.a file
Quoted 7 lines
Quoted 4 lines
With help from Zorro. Thanks very much.
Signed-off-by Pavel Reichl <[email protected]>---
This looks good to me, if you don't tend to replace "drop cache" with "cycle mount" as Darrick suggested :) Both ways good to me, as you wish.
Oh, a tiny problem when I tried to merge this patch:
Applying: generic: add test for boundary in xfs_attr_shortform_verify .git/rebase-apply/patch:87: new blank line at EOF.
+
Quoted 104 lines
Reviewed-by Zorro Lang <[email protected]>Thanks,
ZorroQuoted 98 lines
tests/generic/609 | 63 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/609.out | 4 +++ tests/generic/group | 1 + 3 files changed, 68 insertions(+) create mode 100755 tests/generic/609 create mode 100644 tests/generic/609.outtests/generic/609 new file +63
-0@@ -0,0 +1,63 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test 609 +# +# Verify that metadata won't get corrupted when extended attribute +# name of size one is set. +# +# This test verifies the problem fixed in kernel with commit +# f4020438fab0 ("xfs: fix boundary test in xfs_attr_shortform_verify") + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +_supported_fs generic +_supported_os Linux +_require_scratch +_require_attrs + +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount + +localfile="${SCRATCH_MNT}/testfile" + +touch "${localfile}" +"${SETFATTR_PROG}" -n user.a "${localfile}" + +# Make sure that changes are written to disk +echo 3 > /proc/sys/vm/drop_caches +sleep 3 + +# If the target bug isn't fixed, getfattr fails +${GETFATTR_PROG} --absolute-names -n user.a $localfile | _filter_scratch + +# Make sure the filesystem isn't corrupted manually +_scratch_unmount +_check_scratch_fs + +status=0 +exittests/generic/609.out new file +4
-0@@ -0,0 +1,4 @@ +QA output created by 609 +# file: SCRATCH_MNT/testfile +user.a="" +tests/generic/group +1
-0@@ -611,3 +611,4 @@ 606 auto attr quick dax 607 auto attr quick dax 608 auto attr quick dax +609 auto attr quickSignature · 1 line
2.26.2
Quoted 69 lines · Pavel Reichl
Add a regression test to check that the boundary test for the fixed-offset parts of
xfs_attr_sf_entryinxfs_attr_shortform_verifyis not off by one.This can be shown by:
touch file
setfattr -n user.a fileWith help from Zorro. Thanks very much.
Signed-off-by Pavel Reichl <[email protected]>--- tests/generic/609 | 63 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/609.out | 4 +++ tests/generic/group | 1 + 3 files changed, 68 insertions(+) create mode 100755 tests/generic/609 create mode 100644 tests/generic/609.outtests/generic/609 new file +43
-0@@ -0,0 +1,63 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test 609 +# +# Verify that metadata won't get corrupted when extended attribute +# name of size one is set. +# +# This test verifies the problem fixed in kernel with commit +# f4020438fab0 ("xfs: fix boundary test in xfs_attr_shortform_verify") + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/attr + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +_supported_fs generic +_supported_os Linux +_require_scratch +_require_attrs + +_scratch_mkfs > $seqres.full 2>&1
tests/generic/609 line 53
Quoted 10 lines
tests/generic/609 new file +10
-0+_scratch_mount + +localfile="${SCRATCH_MNT}/testfile" + +touch "${localfile}" +"${SETFATTR_PROG}" -n user.a "${localfile}" + +# Make sure that changes are written to disk +echo 3 > /proc/sys/vm/drop_caches +sleep 3
If _scratch_cycle_mount also works, I'd prefer it over a system-wide drop cache.
And is "sleep 3" really needed?
tests/generic/609 line 60
Quoted 7 lines
tests/generic/609 new file +7
-0+ +# If the target bug isn't fixed, getfattr fails +${GETFATTR_PROG} --absolute-names -n user.a $localfile | _filter_scratch + +# Make sure the filesystem isn't corrupted manually +_scratch_unmount +_check_scratch_fs
The test harness will do fsck by default after test, so there's no need to _check_scratch_fs manually.
Thanks,
Eryu
Quoted 24 lines
tests/generic/609 new file +3
-0+ +status=0 +exittests/generic/609.out new file +4
-0@@ -0,0 +1,4 @@ +QA output created by 609 +# file: SCRATCH_MNT/testfile +user.a="" +tests/generic/group +1
-0@@ -611,3 +611,4 @@ 606 auto attr quick dax 607 auto attr quick dax 608 auto attr quick dax +609 auto attr quickSignature · 1 line
2.26.2