From 629c109282040be48137bd5246515b3984bcb7e1 Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Tue, 23 Apr 2019 08:11:55 -0700
Subject: [PATCH] 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  | 13 +++++++++++--
 test/bdev/bdev.conf.in |  2 +-
 test/bdev/blockdev.sh  |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/scripts/gen_crypto.sh b/scripts/gen_crypto.sh
index f92ea163d..41c554a99 100755
--- a/scripts/gen_crypto.sh
+++ b/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
+
+echo
+echo "[crypto]"
 
 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
+
+if [ -n $base_bdev2 ]; then
+        echo "  CRY $base_bdev2 crypto_ram2 9012345678912345 crypto_aesni_mb"
+fi
diff --git a/test/bdev/bdev.conf.in b/test/bdev/bdev.conf.in
index 0e4b96d70..bed438645 100644
--- a/test/bdev/bdev.conf.in
+++ b/test/bdev/bdev.conf.in
@@ -3,7 +3,7 @@
   PT Malloc3 TestPT
 
 [Malloc]
-  NumberOfLuns 7
+  NumberOfLuns 8
   LunSizeInMB 32
 
 [Split]
diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh
index b8cb0b18e..e40561007 100755
--- a/test/bdev/blockdev.sh
+++ b/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