Add a test that triggers blk_mq_update_nr_hw_queues()
v2 cover Add a test that triggers blk_mq_update_nr_hw_queues()
Hi Omar,
This patch series includes the test that I used to verify my recently posted blk_mq_update_nr_hw_queues() patches. Please consider these patches for inclusion in the blktests repository.
Thanks,
Bart.
Changes compared to v1:
- _uptime_s() now uses awk to read /proc/uptime.
- Removed subshells from tests/block/029.
- Changed find ... | wc -l into nproc.
- Skip kernel versions that do not support modifying the null_blk submit_queues attribute.
Bart Van Assche (2):
Move and rename uptime_s()
Add a test that triggers blk_mq_update_nr_hw_queues()
common/multipath-over-rdma | 9 +----- common/rc | 5 +++ tests/block/029 | 64 ++++++++++++++++++++++++++++++++++++++ tests/block/029.out | 1 + tests/nvmeof-mp/rc | 2 +- tests/srp/014 | 2 +- tests/srp/rc | 2 +- 7 files changed, 74 insertions(+), 11 deletions(-) create mode 100755 tests/block/029 create mode 100644 tests/block/029.out
PATCH v2 1/2 Move and rename uptime_s()
Make it easy to use the uptime_s() function from block tests. Change the implementation of this function into something that is easier to read.
--- common/multipath-over-rdma | 9 +-------- common/rc | 5 +++++ tests/nvmeof-mp/rc | 2 +- tests/srp/014 | 2 +- tests/srp/rc | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-)
common/multipath-over-rdma +1 -8
@@ -129,19 +129,12 @@ held_by() { done } -# System uptime in seconds. -uptime_s() { - local a b - - echo "$(</proc/uptime)" | { read -r a b && echo "${a%%.*}"; } -} - # Sleep until either $1 seconds have elapsed or until the deadline $2 has been # reached. Return 1 if and only if the deadline has been met. sleep_until() { local duration=$1 deadline=$2 u - u=$(uptime_s) + u=$(_uptime_s) if [ $((u + duration)) -le "$deadline" ]; then sleep "$duration" else
common/rc +5 -0
@@ -246,3 +246,8 @@ _test_dev_is_partition() { _filter_xfs_io_error() { sed -e 's/^\(.*\)64\(: .*$\)/\1\2/' } + +# System uptime in seconds. +_uptime_s() { + awk '{ print int($1) }' /proc/uptime +}
tests/nvmeof-mp/rc +1 -1
@@ -113,7 +113,7 @@ simulate_network_failure_loop() { [ -e "$dev" ] || return $? [ -n "$duration" ] || return $? - deadline=$(($(uptime_s) + duration)) + deadline=$(($(_uptime_s) + duration)) while [ $rc = 0 ]; do sleep_until 5 ${deadline} || break for d in $(held_by "$dev"); do
tests/srp/014 +1 -1
@@ -69,7 +69,7 @@ sg_reset_loop() { [ -e "$dev" ] || return $? [ -n "$duration" ] || return $? reset_type=(-d -b) - deadline=$(($(uptime_s) + duration)) + deadline=$(($(_uptime_s) + duration)) while true; do sleep_until 1 ${deadline} || break cmd="sg_reset --no-esc ${reset_type[i++ % 2]} $dev"
tests/srp/rc +1 -1
@@ -247,7 +247,7 @@ simulate_network_failure_loop() { [ -e "$dev" ] || return $? [ -n "$duration" ] || return $? - deadline=$(($(uptime_s) + duration)) + deadline=$(($(_uptime_s) + duration)) s=5 while [ $rc = 0 ]; do sleep_until 5 ${deadline} || break
Signature · 1 line
2.24.0.rc0.303.g954a862665-goog
PATCH v2 2/2 Add a test that triggers blk_mq_update_nr_hw_queues()
In reply to Bart Van AsscheNote: the newly added test script only triggers blk_mq_update_nr_hw_queues() for kernel versions that include commit 45919fbfe1c4 ("null_blk: Enable modifying 'submit_queues' after an instance has been configured").
--- tests/block/029 | 64 +++++++++++++++++++++++++++++++++++++++++++++ tests/block/029.out | 1 + 2 files changed, 65 insertions(+) create mode 100755 tests/block/029 create mode 100644 tests/block/029.out
tests/block/029 new file +64 -0
@@ -0,0 +1,64 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2019 Google LLC +# +# Trigger blk_mq_update_nr_hw_queues(). + +. tests/block/rc +. common/null_blk + +DESCRIPTION="trigger blk_mq_update_nr_hw_queues()" +QUICK=1 + +requires() { + _have_null_blk +} + +# Configure one null_blk instance. +configure_null_blk() { + local nullb0="/sys/kernel/config/nullb/nullb0" + + mkdir "$nullb0" && + echo 0 > "$nullb0/completion_nsec" && + echo 512 > "$nullb0/blocksize" && + echo 16 > "$nullb0/size" && + echo 1 > "$nullb0/memory_backed" && + echo 1 > "$nullb0/power" && + ls -l /dev/nullb* &>>"$FULL" +} + +modify_nr_hw_queues() { + local deadline num_cpus + + deadline=$(($(_uptime_s) + TIMEOUT)) + num_cpus=$(nproc) + while [ "$(_uptime_s)" -lt "$deadline" ]; do + sleep .1 + echo 1 > /sys/kernel/config/nullb/nullb0/submit_queues + sleep .1 + echo "$num_cpus" > /sys/kernel/config/nullb/nullb0/submit_queues + done +} + +test() { + local sq=/sys/kernel/config/nullb/nullb0/submit_queues + + : "${TIMEOUT:=30}" + _init_null_blk nr_devices=0 queue_mode=2 && + configure_null_blk + if { echo 1 >$sq; } 2>/dev/null; then + modify_nr_hw_queues & + fio --rw=randwrite --bs=4K --loops=$((10**6)) \ + --iodepth=64 --group_reporting --sync=1 --direct=1 \ + --ioengine=libaio --filename="/dev/nullb0" \ + --runtime="${TIMEOUT}" --name=nullb0 \ + --output="${RESULTS_DIR}/block/fio-output-029.txt" \ + >>"$FULL" + wait + else + echo "Skipping test because $sq cannot be modified" >>"$FULL" + fi + rmdir /sys/kernel/config/nullb/nullb0 + _exit_null_blk + echo Passed +}
tests/block/029.out new file +1 -0
@@ -0,0 +1 @@ +Passed
Signature · 1 line
2.24.0.rc0.303.g954a862665-goog
Quoted 17 lines · Bart Van Assche
Hi Omar,
This patch series includes the test that I used to verify my recently posted
blk_mq_update_nr_hw_queues()patches. Please consider these patches for inclusion in the blktests repository.Thanks,
Bart.
Changes compared to v1:
-_uptime_s()now uses awk to read/proc/uptime.
- Removed subshells from tests/block/029.
- Changed find ... | wc -l into nproc.
- Skip kernel versions that do not support modifying thenull_blksubmit_queuesattribute.
Quoted 3 lines
Bart Van Assche (2):
Move and renameuptime_s()
Add a test that triggersblk_mq_update_nr_hw_queues()
Thanks, Bart, applied and pushed.