From: Ming Lei <ming.lei@xxxxxxxxxx> Add block/040 for covering updating nr_hw_queues and switching elevator. Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxx> [Shin'ichiro: fixed redirection to scheduler file and skip reason check] [Shin'ichiro: renumbered test case] Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@xxxxxxx> --- I take the liberty to modify the original patch by Ming [1] to reflect my review comments. The new test case had caused hang with the v6.15-rcX kernel. Now it works good with the v6.16-rcX kernel. Thank you for the fix work. [1] https://lore.kernel.org/linux-block/20250402041429.942623-1-ming.lei@xxxxxxxxxx/ Changes from v1: * Renumbered the test case from block/039 to block/040 * Fixed redirection to queue/scheduler * Fixed skip reason reporting * Removed && in requires() * Renamed fio output file tests/block/040 | 71 +++++++++++++++++++++++++++++++++++++++++++++ tests/block/040.out | 1 + 2 files changed, 72 insertions(+) create mode 100755 tests/block/040 create mode 100644 tests/block/040.out diff --git a/tests/block/040 b/tests/block/040 new file mode 100755 index 0000000..fbc433a --- /dev/null +++ b/tests/block/040 @@ -0,0 +1,71 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright 2025 Ming Lei <ming.lei@xxxxxxxxxx> +# +# Most of code is copied from block/029 +# +# Trigger blk_mq_update_nr_hw_queues() & elevator switch + +. tests/block/rc +. common/null_blk + +DESCRIPTION="test blk_mq_update_nr_hw_queues() vs switch elevator" +QUICK=1 + +requires() { + _have_fio + _have_null_blk +} + + +modify_io_sched() { + local deadline + local dev=$1 + + deadline=$(($(_uptime_s) + TIMEOUT)) + while [ "$(_uptime_s)" -lt "$deadline" ]; do + for sched in $(_io_schedulers "$dev"); do + { echo "$sched" > /sys/block/"$dev"/queue/scheduler ;} \ + &> /dev/null + sleep .5 + done + done +} + +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/nullb1/submit_queues + sleep .1 + echo "$num_cpus" > /sys/kernel/config/nullb/nullb1/submit_queues + done +} + +test() { + local sq=/sys/kernel/config/nullb/nullb1/submit_queues + + : "${TIMEOUT:=30}" + _configure_null_blk nullb1 completion_nsec=0 blocksize=512 \ + size=16 memory_backed=1 power=1 && + if { echo 1 >$sq; } 2>/dev/null; then + modify_nr_hw_queues & + modify_io_sched nullb1 & + fio --rw=randwrite --bs=4K --loops=$((10**6)) \ + --iodepth=64 --group_reporting --sync=1 --direct=1 \ + --ioengine=libaio --filename="/dev/nullb1" \ + --runtime="${TIMEOUT}" --name=nullb1 \ + --output="${RESULTS_DIR}/block/fio-output-040.txt" \ + >>"$FULL" + wait + else + SKIP_REASONS+=("$sq cannot be modified") + _exit_null_blk + return + fi + _exit_null_blk + echo Passed +} diff --git a/tests/block/040.out b/tests/block/040.out new file mode 100644 index 0000000..863339f --- /dev/null +++ b/tests/block/040.out @@ -0,0 +1 @@ +Passed -- 2.50.0
