From patchwork Wed Jul 14 11:18:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anoob Joseph X-Patchwork-Id: 95861 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E630FA0547; Wed, 14 Jul 2021 13:18:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D0EAC40E3C; Wed, 14 Jul 2021 13:18:49 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 8D5EC4069F for ; Wed, 14 Jul 2021 13:18:48 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16EBF7Ub030346 for ; Wed, 14 Jul 2021 04:18:47 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=naCHE0jccgC0gArdeH1W4NwGu2Lfv7NU2WdYWC4WTNQ=; b=DBs6cpeW9qCzAgzOL979AXOtx7iTR10U8KJRrw+WU9iYxS7wPu03SrC0dOdOZVm9zJFw iYoIzaExeazL0afCXl/cWGtDNb162VqXyPTGQCLSiThN3tYeht+ovhuGIbVCBIDzogNq wYcZTlXbe3FTeZidK08QRa66RlWGEK+kkIRR7OOj3T++k2d0AbNKk4NhRmWs6Dq3U3OA qA6mRCxcBEfB+Oclb6g9pu1gaeapD32v1QIsrKlMf9sAnXAwdrpyr026sHAgtiNgLhJK JfUmKAauAIHIqAf16Wu09k/36/6DSGuwgeFERkNFWotn5PxX2xR2VeTCFVmGR8VnyQIs 3g== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com with ESMTP id 39swver782-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 14 Jul 2021 04:18:47 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 14 Jul 2021 04:18:46 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Wed, 14 Jul 2021 04:18:45 -0700 Received: from HY-LT1002.marvell.com (unknown [10.193.70.144]) by maili.marvell.com (Postfix) with ESMTP id 15DC53F7074; Wed, 14 Jul 2021 04:18:42 -0700 (PDT) From: Anoob Joseph To: Akhil Goyal , Jerin Jacob CC: Anoob Joseph , Ankur Dwivedi , Tejasree Kondoj , Date: Wed, 14 Jul 2021 16:48:24 +0530 Message-ID: <1626261504-164-1-git-send-email-anoobj@marvell.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Proofpoint-GUID: wRHcB4nxWOsq5YeLsxskerbEoQM-ySTk X-Proofpoint-ORIG-GUID: wRHcB4nxWOsq5YeLsxskerbEoQM-ySTk X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-07-14_06:2021-07-14, 2021-07-14 signatures=0 Subject: [dpdk-dev] [PATCH] common/cpt: allocate auth key mem dynamically X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Reduce session private data size by allocating auth_key dynamically as required. Added auth_key_iova to eliminate any impact on fastpath. Signed-off-by: Anoob Joseph Acked-by: Akhil Goyal --- drivers/common/cpt/cpt_mcode_defines.h | 3 ++- drivers/common/cpt/cpt_ucode.h | 10 +++++++--- drivers/crypto/octeontx/otx_cryptodev_ops.c | 13 +++++++++++++ drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 5 +++++ drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h | 8 ++++++++ 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/common/cpt/cpt_mcode_defines.h b/drivers/common/cpt/cpt_mcode_defines.h index 624bdcf..f63fae6 100644 --- a/drivers/common/cpt/cpt_mcode_defines.h +++ b/drivers/common/cpt/cpt_mcode_defines.h @@ -327,7 +327,8 @@ struct cpt_ctx { mc_zuc_snow3g_ctx_t zs_ctx; mc_kasumi_ctx_t k_ctx; } mc_ctx; - uint8_t auth_key[1024]; + uint8_t *auth_key; + uint64_t auth_key_iova; }; /* Prime and order fields of built-in elliptic curves */ diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h index bb3a862..006411c 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h @@ -561,8 +561,7 @@ cpt_digest_gen_prep(uint32_t flags, i = 0; if (ctx->hmac) { - uint64_t k_dma = params->ctx_buf.dma_addr + - offsetof(struct cpt_ctx, auth_key); + uint64_t k_dma = ctx->auth_key_iova; /* Key */ i = fill_sg_comp(gather_comp, i, k_dma, RTE_ALIGN_CEIL(key_len, 8)); @@ -2551,7 +2550,12 @@ cpt_fc_auth_set_key(struct cpt_ctx *cpt_ctx, auth_type_t type, if (key_len) { cpt_ctx->hmac = 1; - memset(cpt_ctx->auth_key, 0, sizeof(cpt_ctx->auth_key)); + + cpt_ctx->auth_key = rte_zmalloc(NULL, key_len, 8); + if (cpt_ctx->auth_key == NULL) + return -1; + + cpt_ctx->auth_key_iova = rte_mem_virt2iova(cpt_ctx->auth_key); memcpy(cpt_ctx->auth_key, key, key_len); cpt_ctx->auth_key_len = key_len; memset(fctx->hmac.ipad, 0, sizeof(fctx->hmac.ipad)); diff --git a/drivers/crypto/octeontx/otx_cryptodev_ops.c b/drivers/crypto/octeontx/otx_cryptodev_ops.c index 24dfaa3..1470009 100644 --- a/drivers/crypto/octeontx/otx_cryptodev_ops.c +++ b/drivers/crypto/octeontx/otx_cryptodev_ops.c @@ -291,6 +291,11 @@ sym_session_configure(int driver_id, struct rte_crypto_sym_xform *xform, if ((GET_SESS_FC_TYPE(misc) == HASH_HMAC) && cpt_mac_len_verify(&temp_xform->auth)) { CPT_LOG_ERR("MAC length is not supported"); + struct cpt_ctx *ctx = SESS_PRIV(misc); + if (ctx->auth_key != NULL) { + rte_free(ctx->auth_key); + ctx->auth_key = NULL; + } ret = -ENOTSUP; goto priv_put; } @@ -319,11 +324,19 @@ static void sym_session_clear(int driver_id, struct rte_cryptodev_sym_session *sess) { void *priv = get_sym_session_private_data(sess, driver_id); + struct cpt_sess_misc *misc; struct rte_mempool *pool; + struct cpt_ctx *ctx; if (priv == NULL) return; + misc = priv; + ctx = SESS_PRIV(misc); + + if (ctx->auth_key != NULL) + rte_free(ctx->auth_key); + memset(priv, 0, cpt_get_session_size()); pool = rte_mempool_from_obj(priv); diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c index bb73a16..42100154 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c +++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c @@ -408,6 +408,11 @@ sym_session_configure(int driver_id, struct rte_crypto_sym_xform *xform, if ((GET_SESS_FC_TYPE(misc) == HASH_HMAC) && cpt_mac_len_verify(&temp_xform->auth)) { CPT_LOG_ERR("MAC length is not supported"); + struct cpt_ctx *ctx = SESS_PRIV(misc); + if (ctx->auth_key != NULL) { + rte_free(ctx->auth_key); + ctx->auth_key = NULL; + } ret = -ENOTSUP; goto priv_put; } diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h b/drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h index 764daad..01c081a 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h +++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h @@ -11,11 +11,19 @@ static void sym_session_clear(int driver_id, struct rte_cryptodev_sym_session *sess) { void *priv = get_sym_session_private_data(sess, driver_id); + struct cpt_sess_misc *misc; struct rte_mempool *pool; + struct cpt_ctx *ctx; if (priv == NULL) return; + misc = priv; + ctx = SESS_PRIV(misc); + + if (ctx->auth_key != NULL) + rte_free(ctx->auth_key); + memset(priv, 0, cpt_get_session_size()); pool = rte_mempool_from_obj(priv);