test/crypto: always test aesni, even if qat is available

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

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/451784
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>

scripts/gen_crypto.sh

@@ -5,14 +5,23 @@ set -e
 rootdir=$(readlink -f $(dirname $0))/..
 source "$rootdir/scripts/common.sh"
 
+# base_bdev will use QAT if available, otherwise AESNI
+# base_bdev2 will always use AESNI
+# This makes sure that AESNI always gets tested, even if QAT is available.
 base_bdev=$1
+base_bdev2=$2
 
-if [ -n $base_bdev ]; then
 echo
 echo "[crypto]"
+
+if [ -n $base_bdev ]; then
         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
+
+if [ -n $base_bdev2 ]; then
+        echo "  CRY $base_bdev2 crypto_ram2 9012345678912345 crypto_aesni_mb"
+fi

test/bdev/bdev.conf.in

@@ -3,7 +3,7 @@
   PT Malloc3 TestPT
 
 [Malloc]
-  NumberOfLuns 7
+  NumberOfLuns 8
   LunSizeInMB 32
 
 [Split]

test/bdev/blockdev.sh

@@ -69,7 +69,7 @@ if [ $SPDK_TEST_RBD -eq 1 ]; then
 fi
 
 if [ $SPDK_TEST_CRYPTO -eq 1 ]; then
-	$rootdir/scripts/gen_crypto.sh Malloc6 >> $testdir/bdev.conf
+	$rootdir/scripts/gen_crypto.sh Malloc6 Malloc7 >> $testdir/bdev.conf
 fi
 
 if hash pmempool; then