From 5170ac8d83be3b404dc8c3285bf85f4aa5c31dd4 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Thu, 5 Dec 2019 09:51:08 -0700
Subject: [PATCH] test/blockdev: move configuration before tests.

This is a significant simplification to the whole test script. Note, it
does force us to run the hello_bdev example against a gpt bdev instead
of an nvme bdev directly, but I see this as an acceptable tradeoff since
it seems like the purpose of running the hello_bdev example is mostly to
ensure that the example itself is not broken.

Change-Id: I8c2a1ede8e7ece2a82222593a7ae46704cc658af
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476935
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
---
 test/bdev/blockdev.sh | 86 +++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh
index c99860849..adfa73bd4 100755
--- a/test/bdev/blockdev.sh
+++ b/test/bdev/blockdev.sh
@@ -51,10 +51,6 @@ function nbd_function_test() {
 	return 0
 }
 
-QOS_DEV_1="Null_0"
-QOS_DEV_2="Null_1"
-QOS_RUN_TIME=5
-
 function get_io_result() {
 	local limit_type=$1
 	local qos_dev=$2
@@ -143,6 +139,20 @@ function qos_function_test() {
 	fi
 }
 
+# Inital bdev creation and configuration
+#-----------------------------------------------------
+QOS_DEV_1="Null_0"
+QOS_DEV_2="Null_1"
+QOS_RUN_TIME=5
+
+if [ $(uname -s) = Linux ]; then
+	# Test dynamic memory management. All hugepages will be reserved at runtime
+	PRE_RESERVED_MEM=0
+else
+	# Dynamic memory management is not supported on BSD
+	PRE_RESERVED_MEM=2048
+fi
+
 # Create a file to be used as an AIO backend
 dd if=/dev/zero of=/tmp/aiofile bs=2048 count=5000
 
@@ -168,32 +178,6 @@ if hash pmempool; then
 	echo "  Blk /tmp/spdk-pmem-pool Pmem0" >> $testdir/bdev.conf
 fi
 
-if [ $RUN_NIGHTLY -eq 1 ]; then
-	timing_enter hello_bdev
-	if grep -q Nvme0 $testdir/bdev.conf; then
-		$rootdir/examples/bdev/hello_world/hello_bdev -c $testdir/bdev.conf -b Nvme0n1
-	fi
-	timing_exit hello_bdev
-fi
-
-timing_enter bounds
-if [ $(uname -s) = Linux ]; then
-	# Test dynamic memory management. All hugepages will be reserved at runtime
-	PRE_RESERVED_MEM=0
-else
-	# Dynamic memory management is not supported on BSD
-	PRE_RESERVED_MEM=2048
-fi
-$testdir/bdevio/bdevio -w -s $PRE_RESERVED_MEM -c $testdir/bdev.conf &
-bdevio_pid=$!
-trap 'killprocess $bdevio_pid; exit 1' SIGINT SIGTERM EXIT
-echo "Process bdevio pid: $bdevio_pid"
-waitforlisten $bdevio_pid
-$testdir/bdevio/tests.py perform_tests
-killprocess $bdevio_pid
-trap - SIGINT SIGTERM EXIT
-timing_exit bounds
-
 timing_enter nbd_gpt
 if grep -q Nvme0 $testdir/bdev.conf; then
 	part_dev_by_gpt $testdir/bdev.conf Nvme0n1 $rootdir
@@ -204,8 +188,39 @@ timing_enter bdev_svc
 bdevs=$(discover_bdevs $rootdir $testdir/bdev.conf | jq -r '.[] | select(.claimed == false)')
 timing_exit bdev_svc
 
-timing_enter nbd
 bdevs_name=$(echo $bdevs | jq -r '.name')
+
+# Create conf file for bdevperf with gpt
+cat > $testdir/bdev_gpt.conf << EOL
+[Gpt]
+  Disable No
+EOL
+
+# Get Nvme info through filtering gen_nvme.sh's result
+$rootdir/scripts/gen_nvme.sh >> $testdir/bdev_gpt.conf
+# End bdev configuration
+#-----------------------------------------------------
+
+if [ $RUN_NIGHTLY -eq 1 ]; then
+	timing_enter hello_bdev
+	if grep -q Nvme0 $testdir/bdev.conf; then
+		$rootdir/examples/bdev/hello_world/hello_bdev -c $testdir/bdev.conf -b Nvme0n1p1
+	fi
+	timing_exit hello_bdev
+fi
+
+timing_enter bounds
+$testdir/bdevio/bdevio -w -s $PRE_RESERVED_MEM -c $testdir/bdev.conf &
+bdevio_pid=$!
+trap 'killprocess $bdevio_pid; exit 1' SIGINT SIGTERM EXIT
+echo "Process bdevio pid: $bdevio_pid"
+waitforlisten $bdevio_pid
+$testdir/bdevio/tests.py perform_tests
+killprocess $bdevio_pid
+trap - SIGINT SIGTERM EXIT
+timing_exit bounds
+
+timing_enter nbd
 nbd_function_test $testdir/bdev.conf "$bdevs_name"
 timing_exit nbd
 
@@ -244,15 +259,6 @@ else
 	exit 1
 fi
 
-# Create conf file for bdevperf with gpt
-cat > $testdir/bdev_gpt.conf << EOL
-[Gpt]
-  Disable No
-EOL
-
-# Get Nvme info through filtering gen_nvme.sh's result
-$rootdir/scripts/gen_nvme.sh >> $testdir/bdev_gpt.conf
-
 # Run bdevperf with gpt
 $testdir/bdevperf/bdevperf -c $testdir/bdev_gpt.conf -q 128 -o 4096 -w verify -t 5
 $testdir/bdevperf/bdevperf -c $testdir/bdev_gpt.conf -q 128 -o 4096 -w write_zeroes -t 1