nvme/{014/015}: Do not hard code device size for dd test

Read the block device sizes instead hard coding them,
so that the device size can be configurable in future.

Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/014 b/tests/nvme/014
index d13cff7921da4010b899e55a7576638ad457c5e5..875e99eea346960a45574da965a43294891e6c5e 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -23,6 +23,9 @@ test() {
        local port
        local nvmedev
        local loop_dev
+       local size
+       local bs
+       local count
        local file_path="$TMPDIR/img"
        local subsys_name="blktests-subsystem-1"
 
@@ -41,7 +44,12 @@ test() {
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
-       dd if=/dev/urandom of="/dev/${nvmedev}n1" count=128000 bs=4k status=none
+       size="$(blockdev --getsize64 "/dev/${nvmedev}n1")"
+       bs="$(blockdev --getbsz "/dev/${nvmedev}n1")"
+       count=$((size / bs))
+
+       dd if=/dev/urandom of="/dev/${nvmedev}n1" \
+               count="${count}" bs="${bs}" status=none
 
        nvme flush "/dev/${nvmedev}" -n 1
 

diff --git a/tests/nvme/015 b/tests/nvme/015
index bb52ba2598db1f0ecfbb9c10e056df4c8b7252aa..8cb343e1d31c304daff9b613ec5e4637bf75a870 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -22,6 +22,9 @@ test() {
 
        local port
        local nvmedev
+       local size
+       local bs
+       local count
        local file_path="$TMPDIR/img"
        local subsys_name="blktests-subsystem-1"
 
@@ -38,7 +41,12 @@ test() {
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
-       dd if=/dev/urandom of="/dev/${nvmedev}n1" count=128000 bs=4k status=none
+       size="$(blockdev --getsize64 "/dev/${nvmedev}n1")"
+       bs="$(blockdev --getbsz "/dev/${nvmedev}n1")"
+       count=$((size / bs))
+
+       dd if=/dev/urandom of="/dev/${nvmedev}n1" \
+               count="${count}" bs="${bs}" status=none
 
        nvme flush "/dev/${nvmedev}n1" -n 1