Commit 4ecb2e1d authored by Jim Harris's avatar Jim Harris
Browse files

Revert "test/virtio: test support for kernel vhost-scsi device" 



Recent patches to the vhost initiator tests have resulted in
some fairly regular test pool failures (at least 9 in the last
24 hours).  Revert while this is debugged further.

This reverts commit 0b34e88c.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I427d46b10d30bf21b3b29bebc6583403e031f2fb
Reviewed-on: https://review.gerrithub.io/408389


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 8cf4bc42

test/vhost/common/common.sh

+1 −1
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ function vm_setup() 
					return 1

				fi

				notice "Using kernel vhost disk wwn=$disk"

				cmd+=" -device vhost-scsi-pci,wwpn=$disk,num_queues=$queue_number ${eol}"

				cmd+=" -device vhost-scsi-pci,wwpn=$disk ${eol}"

				;;

			*)

				error "unknown mode '$disk_type', use: virtio, spdk_vhost_scsi, spdk_vhost_blk or kernel_vhost"

test/vhost/initiator/blockdev.sh

+15 −51
Original line number Diff line number Diff line
@@ -5,23 +5,14 @@ BASE_DIR=$(readlink -f $(dirname $0)) 
[[ -z "$COMMON_DIR" ]] && COMMON_DIR="$(cd $BASE_DIR/../common && pwd)"

ROOT_DIR=$(readlink -f $BASE_DIR/../../..)



PLUGIN_DIR=$ROOT_DIR/examples/bdev/fio_plugin

FIO_PATH="/usr/src/fio"

virtio_bdevs=""

virtio_with_unmap=""

os_image="/home/sys_sgsw/vhost_vm_image.qcow2"

#different linux distributions have different versions of targetcli that have different names for ramdisk option

targetcli_rd_name=""

kernel_vhost_disk="naa.5012345678901234"



function usage()

{

	[[ ! -z $2 ]] && ( echo "$2"; echo ""; )

	echo "Script for running vhost initiator tests."

	echo "Usage: $(basename $1) [-h|--help] [--fiobin=PATH]"

	echo "-h, --help            Print help and exit"

	echo "    --vm_image=PATH   Path to VM image used in these tests [default=$os_image]"

	echo "    --fiopath=PATH    Path to fio directory on host [default=$FIO_PATH]"

	echo "    --vm_image=PATH   Path to VM image used in these tests [default=/home/sys_sgsw/vhost_vm_image.qcow2]"

	echo "    --fiobin=PATH     Path to fio binary on host [default=/usr/src/fio/fio]"

}



while getopts 'h-:' optchar; do
@@ -29,7 +20,7 @@ while getopts 'h-:' optchar; do 
		-)

		case "$OPTARG" in

			help) usage $0 && exit 0 ;;

			fiopath=*) FIO_PATH="${OPTARG#*=}" ;;

			fiobin=*) FIO_BIN="${OPTARG#*=}" ;;

			vm_image=*) os_image="${OPTARG#*=}" ;;

			*) usage $0 echo "Invalid argument '$OPTARG'" && exit 1 ;;

		esac
@@ -41,9 +32,14 @@ done 


source $COMMON_DIR/common.sh

source $BASE_DIR/autotest.config

PLUGIN_DIR=$ROOT_DIR/examples/bdev/fio_plugin

RPC_PY="$ROOT_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"

FIO_BIN="/usr/src/fio/fio"

virtio_bdevs=""

virtio_with_unmap=""

os_image="/home/sys_sgsw/vhost_vm_image.qcow2"



if [ ! -x $FIO_PATH ]; then

if [ ! -x $FIO_BIN ]; then

	error "Invalid path of fio binary"

fi
@@ -52,24 +48,9 @@ if [[ $EUID -ne 0 ]]; then 
	exit 1

fi



if targetcli ls backstores | grep ramdisk ; then

	targetcli_rd_name="ramdisk"

elif targetcli ls backstores | grep rd_mcp ; then

	targetcli_rd_name="rd_mcp"

else

	error "targetcli: cannot create a ramdisk.\

	 Neither backstores/ramdisk nor backstores/rd_mcp is available"

fi



function remove_kernel_vhost()

{

	targetcli "/vhost delete $kernel_vhost_disk"

	targetcli "/backstores/$targetcli_rd_name delete ramdisk"

}



trap 'rm -f *.state $ROOT_DIR/spdk.tar.gz $ROOT_DIR/fio.tar.gz; error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT

trap 'rm -f *.state $ROOT_DIR/spdk.tar.gz; error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT

function run_spdk_fio() {

	LD_PRELOAD=$PLUGIN_DIR/fio_plugin $FIO_PATH/fio --ioengine=spdk_bdev\

	LD_PRELOAD=$PLUGIN_DIR/fio_plugin $FIO_BIN --ioengine=spdk_bdev\

         "$@" --spdk_mem=1024  --spdk_single_seg=1

}
@@ -123,17 +104,10 @@ run_spdk_fio $BASE_DIR/bdev.fio --filename=$virtio_with_unmap --spdk_conf=$BASE_ 
	--spdk_conf=$BASE_DIR/bdev.conf

timing_exit run_spdk_fio_unmap



timing_enter create_kernel_vhost

targetcli "/backstores/$targetcli_rd_name create name=ramdisk size=1GB"

targetcli "/vhost create $kernel_vhost_disk"

targetcli "/vhost/$kernel_vhost_disk/tpg1/luns create /backstores/$targetcli_rd_name/ramdisk"

timing_exit create_kernel_vhost



timing_enter setup_vm

vm_no="0"

vm_setup --disk-type=spdk_vhost_scsi --force=$vm_no --os=$os_image \

 --disks="Nvme0n1_scsi0:Malloc0:Malloc1:$kernel_vhost_disk,kernel_vhost:\

 Nvme0n1_blk0,spdk_vhost_blk:Nvme0n1_blk1,spdk_vhost_blk" \

 --disks="Nvme0n1_scsi0:Malloc0:Malloc1:Nvme0n1_blk0,spdk_vhost_blk:Nvme0n1_blk1,spdk_vhost_blk" \

 --queue_num=8 --memory=6144

vm_run $vm_no
@@ -146,17 +120,11 @@ touch $ROOT_DIR/spdk.tar.gz 
tar --exclude="spdk.tar.gz" --exclude="*.o" --exclude="*.d" --exclude=".git" -C $ROOT_DIR -zcf $ROOT_DIR/spdk.tar.gz .

vm_scp $vm_no $ROOT_DIR/spdk.tar.gz "127.0.0.1:/root"

vm_ssh $vm_no "mkdir -p /root/spdk; tar -zxf /root/spdk.tar.gz -C /root/spdk --strip-components=1"



touch $ROOT_DIR/fio.tar.gz

tar --exclude="fio.tar.gz" --exclude="*.o" --exclude="*.d" --exclude=".git" -C $FIO_PATH -zcf $ROOT_DIR/fio.tar.gz .

vm_scp $vm_no $ROOT_DIR/fio.tar.gz "127.0.0.1:/root"

vm_ssh $vm_no "rm -rf /root/fio_src; mkdir -p /root/fio_src; tar -zxf /root/fio.tar.gz -C /root/fio_src --strip-components=1"

timing_exit vm_scp_spdk



timing_enter vm_build_spdk

nproc=$(vm_ssh $vm_no "nproc")

vm_ssh $vm_no " cd /root/fio_src ; make clean ; make -j${nproc} ; make install"

vm_ssh $vm_no " cd spdk ; ./configure --with-fio=/root/fio_src ; make clean ; make -j${nproc}"

vm_ssh $vm_no " cd spdk ; make clean ; ./configure --with-fio=/root/fio_src ; make -j${nproc}"

timing_exit vm_build_spdk



vm_ssh $vm_no "/root/spdk/scripts/setup.sh"
@@ -184,11 +152,7 @@ timing_enter vm_shutdown_all 
vm_shutdown_all

timing_exit vm_shutdown_all



rm -f *.state $ROOT_DIR/spdk.tar.gz $ROOT_DIR/fio.tar.gz

timing_enter remove_kernel_vhost

remove_kernel_vhost

timing_exit remove_kernel_vhost



rm -f *.state $ROOT_DIR/spdk.tar.gz

timing_enter spdk_vhost_kill

spdk_vhost_kill

timing_exit spdk_vhost_kill