From patchwork Wed Sep 16 10:37:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archana Muniganti X-Patchwork-Id: 77887 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2F31BA04C7; Wed, 16 Sep 2020 12:37:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4638D1C235; Wed, 16 Sep 2020 12:37:36 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 9ACF91C209; Wed, 16 Sep 2020 12:37:34 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 08GAaPuO017669; Wed, 16 Sep 2020 03:37:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=RgWSKoxd2PEhBAaL+mQWiecIHMCwQX/4B9O0VJUbinE=; b=ai4Omi0k84BM3E9Y7GjHacJBY0RZVm4byxAp6tlpPmj539EepJW6EHG3GfS2bhmMh6q2 nOFdIy9x1VXqT463ejya+gFreeR+0ZyehfIMafq0Izva/afG3OmoJwPGPQL+e4RmHddm FnSrqQKtc3wNhrU6yFZfxfUY4r925aScqJDcemzDsuOL9WwT7bTL3Z4hpbXtHsNXhmZB XORh1j5Ok3Ad5BJjweGx2kiPNVTa2zwzeYDQmsapb3zn/37YtaxUXzI6pwy4Y2JWgORk ducwDCQc0t5k14+hHREpkZWmFyiamlCtfvyp7ttQUfM6G68gT4E+AUT7BmLeKP9FBlVy Gw== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 33k5njjany-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 16 Sep 2020 03:37:33 -0700 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Sep 2020 03:37:33 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Sep 2020 03:37:32 -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.2 via Frontend Transport; Wed, 16 Sep 2020 03:37:32 -0700 Received: from hyd1409.caveonetworks.com (unknown [10.29.45.15]) by maili.marvell.com (Postfix) with ESMTP id 10AF23F7048; Wed, 16 Sep 2020 03:37:28 -0700 (PDT) From: Archana Muniganti To: , , CC: Archana Muniganti , , Date: Wed, 16 Sep 2020 16:07:00 +0530 Message-ID: <1600252620-18201-2-git-send-email-marchana@marvell.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1600252620-18201-1-git-send-email-marchana@marvell.com> References: <1600252620-18201-1-git-send-email-marchana@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-09-16_06:2020-09-16, 2020-09-16 signatures=0 Subject: [dpdk-dev] [PATCH 2/2] common/cpt: add check for mac_len X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" HMAC/HASH opcode algorithms supports fixed mac length. Allowed session creation to fail when requested for unsupported MAC length for HMAC/HASH-only use cases. Signed-off-by: Archana Muniganti --- drivers/common/cpt/cpt_mcode_defines.h | 3 ++ drivers/common/cpt/cpt_ucode.h | 41 +++++++++++++++++++++++++++ drivers/crypto/octeontx/otx_cryptodev_ops.c | 8 ++++++ drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 8 ++++++ 4 files changed, 60 insertions(+) diff --git a/drivers/common/cpt/cpt_mcode_defines.h b/drivers/common/cpt/cpt_mcode_defines.h index ee2c7f3..0a05bd5 100644 --- a/drivers/common/cpt/cpt_mcode_defines.h +++ b/drivers/common/cpt/cpt_mcode_defines.h @@ -427,6 +427,9 @@ struct asym_op_params { #define SESS_PRIV(__sess) \ (void *)((uint8_t *)__sess + sizeof(struct cpt_sess_misc)) +#define GET_SESS_FC_TYPE(__sess) \ + (((struct cpt_ctx *)(SESS_PRIV(__sess)))->fc_type) + /* * Get the session size * diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h index 0cfba0b..5f28bd7 100644 --- a/drivers/common/cpt/cpt_ucode.h +++ b/drivers/common/cpt/cpt_ucode.h @@ -35,6 +35,47 @@ } } +static __rte_always_inline int +cpt_mac_len_verify(struct rte_crypto_auth_xform *auth) +{ + uint16_t mac_len = auth->digest_length; + int ret; + + switch (auth->algo) { + case RTE_CRYPTO_AUTH_MD5: + case RTE_CRYPTO_AUTH_MD5_HMAC: + ret = (mac_len == 16) ? 0 : -1; + break; + case RTE_CRYPTO_AUTH_SHA1: + case RTE_CRYPTO_AUTH_SHA1_HMAC: + ret = (mac_len == 20) ? 0 : -1; + break; + case RTE_CRYPTO_AUTH_SHA224: + case RTE_CRYPTO_AUTH_SHA224_HMAC: + ret = (mac_len == 28) ? 0 : -1; + break; + case RTE_CRYPTO_AUTH_SHA256: + case RTE_CRYPTO_AUTH_SHA256_HMAC: + ret = (mac_len == 32) ? 0 : -1; + break; + case RTE_CRYPTO_AUTH_SHA384: + case RTE_CRYPTO_AUTH_SHA384_HMAC: + ret = (mac_len == 48) ? 0 : -1; + break; + case RTE_CRYPTO_AUTH_SHA512: + case RTE_CRYPTO_AUTH_SHA512_HMAC: + ret = (mac_len == 64) ? 0 : -1; + break; + case RTE_CRYPTO_AUTH_NULL: + ret = 0; + break; + default: + ret = -1; + } + + return ret; +} + static __rte_always_inline void cpt_fc_salt_update(void *ctx, uint8_t *salt) diff --git a/drivers/crypto/octeontx/otx_cryptodev_ops.c b/drivers/crypto/octeontx/otx_cryptodev_ops.c index 2cedf7d..14f22e3 100644 --- a/drivers/crypto/octeontx/otx_cryptodev_ops.c +++ b/drivers/crypto/octeontx/otx_cryptodev_ops.c @@ -239,6 +239,7 @@ struct rte_cryptodev_sym_session *sess, struct rte_mempool *pool) { + struct rte_crypto_sym_xform *temp_xform = xform; struct cpt_sess_misc *misc; void *priv; int ret; @@ -279,6 +280,13 @@ goto priv_put; } + if ((GET_SESS_FC_TYPE(misc) == HASH_HMAC) && + cpt_mac_len_verify(&temp_xform->auth)) { + CPT_LOG_ERR("MAC length is not supported"); + ret = -ENOTSUP; + goto priv_put; + } + set_sym_session_private_data(sess, driver_id, priv); misc->ctx_dma_addr = rte_mempool_virt2iova(misc) + diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c index 9d51b17..793c2a5 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c +++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c @@ -353,6 +353,7 @@ struct rte_cryptodev_sym_session *sess, struct rte_mempool *pool) { + struct rte_crypto_sym_xform *temp_xform = xform; struct cpt_sess_misc *misc; void *priv; int ret; @@ -393,6 +394,13 @@ goto priv_put; } + if ((GET_SESS_FC_TYPE(misc) == HASH_HMAC) && + cpt_mac_len_verify(&temp_xform->auth)) { + CPT_LOG_ERR("MAC length is not supported"); + ret = -ENOTSUP; + goto priv_put; + } + set_sym_session_private_data(sess, driver_id, misc); misc->ctx_dma_addr = rte_mempool_virt2iova(misc) +