test/vhost_perf: add option to not run gen_nvme.sh
Do not run gen_nvme.sh and do not automatically create nvme bdev configuration. Allows more control over Nvme/bdev configuration when running performance tests. Change-Id: I9ef139921efbcc5d92d3a55c05aace929c6284e7 Signed-off-by: Karol Latecki <karol.latecki@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464564 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Maciej Wawryk <maciejx.wawryk@intel.com>
This commit is contained in:
parent
7f19b9c66d
commit
8088176127
@ -110,14 +110,20 @@ function get_vhost_dir()
|
||||
function vhost_run()
|
||||
{
|
||||
local vhost_name="$1"
|
||||
local run_gen_nvme=true
|
||||
|
||||
if [[ -z "$vhost_name" ]]; then
|
||||
error "vhost name must be provided to vhost_run"
|
||||
return 1
|
||||
fi
|
||||
|
||||
shift
|
||||
|
||||
if [[ "$1" == "--no-gen-nvme" ]]; then
|
||||
notice "Skipping gen_nvmf.sh NVMe bdev configuration"
|
||||
run_gen_nvme=false
|
||||
shift
|
||||
fi
|
||||
|
||||
local vhost_dir="$(get_vhost_dir $vhost_name)"
|
||||
local vhost_app="$rootdir/app/vhost/vhost"
|
||||
local vhost_log_file="$vhost_dir/vhost.log"
|
||||
@ -147,7 +153,7 @@ function vhost_run()
|
||||
notice "waiting for app to run..."
|
||||
waitforlisten "$vhost_pid" "$vhost_dir/rpc.sock"
|
||||
#do not generate nvmes if pci access is disabled
|
||||
if [[ "$cmd" != *"--no-pci"* ]] && [[ "$cmd" != *"-u"* ]]; then
|
||||
if [[ "$cmd" != *"--no-pci"* ]] && [[ "$cmd" != *"-u"* ]] && $run_gen_nvme; then
|
||||
$rootdir/scripts/gen_nvme.sh "--json" | $rootdir/scripts/rpc.py\
|
||||
-s $vhost_dir/rpc.sock load_subsystem_config
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user