Commit 33df76dc authored by Seth Howell's avatar Seth Howell Committed by Ben Walker
Browse files

test/bdev: change crypto device conf based on environment 



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

Change-Id: I2868839f40931b964d49a90a86dfb391e2247e30
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/429535


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 51baf04d

scripts/gen_crypto.sh

0 → 100755
+18 −0
Original line number Diff line number Diff line 
#!/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

test/bdev/bdev.conf.in

+0 −6
Original line number Diff line number Diff line
@@ -2,12 +2,6 @@ 
  # PT <bdev name> <vbdev name>

  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]

  NumberOfLuns 7

  LunSizeInMB 32

test/bdev/blockdev.sh

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ if [ $SPDK_TEST_RBD -eq 1 ]; then 
	$rootdir/scripts/gen_rbd.sh >> $testdir/bdev.conf

fi



if [ $SPDK_TEST_CRYPTO -eq 1 ]; then

	$rootdir/scripts/gen_crypto.sh Malloc6 >> $testdir/bdev.conf

fi



if hash pmempool; then

	rm -f /tmp/spdk-pmem-pool

	pmempool create blk --size=32M 512 /tmp/spdk-pmem-pool

test/common/autotest_common.sh

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ function discover_bdevs() 


	# Start the bdev service to query for the list of available

	# 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 &

	stubpid=$!

	while ! [ -e /var/run/spdk_bdev0 ]; do