Hello community, here is the log from the commit of package blktests for openSUSE:Factory checked in at 2020-05-02 22:16:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blktests (Old) and /work/SRC/openSUSE:Factory/.blktests.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blktests" Sat May 2 22:16:56 2020 rev:4 rq:799430 version:0+20200430.bff70b0 Changes: -------- --- /work/SRC/openSUSE:Factory/blktests/blktests.changes 2020-04-02 17:45:15.253522016 +0200 +++ /work/SRC/openSUSE:Factory/.blktests.new.2738/blktests.changes 2020-05-02 22:16:59.084491719 +0200 @@ -1,0 +2,12 @@ +Fri May 1 08:48:32 UTC 2020 - Petr Cervinka <[email protected]> + +- Update to version 0+20200430.bff70b0: + * Add $DESCRIPTION to the TEST_RUN + * Fix unintentional skipping of tests + * Add a test that triggers the blk_mq_realloc_hw_ctxs() error path + * Introduce the function _configure_null_blk() + * Use _{init,exit}_null_blk instead of open-coding these functions + * Make _exit_null_blk remove all null_blk device instances + * common/fio: do not use norandommap with verify + +------------------------------------------------------------------- Old: ---- blktests-0+20200307.cd11d00.tar.xz New: ---- blktests-0+20200430.bff70b0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blktests.spec ++++++ --- /var/tmp/diff_new_pack.mXOYE7/_old 2020-05-02 22:16:59.860493344 +0200 +++ /var/tmp/diff_new_pack.mXOYE7/_new 2020-05-02 22:16:59.864493352 +0200 @@ -17,7 +17,7 @@ Name: blktests -Version: 0+20200307.cd11d00 +Version: 0+20200430.bff70b0 Release: 0 Summary: Linux kernel block layer testing framework License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.mXOYE7/_old 2020-05-02 22:16:59.908493445 +0200 +++ /var/tmp/diff_new_pack.mXOYE7/_new 2020-05-02 22:16:59.912493453 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/osandov/blktests</param> - <param name="changesrevision">cd11d001fe8619f491fcbf89517a14169411ac3e</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">bff70b048e3f7e8274b835687700156361de6836</param></service></servicedata> \ No newline at end of file ++++++ blktests-0+20200307.cd11d00.tar.xz -> blktests-0+20200430.bff70b0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/check new/blktests-0+20200430.bff70b0/check --- old/blktests-0+20200307.cd11d00/check 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/check 2020-04-30 22:21:23.000000000 +0200 @@ -167,7 +167,7 @@ local key value while IFS=$'\t' read -r key value; do - if [[ ! $key =~ ^date|status|reason|exit_status$ ]]; then + if [[ ! $key =~ ^description|date|status|reason|exit_status$ ]]; then LAST_TEST_RUN["$key"]="$value" fi done <"$seqres" @@ -267,7 +267,7 @@ { for key in "${!TEST_RUN[@]}"; do - if [[ $key =~ ^date|status|reason|exit_status$ ]]; then + if [[ $key =~ ^description|date|status|reason|exit_status$ ]]; then continue fi # [[ -v array[key] ]] was added in Bash 4.3. Do it this ugly @@ -331,6 +331,7 @@ declare -A TEST_RUN TEST_RUN["date"]="$(date "+%F %T")" + TEST_RUN["description"]="${DESCRIPTION}" mkdir -p "$(dirname "$seqres")" # Remove leftovers from last time. @@ -421,21 +422,8 @@ } _test_dev_is_zoned() { - if [[ ! -f "${TEST_DEV_SYSFS}/queue/zoned" ]] || - grep -q none "${TEST_DEV_SYSFS}/queue/zoned"; then - SKIP_REASON="${TEST_DEV} is not a zoned block device" - return 1 - fi - return 0 -} - -_test_dev_is_not_zoned() { - if _test_dev_is_zoned; then - SKIP_REASON="${TEST_DEV} is a zoned block device" - return 1 - fi - unset SKIP_REASON - return 0 + [[ -e "${TEST_DEV_SYSFS}/queue/zoned" && + $(cat "${TEST_DEV_SYSFS}/queue/zoned") != none ]] } _run_test() { @@ -497,7 +485,7 @@ local unset_skip_reason=0 if [[ ! -v SKIP_REASON ]]; then unset_skip_reason=1 - if (( !CAN_BE_ZONED )) && ! _test_dev_is_not_zoned; then + if (( !CAN_BE_ZONED )) && _test_dev_is_zoned; then SKIP_REASON="${TEST_DEV} is a zoned block device" elif declare -fF device_requires >/dev/null; then device_requires diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/common/fio new/blktests-0+20200430.bff70b0/common/fio --- old/blktests-0+20200307.cd11d00/common/fio 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/common/fio 2020-04-30 22:21:23.000000000 +0200 @@ -180,7 +180,7 @@ _run_fio_verify_io() { _run_fio --name=verify --rw=randwrite --direct=1 --ioengine=libaio --bs=4k \ - --norandommap --iodepth=16 --verify=crc32c "$@" + --iodepth=16 --verify=crc32c "$@" } _fio_perf_report() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/common/iopoll new/blktests-0+20200430.bff70b0/common/iopoll --- old/blktests-0+20200307.cd11d00/common/iopoll 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/common/iopoll 2020-04-30 22:21:23.000000000 +0200 @@ -17,7 +17,7 @@ return 0 } -_test_dev_supports_io_poll() { +_require_test_dev_supports_io_poll() { local old_io_poll if ! old_io_poll="$(cat "${TEST_DEV_SYSFS}/queue/io_poll" 2>/dev/null)"; then SKIP_REASON="kernel does not support polling" @@ -30,7 +30,7 @@ return 0 } -_test_dev_supports_io_poll_delay() { +_require_test_dev_supports_io_poll_delay() { local old_io_poll_delay if ! old_io_poll_delay="$(cat "${TEST_DEV_SYSFS}/queue/io_poll_delay" 2>/dev/null)"; then SKIP_REASON="kernel does not support hybrid polling" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/common/multipath-over-rdma new/blktests-0+20200430.bff70b0/common/multipath-over-rdma --- old/blktests-0+20200307.cd11d00/common/multipath-over-rdma 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/common/multipath-over-rdma 2020-04-30 22:21:23.000000000 +0200 @@ -5,6 +5,7 @@ # Functions and global variables used by both the srp and nvmeof-mp tests. . common/shellcheck +. common/null_blk debug= filesystem_type=ext4 @@ -619,28 +620,14 @@ configure_null_blk() { local i - ( - cd /sys/kernel/config/nullb || return $? - for i in nullb0 nullb1; do ( - { mkdir -p $i && - cd $i && - echo 0 > completion_nsec && - echo 512 > blocksize && - echo $((ramdisk_size>>20)) > size && - echo 1 > memory_backed && - echo 1 > power; } || exit $? - ) done - ) + for i in nullb0 nullb1; do + _configure_null_blk $i completion_nsec=0 blocksize=512 \ + size=$((ramdisk_size>>20)) memory_backed=1 \ + power=1 || return $? + done ls -l /dev/nullb* &>>"$FULL" } -unload_null_blk() { - local d - - for d in /sys/kernel/config/nullb/*; do [ -d "$d" ] && rmdir "$d"; done - unload_module null_blk -} - setup_rdma() { start_soft_rdma ( @@ -662,7 +649,7 @@ rm -f /etc/multipath.conf stop_target stop_soft_rdma - unload_null_blk + _exit_null_blk } teardown() { @@ -698,7 +685,7 @@ [ -e "/sys/module/$m" ] || modprobe "$m" || return $? done - modprobe null_blk nr_devices=0 || return $? + _init_null_blk nr_devices=0 || return $? configure_null_blk || return $? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/common/null_blk new/blktests-0+20200430.bff70b0/common/null_blk --- old/blktests-0+20200307.cd11d00/common/null_blk 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/common/null_blk 2020-04-30 22:21:23.000000000 +0200 @@ -8,11 +8,15 @@ _have_modules null_blk } -_init_null_blk() { +_remove_null_blk_devices() { if [[ -d /sys/kernel/config/nullb ]]; then find /sys/kernel/config/nullb -mindepth 1 -maxdepth 1 \ -type d -delete fi +} + +_init_null_blk() { + _remove_null_blk_devices local zoned="" if (( RUN_FOR_ZONED )); then zoned="zoned=1"; fi @@ -25,7 +29,22 @@ return 0 } +# Configure one null_blk instance with name $1 and parameters $2..${$#}. +_configure_null_blk() { + local nullb=/sys/kernel/config/nullb/$1 param val + + shift + mkdir "$nullb" || return $? + while [[ $# -gt 0 ]]; do + param="${1%%=*}" + val="${1#*=}" + shift + echo "$val" > "$nullb/$param" || return $? + done +} + _exit_null_blk() { + _remove_null_blk_devices udevadm settle modprobe -r null_blk } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/common/rc new/blktests-0+20200430.bff70b0/common/rc --- old/blktests-0+20200307.cd11d00/common/rc 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/common/rc 2020-04-30 22:21:23.000000000 +0200 @@ -181,17 +181,25 @@ return 0 } -_test_dev_can_discard() { - if [[ $(cat "${TEST_DEV_SYSFS}/queue/discard_max_bytes") -eq 0 ]]; then - SKIP_REASON="$TEST_DEV does not support discard" +_test_dev_is_rotational() { + [[ $(cat "${TEST_DEV_SYSFS}/queue/rotational") -ne 0 ]] +} + +_require_test_dev_is_rotational() { + if ! _test_dev_is_rotational; then + SKIP_REASON="$TEST_DEV is not rotational" return 1 fi return 0 } -_test_dev_is_rotational() { - if [[ $(cat "${TEST_DEV_SYSFS}/queue/rotational") -eq 0 ]]; then - SKIP_REASON="$TEST_DEV is not rotational" +_test_dev_can_discard() { + [[ $(cat "${TEST_DEV_SYSFS}/queue/discard_max_bytes") -gt 0 ]] +} + +_require_test_dev_can_discard() { + if ! _test_dev_can_discard; then + SKIP_REASON="$TEST_DEV does not support discard" return 1 fi return 0 @@ -214,7 +222,7 @@ echo "$2" >"${TEST_DEV_SYSFS}/queue/$1" } -_test_dev_is_pci() { +_require_test_dev_is_pci() { if ! readlink -f "$TEST_DEV_SYSFS/device" | grep -q pci; then # nvme needs some special casing if readlink -f "$TEST_DEV_SYSFS/device" | grep -q nvme; then @@ -247,7 +255,7 @@ tail -2 | head -1 } -_test_dev_in_hotplug_slot() { +_require_test_dev_in_hotplug_slot() { local parent parent="$(_get_pci_parent_from_blkdev)" @@ -261,7 +269,11 @@ } _test_dev_is_partition() { - if [[ -z ${TEST_DEV_PART_SYSFS} ]]; then + [[ -n ${TEST_DEV_PART_SYSFS} ]] +} + +_require_test_dev_is_partition() { + if ! _test_dev_is_partition; then SKIP_REASON="${TEST_DEV} is not a partition device" return 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/new new/blktests-0+20200430.bff70b0/new --- old/blktests-0+20200307.cd11d00/new 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/new 2020-04-30 22:21:23.000000000 +0200 @@ -85,10 +85,10 @@ # # Usually, group_device_requires() just needs to check that the test device is # the right type of hardware or supports any necessary features using the -# _test_dev_foo helpers. If group_device_requires() sets \$SKIP_REASON, all -# tests in this group will be skipped on that device. +# _require_test_dev_foo helpers. If group_device_requires() sets \$SKIP_REASON, +# all tests in this group will be skipped on that device. # group_device_requires() { -# _test_dev_is_foo && _test_dev_supports_bar +# _require_test_dev_is_foo && _require_test_dev_supports_bar # } # TODO: define any helpers that are specific to this group. @@ -171,10 +171,10 @@ # # Usually, device_requires() just needs to check that the test device is the # right type of hardware or supports any necessary features using the -# _test_dev_foo helpers. If device_requires() sets \$SKIP_REASON, the test will -# be skipped on that device. +# _require_test_dev_foo helpers. If device_requires() sets \$SKIP_REASON, the +# test will be skipped on that device. # device_requires() { -# _test_dev_is_foo && _test_dev_supports_bar +# _require_test_dev_is_foo && _require_test_dev_supports_bar # } # TODO: define the test. The output of this function (stdout and stderr) will diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/block/003 new/blktests-0+20200430.bff70b0/tests/block/003 --- old/blktests-0+20200307.cd11d00/tests/block/003 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/block/003 2020-04-30 22:21:23.000000000 +0200 @@ -14,7 +14,7 @@ } device_requires() { - _test_dev_can_discard + _require_test_dev_can_discard } test_device() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/block/007 new/blktests-0+20200430.bff70b0/tests/block/007 --- old/blktests-0+20200307.cd11d00/tests/block/007 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/block/007 2020-04-30 22:21:23.000000000 +0200 @@ -15,7 +15,8 @@ } device_requires() { - _test_dev_supports_io_poll && _test_dev_supports_io_poll_delay + _require_test_dev_supports_io_poll && + _require_test_dev_supports_io_poll_delay } run_fio_job() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/block/011 new/blktests-0+20200430.bff70b0/tests/block/011 --- old/blktests-0+20200307.cd11d00/tests/block/011 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/block/011 2020-04-30 22:21:23.000000000 +0200 @@ -15,7 +15,7 @@ } device_requires() { - _test_dev_is_pci + _require_test_dev_is_pci } test_device() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/block/019 new/blktests-0+20200430.bff70b0/tests/block/019 --- old/blktests-0+20200307.cd11d00/tests/block/019 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/block/019 2020-04-30 22:21:23.000000000 +0200 @@ -14,7 +14,7 @@ } device_requires() { - _test_dev_is_pci && _test_dev_in_hotplug_slot + _require_test_dev_is_pci && _require_test_dev_in_hotplug_slot } test_device() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/block/022 new/blktests-0+20200430.bff70b0/tests/block/022 --- old/blktests-0+20200307.cd11d00/tests/block/022 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/block/022 2020-04-30 22:21:23.000000000 +0200 @@ -50,9 +50,6 @@ wait $pid1 } 2>/dev/null - rmdir /sys/kernel/config/nullb/1 - rmdir /sys/kernel/config/nullb/0 - _exit_null_blk echo "Test complete" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/block/029 new/blktests-0+20200430.bff70b0/tests/block/029 --- old/blktests-0+20200307.cd11d00/tests/block/029 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/block/029 2020-04-30 22:21:23.000000000 +0200 @@ -14,19 +14,6 @@ _have_null_blk } -# Configure one null_blk instance. -configure_null_blk() { - local nullb0="/sys/kernel/config/nullb/nullb0" - - mkdir "$nullb0" && - echo 0 > "$nullb0/completion_nsec" && - echo 512 > "$nullb0/blocksize" && - echo 16 > "$nullb0/size" && - echo 1 > "$nullb0/memory_backed" && - echo 1 > "$nullb0/power" && - ls -l /dev/nullb* &>>"$FULL" -} - modify_nr_hw_queues() { local deadline num_cpus @@ -45,7 +32,8 @@ : "${TIMEOUT:=30}" _init_null_blk nr_devices=0 queue_mode=2 && - configure_null_blk + _configure_null_blk nullb0 completion_nsec=0 blocksize=512 \ + size=16 memory_backed=1 power=1 && if { echo 1 >$sq; } 2>/dev/null; then modify_nr_hw_queues & fio --rw=randwrite --bs=4K --loops=$((10**6)) \ @@ -58,7 +46,6 @@ else echo "Skipping test because $sq cannot be modified" >>"$FULL" fi - rmdir /sys/kernel/config/nullb/nullb0 _exit_null_blk echo Passed } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/block/030 new/blktests-0+20200430.bff70b0/tests/block/030 --- old/blktests-0+20200307.cd11d00/tests/block/030 1970-01-01 01:00:00.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/block/030 2020-04-30 22:21:23.000000000 +0200 @@ -0,0 +1,53 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2020 Google LLC +# +# Trigger the blk_mq_realloc_hw_ctxs() error path. Regression test for commit +# d0930bb8f46b ("blk-mq: Fix a recently introduced regression in +# blk_mq_realloc_hw_ctxs()"). + +. tests/block/rc +. common/null_blk + +DESCRIPTION="trigger the blk_mq_realloc_hw_ctxs() error path" +QUICK=1 + +requires() { + _have_null_blk && _have_module_param null_blk init_hctx +} + +test() { + local i sq=/sys/kernel/config/nullb/nullb0/submit_queues + + : "${TIMEOUT:=30}" + # Legend: init_hctx=<interval>,<probability>,<space>,<times> + # Set <space> to $(nproc) + 1 to make loading of null_blk succeed. + if ! _init_null_blk nr_devices=0 queue_mode=2 \ + "init_hctx=$(nproc),100,$(($(nproc) + 1)),-1"; then + echo "Loading null_blk failed" + return 1 + fi + if ! _configure_null_blk nullb0 completion_nsec=0 blocksize=512 size=16\ + submit_queues="$(nproc)" memory_backed=1 power=1; then + echo "Configuring null_blk failed" + return 1 + fi + # Since older null_blk versions do not allow "submit_queues" to be + # modified, check first whether that configs attribute is writeable. + # Each iteration of the loop below triggers $(nproc) + 1 + # null_init_hctx() calls. Since <interval>=$(nproc), all possible + # blk_mq_realloc_hw_ctxs() error paths will be triggered. Whether or + # not this test succeeds depends on whether or not _check_dmesg() + # detects a kernel warning. + if { echo "$(<"$sq")" >$sq; } 2>/dev/null; then + for ((i = 0; i < 100; i++)); do + echo 1 > $sq + nproc > $sq + done + else + SKIP_REASON="Skipping test because $sq cannot be modified" + fi + rmdir /sys/kernel/config/nullb/nullb0 + _exit_null_blk + echo Passed +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/block/030.out new/blktests-0+20200430.bff70b0/tests/block/030.out --- old/blktests-0+20200307.cd11d00/tests/block/030.out 1970-01-01 01:00:00.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/block/030.out 2020-04-30 22:21:23.000000000 +0200 @@ -0,0 +1 @@ +Passed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/nvme/032 new/blktests-0+20200430.bff70b0/tests/nvme/032 --- old/blktests-0+20200307.cd11d00/tests/nvme/032 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/nvme/032 2020-04-30 22:21:23.000000000 +0200 @@ -19,7 +19,7 @@ } device_requires() { - _test_dev_is_nvme + _require_test_dev_is_nvme } test_device() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/nvme/rc new/blktests-0+20200430.bff70b0/tests/nvme/rc --- old/blktests-0+20200307.cd11d00/tests/nvme/rc 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/nvme/rc 2020-04-30 22:21:23.000000000 +0200 @@ -11,12 +11,12 @@ } group_device_requires() { - _test_dev_is_nvme + _require_test_dev_is_nvme } NVMET_CFS="/sys/kernel/config/nvmet/" -_test_dev_is_nvme() { +_require_test_dev_is_nvme() { if ! readlink -f "$TEST_DEV_SYSFS/device" | grep -q nvme; then SKIP_REASON="$TEST_DEV is not a NVMe device" return 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/nvmeof-mp/rc new/blktests-0+20200430.bff70b0/tests/nvmeof-mp/rc --- old/blktests-0+20200307.cd11d00/tests/nvmeof-mp/rc 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/nvmeof-mp/rc 2020-04-30 22:21:23.000000000 +0200 @@ -278,7 +278,7 @@ ) unload_module nvmet_rdma && unload_module nvmet && - unload_null_blk + _exit_null_blk } start_target() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/scsi/006 new/blktests-0+20200430.bff70b0/tests/scsi/006 --- old/blktests-0+20200307.cd11d00/tests/scsi/006 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/scsi/006 2020-04-30 22:21:23.000000000 +0200 @@ -12,7 +12,7 @@ QUICK=1 device_requires() { - _test_dev_is_scsi_disk + _require_test_dev_is_scsi_disk } test_device() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/scsi/rc new/blktests-0+20200430.bff70b0/tests/scsi/rc --- old/blktests-0+20200307.cd11d00/tests/scsi/rc 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/scsi/rc 2020-04-30 22:21:23.000000000 +0200 @@ -11,14 +11,14 @@ } group_device_requires() { - _test_dev_is_scsi + _require_test_dev_is_scsi } _have_scsi_generic() { _have_modules sg } -_test_dev_is_scsi() { +_require_test_dev_is_scsi() { if [[ ! -d ${TEST_DEV_SYSFS}/device/scsi_device ]]; then SKIP_REASON="$TEST_DEV is not a SCSI device" return 1 @@ -26,7 +26,7 @@ return 0 } -_test_dev_is_scsi_disk() { +_require_test_dev_is_scsi_disk() { if [[ ! -d ${TEST_DEV_SYSFS}/device/scsi_disk ]]; then SKIP_REASON="$TEST_DEV is not a SCSI disk" return 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/zbd/007 new/blktests-0+20200430.bff70b0/tests/zbd/007 --- old/blktests-0+20200307.cd11d00/tests/zbd/007 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/zbd/007 2020-04-30 22:21:23.000000000 +0200 @@ -18,7 +18,7 @@ } device_requires() { - _test_dev_is_logical + _require_test_dev_is_logical } # Select test target zones. Pick up the first sequential required zones. If diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blktests-0+20200307.cd11d00/tests/zbd/rc new/blktests-0+20200430.bff70b0/tests/zbd/rc --- old/blktests-0+20200307.cd11d00/tests/zbd/rc 2020-03-07 22:56:25.000000000 +0100 +++ new/blktests-0+20200430.bff70b0/tests/zbd/rc 2020-04-30 22:21:23.000000000 +0200 @@ -18,7 +18,10 @@ } group_device_requires() { - _test_dev_is_zoned + if ! _test_dev_is_zoned; then + SKIP_REASON="${TEST_DEV} is not a zoned block device" + return + fi } _fallback_null_blk_zoned() { @@ -253,14 +256,10 @@ } _test_dev_is_dm() { - if [[ ! -r "${TEST_DEV_SYSFS}/dm/name" ]]; then - SKIP_REASON="$TEST_DEV is not device-mapper" - return 1 - fi - return 0 + [[ -r "${TEST_DEV_SYSFS}/dm/name" ]] } -_test_dev_is_logical() { +_require_test_dev_is_logical() { if ! _test_dev_is_partition && ! _test_dev_is_dm; then SKIP_REASON="$TEST_DEV is not a logical device" return 1 @@ -274,11 +273,9 @@ dm_name=$(<"${TEST_DEV_SYSFS}/dm/name") if ! dmsetup status "${dm_name}" | grep -qe "${target_type}"; then - SKIP_REASON="$TEST_DEV does not have ${target_type} map" return 1 fi if dmsetup status "${dm_name}" | grep -v "${target_type}"; then - SKIP_REASON="$TEST_DEV has map other than ${target_type}" return 1 fi return 0
