examples/ipsec-secgw: enable cpu-crypto fallback
diff mbox series

Message ID 20200318132659.1031-1-mariuszx.drost@intel.com
State Accepted, archived
Delegated to: akhil goyal
Headers show
Series
  • examples/ipsec-secgw: enable cpu-crypto fallback
Related show

Checks

Context Check Description
ci/iol-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot warning Travis build: failed
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Mariusz Drost March 18, 2020, 1:26 p.m. UTC
Added cpu-crypto fallback option parsing as well as tests for it

Signed-off-by: Mariusz Drost <mariuszx.drost@intel.com>
---
 examples/ipsec-secgw/sa.c                            |  6 ++++--
 examples/ipsec-secgw/test/common_defs.sh             | 12 ++++++++++++
 .../test/trs_aesgcm_inline_crypto_fallback_defs.sh   |  7 ++++++-
 .../test/tun_aesgcm_inline_crypto_fallback_defs.sh   |  7 ++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

Comments

Ananyev, Konstantin March 23, 2020, 12:47 p.m. UTC | #1
> 
> Added cpu-crypto fallback option parsing as well as tests for it
> 
> Signed-off-by: Mariusz Drost <mariuszx.drost@intel.com>
> ---

Tested-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

> 2.17.1
Akhil Goyal April 5, 2020, 4:59 p.m. UTC | #2
> 
> >
> > Added cpu-crypto fallback option parsing as well as tests for it
> >
> > Signed-off-by: Mariusz Drost <mariuszx.drost@intel.com>
> > ---
> 
> Tested-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> 
Applied to dpdk-next-crypto

Thanks.

Patch
diff mbox series

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 4822d6bda..7c65f893a 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -669,9 +669,11 @@  parse_sa_tokens(char **tokens, uint32_t n_tokens,
 			if (status->status < 0)
 				return;
 			fb = ipsec_get_fallback_session(rule);
-			if (strcmp(tokens[ti], "lookaside-none") == 0) {
+			if (strcmp(tokens[ti], "lookaside-none") == 0)
 				fb->type = RTE_SECURITY_ACTION_TYPE_NONE;
-			} else {
+			else if (strcmp(tokens[ti], "cpu-crypto") == 0)
+				fb->type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
+			else {
 				APP_CHECK(0, status, "unrecognized fallback "
 					"type %s.", tokens[ti]);
 				return;
diff --git a/examples/ipsec-secgw/test/common_defs.sh b/examples/ipsec-secgw/test/common_defs.sh
index 6b6ae06f3..35cdd1c55 100644
--- a/examples/ipsec-secgw/test/common_defs.sh
+++ b/examples/ipsec-secgw/test/common_defs.sh
@@ -51,6 +51,13 @@  select_mode()
 		SGW_CFG_XPRM="${SGW_CFG_XPRM} ${CRYPTO_PRIM_TYPE}"
 	fi
 
+	# check if fallback type is needed
+	if [[ "${MODE}" == *fallback* ]]; then
+		if [[ -n "${CRYPTO_FLBK_TYPE}" ]]; then
+			echo "${CRYPTO_FLBK_TYPE} is enabled"
+		fi
+	fi
+
 	#make linux to generate fragmented packets
 	if [[ -n "${MULTI_SEG_TEST}" && -n "${SGW_CMD_XPRM}" ]]; then
 		echo "multi-segment test is enabled"
@@ -58,6 +65,11 @@  select_mode()
 		PING_LEN=5000
 		MTU_LEN=1500
 	else
+		if [[ -z "${MULTI_SEG_TEST}" && "${MODE}" == *fallback* ]]; then
+			echo "MULTI_SEG_TEST environment variable needs to be \
+set for ${MODE} test"
+			exit 127
+		fi
 		PING_LEN=${DEF_PING_LEN}
 		MTU_LEN=${DEF_MTU_LEN}
 	fi
diff --git a/examples/ipsec-secgw/test/trs_aesgcm_inline_crypto_fallback_defs.sh b/examples/ipsec-secgw/test/trs_aesgcm_inline_crypto_fallback_defs.sh
index f21b01d63..4e2ac0ead 100644
--- a/examples/ipsec-secgw/test/trs_aesgcm_inline_crypto_fallback_defs.sh
+++ b/examples/ipsec-secgw/test/trs_aesgcm_inline_crypto_fallback_defs.sh
@@ -3,4 +3,9 @@ 
 
 . ${DIR}/trs_aesgcm_defs.sh
 
-SGW_CFG_XPRM_IN='port_id 0 type inline-crypto-offload fallback lookaside-none'
+if [[ -z "${CRYPTO_FLBK_TYPE}" ]]; then
+	CRYPTO_FLBK_TYPE="fallback lookaside-none"
+fi
+
+SGW_CFG_XPRM_IN="port_id 0 type inline-crypto-offload ${CRYPTO_FLBK_TYPE}"
+
diff --git a/examples/ipsec-secgw/test/tun_aesgcm_inline_crypto_fallback_defs.sh b/examples/ipsec-secgw/test/tun_aesgcm_inline_crypto_fallback_defs.sh
index 97b9431f4..d6bf40d83 100644
--- a/examples/ipsec-secgw/test/tun_aesgcm_inline_crypto_fallback_defs.sh
+++ b/examples/ipsec-secgw/test/tun_aesgcm_inline_crypto_fallback_defs.sh
@@ -3,4 +3,9 @@ 
 
 . ${DIR}/tun_aesgcm_defs.sh
 
-SGW_CFG_XPRM_IN='port_id 0 type inline-crypto-offload fallback lookaside-none'
+if [[ -z "${CRYPTO_FLBK_TYPE}" ]]; then
+	CRYPTO_FLBK_TYPE="fallback lookaside-none"
+fi
+
+SGW_CFG_XPRM_IN="port_id 0 type inline-crypto-offload ${CRYPTO_FLBK_TYPE}"
+