improve DOCSIS session creation
cover improve DOCSIS session creation
These patches improve the DOCSIS session creating in the QAT and AESNI-MB PMDs
David Coyle (2):
crypto/qat: improve DOCSIS session creation crypto/aesni_mb: improve DOCSIS session creation
.../crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 11 ++++--- drivers/crypto/qat/qat_sym_session.c | 32 +++++++++---------- 2 files changed, 21 insertions(+), 22 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 crypto/qat: improve DOCSIS session creation
This patch improves the DOCSIS session creation as follows:
- it validates the security action type as well as the protocol before creating a session and now does this validation before allocating the session from the mempool
- it clears the entire private session struct before populating it with DOCSIS session info, in case any data was left over from the last time it was used
- it simplifies the DOCSIS parameter setting, which was overly complicated
--- drivers/crypto/qat/qat_sym_session.c | 32 +++++++++++++--------------- 1 file changed, 15 insertions(+), 17 deletions(-)
drivers/crypto/qat/qat_sym_session.c +15 -17
@@ -2162,6 +2162,9 @@ qat_sec_session_set_docsis_parameters(struct rte_cryptodev *dev,struct rte_crypto_sym_xform *xform =NULL ;struct qat_sym_session *session = session_private; +/* Clear the session */ +memset (session,0 ,qat_sym_session_get_private_size (dev)); + ret =qat_sec_session_check_docsis (conf);if (ret) {QAT_LOG (ERR ,"Unsupported DOCSIS security configuration" );
@@ -2184,23 +2187,17 @@ qat_sec_session_set_docsis_parameters(struct rte_cryptodev *dev, session->min_qat_dev_gen =QAT_GEN1 ; -/* Get requested QAT command id */ +/* Get requested QAT command id - should be cipher */ qat_cmd_id =qat_get_cmd_id (xform); -if (qat_cmd_id <0 || qat_cmd_id >=ICP_QAT_FW_LA_CMD_DELIMITER ) { +if (qat_cmd_id !=ICP_QAT_FW_LA_CMD_CIPHER ) {QAT_LOG (ERR ,"Unsupported xform chain requested" );return -ENOTSUP ; } session->qat_cmd = (enum icp_qat_fw_la_cmd_id )qat_cmd_id; -switch (session->qat_cmd) { -case ICP_QAT_FW_LA_CMD_CIPHER : - ret =qat_sym_session_configure_cipher (dev, xform, session); -if (ret <0 ) -return ret; -break ; -default : -QAT_LOG (ERR ,"Unsupported Service %u" , session->qat_cmd); -return -ENOTSUP ; - } + + ret =qat_sym_session_configure_cipher (dev, xform, session); +if (ret <0 ) +return ret;return 0 ; }
@@ -2215,16 +2212,17 @@ qat_security_session_create(void *dev,struct rte_cryptodev *cdev = (struct rte_cryptodev *)dev;int ret; +if (conf->action_type !=RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL || + conf->protocol !=RTE_SECURITY_PROTOCOL_DOCSIS ) { +QAT_LOG (ERR ,"Invalid security protocol" ); +return -EINVAL ; + } +if (rte_mempool_get (mempool, &sess_private_data)) {QAT_LOG (ERR ,"Couldn't get object from session mempool" );return -ENOMEM ; } -if (conf->protocol !=RTE_SECURITY_PROTOCOL_DOCSIS ) { -QAT_LOG (ERR ,"Invalid security protocol" ); -return -EINVAL ; - } - ret =qat_sec_session_set_docsis_parameters (cdev, conf, sess_private_data);if (ret !=0 ) {
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v1 1/2] crypto/qat: improve DOCSIS session creation
Quoted 21 lines
-----Original Message-----
From: Coyle, David <[email protected]>
Sent: Thursday, July 16, 2020 4:32 PM
To: [email protected]; Doherty, Declan <[email protected]>; De Lara Guarch, Pablo <[email protected]>; Trahe, Fiona <[email protected]>
Cc: [email protected]; Ryan, Brendan <[email protected]>; O'loingsigh, Mairtin <[email protected]>; Coyle, David <[email protected]>
Subject: [PATCH v1 1/2]crypto/qat: improve DOCSIS session creationThis patch improves the DOCSIS session creation as follows:
- it validates the security action type as well as the protocol before creating a session and now does this validation before allocating the session from the mempool
- it clears the entire private session struct before populating it with DOCSIS session info, in case any data was left over from the last time it was used
- it simplifies the DOCSIS parameter setting, which was overly complicated
Quoted 3 lines
Fixes 6f0ef237404b ("crypto/qat: support DOCSIS protocol")Signed-off-by David Coyle <[email protected]>
PATCH 2/2 crypto/aesni_mb: improve DOCSIS session creation
In reply to David CoyleThis patch improves the DOCSIS session creation as follows:
- it validates the security action type as well as the protocol before creating a session and now does this validation before allocating the session from the mempool
--- drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c +6 -5
@@ -875,16 +875,17 @@ aesni_mb_pmd_sec_sess_create(void *dev, struct rte_security_session_conf *conf,struct rte_cryptodev *cdev = (struct rte_cryptodev *)dev;int ret; +if (conf->action_type !=RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL || + conf->protocol !=RTE_SECURITY_PROTOCOL_DOCSIS ) { +AESNI_MB_LOG (ERR ,"Invalid security protocol" ); +return -EINVAL ; + } +if (rte_mempool_get (mempool, &sess_private_data)) {AESNI_MB_LOG (ERR ,"Couldn't get object from session mempool" );return -ENOMEM ; } -if (conf->protocol !=RTE_SECURITY_PROTOCOL_DOCSIS ) { -AESNI_MB_LOG (ERR ,"Invalid security protocol" ); -return -EINVAL ; - } - ret =aesni_mb_set_docsis_sec_session_parameters (cdev, conf, sess_private_data);
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH v1 2/2] crypto/aesni_mb: improve DOCSIS session creation
Hi David,
Quoted 10 lines
-----Original Message-----
From: Coyle, David <[email protected]>
Sent: Thursday, July 16, 2020 4:32 PM
To: [email protected]; Doherty, Declan <[email protected]>; De Lara Guarch, Pablo <[email protected]>; Trahe, Fiona <[email protected]>
Cc: [email protected]; Ryan, Brendan <[email protected]>; O'loingsigh, Mairtin <[email protected]>; Coyle, David <[email protected]>
Subject: [PATCH v1 2/2]crypto/aesni_mb: improve DOCSIS session creation
Quoted 8 lines
This patch improves the DOCSIS session creation as follows:
- it validates the security action type as well as the protocol before creating a session and now does this validation before allocating the session from the mempoolFixes fda5216fba55 ("crypto/aesni_mb: support DOCSIS protocol")Signed-off-by David Coyle <[email protected]>
Nice, this is actually fixing a potential memory leak, so you could mention this in the commit message/title.
Apart from this:
Re: [dpdk-dev] [PATCH v1 2/2] crypto/aesni_mb: improve DOCSIS session creation
Quoted 7 lines
Quoted 7 lines
This patch improves the DOCSIS session creation as follows:
- it validates the security action type as well as the protocol before creating a session and now does this validation before allocating the session from the mempoolFixes fda5216fba55 ("crypto/aesni_mb: support DOCSIS protocol")
Quoted 8 lines
Quoted 1 line
Signed-off-by David Coyle <[email protected]>Nice, this is actually fixing a potential memory leak, so you could mention this in the commit message/title.
Apart from this:
Acked-by Pablo de Lara <[email protected]>
Series applied to dpdk-next-crypto
Title updated as " crypto/aesni_mb: fix memory leak in DOCSIS session"
Thanks.