Skip to contentSkip to conversation

fstests: add appropriate checks for fs features for some tests

PATCH In review Jeff Layton 2 participants 7 messages Aug 30, 2023

Subsystems (3)
lore
Share & tools
lore

Jeff Layton

author maintainer
#0 lore raw

v4 cover fstests: add appropriate checks for fs features for some tests

A number of fstests fail on NFS, primarily because it lacks certain features that are widely supported on local Linux filesystems. Fix up the test for POSIX ACLs and add a new requirement for fiemap support in generic/578.

---
Changes in v4:
- use "_require_attrs security" instead of special setcap test
- use '_require_xfs_io_command "fiemap"' instead of special fiemap test
- Link to v3: https://lore.kernel.org/r/[email protected]

Changes in v2:
- add new checks for fiemap and setcap
- Link to v2: https://lore.kernel.org/r/[email protected]

Changes in v3:
- use _require_xfs_io_command "fiemap" in generic/578
- drop the _require_setcap patch (Zorro has similar that adds a _require_capabilities)

---
Jeff Layton (3):
common/attr: fix the _require_acl test generic/578: add a check to ensure that fiemap is supported generic/*: add a check for security attrs

 common/attr       | 9 ++++-----
 tests/generic/270 | 2 ++
 tests/generic/513 | 2 ++
 tests/generic/578 | 1 +
 tests/generic/675 | 2 ++
 tests/generic/688 | 2 ++
 tests/generic/727 | 2 ++
 7 files changed, 15 insertions(+), 5 deletions(-)

---
base-commit: 0ca1d4fbb2e9a492968f2951df101f24477f7991
change-id: 20230824-fixes-914cc3f9ef72

Best regards,

Signature · 1 line
Jeff Layton <[email protected]>
author maintainer
#1 lore raw

PATCH v4 1/3 common/attr: fix the _require_acl test

_require_acl tests whether you're able to fetch the ACL from a file using chacl, and then tests for an -EOPNOTSUPP error return. Unfortunately, filesystems that don't support them (like NFSv4) just return -ENODATA when someone calls getxattr for the POSIX ACL, so the test doesn't work.

Fix the test to have chacl set an ACL on the file instead, which should reliably fail on filesystems that don't support them.

---
 common/attr | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
common/attr +4 -5
index cce4d1b201b2..3ebba682c894 100644
@@ -163,13 +163,12 @@ _require_acls()
     [ -n "$CHACL_PROG" ] || _notrun "chacl command not found"
 
     #
-    # Test if chacl is able to list ACLs on the target filesystems.  On really
-    # old kernels the system calls might not be implemented at all, but the
-    # more common case is that the tested filesystem simply doesn't support
-    # ACLs.
+    # Test if chacl is able to set an ACL on a file.  On really old kernels
+    # the system calls might not be implemented at all, but the more common
+    # case is that the tested filesystem simply doesn't support ACLs.
     #
     touch $TEST_DIR/syscalltest
-    chacl -l $TEST_DIR/syscalltest > $TEST_DIR/syscalltest.out 2>&1
+    chacl 'u::rw-,g::---,o::---' $TEST_DIR/syscalltest > $TEST_DIR/syscalltest.out 2>&1
     cat $TEST_DIR/syscalltest.out >> $seqres.full
 
     if grep -q 'Function not implemented' $TEST_DIR/syscalltest.out; then
Signature · 1 line
2.41.0
Reviewed-by on v4 1/3
#2 lore raw

Re: [PATCH fstests v4 1/3] common/attr: fix the _require_acl test

Quoted 10 lines · Jeff Layton

_require_acl tests whether you're able to fetch the ACL from a file using chacl, and then tests for an -EOPNOTSUPP error return. Unfortunately, filesystems that don't support them (like NFSv4) just return -ENODATA when someone calls getxattr for the POSIX ACL, so the test doesn't work.

Fix the test to have chacl set an ACL on the file instead, which should reliably fail on filesystems that don't support them.

Seems logical,

--D

Quoted 30 lines
---
 common/attr | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
common/attr +4 -5
index cce4d1b201b2..3ebba682c894 100644
@@ -163,13 +163,12 @@ _require_acls()
     [ -n "$CHACL_PROG" ] || _notrun "chacl command not found"
 
     #
-    # Test if chacl is able to list ACLs on the target filesystems.  On really
-    # old kernels the system calls might not be implemented at all, but the
-    # more common case is that the tested filesystem simply doesn't support
-    # ACLs.
+    # Test if chacl is able to set an ACL on a file.  On really old kernels
+    # the system calls might not be implemented at all, but the more common
+    # case is that the tested filesystem simply doesn't support ACLs.
     #
     touch $TEST_DIR/syscalltest
-    chacl -l $TEST_DIR/syscalltest > $TEST_DIR/syscalltest.out 2>&1
+    chacl 'u::rw-,g::---,o::---' $TEST_DIR/syscalltest > $TEST_DIR/syscalltest.out 2>&1
     cat $TEST_DIR/syscalltest.out >> $seqres.full
 
     if grep -q 'Function not implemented' $TEST_DIR/syscalltest.out; then
Signature · 2 lines
-- 
2.41.0
author maintainer
#3 lore raw

PATCH v4 2/3 generic/578: add a check to ensure that fiemap is supported

In reply to Jeff Layton

This test requires FIEMAP support.

---
 tests/generic/578 | 1 +
 1 file changed, 1 insertion(+)
tests/generic/578 +1 -0
index b024f6ff90b4..e8bb97f7b96c 100755
@@ -24,6 +24,7 @@ _cleanup()
 _supported_fs generic
 _require_test_program "mmap-write-concurrent"
 _require_command "$FILEFRAG_PROG" filefrag
+_require_xfs_io_command "fiemap"
 _require_test_reflink
 _require_cp_reflink
 
Signature · 1 line
2.41.0
Reviewed-by on v4 2/3
#4 lore raw

Re: [PATCH fstests v4 2/3] generic/578: add a check to ensure that fiemap is supported

Quoted 4 lines · Jeff Layton

This test requires FIEMAP support.

Looks good now,

--D

Quoted 20 lines
---
 tests/generic/578 | 1 +
 1 file changed, 1 insertion(+)
tests/generic/578 +1 -0
index b024f6ff90b4..e8bb97f7b96c 100755
@@ -24,6 +24,7 @@ _cleanup()
 _supported_fs generic
 _require_test_program "mmap-write-concurrent"
 _require_command "$FILEFRAG_PROG" filefrag
+_require_xfs_io_command "fiemap"
 _require_test_reflink
 _require_cp_reflink
 
Signature · 2 lines
-- 
2.41.0
author maintainer
#5 lore raw

PATCH v4 3/3 generic/*: add a check for security attrs

In reply to Jeff Layton

There are several generic tests that require "setcap", but don't check whether the underlying fs supports security attrs. Add the appropriate checks.

---
 tests/generic/270 | 2 ++
 tests/generic/513 | 2 ++
 tests/generic/675 | 2 ++
 tests/generic/688 | 2 ++
 tests/generic/727 | 2 ++
 5 files changed, 10 insertions(+)
tests/generic/270 +2 -0
index 8a6a2822b76b..e7329c2f3280 100755
@@ -13,6 +13,7 @@ _begin_fstest auto quota rw prealloc ioctl enospc stress
 # Import common functions.
 . ./common/filter
 . ./common/quota
+. ./common/attr
 
 # Disable all sync operations to get higher load
 FSSTRESS_AVOID="$FSSTRESS_AVOID -ffsync=0 -fsync=0 -ffdatasync=0"
@@ -58,6 +59,7 @@ _require_user
 _require_scratch
 _require_command "$KILLALL_PROG" killall
 _require_command "$SETCAP_PROG" setcap
+_require_attrs security
 
 _scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
tests/generic/513 +2 -0
index dc082787ae4e..7ff845cea35b 100755
@@ -12,12 +12,14 @@ _begin_fstest auto quick clone
 # Import common functions.
 . ./common/filter
 . ./common/reflink
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
 _require_scratch_reflink
 _require_command "$GETCAP_PROG" getcap
 _require_command "$SETCAP_PROG" setcap
+_require_attrs security
 
 _scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount
tests/generic/675 +2 -0
index 189251f20c0d..cc4309e45a04 100755
@@ -12,6 +12,7 @@ _begin_fstest auto clone quick
 # Import common functions.
 . ./common/filter
 . ./common/reflink
+. ./common/attr
 
 # real QA test starts here
 
@@ -21,6 +22,7 @@ _require_user
 _require_command "$GETCAP_PROG" getcap
 _require_command "$SETCAP_PROG" setcap
 _require_scratch_reflink
+_require_attrs security
 
 _scratch_mkfs >> $seqres.full
 _scratch_mount
tests/generic/688 +2 -0
index 426286b6c6ce..e2bf12b4457d 100755
@@ -18,6 +18,7 @@ _cleanup()
 
 # Import common functions.
 . ./common/filter
+. ./common/attr
 
 # real QA test starts here
 
@@ -29,6 +30,7 @@ _require_command "$SETCAP_PROG" setcap
 _require_xfs_io_command falloc
 _require_test
 _require_congruent_file_oplen $TEST_DIR 65536
+_require_attrs security
 
 junk_dir=$TEST_DIR/$seq
 junk_file=$junk_dir/a
tests/generic/727 +2 -0
index 58a89e3eda70..2cda49eadab3 100755
@@ -19,6 +19,7 @@ _begin_fstest auto fiexchange swapext quick
 
 # Import common functions.
 . ./common/filter
+. ./common/attr
 
 # real QA test starts here
 
@@ -30,6 +31,7 @@ _require_command "$SETCAP_PROG" setcap
 _require_xfs_io_command swapext '-v vfs -a'
 _require_xfs_io_command startupdate
 _require_scratch
+_require_attrs security
 
 _scratch_mkfs >> $seqres.full
 _scratch_mount
Signature · 1 line
2.41.0
Reviewed-by on v4 3/3
#6 lore raw

Re: [PATCH fstests v4 3/3] generic/*: add a check for security attrs

Quoted 5 lines · Jeff Layton

There are several generic tests that require "setcap", but don't check whether the underlying fs supports security attrs. Add the appropriate checks.

Looks good to me,

--D

Quoted 111 lines
---
 tests/generic/270 | 2 ++
 tests/generic/513 | 2 ++
 tests/generic/675 | 2 ++
 tests/generic/688 | 2 ++
 tests/generic/727 | 2 ++
 5 files changed, 10 insertions(+)
tests/generic/270 +2 -0
index 8a6a2822b76b..e7329c2f3280 100755
@@ -13,6 +13,7 @@ _begin_fstest auto quota rw prealloc ioctl enospc stress
 # Import common functions.
 . ./common/filter
 . ./common/quota
+. ./common/attr
 
 # Disable all sync operations to get higher load
 FSSTRESS_AVOID="$FSSTRESS_AVOID -ffsync=0 -fsync=0 -ffdatasync=0"
@@ -58,6 +59,7 @@ _require_user
 _require_scratch
 _require_command "$KILLALL_PROG" killall
 _require_command "$SETCAP_PROG" setcap
+_require_attrs security
 
 _scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
tests/generic/513 +2 -0
index dc082787ae4e..7ff845cea35b 100755
@@ -12,12 +12,14 @@ _begin_fstest auto quick clone
 # Import common functions.
 . ./common/filter
 . ./common/reflink
+. ./common/attr
 
 # real QA test starts here
 _supported_fs generic
 _require_scratch_reflink
 _require_command "$GETCAP_PROG" getcap
 _require_command "$SETCAP_PROG" setcap
+_require_attrs security
 
 _scratch_mkfs >>$seqres.full 2>&1
 _scratch_mount
tests/generic/675 +2 -0
index 189251f20c0d..cc4309e45a04 100755
@@ -12,6 +12,7 @@ _begin_fstest auto clone quick
 # Import common functions.
 . ./common/filter
 . ./common/reflink
+. ./common/attr
 
 # real QA test starts here
 
@@ -21,6 +22,7 @@ _require_user
 _require_command "$GETCAP_PROG" getcap
 _require_command "$SETCAP_PROG" setcap
 _require_scratch_reflink
+_require_attrs security
 
 _scratch_mkfs >> $seqres.full
 _scratch_mount
tests/generic/688 +2 -0
index 426286b6c6ce..e2bf12b4457d 100755
@@ -18,6 +18,7 @@ _cleanup()
 
 # Import common functions.
 . ./common/filter
+. ./common/attr
 
 # real QA test starts here
 
@@ -29,6 +30,7 @@ _require_command "$SETCAP_PROG" setcap
 _require_xfs_io_command falloc
 _require_test
 _require_congruent_file_oplen $TEST_DIR 65536
+_require_attrs security
 
 junk_dir=$TEST_DIR/$seq
 junk_file=$junk_dir/a
tests/generic/727 +2 -0
index 58a89e3eda70..2cda49eadab3 100755
@@ -19,6 +19,7 @@ _begin_fstest auto fiexchange swapext quick
 
 # Import common functions.
 . ./common/filter
+. ./common/attr
 
 # real QA test starts here
 
@@ -30,6 +31,7 @@ _require_command "$SETCAP_PROG" setcap
 _require_xfs_io_command swapext '-v vfs -a'
 _require_xfs_io_command startupdate
 _require_scratch
+_require_attrs security
 
 _scratch_mkfs >> $seqres.full
 _scratch_mount
Signature · 2 lines
-- 
2.41.0