| Message ID | 20230421060505.10132-3-dwagner@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nvme testsuite runtime optimization | expand |
On 4/21/23 08:04, Daniel Wagner wrote: > Read the block device sizes instead hard coding them. > > Signed-off-by: Daniel Wagner <dwagner@suse.de> > --- > tests/nvme/014 | 10 +++++++++- > tests/nvme/015 | 10 +++++++++- > 2 files changed, 18 insertions(+), 2 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
On Apr 21, 2023 / 08:04, Daniel Wagner wrote: > Read the block device sizes instead hard coding them. I suggest to add this to clarify the purpose of this commit: ".., so that the device size can be configurable in future." > > Signed-off-by: Daniel Wagner <dwagner@suse.de> > --- > tests/nvme/014 | 10 +++++++++- > tests/nvme/015 | 10 +++++++++- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/tests/nvme/014 b/tests/nvme/014 > index d13cff7921da..28913641ae40 100755 > --- 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 - 1)) Do we need -1? > + > + 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 bb52ba2598db..2f7957caac88 100755 > --- 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 - 1)) Same here. > + > + dd if=/dev/urandom of="/dev/${nvmedev}n1" \ > + count="${count}" bs="${bs}" status=none > > nvme flush "/dev/${nvmedev}n1" -n 1 > > -- > 2.40.0 >
> > - 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 - 1)) > > Do we need -1? Not really. My aim was to just to make it test case a bit more reliable. The original test didn't fill up the disk either. I am going to drop it.
diff --git a/tests/nvme/014 b/tests/nvme/014 index d13cff7921da..28913641ae40 100755 --- 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 - 1)) + + 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 bb52ba2598db..2f7957caac88 100755 --- 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 - 1)) + + dd if=/dev/urandom of="/dev/${nvmedev}n1" \ + count="${count}" bs="${bs}" status=none nvme flush "/dev/${nvmedev}n1" -n 1
Read the block device sizes instead hard coding them. Signed-off-by: Daniel Wagner <dwagner@suse.de> --- tests/nvme/014 | 10 +++++++++- tests/nvme/015 | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-)