Merge pull request #206 from bvanassche/master

Test scsi_debug timeout and abort handling to scsi/007.
Also improve common scripts.

Author: kawasaki

common/multipath-over-rdma

@@ -267,9 +267,7 @@ mpath_has_stale_dev() {
 # Check whether multipath definition $1 includes the queue_if_no_path keyword.
 is_qinp_def() {
 	case "$1" in
-		*" 3 queue_if_no_path queue_mode mq "*)
-			return 0;;
-		*" 1 queue_if_no_path "*)
+		*" queue_if_no_path "*)
 			return 0;;
 		*)
 			return 1;;

common/rc

@@ -198,22 +198,35 @@ _have_kernel_config_file() {
 	return 0
 }
 
-# Check if the specified kernel option is defined.
-_check_kernel_option() {
-	local f opt=$1
+# Retrieve the value of kernel option $1.
+_get_kernel_option() {
+	local f opt=$1 result
 
 	for f in /proc/config.gz /boot/config-$(uname -r); do
 		[ -e "$f" ] || continue
-		if zgrep -q "^CONFIG_${opt}=[my]$" "$f"; then
+		if result=$(zgrep "^CONFIG_${opt}=" "$f"); then
+			echo "${result#*=}"
 			return 0
 		fi
 	done
 
 	return 1
 }
 
+# Check if kernel option $1 is defined.
+_check_kernel_option() {
+	local value
+
+	case "$(_get_kernel_option "$1")" in
+		y|m)
+			return 0;;
+	esac
+
+	return 1
+}
+
 # Combine _have_kernel_config_file() and _check_kernel_option().
-# Set SKIP_RESAON when _check_kernel_option() returns false.
+# Set SKIP_REASONS when _check_kernel_option() returns false.
 _have_kernel_option() {
 	local opt=$1
 
@@ -343,7 +356,10 @@ _test_dev_queue_set() {
 	      ${SYSFS_QUEUE_SAVED["$path"]-unset} == unset ]]; then
 		SYSFS_QUEUE_SAVED["$path"]="$(_test_dev_queue_get "$1")"
 	fi
-	echo "$2" >"$path"
+	if ! echo "$2" >"$path"; then
+		echo "echo $2 > $path failed"
+		return 1
+	fi
 }
 
 _test_dev_set_scheduler() {

common/scsi_debug

@@ -145,7 +145,7 @@ _configure_scsi_debug() {
 		fi
 	done
 
-	# Modify parameters specifeid with key=value arguments
+	# Modify parameters specified with key=value arguments
 	for o in "$@"; do
 		key=${o%=*}
 		value=${o#*=}

tests/scsi/007

@@ -15,18 +15,45 @@ requires() {
 	_have_module scsi_debug
 }
 
-config_hz() {
-	if [ -e /proc/config.gz ]; then
-		zcat /proc/config.gz
-	else
-		cat "/boot/config-$(uname -r)"
-	fi | sed -n 's/^CONFIG_HZ=//p'
+start_tracing() {
+	if [ -e /sys/kernel/tracing/tracing_on ]; then
+		(
+			set -e
+			cd /sys/kernel/tracing
+			echo 1024 > buffer_size_kb
+			echo function > current_tracer
+			echo 0 > tracing_on
+			echo > trace
+			{
+				echo scsi_error_handler
+				echo "scsi_eh_*"
+				echo scsi_timeout
+				echo scsi_try_host_reset
+			} > set_ftrace_filter
+			echo 0 > events/enable
+			echo 1 > tracing_on
+		)
+	fi
 }
 
-test() {
-	local dev freq delay_s jdelay
+stop_tracing() {
+	if [ -e /sys/kernel/tracing/tracing_on ]; then
+		(
+			set -e
+			cd /sys/kernel/tracing
+			cat trace >> "${FULL}"
+			if ! grep -qw scsi_timeout trace; then
+				echo "Unexpected: scsi_timeout() has not been called"
+			fi
+			echo 0 > tracing_on
+		)
+	fi
+}
 
-	echo "Running ${TEST_NAME}"
+run_test() {
+	set -e
+
+	local dev freq delay_s jdelay
 
 	if ! _init_scsi_debug; then
 		return 1
@@ -42,21 +69,43 @@ test() {
 	echo "I/O timeout = $(<"/sys/class/block/$dev/queue/io_timeout")" >>"$FULL"
         # Change the scsi_debug delay to 3 seconds.
 	delay_s=3
-        freq=$(config_hz)
+        freq=$(_get_kernel_option HZ)
         jdelay=$((delay_s * "${freq}"))
         echo "CONFIG_HZ=${freq} jdelay=${jdelay}" >>"$FULL"
 	echo "$jdelay" > /sys/module/scsi_debug/parameters/delay
+
+	start_tracing
+
+	set +e
+
 	if dd if="/dev/$dev" of=/dev/null bs=512 count=1 \
 	      iflag=direct >&/dev/null; then
 		echo "Reading from scsi_debug succeeded"
 	else
 		echo "Reading from scsi_debug failed"
 	fi
 
+	stop_tracing
+
 	# Disable SCSI error handler logging
 	echo 0 > /sys/module/scsi_mod/parameters/scsi_logging_level
+}
+
+test() {
+	echo "Running ${TEST_NAME}"
+
+	(
+	        run_test
+	)
+	# shellcheck disable=SC2181
+	(($? != 0)) && fail=true
 
 	_exit_scsi_debug
 
-	echo "Test complete"
+	if [ -z "$fail" ]; then
+	        echo "Test complete"
+	else
+	        echo "Test failed"
+	        return 1
+	fi
 }