[blktests,v4,03/12] block/004: Adjust fio conditions for zoned block devices

Commit Message

Shin'ichiro Kawasaki Jan. 28, 2019, 1:14 p.m. UTC

For a random write pattern to a zoned block device, fio requires --direct=1
and --zonemode=zbd options as well as deadline I/O scheduler to be
specified. Specify these options and set the I/O scheduler if the target
device is a zoned block device. Before doing that, also make sure that the
deadline scheduler is available and that fio supports the zbd zone mode.
Set CAN_BE_ZONED flag to run this test case for zoned block devices.

Signed-off-by: Shin'ichiro Kawasaki <[e-mail]>
---
 tests/block/004 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

Patch

diff --git a/tests/block/004 b/tests/block/004
index 4c14c4b..d181725 100755
--- a/tests/block/004
+++ b/tests/block/004
@@ -8,18 +8,32 @@ 
 
 DESCRIPTION="run lots of flushes"
 TIMED=1
+CAN_BE_ZONED=1
 
 requires() {
 	_have_fio
 }
 
+device_requires() {
+	! _test_dev_is_zoned || _have_fio_zbd_zonemode
+}
+
 test_device() {
 	echo "Running ${TEST_NAME}"
 
+	local directio=""
+	local zbdmode=""
+
+	if _test_dev_is_zoned; then
+		_test_dev_queue_set scheduler deadline
+		directio="--direct=1"
+		zbdmode="--zonemode=zbd"
+	fi
+
 	FIO_PERF_FIELDS=("write iops")
 	_fio_perf --bs=4k --rw=randwrite --norandommap --fsync=1 \
 		--number_ios=256 --numjobs=64 --name=flushes \
-		--filename="$TEST_DEV"
+		${directio} ${zbdmode} --filename="$TEST_DEV"
 
 	echo "Test complete"
 }