From: Daniel Wagner <dwagner@suse.de>
To: Shinichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Cc: Chaitanya Kulkarni <chaitanyak@nvidia.com>,
Keith Busch <kbusch@kernel.org>,
linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
Daniel Wagner <dwagner@suse.de>
Subject: [PATCH blktests 2/2] nvme/048: make queue count check retry-able
Date: Fri, 1 Mar 2024 10:48:17 +0100 [thread overview]
Message-ID: <20240301094817.29491-3-dwagner@suse.de> (raw)
In-Reply-To: <20240301094817.29491-1-dwagner@suse.de>
We are racing with the reset path of the controller. That means, when we
set a new queue count, we might not observe the resetting state in time.
Thus, first check if we see the correct queue count and then the
controller state.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
tests/nvme/048 | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/tests/nvme/048 b/tests/nvme/048
index 8c314fae9620..3b9a30bcca89 100755
--- a/tests/nvme/048
+++ b/tests/nvme/048
@@ -47,11 +47,23 @@ nvmf_check_queue_count() {
local queue_count="$2"
local nvmedev
local queue_count_file
+ local retries
nvmedev=$(_find_nvme_dev "${subsys_name}")
+ queue_count=$((queue_count + 1))
+ retries=5
+
queue_count_file=$(cat /sys/class/nvme-fabrics/ctl/"${nvmedev}"/queue_count)
+ while [[ "${queue_count}" -ne "${queue_count_file}" ]]; do
+ if [[ "${retries}" == 0 ]]; then
+ break;
+ fi
+ retries=$((retries - 1))
+ sleep 1
+
+ queue_count_file=$(cat /sys/class/nvme-fabrics/ctl/"${nvmedev}"/queue_count)
+ done
- queue_count=$((queue_count + 1))
if [[ "${queue_count}" -ne "${queue_count_file}" ]]; then
echo "expected queue count ${queue_count} not set"
return 1
@@ -73,8 +85,8 @@ set_qid_max() {
local qid_max="$2"
set_nvmet_attr_qid_max "${subsys_name}" "${qid_max}"
- nvmf_wait_for_state "${subsys_name}" "live" || return 1
nvmf_check_queue_count "${subsys_name}" "${qid_max}" || return 1
+ nvmf_wait_for_state "${subsys_name}" "live" || return 1
return 0
}
--
2.43.2
next prev parent reply other threads:[~2024-03-01 9:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 9:48 [PATCH blktests 0/2] make nvme/048 checks more robust Daniel Wagner
2024-03-01 9:48 ` [PATCH blktests 1/2] nvme/048: remove unused argument for set_qid_max Daniel Wagner
2024-03-03 6:37 ` Chaitanya Kulkarni
2024-03-01 9:48 ` Daniel Wagner [this message]
2024-03-03 6:43 ` [PATCH blktests 2/2] nvme/048: make queue count check retry-able Chaitanya Kulkarni
2024-03-04 13:00 ` 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=20240301094817.29491-3-dwagner@suse.de \
--to=dwagner@suse.de \
--cc=chaitanyak@nvidia.com \
--cc=kbusch@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.