88055b422f
We do not need to force usage of 4096MB of memory for these
tests. Let's just remove how that is being forced.
This allows us to also remove the setup.sh call from
the spdkcli test common.sh script. Its only purpose
was to increase the amount of memory allocated to satisfy
the spdkcli tests, but now that the spdkcli tests aren't
forcing so much memory to be allocated, we can remove
that too.
Fixes issue #2694.
Note: these limits were in the original commit for the
test scripts - 7e8206c - but it is not clear why they
were added instead of just relying on DPDK dynamic
memory allocation..
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I2210765e69117205a039aa6bc468efa5d5d537cb
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14520
Reviewed-by: Michal Berger <michal.berger@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
79 lines
3.0 KiB
Bash
Executable File
79 lines
3.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../..)
|
|
source $rootdir/test/common/autotest_common.sh
|
|
source $rootdir/test/spdkcli/common.sh
|
|
|
|
trap 'killprocess $virtio_pid; on_error_exit' ERR
|
|
|
|
timing_enter run_spdk_tgt
|
|
run_spdk_tgt
|
|
timing_exit run_spdk_tgt
|
|
|
|
timing_enter run_spdk_virtio
|
|
$SPDK_BIN_DIR/spdk_tgt -m 0x4 -p 0 -g -u -r /var/tmp/virtio.sock &
|
|
virtio_pid=$!
|
|
waitforlisten $virtio_pid /var/tmp/virtio.sock
|
|
timing_exit run_spdk_virtio
|
|
|
|
timing_enter spdkcli_create_virtio_pci_config
|
|
$spdkcli_job "'/bdevs/malloc create 32 512 Malloc0' 'Malloc0' True
|
|
'/bdevs/malloc create 32 512 Malloc1' 'Malloc1' True
|
|
"
|
|
pci_blk=$(lspci -nn -D | grep '1af4:1001' | head -1 | awk '{print $1;}')
|
|
if [ -n "$pci_blk" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_blk/uevent"; then
|
|
$spdkcli_job "'/bdevs/virtioblk_disk create virtioblk_pci pci $pci_blk' 'virtioblk_pci' True"
|
|
fi
|
|
pci_scsi=$(lspci -nn -D | grep '1af4:1004' | head -1 | awk '{print $1;}')
|
|
if [ -n "$pci_scsi" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_scsi/uevent"; then
|
|
$spdkcli_job "'/bdevs/virtioscsi_disk create virtioscsi_pci pci $pci_scsi' 'virtioscsi_pci' True"
|
|
fi
|
|
$spdkcli_job "'/vhost/scsi create sample_scsi' 'sample_scsi' True
|
|
'/vhost/scsi/sample_scsi add_lun 0 Malloc0' 'Malloc0' True
|
|
'/vhost/block create sample_block Malloc1' 'Malloc1' True
|
|
"
|
|
timing_exit spdkcli_create_virtio_pci_config
|
|
|
|
timing_enter spdkcli_check_match
|
|
if [ -n "$pci_blk" ] && [ -n "$pci_scsi" ]; then
|
|
MATCH_FILE="spdkcli_virtio_pci.test"
|
|
SPDKCLI_BRANCH="/bdevs"
|
|
check_match
|
|
fi
|
|
timing_exit spdkcli_check_match
|
|
|
|
timing_enter spdkcli_create_virtio_user_config
|
|
$spdkcli_job "'/bdevs/virtioblk_disk create virtioblk_user user $testdir/../../sample_block' 'virtioblk_user' True
|
|
'/bdevs/virtioscsi_disk create virtioscsi_user user $testdir/../../sample_scsi' 'virtioscsi_user' True
|
|
" /var/tmp/virtio.sock
|
|
timing_exit spdkcli_create_virtio_user_config
|
|
|
|
timing_enter spdkcli_check_match_user_config
|
|
MATCH_FILE="spdkcli_virtio_user.test"
|
|
SPDKCLI_BRANCH="/vhost"
|
|
check_match
|
|
timing_exit spdkcli_check_match_user_config
|
|
|
|
timing_enter spdkcli_clear_virtio_config
|
|
$spdkcli_job "'/bdevs/virtioscsi_disk delete virtioscsi_user' '' False
|
|
'/bdevs/virtioblk_disk delete virtioblk_user' '' False
|
|
" /var/tmp/virtio.sock
|
|
$spdkcli_job "'/vhost/block delete sample_block' 'sample_block'
|
|
'/vhost/scsi/sample_scsi remove_target 0' 'Malloc0'
|
|
'/vhost/scsi delete sample_scsi' 'sample_scsi'
|
|
"
|
|
if [ -n "$pci_blk" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_blk/uevent"; then
|
|
$spdkcli_job "'/bdevs/virtioblk_disk delete virtioblk_pci' 'virtioblk_pci'"
|
|
fi
|
|
if [ -n "$pci_scsi" ] && grep -Eq "DRIVER=(uio|vfio)" "/sys/bus/pci/devices/$pci_scsi/uevent"; then
|
|
$spdkcli_job "'/bdevs/virtioscsi_disk delete virtioscsi_pci' 'virtioscsi_pci'"
|
|
fi
|
|
$spdkcli_job "'/bdevs/malloc delete Malloc0' 'Malloc0'
|
|
'/bdevs/malloc delete Malloc1' 'Malloc1'
|
|
"
|
|
timing_exit spdkcli_clear_virtio_config
|
|
|
|
killprocess $virtio_pid
|
|
killprocess $spdk_tgt_pid
|