d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/nvmf: remove -p num_queues restrictions

Browse Source 
There's a bug in Linux 5.1 (possibly 5.0 too) where
the kernel initiator driver crashes if it can't get
one queue per CPU.  This will get fixed eventually,
but for now we need to remove the cases where we
restrict the number of queues per controller so that
we can test on newer kernels.

Even on cases where we're testing the SPDK initiator,
there's no real need to restrict the number of queue
pairs.

The kernel will eventually get fixed, but we should
be testing with default behavior anyways (the kernel
wants lots of queues).  We'll also want to add some
regression tests to make sure the kernel doesn't
break again.  But that will all come later.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I9979e6d94456e075688b822b042936b63e518a4a

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454819
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Jim Harris 2019-05-16 14:39:52 -07:00
parent d2e2758e0d
commit d96abc9f0d
22 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
View File

@ -67,7 +67,7 @@ echo "NVMf target launched. pid: $nvmfpid"
trap "iscsitestfini $1 $2; nvmftestfini; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py start_subsystem_init
$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
$rpc_py nvmf_create_transport -t RDMA -u 8192
echo "NVMf target has started."
bdevs=$($rpc_py construct_malloc_bdev 64 512)
$rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001

2
test/json_config/json_config.sh
View File

@ -305,7 +305,7 @@ function create_nvmf_subsystem_config() {
tgt_rpc construct_malloc_bdev 8 512 --name MallocForNvmf0
tgt_rpc construct_malloc_bdev 4 1024 --name MallocForNvmf1
tgt_rpc nvmf_create_transport -t RDMA -u 8192 -p 4 -c 0
tgt_rpc nvmf_create_transport -t RDMA -u 8192 -c 0
tgt_rpc nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001
tgt_rpc nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 MallocForNvmf0
tgt_rpc nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 MallocForNvmf1

2
test/nvmf/host/aer.sh
View File

@ -29,7 +29,7 @@ nvmfpid=$!
trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
$rpc_py nvmf_create_transport -t RDMA -u 8192
timing_exit start_nvmf_tgt
modprobe -v nvme-rdma

2
test/nvmf/host/bdevperf.sh
View File

@ -32,7 +32,7 @@ nvmfpid=$!
trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
$rpc_py nvmf_create_transport -t RDMA -u 8192
timing_exit start_nvmf_tgt
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0

2
test/nvmf/host/fio.sh
View File

@ -35,7 +35,7 @@ nvmfpid=$!
trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
$rpc_py nvmf_create_transport -t RDMA -u 8192
timing_exit start_nvmf_tgt
$rpc_py construct_malloc_bdev 64 512 -b Malloc1

2
test/nvmf/host/identify.sh
View File

@ -30,7 +30,7 @@ nvmfpid=$!
trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
$rpc_py nvmf_create_transport -t RDMA -u 8192
timing_exit start_nvmf_tgt
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0

2
test/nvmf/host/perf.sh
View File

@ -48,7 +48,7 @@ function test_perf()
{
TYPE=$1
NVMF_TARGET_IP=$2
$rpc_py nvmf_create_transport -t $TYPE -p 4
$rpc_py nvmf_create_transport -t $TYPE
$rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001
for bdev in $bdevs; do
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 $bdev

2
test/nvmf/target/bdev_io_wait.sh
View File

@ -21,7 +21,7 @@ nvmfappstart "-m 0xF --wait-for-rpc"
# Minimal number of bdev io pool (5) and cache (1)
$rpc_py set_bdev_options -p 5 -c 1
$rpc_py start_subsystem_init
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
$rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001

2
test/nvmf/target/bdevio.sh
View File

@ -18,7 +18,7 @@ timing_enter bdevio
nvmftestinit
nvmfappstart "-m 0xF"
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
$rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc0

2
test/nvmf/target/connect_disconnect.sh
View File

@ -20,7 +20,7 @@ timing_enter connect_disconnect
nvmftestinit
nvmfappstart "-m 0xF"
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 -c 0
$rpc_py nvmf_create_transport -t rdma -u 8192 -c 0
bdev="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

2
test/nvmf/target/create_transport.sh
View File

@ -24,7 +24,7 @@ nvmftestinit
nvmfappstart "-m 0xF"
# Use nvmf_create_transport call to create transport
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
null_bdevs="$($rpc_py construct_null_bdev Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE) "
null_bdevs+="$($rpc_py construct_null_bdev Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)"

2
test/nvmf/target/discovery.sh
View File

@ -23,7 +23,7 @@ timing_enter discovery
nvmftestinit
nvmfappstart "-m 0xF"
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
null_bdevs="$($rpc_py construct_null_bdev Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE) "
null_bdevs+="$($rpc_py construct_null_bdev Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)"

2
test/nvmf/target/filesystem.sh
View File

@ -21,7 +21,7 @@ nvmftestinit
for incapsule in 0 4096; do
nvmfappstart "-m 0xF"
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 -c $incapsule
$rpc_py nvmf_create_transport -t rdma -u 8192 -c $incapsule
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1
$rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001

2
test/nvmf/target/fio.sh
View File

@ -18,7 +18,7 @@ timing_enter fio
nvmftestinit
nvmfappstart "-m 0xF"
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
malloc_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "
malloc_bdevs+="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

2
test/nvmf/target/multiconnection.sh
View File

@ -27,7 +27,7 @@ if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
NVMF_SUBSYS=1
fi
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
for i in `seq 1 $NVMF_SUBSYS`
do

2
test/nvmf/target/nmic.sh
View File

@ -20,7 +20,7 @@ nvmfappstart "-m 0xF"
NVMF_SECOND_TARGET_IP=$(echo "$RDMA_IP_LIST" | sed -n 2p)
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
# Create subsystems
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0

2
test/nvmf/target/nvme_cli.sh
View File

@ -25,7 +25,7 @@ timing_enter nvme_cli
nvmftestinit
nvmfappstart "-m 0xF"
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1

2
test/nvmf/target/nvmf_lvol.sh
View File

@ -28,7 +28,7 @@ if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
SUBSYS_NR=1
fi
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
# Construct a RAID volume for the logical volume store
base_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "

2
test/nvmf/target/rpc.sh
View File

@ -15,7 +15,7 @@ timing_enter rpc
nvmftestinit
nvmfappstart "-m 0xF"
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
# set times for subsystem construct/delete
if [ $RUN_NIGHTLY -eq 1 ]; then

2
test/nvmf/target/shutdown.sh
View File

@ -42,7 +42,7 @@ timing_enter shutdown
nvmftestinit
nvmfappstart "-m 0xF"
$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4
$rpc_py nvmf_create_transport -t rdma -u 8192
num_subsystems=10
# SoftRoce does not have enough queues available for

2
test/vhost/migration/migration-tc2.sh
View File

@ -98,7 +98,7 @@ function migration_tc2_configure_vhost()
echo $nvmf_tgt_pid > $nvmf_dir/nvmf_tgt.pid
waitforlisten "$nvmf_tgt_pid" "$nvmf_dir/rpc.sock"
$rpc_nvmf start_subsystem_init
$rpc_nvmf nvmf_create_transport -t RDMA -u 8192 -p 4
$rpc_nvmf nvmf_create_transport -t RDMA -u 8192
$SPDK_BUILD_DIR/scripts/gen_nvme.sh --json | $rpc_nvmf load_subsystem_config
timing_exit start_nvmf_tgt

2
test/vhost/migration/migration-tc3a.sh
View File

@ -106,7 +106,7 @@ function host1_start_nvmf()
echo $nvmf_tgt_pid > $nvmf_dir/nvmf_tgt.pid
waitforlisten "$nvmf_tgt_pid" "$nvmf_dir/nvmf_rpc.sock"
$rpc_nvmf start_subsystem_init
$rpc_nvmf nvmf_create_transport -t RDMA -u 8192 -p 4
$rpc_nvmf nvmf_create_transport -t RDMA -u 8192
$SPDK_BUILD_DIR/scripts/gen_nvme.sh --json | $rpc_nvmf load_subsystem_config
$rpc_nvmf nvmf_subsystem_create nqn.2018-02.io.spdk:cnode1 -a -s SPDK01