ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/bdev: change crypto device conf based on environment

Browse Source 
Also, remove bdev_svc memory limit to prevent it from hanging while
handling discover_bdevs calls.

Change-Id: I2868839f40931b964d49a90a86dfb391e2247e30
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/429535
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Seth Howell 2018-10-15 14:38:49 -07:00 committed by Ben Walker
parent 51baf04dc6
commit 33df76dc93
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/gen_crypto.sh Executable file
View File

@ -0,0 +1,18 @@
#!/usr/bin/env bash
set -e
rootdir=$(readlink -f $(dirname $0))/..
source "$rootdir/scripts/common.sh"
base_bdev=$1
if [ -n $base_bdev ]; then
echo
echo "[crypto]"
if [ $(lspci -d:37c8 | wc -l) -eq 0 ]; then
echo " CRY $base_bdev crypto_ram 0123456789123456 crypto_aesni_mb"
else
echo " CRY $base_bdev crypto_ram 0123456789123456 crypto_qat"
fi
fi

6
test/bdev/bdev.conf.in
View File

@ -2,12 +2,6 @@
# PT <bdev name> <vbdev name> # PT <bdev name> <vbdev name>
PT Malloc3 TestPT PT Malloc3 TestPT
[crypto]
# CRY <bdev name> <vbdev name> <key> <PMD>
# key size depends on cipher
# supported PMD names: crypto_aesni_mb, crypto_qat
CRY Malloc6 crypto_ram 0123456789123456 crypto_aesni_mb
[Malloc] [Malloc]
NumberOfLuns 7 NumberOfLuns 7
LunSizeInMB 32 LunSizeInMB 32

4
test/bdev/blockdev.sh
View File

@ -67,6 +67,10 @@ if [ $SPDK_TEST_RBD -eq 1 ]; then
$rootdir/scripts/gen_rbd.sh >> $testdir/bdev.conf $rootdir/scripts/gen_rbd.sh >> $testdir/bdev.conf
fi fi
if [ $SPDK_TEST_CRYPTO -eq 1 ]; then
$rootdir/scripts/gen_crypto.sh Malloc6 >> $testdir/bdev.conf
fi
if hash pmempool; then if hash pmempool; then
rm -f /tmp/spdk-pmem-pool rm -f /tmp/spdk-pmem-pool
pmempool create blk --size=32M 512 /tmp/spdk-pmem-pool pmempool create blk --size=32M 512 /tmp/spdk-pmem-pool

2
test/common/autotest_common.sh
View File

@ -558,7 +558,7 @@ function discover_bdevs()
# Start the bdev service to query for the list of available # Start the bdev service to query for the list of available
# bdevs. # bdevs.
$rootdir/test/app/bdev_svc/bdev_svc -r $rpc_server -i 0 -s 1024 \ $rootdir/test/app/bdev_svc/bdev_svc -r $rpc_server -i 0 \
-c $config_file &>/dev/null & -c $config_file &>/dev/null &
stubpid=$! stubpid=$!
while ! [ -e /var/run/spdk_bdev0 ]; do while ! [ -e /var/run/spdk_bdev0 ]; do