]> www.infradead.org Git - users/sagi/blktests.git/commitdiff
block/007: skip hybrid polling tests when kernel does not support it
authorShin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Wed, 13 Dec 2023 08:46:19 +0000 (17:46 +0900)
committerShin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Mon, 25 Dec 2023 04:10:30 +0000 (13:10 +0900)
Since the kernel commit 54bdd67d0f88 ("blk-mq: remove hybrid polling"),
kernel does not support hybrid polling. The test case block/007
specifies auto-hybrid and fixed-hybrid polling for testing. But it is
confusing and meaningless when kernel does not support it. Check if
kernel supports hybrid polling. If not, skip the hybrid polling tests.

Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
tests/block/007

index faa378046f76f5db97d46c6a447024fbeb7e7dac..3b68d0deec353bf70e22baee907c875738261654 100755 (executable)
@@ -58,14 +58,18 @@ test_device() {
        run_fio_job 1
 
        # switch to auto-hybrid polling, run job
-       FIO_PERF_PREFIX="auto hybrid poll "
        _test_dev_queue_set io_poll_delay 0
-       run_fio_job 1
+       if [[ $(_test_dev_queue_get io_poll_delay) == '0' ]]; then
+               FIO_PERF_PREFIX="auto hybrid poll "
+               run_fio_job 1
+       fi
 
        # switch to explicit delay polling, run job
-       FIO_PERF_PREFIX="fixed hybrid poll "
        _test_dev_queue_set io_poll_delay 4
-       run_fio_job 1
+       if [[ $(_test_dev_queue_get io_poll_delay) == '4' ]]; then
+               FIO_PERF_PREFIX="fixed hybrid poll "
+               run_fio_job 1
+       fi
 
        echo "Test complete"
 }