nvme/{045,047}: Calculate IO size for random fio jobs

_nvme_calc_run_io_size() returns the jobs size for _run_fio_rand_io()
function. The jobs size is the size per job, thus we have to divide
through the number of CPUs.

_xfs_run_fio_verify_io() is replaced with _run_fio_rand_io() because the
former has a minimum nvme_img_size of 350M. Both tests nvme/{045,047}
just want some IO to verify that the path is working. Thus reduce the
min nmve_img_size requirement switch to _run_fio_rand_io()

Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/045 b/tests/nvme/045
index d6eba6c654cdf5cf6ba41d9e038451dc10c2ed96..26a55335a92cb0fc9a691940b465a86856af04e8 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -32,6 +32,7 @@ test() {
        local ctrlkey
        local new_ctrlkey
        local ctrldev
+       local rand_io_size
 
        echo "Running ${TEST_NAME}"
 
@@ -121,7 +122,8 @@ test() {
 
        nvmedev=$(_find_nvme_dev "${subsys_name}")
 
-       _run_fio_rand_io --size=4m --filename="/dev/${nvmedev}n1"
+       rand_io_size="$(_nvme_calc_rand_io_size 4m)"
+       _run_fio_rand_io --size="${rand_io_size}" --filename="/dev/${nvmedev}n1"
 
        _nvme_disconnect_subsys "${subsys_name}"
 

diff --git a/tests/nvme/047 b/tests/nvme/047
index b5a8d469a9831b6dde3b60eb2c2f39989ca9605d..6a7599bc2e91f0ac45a054601ece77a466920ad2 100755 (executable)
--- a/tests/nvme/047
+++ b/tests/nvme/047
@@ -25,6 +25,7 @@ test() {
        local port
        local nvmedev
        local loop_dev
+       local rand_io_size
        local file_path="$TMPDIR/img"
        local subsys_name="blktests-subsystem-1"
 
@@ -42,7 +43,8 @@ test() {
 
        nvmedev=$(_find_nvme_dev "${subsys_name}")
 
-       _xfs_run_fio_verify_io /dev/"${nvmedev}n1" "1m" || echo FAIL
+       rand_io_size="$(_nvme_calc_rand_io_size 4M)"
+       _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size="${rand_io_size}"
 
        _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
 
@@ -50,7 +52,7 @@ test() {
                --nr-write-queues 1 \
                --nr-poll-queues 1 || echo FAIL
 
-       _xfs_run_fio_verify_io /dev/"${nvmedev}n1" "1m" || echo FAIL
+       _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size="${rand_io_size}"
 
        _nvme_disconnect_subsys "${subsys_name}" >> "$FULL" 2>&1
 

diff --git a/tests/nvme/rc b/tests/nvme/rc
index c4854e63711580495ef20f9f3a146d61e65e0181..3fd03f40a1b678f6c036ffda31b8126db8e7d194 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -150,6 +150,16 @@ _test_dev_nvme_nsid() {
        cat "${TEST_DEV_SYSFS}/nsid"
 }
 
+_nvme_calc_rand_io_size() {
+       local img_size_mb
+       local io_size_kb
+
+       img_size_mb="$(convert_to_mb "$1")"
+       io_size_kb="$(((img_size_mb * 1024) / $(nproc)))"
+
+       echo "${io_size_kb}k"
+}
+
 _nvme_fcloop_add_rport() {
        local local_wwnn="$1"
        local local_wwpn="$2"