diff --git a/test/nvmf/discovery/discovery.sh b/test/nvmf/discovery/discovery.sh index d21c1b7859..376568978d 100755 --- a/test/nvmf/discovery/discovery.sh +++ b/test/nvmf/discovery/discovery.sh @@ -5,6 +5,9 @@ rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh source $rootdir/test/nvmf/common.sh +MALLOC_BDEV_SIZE=64 +MALLOC_BLOCK_SIZE=512 + rpc_py="python $rootdir/scripts/rpc.py" set -e @@ -29,6 +32,9 @@ trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid ${RPC_PORT} +$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE +$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE + modprobe -v nvme-rdma if [ -e "/dev/nvme-fabrics" ]; then diff --git a/test/nvmf/filesystem/filesystem.sh b/test/nvmf/filesystem/filesystem.sh index 9b13bcbe2c..b0eb9d40ab 100755 --- a/test/nvmf/filesystem/filesystem.sh +++ b/test/nvmf/filesystem/filesystem.sh @@ -5,6 +5,9 @@ rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh source $rootdir/test/nvmf/common.sh +MALLOC_BDEV_SIZE=64 +MALLOC_BLOCK_SIZE=512 + rpc_py="python $rootdir/scripts/rpc.py" set -e @@ -24,6 +27,9 @@ trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid ${RPC_PORT} +$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE +$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE + modprobe -v nvme-rdma if [ -e "/dev/nvme-fabrics" ]; then diff --git a/test/nvmf/fio/fio.sh b/test/nvmf/fio/fio.sh index 99169b1581..4d4aaabb95 100755 --- a/test/nvmf/fio/fio.sh +++ b/test/nvmf/fio/fio.sh @@ -5,6 +5,9 @@ rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh source $rootdir/test/nvmf/common.sh +MALLOC_BDEV_SIZE=64 +MALLOC_BLOCK_SIZE=512 + rpc_py="python $rootdir/scripts/rpc.py" set -e @@ -24,6 +27,9 @@ trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid ${RPC_PORT} +$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE +$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE + modprobe -v nvme-rdma if [ -e "/dev/nvme-fabrics" ]; then diff --git a/test/nvmf/nvme_cli/nvme_cli.sh b/test/nvmf/nvme_cli/nvme_cli.sh index 7f0d602a76..94139b6a5f 100755 --- a/test/nvmf/nvme_cli/nvme_cli.sh +++ b/test/nvmf/nvme_cli/nvme_cli.sh @@ -5,6 +5,9 @@ rootdir=$(readlink -f $testdir/../../..) source $rootdir/scripts/autotest_common.sh source $rootdir/test/nvmf/common.sh +MALLOC_BDEV_SIZE=64 +MALLOC_BLOCK_SIZE=512 + rpc_py="python $rootdir/scripts/rpc.py" set -e @@ -23,6 +26,9 @@ trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT waitforlisten $nvmfpid ${RPC_PORT} +$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE +$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE + modprobe -v nvme-rdma if [ -e "/dev/nvme-fabrics" ]; then diff --git a/test/nvmf/nvmf.conf b/test/nvmf/nvmf.conf index b3f17151f4..b1c452a394 100644 --- a/test/nvmf/nvmf.conf +++ b/test/nvmf/nvmf.conf @@ -5,9 +5,5 @@ [Rpc] Enable Yes -[Malloc] - NumberOfLuns 2 - LunSizeInMB 64 - [Nvmf] MaxQueuesPerSession 4