| Message ID | 20171117202828.25472-4-ross.zwisler@linux.intel.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Fri, Nov 17, 2017 at 01:28:27PM -0700, Ross Zwisler wrote: > Enhance _require_dm_target so that a user can request a minimum version of a > given dm target. > > DAX support was added to v1.1.0 of the dm-log-writes kernel module, so > allow the DAX mount option starting with that version. Is is possible not relying on the version numbers but actually trying what you want to do and _notrun if that fails? Currently fstests does no version number checking at all, and it'd be great if we keep that tradition. Thanks, Eryu -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Nov 18, 2017 at 02:17:03PM +0800, Eryu Guan wrote: > On Fri, Nov 17, 2017 at 01:28:27PM -0700, Ross Zwisler wrote: > > Enhance _require_dm_target so that a user can request a minimum version of a > > given dm target. > > > > DAX support was added to v1.1.0 of the dm-log-writes kernel module, so > > allow the DAX mount option starting with that version. > > Is is possible not relying on the version numbers but actually trying > what you want to do and _notrun if that fails? Currently fstests does no > version number checking at all, and it'd be great if we keep that > tradition. Yep, and I agree that this is better. I'll be fixed in the next version. Thanks for the feedback. -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/common/dmlogwrites b/common/dmlogwrites index 80ed4fc..2cb804c 100644 --- a/common/dmlogwrites +++ b/common/dmlogwrites @@ -23,8 +23,9 @@ _require_log_writes() [ -z "$LOGWRITES_DEV" -o ! -b "$LOGWRITES_DEV" ] && \ _notrun "This test requires a valid \$LOGWRITES_DEV" - _exclude_scratch_mount_option dax - _require_dm_target log-writes + local z=0 + _scratch_has_mount_option dax && z=1 + _require_dm_target log-writes 1 $z 0 _require_test_program "log-writes/replay-log" } diff --git a/common/rc b/common/rc index 701b1ff..c1f24ed 100644 --- a/common/rc +++ b/common/rc @@ -1782,6 +1782,18 @@ _require_sane_bdev_flush() fi } +_compare_dm_target_versions() +{ + for i in $(seq 0 2); do + if [[ ${_actual_ver[$i]} > ${_required_ver[$i]} ]]; then + return + fi + if [[ ${_actual_ver[$i]} < ${_required_ver[$i]} ]]; then + _notrun "dm $_target version ${_required_ver[@]} required" + fi + done +} + # this test requires a specific device mapper target _require_dm_target() { @@ -1795,8 +1807,15 @@ _require_dm_target() modprobe dm-$_target >/dev/null 2>&1 - $DMSETUP_PROG targets 2>&1 | grep -q ^$_target - if [ $? -ne 0 ]; then + local _version=$($DMSETUP_PROG targets 2>&1 | grep ^$_target) + if [[ $_version =~ .*v([0-9]+)\.([0-9]+)\.([0-9]+) ]]; then + # check for a required minimum version? + if [[ $# == 4 ]]; then + local _actual_ver=(${BASH_REMATCH[@]:1}) + local _required_ver=($2 $3 $4) + _compare_dm_target_versions + fi + else _notrun "This test requires dm $_target support" fi } diff --git a/doc/requirement-checking.txt b/doc/requirement-checking.txt index 4e01b1f..bbfc34f 100644 --- a/doc/requirement-checking.txt +++ b/doc/requirement-checking.txt @@ -112,10 +112,11 @@ _require_statx DEVICE MAPPER REQUIREMENTS ========================== -_require_dm_target <name> +_require_dm_target <name> [<version 1> <version 2> <version 3>] The test requires the use of the device mapper target and will be skipped - if it isn't available in the kernel. + if it isn't available in the kernel. Optionally specify the minimum + three part version number of the dm target that is required. _require_log_writes
Enhance _require_dm_target so that a user can request a minimum version of a given dm target. DAX support was added to v1.1.0 of the dm-log-writes kernel module, so allow the DAX mount option starting with that version. Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> Suggested-by: Amir Goldstein <amir73il@gmail.com> --- common/dmlogwrites | 5 +++-- common/rc | 23 +++++++++++++++++++++-- doc/requirement-checking.txt | 5 +++-- 3 files changed, 27 insertions(+), 6 deletions(-)