reduce the dependency on modules v2
Hi Shin'ichiro,
this series reduces the dependency of blktests on modular builds of various block drivers. There are still plenty of tests that do require modules, mostly because a lot of scsi_debug and null_blk can only be set at load time, but I plan to address those in the kernel soon.
Changes since v1:
- drop the partial null_blk and scsi_debug changes. They caused to much trouble for just enabling one test each.
- more quoting
- two spelling fixes
PATCH 1/7 nvme: use _have_loop instead of _have_modules loop
Also check for the losetup existance.
--- tests/nvme/002 | 2 +- tests/nvme/003 | 2 +- tests/nvme/004 | 2 +- tests/nvme/005 | 3 +-- tests/nvme/006 | 2 +- tests/nvme/008 | 2 +- tests/nvme/010 | 2 +- tests/nvme/012 | 2 +- tests/nvme/014 | 2 +- tests/nvme/015 | 2 +- tests/nvme/018 | 2 +- tests/nvme/019 | 2 +- tests/nvme/021 | 2 +- tests/nvme/022 | 2 +- tests/nvme/023 | 2 +- tests/nvme/024 | 2 +- tests/nvme/025 | 2 +- tests/nvme/026 | 2 +- tests/nvme/027 | 2 +- tests/nvme/028 | 2 +- tests/nvme/029 | 2 +- tests/nvme/030 | 2 +- tests/nvme/031 | 2 +- 23 files changed, 23 insertions(+), 24 deletions(-)
tests/nvme/002 +1 -1
@@ -11,7 +11,7 @@ DESCRIPTION="create many subsystems and test discovery" requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_loop }
tests/nvme/003 +1 -1
@@ -12,7 +12,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/004 +1 -1
@@ -13,7 +13,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/005 +1 -2
@@ -12,8 +12,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop && \ - _have_module_param_value nvme_core multipath Y + _have_loop && _have_module_param_value nvme_core multipath Y _require_nvme_trtype_is_fabrics }
tests/nvme/006 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/008 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/010 +1 -1
@@ -11,7 +11,7 @@ TIMED=1 requires() { _nvme_requires - _have_fio && _have_modules loop + _have_fio && _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/012 +1 -1
@@ -14,7 +14,7 @@ requires() { _nvme_requires _have_xfs _have_fio - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/014 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/015 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/018 +1 -1
@@ -12,7 +12,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/019 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/021 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/022 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/023 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/024 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/025 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/026 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/027 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/028 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/029 +1 -1
@@ -12,7 +12,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/030 +1 -1
@@ -11,7 +11,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
tests/nvme/031 +1 -1
@@ -19,7 +19,7 @@ QUICK=1 requires() { _nvme_requires - _have_modules loop + _have_loop _require_nvme_trtype_is_fabrics }
Signature · 1 line
2.30.2
PATCH 2/7 common: add a helper if a driver is available
In reply to Christoph HellwigUnlike _have_modules this allows allows for a built-in driver.
--- common/rc | 12 ++++++++++++ 1 file changed, 12 insertions(+)
common/rc +12 -0
@@ -28,6 +28,18 @@ _have_root() { return 0 } +_have_driver() +{ + local modname="${1/-/_}" + + if [ ! -d "/sys/module/${modname}" ] && ! modprobe -q "${modname}"; then + SKIP_REASON="driver ${modname} is not available" + return 1 + fi + + return 0 +} + _have_modules() { local missing=() local module
Signature · 1 line
2.30.2
PATCH 3/7 common: fix _have_module_param_value to work with built-in drivers
In reply to Christoph HellwigDon't bother to call modprobe directly and just check the /sys/module/ directory. Also switch to using descriptive variable names for the parameters.
--- common/rc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
common/rc +10 -5
@@ -74,17 +74,22 @@ _have_module_param() { } _have_module_param_value() { + local modname="${1/-/_}" + local param="$2" + local expected_value="$3" local value - modprobe "$1" + if ! _have_driver "$modname"; then + return 1; + fi - if ! _have_module_param "$1" "$2"; then + if ! _have_module_param "$modname" "$param"; then return 1 fi - value=$(cat "/sys/module/$1/parameters/$2") - if [[ "${value}" != "$3" ]]; then - SKIP_REASON="$1 module parameter $2 must be set to $3" + value=$(cat "/sys/module/$modname/parameters/$param") + if [[ "${value}" != "$expected_value" ]]; then + SKIP_REASON="$modname module parameter $param must be set to $expected_value" return 1 fi
Signature · 1 line
2.30.2
PATCH 4/7 common: do not require loop support to be modular
In reply to Christoph HellwigUse _have_driver instead of _have_modules in _have_loop as nothing requires the loop driver to be modular.
--- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
common/rc +1 -1
@@ -128,7 +128,7 @@ _have_src_program() { } _have_loop() { - _have_modules loop && _have_program losetup + _have_driver loop && _have_program losetup } _have_blktrace() {
Signature · 1 line
2.30.2
PATCH 5/7 nbd: do not require nbd support to be modular
In reply to Christoph HellwigUse _have_driver instead of _have_modules in _have_nbd as nothing requires the nbd driver to be modular.
--- tests/nbd/rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/nbd/rc +2 -2
@@ -7,11 +7,11 @@ . common/rc group_requires() { - _have_root && _have_nbd && modprobe nbd + _have_root && _have_nbd } _have_nbd() { - if ! _have_modules nbd; then + if ! _have_driver nbd; then return 1 fi if ! _have_program nbd-server; then
Signature · 1 line
2.30.2
PATCH 6/7 scsi: don't require sg to be built in
In reply to Christoph HellwigUse _have_driver instead of _have_modules in _have_scsi_generic as nothing requires the sg driver to be modular.
--- tests/scsi/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/scsi/rc +1 -1
@@ -15,7 +15,7 @@ group_device_requires() { } _have_scsi_generic() { - _have_modules sg + _have_driver sg } _require_test_dev_is_scsi() {
Signature · 1 line
2.30.2
PATCH 7/7 nvme: don't require the nvme drivers to be built in
In reply to Christoph HellwigUse _have_driver instead of _have_modules to check for the availability of the nvme drivers, and don't bother checking at all for drivers that are pulled in as dependencies.
--- tests/nvme/rc | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
tests/nvme/rc +13 -11
@@ -16,21 +16,23 @@ _nvme_requires() { _have_program nvme case ${nvme_trtype} in loop) - _have_modules nvmet nvme-core nvme-loop + _have_driver nvme-loop _have_configfs ;; pci) - _have_modules nvme nvme-core + _have_driver nvme ;; tcp) - _have_modules nvmet nvme-core nvme-tcp nvmet-tcp + _have_driver nvme-tcp + _have_driver nvmet-tcp _have_configfs ;; rdma) - _have_modules nvmet nvme-core nvme-rdma nvmet-rdma + _have_driver nvme-rdma + _have_driver nvmet-rdma _have_configfs _have_program rdma - _have_modules rdma_rxe || _have_modules siw + _have_driver rdma_rxe || _have_driver siw ;; *) SKIP_REASON="unsupported nvme_trtype=${nvme_trtype}"
@@ -125,11 +127,11 @@ _cleanup_nvmet() { shopt -u nullglob trap SIGINT - modprobe -r nvme-"${nvme_trtype}" 2>/dev/null + modprobe -rq nvme-"${nvme_trtype}" 2>/dev/null if [[ "${nvme_trtype}" != "loop" ]]; then - modprobe -r nvmet-"${nvme_trtype}" 2>/dev/null + modprobe -rq nvmet-"${nvme_trtype}" 2>/dev/null fi - modprobe -r nvmet 2>/dev/null + modprobe -rq nvmet 2>/dev/null if [[ "${nvme_trtype}" == "rdma" ]]; then stop_soft_rdma fi
@@ -137,11 +139,11 @@ _cleanup_nvmet() { _setup_nvmet() { _register_test_cleanup _cleanup_nvmet - modprobe nvmet + modprobe -q nvmet if [[ "${nvme_trtype}" != "loop" ]]; then - modprobe nvmet-"${nvme_trtype}" + modprobe -q nvmet-"${nvme_trtype}" fi - modprobe nvme-"${nvme_trtype}" + modprobe -q nvme-"${nvme_trtype}" if [[ "${nvme_trtype}" == "rdma" ]]; then start_soft_rdma for i in $(rdma_network_interfaces)
Signature · 1 line
2.30.2
Shinichiro Kawasaki
AppliedQuoted 7 lines · Christoph Hellwig
Hi Shin'ichiro,
this series reduces the dependency of blktests on modular builds of various block drivers. There are still plenty of tests that do require modules, mostly because a lot of
scsi_debugandnull_blkcan only be set at load time, but I plan to address those in the kernel soon.
Thanks, applied!
Signature · 1 line
Shin'ichiro Kawasaki