From: Hemant Agrawal <hemant.agra...@nxp.com>
This patch improves the debug logs for un-supported algo sessions.
Signed-off-by: Hemant Agrawal <hemant.agra...@nxp.com>
---
drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 128 +++++---------------
drivers/crypto/dpaa_sec/dpaa_sec.c | 56 ++++-----
2 files changed, 53 insertions(+), 131 deletions(-)
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 1cae6c4505..922a35e3ee 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -1378,9 +1378,10 @@ build_sec_fd(struct rte_crypto_op *op,
case DPAA2_SEC_PDCP:
ret = build_proto_compound_sg_fd(sess, op, fd, bpid);
break;
- case DPAA2_SEC_HASH_CIPHER:
default:
- DPAA2_SEC_ERR("error: Unsupported session");
+ DPAA2_SEC_ERR("error: Unsupported session %d",
+ sess->ctxt_type);
+ ret = -ENOTSUP;
}
} else {
switch (sess->ctxt_type) {
@@ -1402,9 +1403,9 @@ build_sec_fd(struct rte_crypto_op *op,
case DPAA2_SEC_PDCP:
ret = build_proto_compound_fd(sess, op, fd, bpid, qp);
break;
- case DPAA2_SEC_HASH_CIPHER:
default:
- DPAA2_SEC_ERR("error: Unsupported session");
+ DPAA2_SEC_ERR("error: Unsupported session%d",
+ sess->ctxt_type);
ret = -ENOTSUP;
}
}
@@ -2169,20 +2170,9 @@ dpaa2_sec_cipher_init(struct rte_crypto_sym_xform *xform,
&cipherdata,
session->dir);
break;
- case RTE_CRYPTO_CIPHER_KASUMI_F8:
- case RTE_CRYPTO_CIPHER_AES_F8:
- case RTE_CRYPTO_CIPHER_AES_ECB:
- case RTE_CRYPTO_CIPHER_3DES_ECB:
- case RTE_CRYPTO_CIPHER_3DES_CTR:
- case RTE_CRYPTO_CIPHER_AES_XTS:
- case RTE_CRYPTO_CIPHER_ARC4:
- case RTE_CRYPTO_CIPHER_NULL:
- DPAA2_SEC_ERR("Crypto: Unsupported Cipher alg %u",
- xform->cipher.algo);
- ret = -ENOTSUP;
- goto error_out;
default:
- DPAA2_SEC_ERR("Crypto: Undefined Cipher specified %u",
+ DPAA2_SEC_ERR("Crypto: Unsupported Cipher alg %s (%u)",
+
rte_cryptodev_get_cipher_algo_string(xform->cipher.algo),
xform->cipher.algo);
ret = -ENOTSUP;
goto error_out;
@@ -2407,23 +2397,16 @@ dpaa2_sec_auth_init(struct rte_crypto_sym_xform *xform,
!session->dir,
session->digest_length);
break;
- case RTE_CRYPTO_AUTH_AES_CBC_MAC:
- case RTE_CRYPTO_AUTH_AES_GMAC:
- case RTE_CRYPTO_AUTH_KASUMI_F9:
- case RTE_CRYPTO_AUTH_NULL:
- DPAA2_SEC_ERR("Crypto: Unsupported auth alg %un",
- xform->auth.algo);
- ret = -ENOTSUP;
- goto error_out;
default:
- DPAA2_SEC_ERR("Crypto: Undefined Auth specified %u",
- xform->auth.algo);
+ DPAA2_SEC_ERR("Crypto: Unsupported Auth alg %s (%u)",
+ rte_cryptodev_get_auth_algo_string(xform->auth.algo),
+ xform->auth.algo);
ret = -ENOTSUP;
goto error_out;
}
if (bufsize < 0) {
- DPAA2_SEC_ERR("Crypto: Invalid buffer length");
+ DPAA2_SEC_ERR("Crypto: Invalid SEC-DESC buffer length");
ret = -EINVAL;
goto error_out;
}
@@ -2500,14 +2483,11 @@ dpaa2_sec_aead_init(struct rte_crypto_sym_xform *xform,
aeaddata.algmode = OP_ALG_AAI_GCM;
session->aead_alg = RTE_CRYPTO_AEAD_AES_GCM;
break;
- case RTE_CRYPTO_AEAD_AES_CCM:
- DPAA2_SEC_ERR("Crypto: Unsupported AEAD alg %u",
- aead_xform->algo);
- ret = -ENOTSUP;
- goto error_out;
default:
- DPAA2_SEC_ERR("Crypto: Undefined AEAD specified %u",
- aead_xform->algo);
+
+ DPAA2_SEC_ERR("Crypto: Unsupported AEAD alg %s (%u)",
+ rte_cryptodev_get_aead_algo_string(aead_xform->algo),
+ aead_xform->algo);
ret = -ENOTSUP;
goto error_out;
}
@@ -2545,7 +2525,7 @@ dpaa2_sec_aead_init(struct rte_crypto_sym_xform *xform,
&aeaddata, session->iv.length,
session->digest_length);
if (bufsize < 0) {
- DPAA2_SEC_ERR("Crypto: Invalid buffer length");
+ DPAA2_SEC_ERR("Crypto: Invalid SEC-DESC buffer length");
ret = -EINVAL;
goto error_out;
}
@@ -2680,24 +2660,9 @@ dpaa2_sec_aead_chain_init(struct rte_crypto_sym_xform
*xform,
authdata.algmode = OP_ALG_AAI_CMAC;
session->auth_alg = RTE_CRYPTO_AUTH_AES_CMAC;
break;
- case RTE_CRYPTO_AUTH_AES_CBC_MAC:
- case RTE_CRYPTO_AUTH_AES_GMAC:
- case RTE_CRYPTO_AUTH_SNOW3G_UIA2:
- case RTE_CRYPTO_AUTH_NULL:
- case RTE_CRYPTO_AUTH_SHA1:
- case RTE_CRYPTO_AUTH_SHA256:
- case RTE_CRYPTO_AUTH_SHA512:
- case RTE_CRYPTO_AUTH_SHA224:
- case RTE_CRYPTO_AUTH_SHA384:
- case RTE_CRYPTO_AUTH_MD5:
- case RTE_CRYPTO_AUTH_KASUMI_F9:
- case RTE_CRYPTO_AUTH_ZUC_EIA3:
- DPAA2_SEC_ERR("Crypto: Unsupported auth alg %u",
- auth_xform->algo);
- ret = -ENOTSUP;
- goto error_out;
default:
- DPAA2_SEC_ERR("Crypto: Undefined Auth specified %u",
+ DPAA2_SEC_ERR("Crypto: Undefined Auth specified %s (%u)",
+
rte_cryptodev_get_auth_algo_string(auth_xform->algo),
auth_xform->algo);
ret = -ENOTSUP;
goto error_out;
@@ -2728,20 +2693,10 @@ dpaa2_sec_aead_chain_init(struct rte_crypto_sym_xform
*xform,
cipherdata.algmode = OP_ALG_AAI_CTR;
session->cipher_alg = RTE_CRYPTO_CIPHER_AES_CTR;
break;
- case RTE_CRYPTO_CIPHER_SNOW3G_UEA2:
- case RTE_CRYPTO_CIPHER_ZUC_EEA3:
- case RTE_CRYPTO_CIPHER_NULL:
- case RTE_CRYPTO_CIPHER_3DES_ECB:
- case RTE_CRYPTO_CIPHER_3DES_CTR:
- case RTE_CRYPTO_CIPHER_AES_ECB:
- case RTE_CRYPTO_CIPHER_KASUMI_F8:
- DPAA2_SEC_ERR("Crypto: Unsupported Cipher alg %u",
- cipher_xform->algo);
- ret = -ENOTSUP;
- goto error_out;
default:
- DPAA2_SEC_ERR("Crypto: Undefined Cipher specified %u",
- cipher_xform->algo);
+ DPAA2_SEC_ERR("Crypto: Undefined Cipher specified %s (%u)",
+
rte_cryptodev_get_cipher_algo_string(cipher_xform->algo),
+ cipher_xform->algo);
ret = -ENOTSUP;
goto error_out;
}
@@ -2784,7 +2739,7 @@ dpaa2_sec_aead_chain_init(struct rte_crypto_sym_xform
*xform,
session->digest_length,
session->dir);
if (bufsize < 0) {
- DPAA2_SEC_ERR("Crypto: Invalid buffer length");
+ DPAA2_SEC_ERR("Crypto: Invalid SEC-DESC buffer length");
ret = -EINVAL;
goto error_out;
}
@@ -3041,22 +2996,9 @@ dpaa2_sec_ipsec_proto_init(struct
rte_crypto_cipher_xform *cipher_xform,
case RTE_CRYPTO_AUTH_NULL:
authdata->algtype = OP_PCL_IPSEC_HMAC_NULL;
break;
- case RTE_CRYPTO_AUTH_SNOW3G_UIA2:
- case RTE_CRYPTO_AUTH_SHA1:
- case RTE_CRYPTO_AUTH_SHA256:
- case RTE_CRYPTO_AUTH_SHA512:
- case RTE_CRYPTO_AUTH_SHA224:
- case RTE_CRYPTO_AUTH_SHA384:
- case RTE_CRYPTO_AUTH_MD5:
- case RTE_CRYPTO_AUTH_AES_GMAC:
- case RTE_CRYPTO_AUTH_KASUMI_F9:
- case RTE_CRYPTO_AUTH_AES_CBC_MAC:
- case RTE_CRYPTO_AUTH_ZUC_EIA3:
- DPAA2_SEC_ERR("Crypto: Unsupported auth alg %u",
- session->auth_alg);
- return -ENOTSUP;
default:
- DPAA2_SEC_ERR("Crypto: Undefined Auth specified %u",
+ DPAA2_SEC_ERR("Crypto: Unsupported auth alg %s (%u)",
+ rte_cryptodev_get_auth_algo_string(session->auth_alg),
session->auth_alg);
return -ENOTSUP;
}
@@ -3085,18 +3027,10 @@ dpaa2_sec_ipsec_proto_init(struct
rte_crypto_cipher_xform *cipher_xform,
case RTE_CRYPTO_CIPHER_NULL:
cipherdata->algtype = OP_PCL_IPSEC_NULL;
break;
- case RTE_CRYPTO_CIPHER_SNOW3G_UEA2:
- case RTE_CRYPTO_CIPHER_ZUC_EEA3:
- case RTE_CRYPTO_CIPHER_3DES_ECB:
- case RTE_CRYPTO_CIPHER_3DES_CTR:
- case RTE_CRYPTO_CIPHER_AES_ECB:
- case RTE_CRYPTO_CIPHER_KASUMI_F8:
- DPAA2_SEC_ERR("Crypto: Unsupported Cipher alg %u",
- session->cipher_alg);
- return -ENOTSUP;
default:
- DPAA2_SEC_ERR("Crypto: Undefined Cipher specified %u",
- session->cipher_alg);
+ DPAA2_SEC_ERR("Crypto: Unsupported Cipher alg %s (%u)",
+
rte_cryptodev_get_cipher_algo_string(session->cipher_alg),
+ session->cipher_alg);
return -ENOTSUP;
}
@@ -3380,7 +3314,7 @@ dpaa2_sec_set_ipsec_session(struct rte_cryptodev *dev,
goto out;
if (bufsize < 0) {
- DPAA2_SEC_ERR("Crypto: Invalid buffer length");
+ DPAA2_SEC_ERR("Crypto: Invalid SEC-DESC buffer length");
goto out;
}
@@ -3679,7 +3613,7 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev *dev,
}
if (bufsize < 0) {
- DPAA2_SEC_ERR("Crypto: Invalid buffer length");
+ DPAA2_SEC_ERR("Crypto: Invalid SEC-DESC buffer length");
goto out;
}
@@ -3739,7 +3673,7 @@ dpaa2_sec_security_session_create(void *dev,
return -EINVAL;
}
if (ret != 0) {
- DPAA2_SEC_ERR("Failed to configure session parameters");
+ DPAA2_SEC_DEBUG("Failed to configure session parameters %d",
ret);
return ret;
}
@@ -3781,7 +3715,7 @@ dpaa2_sec_sym_session_configure(struct rte_cryptodev *dev
__rte_unused,
ret = dpaa2_sec_set_session_parameters(xform, sess_private_data);
if (ret != 0) {
- DPAA2_SEC_ERR("Failed to configure session parameters");
+ DPAA2_SEC_DEBUG("Failed to configure session parameters %d",
ret);
/* Return session to mempool */
return ret;
}
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c
b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 105274e49e..453066fded 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -495,7 +495,8 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
ses->dir);
break;
default:
- DPAA_SEC_ERR("unsupported cipher alg %d",
+ DPAA_SEC_ERR("unsupported cipher alg %s (%d)",
+
rte_cryptodev_get_cipher_algo_string(ses->cipher_alg),
ses->cipher_alg);
return -ENOTSUP;
}
@@ -556,7 +557,9 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
ses->digest_length);
break;
default:
- DPAA_SEC_ERR("unsupported auth alg %u", ses->auth_alg);
+ DPAA_SEC_ERR("unsupported auth alg %s (%u)",
+
rte_cryptodev_get_auth_algo_string(ses->auth_alg),
+ ses->auth_alg);
}
break;
case DPAA_SEC_AEAD:
@@ -635,9 +638,8 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
ses->iv.length,
ses->digest_length, ses->dir);
break;
- case DPAA_SEC_HASH_CIPHER:
default:
- DPAA_SEC_ERR("error: Unsupported session");
+ DPAA_SEC_ERR("error: Unsupported session %d", ses->ctxt);
return -ENOTSUP;
}
@@ -2221,8 +2223,9 @@ dpaa_sec_cipher_init(struct rte_cryptodev *dev
__rte_unused,
session->cipher_key.alg = OP_ALG_ALGSEL_ZUCE;
break;
default:
- DPAA_SEC_ERR("Crypto: Undefined Cipher specified %u",
- xform->cipher.algo);
+ DPAA_SEC_ERR("Crypto: Unsupported Cipher specified %s (%u)",
+
rte_cryptodev_get_cipher_algo_string(xform->cipher.algo),
+ xform->cipher.algo);
return -ENOTSUP;
}
session->dir = (xform->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?
@@ -2323,7 +2326,8 @@ dpaa_sec_auth_init(struct rte_cryptodev *dev __rte_unused,
session->auth_key.algmode = OP_ALG_AAI_CMAC;
break;
default:
- DPAA_SEC_ERR("Crypto: Unsupported Auth specified %u",
+ DPAA_SEC_ERR("Crypto: Unsupported Auth specified %s (%u)",
+ rte_cryptodev_get_auth_algo_string(xform->auth.algo),
xform->auth.algo);
return -ENOTSUP;
}
@@ -2412,7 +2416,8 @@ dpaa_sec_chain_init(struct rte_cryptodev *dev
__rte_unused,
session->auth_key.algmode = OP_ALG_AAI_CMAC;
break;
default:
- DPAA_SEC_ERR("Crypto: Unsupported Auth specified %u",
+ DPAA_SEC_ERR("Crypto: Unsupported Auth specified %s (%u)",
+ rte_cryptodev_get_auth_algo_string(auth_xform->algo),
auth_xform->algo);
return -ENOTSUP;
}
@@ -2437,7 +2442,9 @@ dpaa_sec_chain_init(struct rte_cryptodev *dev
__rte_unused,
session->cipher_key.algmode = OP_ALG_AAI_CTR;
break;
default:
- DPAA_SEC_ERR("Crypto: Undefined Cipher specified %u",
+
+ DPAA_SEC_ERR("Crypto: Undefined Cipher specified %s (%u)",
+
rte_cryptodev_get_cipher_algo_string(cipher_xform->algo),
cipher_xform->algo);
return -ENOTSUP;
}
@@ -2849,22 +2856,9 @@ dpaa_sec_ipsec_proto_init(struct rte_crypto_cipher_xform
*cipher_xform,
session->auth_key.alg = OP_PCL_IPSEC_AES_XCBC_MAC_96;
session->auth_key.algmode = OP_ALG_AAI_XCBC_MAC;
break;
- case RTE_CRYPTO_AUTH_SNOW3G_UIA2:
- case RTE_CRYPTO_AUTH_SHA1:
- case RTE_CRYPTO_AUTH_SHA256:
- case RTE_CRYPTO_AUTH_SHA512:
- case RTE_CRYPTO_AUTH_SHA224:
- case RTE_CRYPTO_AUTH_SHA384:
- case RTE_CRYPTO_AUTH_MD5:
- case RTE_CRYPTO_AUTH_AES_GMAC:
- case RTE_CRYPTO_AUTH_KASUMI_F9:
- case RTE_CRYPTO_AUTH_AES_CBC_MAC:
- case RTE_CRYPTO_AUTH_ZUC_EIA3:
- DPAA_SEC_ERR("Crypto: Unsupported auth alg %u",
- session->auth_alg);
- return -ENOTSUP;
default:
- DPAA_SEC_ERR("Crypto: Undefined Auth specified %u",
+ DPAA_SEC_ERR("Crypto: Unsupported auth alg %s (%u)",
+ rte_cryptodev_get_auth_algo_string(session->auth_alg),
session->auth_alg);
return -ENOTSUP;
}
@@ -2896,16 +2890,9 @@ dpaa_sec_ipsec_proto_init(struct rte_crypto_cipher_xform
*cipher_xform,
case RTE_CRYPTO_CIPHER_NULL:
session->cipher_key.alg = OP_PCL_IPSEC_NULL;
break;
- case RTE_CRYPTO_CIPHER_SNOW3G_UEA2:
- case RTE_CRYPTO_CIPHER_ZUC_EEA3:
- case RTE_CRYPTO_CIPHER_3DES_ECB:
- case RTE_CRYPTO_CIPHER_AES_ECB:
- case RTE_CRYPTO_CIPHER_KASUMI_F8:
- DPAA_SEC_ERR("Crypto: Unsupported Cipher alg %u",
- session->cipher_alg);
- return -ENOTSUP;
default:
- DPAA_SEC_ERR("Crypto: Undefined Cipher specified %u",
+ DPAA_SEC_ERR("Crypto: Unsupported Cipher alg %s (%u)",
+
rte_cryptodev_get_cipher_algo_string(session->cipher_alg),
session->cipher_alg);
return -ENOTSUP;
}
@@ -3181,7 +3168,8 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,
session->auth_key.alg = PDCP_AUTH_TYPE_NULL;
break;
default:
- DPAA_SEC_ERR("Crypto: Unsupported auth alg %u",
+ DPAA_SEC_ERR("Crypto: Unsupported auth alg %s (%u)",
+ rte_cryptodev_get_auth_algo_string(session->auth_alg),
session->auth_alg);
rte_free(session->cipher_key.data);
return -EINVAL;
--
2.25.1
