d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
e333c67bc0
numam-spdk/test/vhost/shared/shared.sh

33 lines
856 B
Bash
Raw Normal View History

test/vhost: test multiple connections to a single vhost device Two fio instancess will try to do simultaneous I/O to a single vhost block device. The test uses default_initiator.job as a fio config, which apparently wasn't used anywhere and had to be slightly adjusted to work. Specificaly, we had to specify an empty job in the config file, as specifying it from the command line wouldn't make it inherit any options from the [global] section in the file. Change-Id: I2c2a96a709c567f5c910715a5b3d85a4e28bcb97 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/c/419066 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
2018-07-12 14:22:17 +00:00
#!/usr/bin/env bash
vhost: Use standard path names throughout tests Follow the pattern that most of the other tests follow by defining testdir and rootdir at the top, then sourcing the common files. Change-Id: I8f4374e91f20edc244e8e8bcf8f9df198b4509c6 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454380 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-05-10 17:54:24 +00:00
testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/vhost/common.sh
test/vhost: Allow string names for vhost targets Don't require these to be numbered. Change-Id: I385f579b41d24eea02e157e53c4fc1530864bb5b Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461389 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-06-04 20:55:21 +00:00
rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock"
test/vhost: test multiple connections to a single vhost device Two fio instancess will try to do simultaneous I/O to a single vhost block device. The test uses default_initiator.job as a fio config, which apparently wasn't used anywhere and had to be slightly adjusted to work. Specificaly, we had to specify an empty job in the config file, as specifying it from the command line wouldn't make it inherit any options from the [global] section in the file. Change-Id: I2c2a96a709c567f5c910715a5b3d85a4e28bcb97 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/c/419066 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
2018-07-12 14:22:17 +00:00
function run_spdk_fio() {
test/fio: export single variable for running fio_plugins This patch adds functions in autotest_common.sh, fio_bdev() and fio_nvme() for their respective plugins. It simplifies its usage throughout the scripts. Additionally will help with expanding the fio cmd line with nessecary changes only in single place. This will be used in next patch in series to LD_PRELOAD ASAN before fio_plugin. Note: Did not implement changes for perf scripts, since they are usualy run separately and didn't want to affect those. Similarly didn't change vhost initiator tests, because the exported directories do not work for inside the VM. Will need to think of a way to change it there as well. Change-Id: Idf750ee7aa9d5e30efc0ce430d15fa45ceccb203 Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456314 Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
2019-05-30 06:59:51 +00:00
fio_bdev --ioengine=spdk_bdev \
vhost: Use standard path names throughout tests Follow the pattern that most of the other tests follow by defining testdir and rootdir at the top, then sourcing the common files. Change-Id: I8f4374e91f20edc244e8e8bcf8f9df198b4509c6 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454380 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-05-10 17:54:24 +00:00
"$rootdir/test/vhost/common/fio_jobs/default_initiator.job" --runtime=10 --rw=randrw \
test/vhost: Replace ini config with json in shared test Change-Id: Iad98a16f3a01c68c34e23bcd880035c8c6550da4 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/765 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Seth Howell <seth.howell5141@gmail.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
2020-01-27 16:36:50 +00:00
--spdk_mem=1024 --spdk_single_seg=1 --spdk_json_conf=$testdir/bdev.json "$@"
test/vhost: test multiple connections to a single vhost device Two fio instancess will try to do simultaneous I/O to a single vhost block device. The test uses default_initiator.job as a fio config, which apparently wasn't used anywhere and had to be slightly adjusted to work. Specificaly, we had to specify an empty job in the config file, as specifying it from the command line wouldn't make it inherit any options from the [global] section in the file. Change-Id: I2c2a96a709c567f5c910715a5b3d85a4e28bcb97 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/c/419066 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
2018-07-12 14:22:17 +00:00
}
test/vhost: Add calls to vhosttestinit and vhosttestfini Change-Id: I0b564a6931b91f5226ad6a6909c5285f5cb76a71 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454944 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-05-17 21:09:40 +00:00
vhosttestinit
test/vhost: test multiple connections to a single vhost device Two fio instancess will try to do simultaneous I/O to a single vhost block device. The test uses default_initiator.job as a fio config, which apparently wasn't used anywhere and had to be slightly adjusted to work. Specificaly, we had to specify an empty job in the config file, as specifying it from the command line wouldn't make it inherit any options from the [global] section in the file. Change-Id: I2c2a96a709c567f5c910715a5b3d85a4e28bcb97 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/c/419066 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
2018-07-12 14:22:17 +00:00
trap 'error_exit "${FUNCNAME}" "${LINENO}"' ERR SIGTERM SIGABRT
test/vhost: Require vhost num as first arg to vhost_run Making this explicit makes the tests clearer Change-Id: I6c37f873683b38b644bebc42532694d45a181d04 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461387 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Maciej Szwed <maciej.szwed@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-06-05 19:47:53 +00:00
vhost_run 0
test/vhost: test multiple connections to a single vhost device Two fio instancess will try to do simultaneous I/O to a single vhost block device. The test uses default_initiator.job as a fio config, which apparently wasn't used anywhere and had to be slightly adjusted to work. Specificaly, we had to specify an empty job in the config file, as specifying it from the command line wouldn't make it inherit any options from the [global] section in the file. Change-Id: I2c2a96a709c567f5c910715a5b3d85a4e28bcb97 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/c/419066 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
2018-07-12 14:22:17 +00:00
scripts/rpc: Change rpc construct_malloc_bdev to bdev_malloc_create This is patch that implements changes according to proposal submitted in https://review.gerrithub.io/c/spdk/spdk/+/453036 Change-Id: I5423cd34cb5fc111b34cab2b7f7c6c5f11898af8 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464677 Reviewed-by: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Paul Luse <paul.e.luse@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
2019-08-09 11:15:35 +00:00
$rpc_py bdev_malloc_create -b Malloc 124 4096
rpc: Rename construct_vhost_blk_controller to vhost_create_blk_controller Change-Id: I49e5a24f89566ecf95e2df15e43d589f7ef3badb Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469861 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Paul Luse <paul.e.luse@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
2019-09-30 10:51:55 +00:00
$rpc_py vhost_create_blk_controller Malloc.0 Malloc
test/vhost: test multiple connections to a single vhost device Two fio instancess will try to do simultaneous I/O to a single vhost block device. The test uses default_initiator.job as a fio config, which apparently wasn't used anywhere and had to be slightly adjusted to work. Specificaly, we had to specify an empty job in the config file, as specifying it from the command line wouldn't make it inherit any options from the [global] section in the file. Change-Id: I2c2a96a709c567f5c910715a5b3d85a4e28bcb97 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.gerrithub.io/c/419066 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
2018-07-12 14:22:17 +00:00
run_spdk_fio --size=50% --offset=0 --filename=VirtioBlk0 &
run_fio_pid=$!
sleep 1
run_spdk_fio --size=50% --offset=50% --filename=VirtioBlk0
wait $run_fio_pid
test/vhost: Allow string names for vhost targets Don't require these to be numbered. Change-Id: I385f579b41d24eea02e157e53c4fc1530864bb5b Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461389 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-06-04 20:55:21 +00:00
vhost_kill 0
test/vhost: Add calls to vhosttestinit and vhosttestfini Change-Id: I0b564a6931b91f5226ad6a6909c5285f5cb76a71 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454944 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-05-17 21:09:40 +00:00
vhosttestfini
Reference in New Issue Copy Permalink