The following changes since commit a142e0df6c1483a76d92ff7f9d8c07242af9910e: Merge branch 'fio_client_server_doc_fix' of https://github.com/pcpartpicker/fio (2023-09-20 07:41:17 -0400) are available in the Git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to 996ac91f54844e63ef43092472fc1f7610567b67: t/zbd: set mq-deadline scheduler to device-mapper destination devices (2023-09-26 09:00:13 -0400) ---------------------------------------------------------------- Shin'ichiro Kawasaki (1): t/zbd: set mq-deadline scheduler to device-mapper destination devices t/zbd/functions | 11 +++++++++ t/zbd/test-zbd-support | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 1 deletion(-) --- Diff of recent changes: diff --git a/t/zbd/functions b/t/zbd/functions index 4faa45a9..028df404 100644 --- a/t/zbd/functions +++ b/t/zbd/functions @@ -27,6 +27,17 @@ blkzone_reports_capacity() { "${blkzone}" report -c 1 -o 0 "${dev}" | grep -q 'cap ' } +has_command() { + local cmd="${1}" + + cmd_path=$(type -p "${cmd}" 2>/dev/null) + if [ -z "${cmd_path}" ]; then + echo "${cmd} is not available" + return 1 + fi + return 0 +} + # Whether or not $1 (/dev/...) is a NVME ZNS device. is_nvme_zns() { local s diff --git a/t/zbd/test-zbd-support b/t/zbd/test-zbd-support index c8f3eb61..0436d319 100755 --- a/t/zbd/test-zbd-support +++ b/t/zbd/test-zbd-support @@ -46,6 +46,55 @@ ioengine() { fi } +get_dev_path_by_id() { + for d in /sys/block/* /sys/block/*/*; do + if [[ ! -r "${d}/dev" ]]; then + continue + fi + if [[ "${1}" == "$(<"${d}/dev")" ]]; then + echo "/dev/${d##*/}" + return 0 + fi + done + return 1 +} + +dm_destination_dev_set_io_scheduler() { + local dev=$1 sched=$2 + local dest_dev_id dest_dev path + + has_command dmsetup || return 1 + + while read -r dest_dev_id; do + if ! dest_dev=$(get_dev_path_by_id "${dest_dev_id}"); then + continue + fi + path=${dest_dev/dev/sys\/block}/queue/scheduler + if [[ ! -w ${path} ]]; then + echo "Can not set scheduler of device mapper destination: ${dest_dev}" + continue + fi + echo "${2}" > "${path}" + done < <(dmsetup table "$(<"/sys/block/$dev/dm/name")" | + sed -n 's/.* \([0-9]*:[0-9]*\).*/\1/p') +} + +dev_has_dm_map() { + local dev=${1} target_type=${2} + local dm_name + + has_command dmsetup || return 1 + + dm_name=$(<"/sys/block/$dev/dm/name") + if ! dmsetup status "${dm_name}" | grep -qe "${target_type}"; then + return 1 + fi + if dmsetup status "${dm_name}" | grep -v "${target_type}"; then + return 1 + fi + return 0 +} + set_io_scheduler() { local dev=$1 sched=$2 @@ -62,7 +111,17 @@ set_io_scheduler() { esac fi - echo "$sched" >"/sys/block/$dev/queue/scheduler" + if [ -w "/sys/block/$dev/queue/scheduler" ]; then + echo "$sched" >"/sys/block/$dev/queue/scheduler" + elif [ -r "/sys/block/$dev/dm/name" ] && + ( dev_has_dm_map "$dev" linear || + dev_has_dm_map "$dev" flakey || + dev_has_dm_map "$dev" crypt ); then + dm_destination_dev_set_io_scheduler "$dev" "$sched" + else + echo "can not set io scheduler" + exit 1 + fi } check_read() {
