fstests: btrfs: add test case to validate sysfs input arguments
v4 cover fstests: btrfs: add test case to validate sysfs input arguments
v4:
Fixed the double quotes in 1/5.
(Thanks for the review! If no other comments, I'll push this set on the weekend.)
v3:
https://lore.kernel.org/fstests/[email protected]/
v2:
https://lore.kernel.org/fstests/[email protected]/
v1:
https://lwn.net/ml/all/[email protected]/
Anand Jain (5):
fstests: common/rc: set_fs_sysfs_attr: redirect errors to stdout
fstests: filter: helper for sysfs error filtering
fstests: common/rc: add sysfs argument verification helpers
fstests: btrfs: testcase for sysfs policy syntax verification
fstests: btrfs: testcase for sysfs chunk_size attribute validation
common/filter | 9 +++ common/rc | 3 +- common/sysfs | 142 ++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/329 | 19 ++++++ tests/btrfs/329.out | 19 ++++++ tests/btrfs/334 | 19 ++++++ tests/btrfs/334.out | 14 +++++ 7 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 common/sysfs create mode 100755 tests/btrfs/329 create mode 100644 tests/btrfs/329.out create mode 100755 tests/btrfs/334 create mode 100644 tests/btrfs/334.out
Signature · 1 line
2.47.0
PATCH v4 1/5 fstests: common/rc: set_fs_sysfs_attr: redirect errors to stdout
Redirect sysfs write errors to stdout as a preparatory patch to enable testing of expected sysfs write failures. Also, log the executed sysfs write command and its failure if any to seqres.full for better debugging and traceability.
--- common/rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
common/rc +2 -1
@@ -5181,7 +5181,8 @@ _set_fs_sysfs_attr() local dname=$(_fs_sysfs_dname $dev) - echo "$content" > /sys/fs/${FSTYP}/${dname}/${attr} + echo "echo '$content' 2>&1 > /sys/fs/${FSTYP}/${dname}/${attr}" >> $seqres.full + echo "$content" 2>&1 > /sys/fs/${FSTYP}/${dname}/${attr} | tee -a $seqres.full } # Print the content of /sys/fs/$FSTYP/$DEV/$ATTR
Signature · 1 line
2.47.0
PATCH v4 2/5 fstests: filter: helper for sysfs error filtering
In reply to Anand JainAdded filter helper to filter sysfs write errors, retain only the error part.
--- common/filter | 9 +++++++++ 1 file changed, 9 insertions(+)
common/filter +9 -0
@@ -671,5 +671,14 @@ _filter_flakey_EIO() sed -e "s#.*: Input\/output error#$message#" } +# Filters +# +./common/rc: line 5085: echo: write error: Invalid argument +# to +# Invalid argument +_filter_sysfs_error() +{ + sed 's/.*: \(.*\)$/\1/' +} + # make sure this script returns success /bin/true
Signature · 1 line
2.47.0
PATCH v4 3/5 fstests: common/rc: add sysfs argument verification helpers
In reply to Anand JainIntroduce verify_sysfs_syntax() and _require_fs_sysfs_attr_policy() to verify whether a sysfs attribute rejects invalid input arguments during writes.
--- common/sysfs | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 common/sysfs
common/sysfs new file +142 -0
@@ -0,0 +1,142 @@ +##/bin/bash +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2025 Oracle. All Rights Reserved. +# +# Common/sysfs file for the sysfs related helper functions. + +# Test for the existence of a policy at /sys/fs/$FSTYP/$DEV/$ATTR +# +# All arguments are necessary, and in this order: +# - dev: device name, e.g. $SCRATCH_DEV +# - attr: path name under /sys/fs/$FSTYP/$dev +# - policy: policy within /sys/fs/$FSTYP/$dev +# +# Usage example: +# _has_fs_sysfs_attr_policy /dev/mapper/scratch-dev read_policy round-robin +_has_fs_sysfs_attr_policy() +{ + local dev=$1 + local attr=$2 + local policy=$3 + + if [ ! -b "$dev" -o -z "$attr" -o -z "$policy" ]; then + _fail \ + "Usage: _has_fs_sysfs_attr_policy <mounted_device> <attr> <policy>" + fi + + local dname=$(_fs_sysfs_dname $dev) + test -e /sys/fs/${FSTYP}/${dname}/${attr} + + cat /sys/fs/${FSTYP}/${dname}/${attr} | grep -q ${policy} +} + +# Require the existence of a sysfs entry at /sys/fs/$FSTYP/$DEV/$ATTR +# and value in it contains $policy +# All arguments are necessary, and in this order: +# - dev: device name, e.g. $SCRATCH_DEV +# - attr: path name under /sys/fs/$FSTYP/$dev +# - policy: mentioned in /sys/fs/$FSTYP/$dev/$attr +# +# Usage example: +# _require_fs_sysfs_attr_policy /dev/mapper/scratch-dev read_policy round-robin +_require_fs_sysfs_attr_policy() +{ + _has_fs_sysfs_attr_policy "$@" && return + + local dev=$1 + local attr=$2 + local policy=$3 + local dname=$(_fs_sysfs_dname $dev) + + _notrun "This test requires /sys/fs/${FSTYP}/${dname}/${attr} ${policy}" +} + +set_sysfs_policy() +{ + local dev=$1 + local attr=$2 + shift + shift + local policy=$@ + + _set_fs_sysfs_attr $dev $attr ${policy} + + case "$FSTYP" in + btrfs) + _get_fs_sysfs_attr $dev $attr | grep -q "[${policy}]" + if [[ $? != 0 ]]; then + echo "Setting sysfs $attr $policy failed" + fi + ;; + *) + _fail \ +"sysfs syntax verification for '${attr}' '${policy}' for '${FSTYP}' is not implemented" + ;; + esac +} + +set_sysfs_policy_must_fail() +{ + local dev=$1 + local attr=$2 + shift + shift + local policy=$@ + + _set_fs_sysfs_attr $dev $attr ${policy} | _filter_sysfs_error \ + | tee -a $seqres.full +} + +# Verify sysfs attribute rejects invalid input. +# Usage syntax: +# verify_sysfs_syntax <$dev> <$attr> <$policy> [$value] +# Examples: +# verify_sysfs_syntax $TEST_DEV read_policy pid +# verify_sysfs_syntax $TEST_DEV read_policy round-robin 4k +# Note: +# Process must call . ./common/filter +verify_sysfs_syntax() +{ + local dev=$1 + local attr=$2 + local policy=$3 + local value=$4 + + # Do this in the test case so that we know its prerequisites. + # '_require_fs_sysfs_attr_policy $TEST_DEV $attr $policy' + + # Test policy specified wrongly. Must fail. + set_sysfs_policy_must_fail $dev $attr "'$policy $policy'" + set_sysfs_policy_must_fail $dev $attr "'$policy t'" + set_sysfs_policy_must_fail $dev $attr "' '" + set_sysfs_policy_must_fail $dev $attr "'${policy} n'" + set_sysfs_policy_must_fail $dev $attr "'n ${policy}'" + set_sysfs_policy_must_fail $dev $attr "' ${policy}'" + set_sysfs_policy_must_fail $dev $attr "' ${policy} '" + set_sysfs_policy_must_fail $dev $attr "'${policy} '" + set_sysfs_policy_must_fail $dev $attr _${policy} + set_sysfs_policy_must_fail $dev $attr ${policy}_ + set_sysfs_policy_must_fail $dev $attr _${policy}_ + set_sysfs_policy_must_fail $dev $attr ${policy}: + # Test policy longer than 32 chars fails stable. + set_sysfs_policy_must_fail $dev $attr 'jfdkkkkjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjffjfjfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff' + + # Test policy specified correctly. Must pass. + set_sysfs_policy $dev $attr $policy + + # If the policy has no value return + if [[ -z $value ]]; then + return + fi + + # Test value specified wrongly. Must fail. + set_sysfs_policy_must_fail $dev $attr "'$policy: $value'" + set_sysfs_policy_must_fail $dev $attr "'$policy:$value '" + set_sysfs_policy_must_fail $dev $attr "'$policy:$value typo'" + set_sysfs_policy_must_fail $dev $attr "'$policy:${value}typo'" + set_sysfs_policy_must_fail $dev $attr "'$policy :$value'" + + # Test policy and value all specified correctly. Must pass. + set_sysfs_policy $dev $attr $policy:$value +} +
Signature · 1 line
2.47.0
PATCH v4 4/5 fstests: btrfs: testcase for sysfs policy syntax verification
In reply to Anand JainChecks if the sysfs attribute sanitizes arguments and verifies input syntax.
--- tests/btrfs/329 | 19 +++++++++++++++++++ tests/btrfs/329.out | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100755 tests/btrfs/329 create mode 100644 tests/btrfs/329.out
tests/btrfs/329 new file +19 -0
@@ -0,0 +1,19 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2025 Oracle. All Rights Reserved. +# +# FS QA Test 329 +# +# Verify sysfs knob input syntax for read_policy round-robin +# +. ./common/preamble +_begin_fstest auto quick + +. ./common/sysfs +. ./common/filter + +_require_fs_sysfs_attr_policy $TEST_DEV read_policy round-robin +verify_sysfs_syntax $TEST_DEV read_policy round-robin 4096 + +status=0 +exit
tests/btrfs/329.out new file +19 -0
@@ -0,0 +1,19 @@ +QA output created by 329 +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument
Signature · 1 line
2.47.0
PATCH v4 5/5 fstests: btrfs: testcase for sysfs chunk_size attribute validation
In reply to Anand JainChecks if the sysfs attribute sanitizes arguments and verifies input syntax allocation/data/chunk_size.
--- tests/btrfs/334 | 19 +++++++++++++++++++ tests/btrfs/334.out | 14 ++++++++++++++ 2 files changed, 33 insertions(+) create mode 100755 tests/btrfs/334 create mode 100644 tests/btrfs/334.out
tests/btrfs/334 new file +19 -0
@@ -0,0 +1,19 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2025 Oracle. All Rights Reserved. +# +# FS QA Test 334 +# +# Verify sysfs knob input syntax for allocation/data/chunk_size +# +. ./common/preamble +_begin_fstest auto quick + +. ./common/sysfs +. ./common/filter + +_require_fs_sysfs_attr $TEST_DEV allocation/data/chunk_size +verify_sysfs_syntax $TEST_DEV allocation/data/chunk_size 256m + +status=0 +exit
tests/btrfs/334.out new file +14 -0
@@ -0,0 +1,14 @@ +QA output created by 334 +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument
Signature · 1 line
2.47.0
Anand Jain
AppliedQuoted 14 lines · Anand Jain
v4:
Fixed the double quotes in 1/5.
(Thanks for the review! If no other comments, I'll push this set on the weekend.)v3:
https://lore.kernel.org/fstests/[email protected]/
Quoted 6 lines
Anand Jain (5):
fstests: common/rc:set_fs_sysfs_attr: redirect errors to stdout
fstests: filter: helper for sysfs error filtering
fstests: common/rc: add sysfs argument verification helpers
fstests: btrfs: testcase for sysfs policy syntax verification
fstests: btrfs: testcase for sysfschunk_sizeattribute validation
Applied to the upcoming for-next.
Thanks, Anand
Quoted 15 lines
common/filter | 9 +++ common/rc | 3 +- common/sysfs | 142 ++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/329 | 19 ++++++ tests/btrfs/329.out | 19 ++++++ tests/btrfs/334 | 19 ++++++ tests/btrfs/334.out | 14 +++++ 7 files changed, 224 insertions(+), 1 deletion(-)create mode 100644 common/sysfs
create mode 100755 tests/btrfs/329
create mode 100644 tests/btrfs/329.out
create mode 100755 tests/btrfs/334
create mode 100644 tests/btrfs/334.out
Quoted 17 lines · Anand Jain
Quoted 14 lines · Anand Jain
v4:
Fixed the double quotes in 1/5.
(Thanks for the review! If no other comments, I'll push this set on the weekend.)v3:
https://lore.kernel.org/fstests/b297a34f-4c09-48bb-86a3- [email protected]/
Quoted 8 lines
Quoted 6 lines
Anand Jain (5):
fstests: common/rc:set_fs_sysfs_attr: redirect errors to stdout
fstests: filter: helper for sysfs error filtering
fstests: common/rc: add sysfs argument verification helpers
fstests: btrfs: testcase for sysfs policy syntax verification
fstests: btrfs: testcase for sysfschunk_sizeattribute validationApplied to the upcoming for-next.
Postponed for now. Waiting on RVB. Thanks!
Quoted 20 lines
Thanks, Anand
Quoted 15 lines
common/filter | 9 +++
common/rc | 3 +-
common/sysfs | 142 ++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/329 | 19 ++++++
tests/btrfs/329.out | 19 ++++++
tests/btrfs/334 | 19 ++++++
tests/btrfs/334.out | 14 +++++7 files changed, 224 insertions(+), 1 deletion(-)create mode 100644 common/sysfs
create mode 100755 tests/btrfs/329
create mode 100644 tests/btrfs/329.out
create mode 100755 tests/btrfs/334
create mode 100644 tests/btrfs/334.out
Re: [PATCH v4 3/5] fstests: common/rc: add sysfs argument verification helpers
In reply to Anand JainQuoted 5 lines · Anand Jain
Introduce
verify_sysfs_syntax()and_require_fs_sysfs_attr_policy()to verify whether a sysfs attribute rejects invalid input arguments during writes.Signed-off-by Anand Jain <[email protected]>---
The subject is "common/rc: ...", but this patch isn't about common/rc. So feel free to remove the "/rc", or use "/sysfs".
Quoted 142 lines
common/sysfs | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 common/sysfscommon/sysfs new file +132
-0@@ -0,0 +1,142 @@ +##/bin/bash +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2025 Oracle. All Rights Reserved. +# +# Common/sysfs file for the sysfs related helper functions. + +# Test for the existence of a policy at /sys/fs/$FSTYP/$DEV/$ATTR +# +# All arguments are necessary, and in this order: +# - dev: device name, e.g. $SCRATCH_DEV +# - attr: path name under /sys/fs/$FSTYP/$dev +# - policy: policy within /sys/fs/$FSTYP/$dev +# +# Usage example: +# _has_fs_sysfs_attr_policy /dev/mapper/scratch-dev read_policy round-robin +_has_fs_sysfs_attr_policy() +{ + local dev=$1 + local attr=$2 + local policy=$3 + + if [ ! -b "$dev" -o -z "$attr" -o -z "$policy" ]; then + _fail \ + "Usage: _has_fs_sysfs_attr_policy <mounted_device> <attr> <policy>" + fi + + local dname=$(_fs_sysfs_dname $dev) + test -e /sys/fs/${FSTYP}/${dname}/${attr} + + cat /sys/fs/${FSTYP}/${dname}/${attr} | grep -q ${policy} +} + +# Require the existence of a sysfs entry at /sys/fs/$FSTYP/$DEV/$ATTR +# and value in it contains $policy +# All arguments are necessary, and in this order: +# - dev: device name, e.g. $SCRATCH_DEV +# - attr: path name under /sys/fs/$FSTYP/$dev +# - policy: mentioned in /sys/fs/$FSTYP/$dev/$attr +# +# Usage example: +# _require_fs_sysfs_attr_policy /dev/mapper/scratch-dev read_policy round-robin +_require_fs_sysfs_attr_policy() +{ + _has_fs_sysfs_attr_policy "$@" && return + + local dev=$1 + local attr=$2 + local policy=$3 + local dname=$(_fs_sysfs_dname $dev) + + _notrun "This test requires /sys/fs/${FSTYP}/${dname}/${attr} ${policy}" +} + +set_sysfs_policy() +{ + local dev=$1 + local attr=$2 + shift + shift + local policy=$@ + + _set_fs_sysfs_attr $dev $attr ${policy} + + case "$FSTYP" in + btrfs) + _get_fs_sysfs_attr $dev $attr | grep -q "[${policy}]" + if [[ $? != 0 ]]; then + echo "Setting sysfs $attr $policy failed" + fi + ;; + *) + _fail \ +"sysfs syntax verification for '${attr}' '${policy}' for '${FSTYP}' is not implemented" + ;; + esac +} + +set_sysfs_policy_must_fail() +{ + local dev=$1 + local attr=$2 + shift + shift + local policy=$@ + + _set_fs_sysfs_attr $dev $attr ${policy} | _filter_sysfs_error \ + | tee -a $seqres.full +} + +# Verify sysfs attribute rejects invalid input. +# Usage syntax: +# verify_sysfs_syntax <$dev> <$attr> <$policy> [$value] +# Examples: +# verify_sysfs_syntax $TEST_DEV read_policy pid +# verify_sysfs_syntax $TEST_DEV read_policy round-robin 4k +# Note: +# Process must call . ./common/filter +verify_sysfs_syntax() +{ + local dev=$1 + local attr=$2 + local policy=$3 + local value=$4 + + # Do this in the test case so that we know its prerequisites. + # '_require_fs_sysfs_attr_policy $TEST_DEV $attr $policy' + + # Test policy specified wrongly. Must fail. + set_sysfs_policy_must_fail $dev $attr "'$policy $policy'" + set_sysfs_policy_must_fail $dev $attr "'$policy t'" + set_sysfs_policy_must_fail $dev $attr "' '" + set_sysfs_policy_must_fail $dev $attr "'${policy} n'" + set_sysfs_policy_must_fail $dev $attr "'n ${policy}'" + set_sysfs_policy_must_fail $dev $attr "' ${policy}'" + set_sysfs_policy_must_fail $dev $attr "' ${policy} '" + set_sysfs_policy_must_fail $dev $attr "'${policy} '" + set_sysfs_policy_must_fail $dev $attr _${policy} + set_sysfs_policy_must_fail $dev $attr ${policy}_ + set_sysfs_policy_must_fail $dev $attr _${policy}_ + set_sysfs_policy_must_fail $dev $attr ${policy}: + # Test policy longer than 32 chars fails stable. + set_sysfs_policy_must_fail $dev $attr 'jfdkkkkjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjffjfjfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff' + + # Test policy specified correctly. Must pass. + set_sysfs_policy $dev $attr $policy + + # If the policy has no value return + if [[ -z $value ]]; then + return + fi + + # Test value specified wrongly. Must fail.
common/sysfs line 142
Quoted 10 lines
common/sysfs new file +10
-0+ set_sysfs_policy_must_fail $dev $attr "'$policy: $value'" + set_sysfs_policy_must_fail $dev $attr "'$policy:$value '" + set_sysfs_policy_must_fail $dev $attr "'$policy:$value typo'" + set_sysfs_policy_must_fail $dev $attr "'$policy:${value}typo'" + set_sysfs_policy_must_fail $dev $attr "'$policy :$value'" + + # Test policy and value all specified correctly. Must pass. + set_sysfs_policy $dev $attr $policy:$value +} +
I got this warning:
Applying: fstests: common/rc: add sysfs argument verification helpers .git/rebase-apply/patch:153: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Other looks good to me,
Thanks,
Zorro
Quoted 4 lines
Signature · 1 line
2.47.0
Re: [PATCH v4 1/5] fstests: common/rc: set_fs_sysfs_attr: redirect errors to stdout
In reply to Anand JainQuoted 15 lines · Anand Jain
Redirect sysfs write errors to stdout as a preparatory patch to enable testing of expected sysfs write failures. Also, log the executed sysfs write command and its failure if any to seqres.full for better debugging and traceability.
Signed-off-by Anand Jain <[email protected]>--- common/rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)common/rc +0
-0
common/rc _set_fs_sysfs_attr() · line 5185
Quoted 6 lines
common/rc +2
-1@@ -5181,7 +5181,8 @@ _set_fs_sysfs_attr() local dname=$(_fs_sysfs_dname $dev) - echo "$content" > /sys/fs/${FSTYP}/${dname}/${attr} + echo "echo '$content' 2>&1 > /sys/fs/${FSTYP}/${dname}/${attr}" >> $seqres.full + echo "$content" 2>&1 > /sys/fs/${FSTYP}/${dname}/${attr} | tee -a $seqres.full
Actually I doubt the $seqres might be not defined before calling _set_fs_sysfs_attr. For example, we call _set_fs_sysfs_attr in ./check as
_test_mount -> _prepare_for_eio_shutdown -> _xfs_prepare_for_eio_shutdown -> _set_fs_sysfs_attr
The _test_mount is called before $seqres is defined. At that time, the $seqres.full will be ".full" if the FSTYP=xfs
Anyway, we can fix this problem in another patch, this patch is good to me,
Quoted 7 lines
common/rc +0
-0} # Print the content of /sys/fs/$FSTYP/$DEV/$ATTRSignature · 1 line
2.47.0
Re: [PATCH v4 2/5] fstests: filter: helper for sysfs error filtering
In reply to Anand JainQuoted 14 lines · Anand Jain
Added filter helper to filter sysfs write errors, retain only the error part.
Signed-off-by Anand Jain <[email protected]>--- common/filter | 9 +++++++++ 1 file changed, 9 insertions(+)common/filter +0
-0@@ -671,5 +671,14 @@ _filter_flakey_EIO() sed -e "s#.*: Input\/output error#$message#"
common/filter _filter_flakey_EIO() · line 681
Quoted 10 lines
common/filter +8
-0} +# Filters +# +./common/rc: line 5085: echo: write error: Invalid argument +# to +# Invalid argument +_filter_sysfs_error() +{ + sed 's/.*: \(.*\)$/\1/' +}
Maybe output the "echo: write error: Invalid argument" or "write error:
Invalid argument" is better. But as there's not more requirement for this helper, for later two cases, this helper is good. We can change that when we have particular requirement.
Quoted 7 lines
common/filter +1
-0+ # make sure this script returns success /bin/trueSignature · 1 line
2.47.0
Re: [PATCH v4 3/5] fstests: common/rc: add sysfs argument verification helpers
In reply to Anand JainQuoted 103 lines · Anand Jain
Introduce
verify_sysfs_syntax()and_require_fs_sysfs_attr_policy()to verify whether a sysfs attribute rejects invalid input arguments during writes.Signed-off-by Anand Jain <[email protected]>--- common/sysfs | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 common/sysfscommon/sysfs new file +88
-0@@ -0,0 +1,142 @@ +##/bin/bash +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2025 Oracle. All Rights Reserved. +# +# Common/sysfs file for the sysfs related helper functions. + +# Test for the existence of a policy at /sys/fs/$FSTYP/$DEV/$ATTR +# +# All arguments are necessary, and in this order: +# - dev: device name, e.g. $SCRATCH_DEV +# - attr: path name under /sys/fs/$FSTYP/$dev +# - policy: policy within /sys/fs/$FSTYP/$dev +# +# Usage example: +# _has_fs_sysfs_attr_policy /dev/mapper/scratch-dev read_policy round-robin +_has_fs_sysfs_attr_policy() +{ + local dev=$1 + local attr=$2 + local policy=$3 + + if [ ! -b "$dev" -o -z "$attr" -o -z "$policy" ]; then + _fail \ + "Usage: _has_fs_sysfs_attr_policy <mounted_device> <attr> <policy>" + fi + + local dname=$(_fs_sysfs_dname $dev) + test -e /sys/fs/${FSTYP}/${dname}/${attr} + + cat /sys/fs/${FSTYP}/${dname}/${attr} | grep -q ${policy} +} + +# Require the existence of a sysfs entry at /sys/fs/$FSTYP/$DEV/$ATTR +# and value in it contains $policy +# All arguments are necessary, and in this order: +# - dev: device name, e.g. $SCRATCH_DEV +# - attr: path name under /sys/fs/$FSTYP/$dev +# - policy: mentioned in /sys/fs/$FSTYP/$dev/$attr +# +# Usage example: +# _require_fs_sysfs_attr_policy /dev/mapper/scratch-dev read_policy round-robin +_require_fs_sysfs_attr_policy() +{ + _has_fs_sysfs_attr_policy "$@" && return + + local dev=$1 + local attr=$2 + local policy=$3 + local dname=$(_fs_sysfs_dname $dev) + + _notrun "This test requires /sys/fs/${FSTYP}/${dname}/${attr} ${policy}" +} + +set_sysfs_policy() +{ + local dev=$1 + local attr=$2 + shift + shift + local policy=$@ + + _set_fs_sysfs_attr $dev $attr ${policy} + + case "$FSTYP" in + btrfs) + _get_fs_sysfs_attr $dev $attr | grep -q "[${policy}]" + if [[ $? != 0 ]]; then + echo "Setting sysfs $attr $policy failed" + fi + ;; + *) + _fail \ +"sysfs syntax verification for '${attr}' '${policy}' for '${FSTYP}' is not implemented" + ;; + esac +} + +set_sysfs_policy_must_fail() +{ + local dev=$1 + local attr=$2 + shift + shift + local policy=$@ + + _set_fs_sysfs_attr $dev $attr ${policy} | _filter_sysfs_error \ + | tee -a $seqres.full +}
common/sysfs line 98
Quoted 10 lines
common/sysfs new file +10
-0+ +# Verify sysfs attribute rejects invalid input. +# Usage syntax: +# verify_sysfs_syntax <$dev> <$attr> <$policy> [$value] +# Examples: +# verify_sysfs_syntax $TEST_DEV read_policy pid +# verify_sysfs_syntax $TEST_DEV read_policy round-robin 4k +# Note: +# Process must call . ./common/filter +verify_sysfs_syntax()
Wait a moment, we generally has "_" for common helpers (is there any exception you can find in common/ ?).
So better to add rename this function as _verify_sysfs_syntax.
Same to above two functions, please rename them to:_set_sysfs_policy, _set_sysfs_policy_must_fail,
Quoted 48 lines
common/sysfs new file +44
-0+{ + local dev=$1 + local attr=$2 + local policy=$3 + local value=$4 + + # Do this in the test case so that we know its prerequisites. + # '_require_fs_sysfs_attr_policy $TEST_DEV $attr $policy' + + # Test policy specified wrongly. Must fail. + set_sysfs_policy_must_fail $dev $attr "'$policy $policy'" + set_sysfs_policy_must_fail $dev $attr "'$policy t'" + set_sysfs_policy_must_fail $dev $attr "' '" + set_sysfs_policy_must_fail $dev $attr "'${policy} n'" + set_sysfs_policy_must_fail $dev $attr "'n ${policy}'" + set_sysfs_policy_must_fail $dev $attr "' ${policy}'" + set_sysfs_policy_must_fail $dev $attr "' ${policy} '" + set_sysfs_policy_must_fail $dev $attr "'${policy} '" + set_sysfs_policy_must_fail $dev $attr _${policy} + set_sysfs_policy_must_fail $dev $attr ${policy}_ + set_sysfs_policy_must_fail $dev $attr _${policy}_ + set_sysfs_policy_must_fail $dev $attr ${policy}: + # Test policy longer than 32 chars fails stable. + set_sysfs_policy_must_fail $dev $attr 'jfdkkkkjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjffjfjfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff' + + # Test policy specified correctly. Must pass. + set_sysfs_policy $dev $attr $policy + + # If the policy has no value return + if [[ -z $value ]]; then + return + fi + + # Test value specified wrongly. Must fail. + set_sysfs_policy_must_fail $dev $attr "'$policy: $value'" + set_sysfs_policy_must_fail $dev $attr "'$policy:$value '" + set_sysfs_policy_must_fail $dev $attr "'$policy:$value typo'" + set_sysfs_policy_must_fail $dev $attr "'$policy:${value}typo'" + set_sysfs_policy_must_fail $dev $attr "'$policy :$value'" + + # Test policy and value all specified correctly. Must pass. + set_sysfs_policy $dev $attr $policy:$value +} +Signature · 1 line
2.47.0
Re: [PATCH v4 4/5] fstests: btrfs: testcase for sysfs policy syntax verification
In reply to Anand JainQuoted 23 lines · Anand Jain
Checks if the sysfs attribute sanitizes arguments and verifies input syntax.
Signed-off-by Anand Jain <[email protected]>--- tests/btrfs/329 | 19 +++++++++++++++++++ tests/btrfs/329.out | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100755 tests/btrfs/329 create mode 100644 tests/btrfs/329.outtests/btrfs/329 new file +6
-0@@ -0,0 +1,19 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2025 Oracle. All Rights Reserved. +# +# FS QA Test 329 +#
tests/btrfs/329 line 16
Quoted 10 lines
tests/btrfs/329 new file +10
-0+# Verify sysfs knob input syntax for read_policy round-robin +# +. ./common/preamble +_begin_fstest auto quick + +. ./common/sysfs +. ./common/filter + +_require_fs_sysfs_attr_policy $TEST_DEV read_policy round-robin +verify_sysfs_syntax $TEST_DEV read_policy round-robin 4096
Please change the verify_sysfs_syntax to _verify_sysfs_syntax after you update the patch 3/5.
And just be curious, do we need to make sure the $TEST_DEV is mounted before testing the sysfs' read_policy of $TEST_DEV? For example, calls
_require_test
Thanks,
Zorro
Quoted 32 lines
tests/btrfs/329 new file +3
-0+ +status=0 +exittests/btrfs/329.out new file +19
-0@@ -0,0 +1,19 @@ +QA output created by 329 +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argumentSignature · 1 line
2.47.0
Re: [PATCH v4 5/5] fstests: btrfs: testcase for sysfs chunk_size attribute validation
In reply to Anand JainQuoted 23 lines · Anand Jain
Checks if the sysfs attribute sanitizes arguments and verifies input syntax allocation/data/chunk_size.
Signed-off-by Anand Jain <[email protected]>--- tests/btrfs/334 | 19 +++++++++++++++++++ tests/btrfs/334.out | 14 ++++++++++++++ 2 files changed, 33 insertions(+) create mode 100755 tests/btrfs/334 create mode 100644 tests/btrfs/334.outtests/btrfs/334 new file +6
-0@@ -0,0 +1,19 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2025 Oracle. All Rights Reserved. +# +# FS QA Test 334 +#
tests/btrfs/334 line 16
Quoted 10 lines
tests/btrfs/334 new file +10
-0+# Verify sysfs knob input syntax for allocation/data/chunk_size +# +. ./common/preamble +_begin_fstest auto quick + +. ./common/sysfs +. ./common/filter + +_require_fs_sysfs_attr $TEST_DEV allocation/data/chunk_size +verify_sysfs_syntax $TEST_DEV allocation/data/chunk_size 256m
Same review points with patch 4/5.
Quoted 27 lines
tests/btrfs/334 new file +3
-0+ +status=0 +exittests/btrfs/334.out new file +14
-0@@ -0,0 +1,14 @@ +QA output created by 334 +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argument +Invalid argumentSignature · 1 line
2.47.0