Hi Omar
Thanks for your review, pls check my comments inline
On 9/5/19 2:21 AM, Omar Sandoval wrote:
On Tue, Sep 03, 2019 at 04:17:52PM +0800, Yi Zhang wrote:
Add one test to cover NVMe SSD rescan/reset/remove operation during
IO, the steps found several issues during my previous testing, check
them here:
http://lists.infradead.org/pipermail/linux-nvme/2017-February/008358.html
http://lists.infradead.org/pipermail/linux-nvme/2017-May/010259.html
Signed-off-by: Yi Zhang <yi.zhang@xxxxxxxxxx>
---
tests/nvme/031 | 43 +++++++++++++++++++++++++++++++++++++++++++
tests/nvme/031.out | 2 ++
2 files changed, 45 insertions(+)
create mode 100755 tests/nvme/031
create mode 100644 tests/nvme/031.out
diff --git a/tests/nvme/031 b/tests/nvme/031
new file mode 100755
index 0000000..4113d12
--- /dev/null
+++ b/tests/nvme/031
@@ -0,0 +1,43 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-3.0+
+# Copyright (C) 2019 Yi Zhang <yi.zhang@xxxxxxxxxx>
+#
+# Test nvme pci adapter rescan/reset/remove operation during I/O
+#
+# Regression test for bellow two commits:
+# http://lists.infradead.org/pipermail/linux-nvme/2017-May/010367.html
+# 986f75c876db nvme: avoid to use blk_mq_abort_requeue_list()
+# 806f026f9b90 nvme: use blk_mq_start_hw_queues() in nvme_kill_queues()
+
+. tests/nvme/rc
+
+DESCRIPTION="test nvme pci adapter rescan/reset/remove during I/O"
+TIMED=1
+
+requires() {
+ _have_fio
+}
+
+device_requires() {
+ _test_dev_is_nvme
+}
+
+test_device() {
+ echo "Running ${TEST_NAME}"
+
+ pdev="$(_get_pci_dev_from_blkdev)"
+
+ # start fio job
+ _run_fio_rand_io --filename="$TEST_DEV" --size=1g \
+ --ignore_error=EIO,ENXIO,ENODEV --group_reporting &> /dev/null &
+
+ # do rescan/reset/remove operation
+ echo 1 > /sys/bus/pci/devices/"${pdev}"/rescan
+ echo 1 > /sys/bus/pci/devices/"${pdev}"/reset
My QEMU VM doesn't have the "reset" attribute, I'm guessing because of
this code in pci_create_capabilities_sysfs():
if (dev->reset_fn) {
retval = device_create_file(&dev->dev, &reset_attr);
if (retval)
goto error;
}
We can skip the reset if the attribute doesn't exist.
OK, will change to bellow to skip it.
# QEMU VM doesn't have the "reset" attribute, skip it
if [[ -e /sys/bus/pci/devices/"${pdev}"/reset ]]; then
echo 1 > /sys/bus/pci/devices/"${pdev}"/reset
fi
+ echo 1 > /sys/bus/pci/devices/"${pdev}"/remove
+ sleep .5
+ echo 1 > /sys/bus/pci/rescan
+ sleep 5
Instead of sleep, we can kill and wait for fio.
OK, will add bellow kill and wait cmd
{ kill $!; wait; } &> /dev/null
After remve/rescan operation, the nvme need about 3s to be
reinitialized on my environment, so I added sleep 5 here,
how about add bellow loop to wait for the device node?
# wait nvme reinitialized
local m
for ((m = 0; m < 10; m++)); do
if [[ -b "${TEST_DEV}" ]]; then
break
fi
sleep 0.5
done
if (( m > 9 )); then
echo "nvme still not reinitialized after 5 seconds!"
fi
Thanks!
