Commit d82c680d authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

test/nvme-perf: group kernel mode setup into one block 



Group all kernel conditionals for various ioengines in
one if block.

Change-Id: I14f736c1ab8fce13effeb9ec06731b3d14859941
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/479818


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 73059a2a

test/nvme/perf/common.sh

+7 −0
Original line number Diff line number Diff line
@@ -11,6 +11,13 @@ NVMEPERF_DIR=$ROOT_DIR/examples/nvme/perf 
. $ROOT_DIR/test/common/autotest_common.sh

NVME_FIO_RESULTS=$BASE_DIR/result.json



declare -A KERNEL_ENGINES

KERNEL_ENGINES=(

				["kernel-libaio"]="--ioengine=libaio"

				["kernel-classic-polling"]="--ioengine=pvsync2 --hipri=100"

				["kernel-hybrid-polling"]="--ioengine=pvsync2 --hipri=100"

				["kernel-io-uring"]="--ioengine=io_uring" )



RW=randrw

MIX=100

IODEPTH=256

test/nvme/perf/run_perf.sh

+38 −46
Original line number Diff line number Diff line
@@ -47,27 +47,19 @@ if $PRECONDITIONING; then 
	preconditioning

fi



#Kernel Classic Polling ioengine parameters

if [ $PLUGIN = "kernel-classic-polling" ]; then

if [[ "$PLUGIN" =~ "kernel" ]]; then

	$ROOT_DIR/scripts/setup.sh reset

	fio_ioengine_opt="--ioengine=pvsync2 --hipri=100"

	fio_ioengine_opt="${KERNEL_ENGINES[$PLUGIN]}"



	if [[ $PLUGIN = "kernel-classic-polling" ]]; then

		for disk in $DISK_NAMES; do

			echo -1 > /sys/block/$disk/queue/io_poll_delay

		done

#Kernel Hybrid Polling ioengine parameter

elif [ $PLUGIN = "kernel-hybrid-polling" ]; then

	$ROOT_DIR/scripts/setup.sh reset

	fio_ioengine_opt="--ioengine=pvsync2 --hipri=100"

	elif [[ $PLUGIN = "kernel-hybrid-polling" ]]; then

		for disk in $DISK_NAMES; do

			echo 0 > /sys/block/$disk/queue/io_poll_delay

		done

elif [ $PLUGIN = "kernel-libaio" ]; then

	$ROOT_DIR/scripts/setup.sh reset

	fio_ioengine_opt="--ioengine=libaio"

elif [ $PLUGIN = "kernel-io-uring" ]; then

	$ROOT_DIR/scripts/setup.sh reset

	fio_ioengine_opt="--ioengine=io_uring"



	elif [[ $PLUGIN = "kernel-io-uring" ]]; then

		modprobe -rv nvme

		modprobe nvme poll_queues=8

		wait_for_nvme_reload $DISK_NAMES
@@ -85,7 +77,6 @@ elif [ $PLUGIN = "kernel-io-uring" ]; then 
			cat $sysfs/io_poll_delay > $backup_dir/$disk/io_poll_delay

		done





		for disk in $DISK_NAMES; do

			echo "INFO: Setting device parameters for $disk"

			sysfs=/sys/block/$disk/queue
@@ -95,6 +86,7 @@ elif [ $PLUGIN = "kernel-io-uring" ]; then 
			echo 0 > $sysfs/io_poll_delay

		done

	fi

fi



result_dir=$BASE_DIR/results/perf_results_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${DATE}

result_file=$result_dir/perf_results_${BLK_SIZE}BS_${IODEPTH}QD_${RW}_${MIX}MIX_${PLUGIN}_${DATE}.csv