blktest: remove instances of null_blk queue_mode=1

This is no longer supported in recent kernels, get rid of any testing of
queue_mode=1. queue_mode=1 tested the legacy IO path, which is going
away completely. As such, there's no point in doing anymore testing with
it.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/tests/block/017 b/tests/block/017
index 715c4e59c514008556a1a84dbacb50fbb2ee1cb1..cea29beaf0625eea588927e58c1225f06f576c44 100755 (executable)
--- a/tests/block/017
+++ b/tests/block/017
@@ -26,27 +26,23 @@ show_inflight() {
 test() {
        echo "Running ${TEST_NAME}"
 
-       for ((queue_mode = 1; queue_mode <= 2; queue_mode++)) do
-               echo "queue mode $queue_mode"
+       if ! _init_null_blk queue_mode=2 irqmode=2 \
+            completion_nsec=500000000; then
+               return 1
+       fi
 
-               if ! _init_null_blk queue_mode="$queue_mode" irqmode=2 \
-                    completion_nsec=500000000; then
-                       continue
-               fi
+       dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1 status=none &
+       sleep 0.1
+       show_inflight
 
-               dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1 status=none &
-               sleep 0.1
-               show_inflight
+       dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none &
+       sleep 0.1
+       show_inflight
 
-               dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none &
-               sleep 0.1
-               show_inflight
+       wait
+       show_inflight
 
-               wait
-               show_inflight
-
-               _exit_null_blk
-       done
+       _exit_null_blk
 
        echo "Test complete"
 }

diff --git a/tests/block/017.out b/tests/block/017.out
index 93d67c98e15931011d66381d58d7a5cac6c4403c..e2ecf978af5f67827f40898e3078f09e8ddc7645 100644 (file)
--- a/tests/block/017.out
+++ b/tests/block/017.out
@@ -1,18 +1,4 @@
 Running block/017
-queue mode 1
-sysfs inflight reads 1
-sysfs inflight writes 0
-sysfs stat 1
-diskstats 1
-sysfs inflight reads 1
-sysfs inflight writes 1
-sysfs stat 2
-diskstats 2
-sysfs inflight reads 0
-sysfs inflight writes 0
-sysfs stat 0
-diskstats 0
-queue mode 2
 sysfs inflight reads 1
 sysfs inflight writes 0
 sysfs stat 1

diff --git a/tests/block/018 b/tests/block/018
index 279dc7a3195890cb2ea0d9cf5f3d89fd4ad40897..731272399a82b9b7d5e6d7a32e968cbfb62cd0f1 100755 (executable)
--- a/tests/block/018
+++ b/tests/block/018
@@ -29,37 +29,33 @@ show_times() {
 }
 
 test() {
-       echo "Running ${TEST_NAME}"
-
-       for ((queue_mode = 1; queue_mode <= 2; queue_mode++)) do
-               local init_read_ms init_write_ms read_ms write_ms
+       local init_read_ms init_write_ms read_ms write_ms
 
-               echo "queue mode $queue_mode"
+       echo "Running ${TEST_NAME}"
 
-               if ! _init_null_blk queue_mode="$queue_mode" irqmode=2 \
-                    completion_nsec=1000000000; then
-                       continue
-               fi
+       if ! _init_null_blk queue_mode=2 irqmode=2 \
+            completion_nsec=1000000000; then
+               return 1
+       fi
 
-               init_times
-               show_times
+       init_times
+       show_times
 
-               dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1 status=none
-               show_times
+       dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1 status=none
+       show_times
 
-               dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none
-               show_times
+       dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none
+       show_times
 
-               dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1 status=none &
-               dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none &
-               dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none &
-               wait
-               show_times
+       dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1 status=none &
+       dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none &
+       dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1 status=none &
+       wait
+       show_times
 
-               _exit_null_blk
+       _exit_null_blk
 
-               unset init_read_ms init_write_ms read_ms write_ms
-       done
+       unset init_read_ms init_write_ms read_ms write_ms
 
        echo "Test complete"
 }

diff --git a/tests/block/018.out b/tests/block/018.out
index facb7c2be260e716d37de08688c1b457811eaf70..27c74bec233795ac2ad56451d324a88ae3e9ad9e 100644 (file)
--- a/tests/block/018.out
+++ b/tests/block/018.out
@@ -1,14 +1,4 @@
 Running block/018
-queue mode 1
-read 0 s
-write 0 s
-read 1 s
-write 0 s
-read 1 s
-write 1 s
-read 2 s
-write 3 s
-queue mode 2
 read 0 s
 write 0 s
 read 1 s

diff --git a/tests/block/022 b/tests/block/022
deleted file mode 100755 (executable)
index 91946cf..0000000
--- a/tests/block/022
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
-# Copyright (C) 2018 Jens Axboe
-#
-# Smoke test !mq timeout handling with null-blk.
-
-. tests/block/rc
-. common/null_blk
-
-DESCRIPTION="run null-blk with legacy blk path and timeout injection configured"
-
-requires() {
-       _have_null_blk && _have_module_param null_blk timeout
-}
-
-test() {
-       echo "Running ${TEST_NAME}"
-
-       # The format is "<interval>,<probability>,<space>,<times>". Here, we
-       # fail 50% of I/Os.
-       if ! _init_null_blk queue_mode=1 timeout='1,50,0,-1'; then
-               return 1
-       fi
-
-       local scheds
-       # shellcheck disable=SC2207
-       scheds=($(sed 's/[][]//g' /sys/block/nullb0/queue/scheduler))
-
-       for sched in "${scheds[@]}"; do
-               echo "Testing $sched" >> "$FULL"
-               echo "$sched" > /sys/block/nullb0/queue/scheduler
-               # Do a bunch of I/Os which will timeout and then complete. The
-               # only thing we're really testing here is that this doesn't
-               # crash or hang.
-               for ((i = 0; i < 100; i++)); do
-                       dd if=/dev/nullb0 of=/dev/null bs=4K count=4 \
-                               iflag=direct status=none &
-               done
-               wait
-       done
-
-       _exit_null_blk
-
-       echo "Test complete"
-}

diff --git a/tests/block/022.out b/tests/block/022.out
deleted file mode 100644 (file)
index 14d43cb..0000000
--- a/tests/block/022.out
+++ /dev/null
@@ -1,2 +0,0 @@
-Running block/022
-Test complete

diff --git a/tests/block/023 b/tests/block/023
index b053af45adb0a979e1d9241761fff33f0ac0e71f..b0739f72e46dbe82c9bae15b6c91e40791f07972 100755 (executable)
--- a/tests/block/023
+++ b/tests/block/023
@@ -19,7 +19,7 @@ test() {
        echo "Running ${TEST_NAME}"
 
        local queue_mode
-       for ((queue_mode = 0; queue_mode <= 2; queue_mode++)); do
+       for queue_mode in 0 2; do
                if _init_null_blk gb=1 queue_mode="$queue_mode"; then
                        echo "Queue mode $queue_mode"
                        dd if=/dev/nullb0 of=/dev/null iflag=direct bs=64k status=none

diff --git a/tests/block/023.out b/tests/block/023.out
index a2f376d979e26fe84063958ffea102695ef5faaa..3216d0c4b5c18691ca2d9d2c01722d7bdd0341d2 100644 (file)
--- a/tests/block/023.out
+++ b/tests/block/023.out
@@ -1,5 +1,4 @@
 Running block/023
 Queue mode 0
-Queue mode 1
 Queue mode 2
 Test complete

diff --git a/tests/block/024 b/tests/block/024
index 31898e42145dfc373c41bb40038a02a30b869e7c..cf1470709169d01528cedc22c8f4223d11ec8e8b 100755 (executable)
--- a/tests/block/024
+++ b/tests/block/024
@@ -31,41 +31,37 @@ show_times() {
 }
 
 test() {
-       echo "Running ${TEST_NAME}"
-
-       for ((queue_mode = 1; queue_mode <= 2; queue_mode++)) do
-               local init_read_ms init_write_ms read_ms write_ms
+       local init_read_ms init_write_ms read_ms write_ms
 
-               echo "queue mode $queue_mode"
+       echo "Running ${TEST_NAME}"
 
-               # The maximum value for CONFIG_HZ is 1000. I.e., a tick is one
-               # millisecond. So, make each I/O take half a millisecond.
-               if ! _init_null_blk queue_mode="$queue_mode" irqmode=2 \
-                    completion_nsec=500000; then
-                       continue
-               fi
+       # The maximum value for CONFIG_HZ is 1000. I.e., a tick is one
+       # millisecond. So, make each I/O take half a millisecond.
+       if ! _init_null_blk queue_mode=2 irqmode=2 \
+            completion_nsec=500000; then
+               return 1
+       fi
 
-               init_times
-               show_times
+       init_times
+       show_times
 
-               # 1500 * 0.5 ms is 0.75 seconds, allowing for some overhead so
-               # that it rounds to one second.
-               dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1500 status=none
-               show_times
+       # 1500 * 0.5 ms is 0.75 seconds, allowing for some overhead so
+       # that it rounds to one second.
+       dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1500 status=none
+       show_times
 
-               dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1500 status=none
-               show_times
+       dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1500 status=none
+       show_times
 
-               dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1500 status=none &
-               dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1500 status=none &
-               dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1500 status=none &
-               wait
-               show_times
+       dd if=/dev/nullb0 of=/dev/null bs=4096 iflag=direct count=1500 status=none &
+       dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1500 status=none &
+       dd if=/dev/zero of=/dev/nullb0 bs=4096 oflag=direct count=1500 status=none &
+       wait
+       show_times
 
-               _exit_null_blk
+       _exit_null_blk
 
-               unset init_read_ms init_write_ms read_ms write_ms
-       done
+       unset init_read_ms init_write_ms read_ms write_ms
 
        echo "Test complete"
 }

diff --git a/tests/block/024.out b/tests/block/024.out
index 7600389291afdb406e92e02cfdcae954d5d0b2a5..3cff4189c711ad3bc1a8b8df30020fb21587cda4 100644 (file)
--- a/tests/block/024.out
+++ b/tests/block/024.out
@@ -1,14 +1,4 @@
 Running block/024
-queue mode 1
-read 0 s
-write 0 s
-read 1 s
-write 0 s
-read 1 s
-write 1 s
-read 2 s
-write 3 s
-queue mode 2
 read 0 s
 write 0 s
 read 1 s