[PATCH v4 1/3] blktests: nvme/{033-037,039}: skip passthru tests on multipath devices
Martin Wilck
martin.wilck at suse.com
Tue Sep 3 09:29:28 PDT 2024
NVMe multipath devices have no associated character device that
can be used for NVMe passtrhu. Skip them.
Signed-off-by: Martin Wilck <mwilck at suse.com>
---
v3: improve patch subject (Shinichiro Kawasaki)
v2: used more expressive function name for non-multipath test (Daniel Wagner)
---
tests/nvme/033 | 4 ++++
tests/nvme/034 | 4 ++++
tests/nvme/035 | 1 +
tests/nvme/036 | 4 ++++
tests/nvme/037 | 4 ++++
tests/nvme/039 | 4 ++++
tests/nvme/rc | 8 ++++++++
7 files changed, 29 insertions(+)
diff --git a/tests/nvme/033 b/tests/nvme/033
index 7a69b94..5e05175 100755
--- a/tests/nvme/033
+++ b/tests/nvme/033
@@ -13,6 +13,10 @@ requires() {
_have_kernel_option NVME_TARGET_PASSTHRU
}
+device_requires() {
+ _require_test_dev_is_not_nvme_multipath
+}
+
set_conditions() {
_set_nvme_trtype "$@"
}
diff --git a/tests/nvme/034 b/tests/nvme/034
index 239757c..154fc91 100755
--- a/tests/nvme/034
+++ b/tests/nvme/034
@@ -14,6 +14,10 @@ requires() {
_have_fio
}
+device_requires() {
+ _require_test_dev_is_not_nvme_multipath
+}
+
set_conditions() {
_set_nvme_trtype "$@"
}
diff --git a/tests/nvme/035 b/tests/nvme/035
index 8286178..ff217d6 100755
--- a/tests/nvme/035
+++ b/tests/nvme/035
@@ -17,6 +17,7 @@ requires() {
}
device_requires() {
+ _require_test_dev_is_not_nvme_multipath
_require_test_dev_size "${NVME_IMG_SIZE}"
}
diff --git a/tests/nvme/036 b/tests/nvme/036
index ef6c29d..442ffe7 100755
--- a/tests/nvme/036
+++ b/tests/nvme/036
@@ -13,6 +13,10 @@ requires() {
_have_kernel_option NVME_TARGET_PASSTHRU
}
+device_requires() {
+ _require_test_dev_is_not_nvme_multipath
+}
+
set_conditions() {
_set_nvme_trtype "$@"
}
diff --git a/tests/nvme/037 b/tests/nvme/037
index ef7ac59..f7ddc2d 100755
--- a/tests/nvme/037
+++ b/tests/nvme/037
@@ -12,6 +12,10 @@ requires() {
_have_kernel_option NVME_TARGET_PASSTHRU
}
+device_requires() {
+ _require_test_dev_is_not_nvme_multipath
+}
+
set_conditions() {
_set_nvme_trtype "$@"
}
diff --git a/tests/nvme/039 b/tests/nvme/039
index a0f135c..e8020a7 100755
--- a/tests/nvme/039
+++ b/tests/nvme/039
@@ -18,6 +18,10 @@ requires() {
_have_kernel_option FAULT_INJECTION_DEBUG_FS
}
+device_requires() {
+ _require_test_dev_is_not_nvme_multipath
+}
+
# Get the last dmesg lines as many as specified. Exclude the lines to indicate
# suppression by rate limit.
last_dmesg()
diff --git a/tests/nvme/rc b/tests/nvme/rc
index dedc412..5c554b6 100644
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -130,6 +130,14 @@ _require_test_dev_is_nvme() {
return 0
}
+_require_test_dev_is_not_nvme_multipath() {
+ if [[ "$(readlink -f "$TEST_DEV_SYSFS/device")" =~ /nvme-subsystem/ ]]; then
+ SKIP_REASONS+=("$TEST_DEV is a NVMe multipath device")
+ return 1
+ fi
+ return 0
+}
+
_require_nvme_test_img_size() {
local require_sz_mb
local nvme_img_size_mb
--
2.46.0
More information about the Linux-nvme
mailing list