From: Daniel Wagner <dwagner@suse.de>
To: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
Chaitanya Kulkarni <chaitanyak@nvidia.com>,
Hannes Reinecke <hare@suse.de>, Daniel Wagner <dwagner@suse.de>
Subject: [PATCH blktests v2 07/18] nvme/{014,015,018,019,020,023,024,026,045,046}: use long command line option for nvme
Date: Fri, 22 Mar 2024 14:50:04 +0100 [thread overview]
Message-ID: <20240322135015.14712-8-dwagner@suse.de> (raw)
In-Reply-To: <20240322135015.14712-1-dwagner@suse.de>
The long format of the command line option are more descriptive and more
likely to stay stable.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
tests/nvme/014 | 2 +-
tests/nvme/015 | 2 +-
tests/nvme/018 | 3 ++-
tests/nvme/019 | 3 ++-
tests/nvme/020 | 3 ++-
tests/nvme/023 | 3 ++-
tests/nvme/024 | 3 ++-
tests/nvme/026 | 3 ++-
tests/nvme/045 | 4 ++--
tests/nvme/046 | 7 ++++---
10 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/tests/nvme/014 b/tests/nvme/014
index 31bfeb76d13d..c02167142cb3 100755
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -39,7 +39,7 @@ test() {
dd if=/dev/urandom of="/dev/${nvmedev}n1" \
count="${count}" bs="${bs}" status=none
- nvme flush "/dev/${nvmedev}" -n 1
+ nvme flush "/dev/${nvmedev}" --namespace-id 1
_nvme_disconnect_subsys "${def_subsysnqn}"
diff --git a/tests/nvme/015 b/tests/nvme/015
index 4315ffa57577..8ea90f10bda7 100755
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -39,7 +39,7 @@ test() {
dd if=/dev/urandom of="/dev/${nvmedev}n1" \
count="${count}" bs="${bs}" status=none
- nvme flush "/dev/${nvmedev}n1" -n 1
+ nvme flush "/dev/${nvmedev}n1" --namespace-id 1
_nvme_disconnect_subsys "${def_subsysnqn}"
diff --git a/tests/nvme/018 b/tests/nvme/018
index e90173098ec1..e631434d7bd6 100755
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -35,7 +35,8 @@ test() {
sectors="$(blockdev --getsz "/dev/${nvmedev}n1")"
bs="$(blockdev --getbsz "/dev/${nvmedev}n1")"
- nvme read "/dev/${nvmedev}n1" -s "$sectors" -c 0 -z "$bs" &>"$FULL" \
+ nvme read "/dev/${nvmedev}n1" --start-block "$sectors" \
+ --block-count 0 --data-size "$bs" &>"$FULL" \
&& echo "ERROR: nvme read for out of range LBA was not rejected"
_nvme_disconnect_subsys "${def_subsysnqn}"
diff --git a/tests/nvme/019 b/tests/nvme/019
index a1035ff8d8c7..3ab22e2cba01 100755
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -31,7 +31,8 @@ test() {
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
_check_uuid "${nvmedev}"
- nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}"
+ nvme dsm "/dev/${nvmedev}" --namespace-id 1 --ad \
+ --slbs "${sblk_range}" --blocks "${nblk_range}"
_nvme_disconnect_subsys "${def_subsysnqn}"
diff --git a/tests/nvme/020 b/tests/nvme/020
index ba3f4c8a5b3d..10de114b83af 100755
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -30,7 +30,8 @@ test() {
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
_check_uuid "${nvmedev}"
- nvme dsm "/dev/${nvmedev}" -n 1 -d -s "${sblk_range}" -b "${nblk_range}"
+ nvme dsm "/dev/${nvmedev}" --namespace-id 1 --ad \
+ --slbs "${sblk_range}" --blocks "${nblk_range}"
_nvme_disconnect_subsys "${def_subsysnqn}"
diff --git a/tests/nvme/023 b/tests/nvme/023
index 4e4d838ef6c9..58f03e8603a7 100755
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -29,7 +29,8 @@ test() {
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
_check_uuid "${nvmedev}"
- if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
+ if ! nvme smart-log "/dev/${nvmedev}" --namespace-id 1 \
+ >> "$FULL" 2>&1; then
echo "ERROR: smart-log bdev-ns failed"
fi
diff --git a/tests/nvme/024 b/tests/nvme/024
index 2535a9a78d23..4608f015c4c3 100755
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -29,7 +29,8 @@ test() {
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
_check_uuid "${nvmedev}"
- if ! nvme smart-log "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
+ if ! nvme smart-log "/dev/${nvmedev}" --namespace-id 1 \
+ >> "$FULL" 2>&1; then
echo "ERROR: smart-log file-ns failed"
fi
_nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1
diff --git a/tests/nvme/026 b/tests/nvme/026
index 5a7d9927b44b..d5e13db0a916 100755
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -29,7 +29,8 @@ test() {
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
_check_uuid "${nvmedev}"
- if ! nvme ns-descs "/dev/${nvmedev}" -n 1 >> "$FULL" 2>&1; then
+ if ! nvme ns-descs "/dev/${nvmedev}" --namespace-id 1 \
+ >> "$FULL" 2>&1; then
echo "ERROR: ns-desc failed"
fi
diff --git a/tests/nvme/045 b/tests/nvme/045
index be408b629771..9e5cb54e9533 100755
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -68,7 +68,7 @@ test() {
echo "Renew host key on the controller"
- new_hostkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
+ new_hostkey="$(nvme gen-dhchap-key --nqn ${def_subsysnqn} 2> /dev/null)"
_set_nvmet_hostkey "${def_hostnqn}" "${new_hostkey}"
@@ -78,7 +78,7 @@ test() {
echo "Renew ctrl key on the controller"
- new_ctrlkey="$(nvme gen-dhchap-key -n ${def_subsysnqn} 2> /dev/null)"
+ new_ctrlkey="$(nvme gen-dhchap-key --nqn ${def_subsysnqn} 2> /dev/null)"
_set_nvmet_ctrlkey "${def_hostnqn}" "${new_ctrlkey}"
diff --git a/tests/nvme/046 b/tests/nvme/046
index 7576a24f234d..ea68d4079403 100755
--- a/tests/nvme/046
+++ b/tests/nvme/046
@@ -25,13 +25,14 @@ test_device() {
chmod g+r,o+r "$ngdev"
- if ! _run_user "nvme io-passthru ${ngdev} --opcode 2 -l 4096 \
- -n $nsid -r" >> "${FULL}" 2>&1; then
+ if ! _run_user "nvme io-passthru ${ngdev} --opcode 2 --data-len 4096 \
+ --namespace-id $nsid --read" >> "${FULL}" 2>&1; then
echo "Error: io-passthru read failed"
fi
if _run_user "echo hello | nvme io-passthru ${ngdev} --opcode 1 \
- -l 4096 -n $nsid -r" >> "${FULL}" 2>&1; then
+ --data-len 4096 --namespace-id $nsid --read" \
+ >> "${FULL}" 2>&1; then
echo "Error: io-passthru write passed (unexpected)"
fi
--
2.44.0
next prev parent reply other threads:[~2024-03-22 13:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-22 13:49 [PATCH blktests v2 00/18] refactoring and various cleanups/fixes Daniel Wagner
2024-03-22 13:49 ` [PATCH blktests v2 01/18] nvme/rc: silence error on module unload for fc Daniel Wagner
2024-03-22 13:49 ` [PATCH blktests v2 02/18] nvme/rc: silence fcloop cleanup failures Daniel Wagner
2024-03-25 18:27 ` Daniel Wagner
2024-03-26 8:39 ` Shinichiro Kawasaki
2024-03-26 9:23 ` Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 03/18] nvme/rc: log error if stale configuration is found Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 04/18] common/xfs: propagate errors from _xfs_run_fio_verify_io Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 05/18] nvme/{012,013,035}: check return value of _xfs_run_fio_verify_io Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 06/18] nvme/rc: use long command line option for nvme Daniel Wagner
2024-03-22 13:50 ` Daniel Wagner [this message]
2024-03-22 13:50 ` [PATCH blktests v2 08/18] nvme/rc: connect subsys only support long options Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 09/18] nvme/rc: add nqn/uuid args to target setup/cleanup helper Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 10/18] nvme/rc: remove unused connect options Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 11/18] nvme/rc: do not cleanup external managed loop device Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 12/18] nvme/031: do not open code target setup/cleanup Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 13/18] nvme: drop default trtype argument for _nvmet_connect_subsys Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 14/18] nvme: drop default trtype argument for _nvmet_passthru_target_connect Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 15/18] nvme: drop default subsysnqn argument from _nvme_{connect|disconnect}_subsys Daniel Wagner
2024-03-26 8:47 ` Shinichiro Kawasaki
2024-03-22 13:50 ` [PATCH blktests v2 16/18] nvme/{041,042,043,044,045,048}: do not pass default host{nqn|id} to _nvme_connect_subsys Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 17/18] nvme: don't assume namespace id Daniel Wagner
2024-03-22 13:50 ` [PATCH blktests v2 18/18] nvme/028: drop unused nvmedev Daniel Wagner
2024-04-16 2:50 ` [PATCH blktests v2 00/18] refactoring and various cleanups/fixes Chaitanya Kulkarni
2024-04-16 4:56 ` Shinichiro Kawasaki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240322135015.14712-8-dwagner@suse.de \
--to=dwagner@suse.de \
--cc=chaitanyak@nvidia.com \
--cc=hare@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=shinichiro.kawasaki@wdc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).