Adding upstream version 14.2.21.upstream/14.2.21upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 90 insertions, 0 deletions

diff --git a/src/spdk/test/vhost/hotplug/scsi_hotplug.sh b/src/spdk/test/vhost/hotplug/scsi_hotplug.sh
new file mode 100755
index 00000000..ab429c1e
--- /dev/null
+++ b/src/spdk/test/vhost/hotplug/scsi_hotplug.sh
@@ -0,0 +1,90 @@
+#!/usr/bin/env bash
+set -e
+BASE_DIR=$(readlink -f $(dirname $0))
+. $BASE_DIR/common.sh
+
+if [[ $scsi_hot_remove_test == 1 ]] && [[ $blk_hot_remove_test == 1 ]]; then
+    notice "Vhost-scsi and vhost-blk hotremove tests cannot be run together"
+fi
+
+# Add split section into vhost config
+function gen_config() {
+    cp $BASE_DIR/vhost.conf.base $BASE_DIR/vhost.conf.in
+    cat << END_OF_CONFIG >> $BASE_DIR/vhost.conf.in
+[Split]
+  Split Nvme0n1 16
+  Split Nvme1n1 20
+  Split HotInNvme0n1 2
+  Split HotInNvme1n1 2
+  Split HotInNvme2n1 2
+  Split HotInNvme3n1 2
+END_OF_CONFIG
+}
+
+# Run spdk by calling run_vhost from hotplug/common.sh.
+# Then prepare vhost with rpc calls and setup and run 4 VMs.
+function pre_hot_attach_detach_test_case() {
+    used_vms=""
+    $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p0.0
+    $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p1.0
+    $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p2.1
+    $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p3.1
+    $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p4.2
+    $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p5.2
+    $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p6.3
+    $rpc_py construct_vhost_scsi_controller naa.Nvme0n1p7.3
+    $rpc_py add_vhost_scsi_lun naa.Nvme0n1p4.2 0 Nvme0n1p8
+    $rpc_py add_vhost_scsi_lun naa.Nvme0n1p4.2 1 Nvme0n1p9
+    $rpc_py add_vhost_scsi_lun naa.Nvme0n1p5.2 0 Nvme0n1p10
+    $rpc_py add_vhost_scsi_lun naa.Nvme0n1p5.2 1 Nvme0n1p11
+    $rpc_py add_vhost_scsi_lun naa.Nvme0n1p6.3 0 Nvme0n1p12
+    $rpc_py add_vhost_scsi_lun naa.Nvme0n1p6.3 1 Nvme0n1p13
+    $rpc_py add_vhost_scsi_lun naa.Nvme0n1p7.3 0 Nvme0n1p14
+    $rpc_py add_vhost_scsi_lun naa.Nvme0n1p7.3 1 Nvme0n1p15
+    vms_setup_and_run "0 1 2 3"
+    vms_prepare "0 1 2 3"
+}
+
+function clear_vhost_config() {
+    $rpc_py remove_vhost_scsi_target naa.Nvme0n1p4.2 0
+    $rpc_py remove_vhost_scsi_target naa.Nvme0n1p4.2 1
+    $rpc_py remove_vhost_scsi_target naa.Nvme0n1p5.2 0
+    $rpc_py remove_vhost_scsi_target naa.Nvme0n1p5.2 1
+    $rpc_py remove_vhost_scsi_target naa.Nvme0n1p6.3 0
+    $rpc_py remove_vhost_scsi_target naa.Nvme0n1p6.3 1
+    $rpc_py remove_vhost_scsi_target naa.Nvme0n1p7.3 0
+    $rpc_py remove_vhost_scsi_target naa.Nvme0n1p7.3 1
+    $rpc_py remove_vhost_controller naa.Nvme0n1p0.0
+    $rpc_py remove_vhost_controller naa.Nvme0n1p1.0
+    $rpc_py remove_vhost_controller naa.Nvme0n1p2.1
+    $rpc_py remove_vhost_controller naa.Nvme0n1p3.1
+    $rpc_py remove_vhost_controller naa.Nvme0n1p4.2
+    $rpc_py remove_vhost_controller naa.Nvme0n1p5.2
+    $rpc_py remove_vhost_controller naa.Nvme0n1p6.3
+    $rpc_py remove_vhost_controller naa.Nvme0n1p7.3
+}
+
+trap 'error_exit "${FUNCNAME}" "${LINENO}"' ERR
+gen_config
+# Hotremove/hotattach/hotdetach test cases prerequisites
+# 1. Run vhost with 2 NVMe disks.
+run_vhost
+rm $BASE_DIR/vhost.conf.in
+if [[ $scsi_hot_remove_test == 0 ]] && [[ $blk_hot_remove_test == 0 ]]; then
+    pre_hot_attach_detach_test_case
+    $BASE_DIR/scsi_hotattach.sh --fio-bin=$fio_bin &
+    first_script=$!
+    $BASE_DIR/scsi_hotdetach.sh --fio-bin=$fio_bin &
+    second_script=$!
+    wait $first_script
+    wait $second_script
+    vm_shutdown_all
+    clear_vhost_config
+fi
+if [[ $scsi_hot_remove_test == 1 ]]; then
+    source $BASE_DIR/scsi_hotremove.sh
+fi
+if [[ $blk_hot_remove_test == 1 ]]; then
+    source $BASE_DIR/blk_hotremove.sh
+fi
+post_test_case