From 33df76dc93e4478a629512a4c89913cd4534f6fb Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Mon, 15 Oct 2018 14:38:49 -0700
Subject: [PATCH] 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: 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>
---
 scripts/gen_crypto.sh          | 18 ++++++++++++++++++
 test/bdev/bdev.conf.in         |  6 ------
 test/bdev/blockdev.sh          |  4 ++++
 test/common/autotest_common.sh |  2 +-
 4 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100755 scripts/gen_crypto.sh

diff --git a/scripts/gen_crypto.sh b/scripts/gen_crypto.sh
new file mode 100755
index 000000000..f92ea163d
--- /dev/null
+++ b/scripts/gen_crypto.sh
@@ -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
diff --git a/test/bdev/bdev.conf.in b/test/bdev/bdev.conf.in
index cd53aa5cd..0439ab5ee 100644
--- a/test/bdev/bdev.conf.in
+++ b/test/bdev/bdev.conf.in
@@ -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
diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh
index e49ddeb9a..bf3e006bb 100755
--- a/test/bdev/blockdev.sh
+++ b/test/bdev/blockdev.sh
@@ -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
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 4f14711e3..86511ccf7 100644
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -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