From patchwork Tue Aug 9 10:53:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anoob Joseph X-Patchwork-Id: 114751 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 ABE81A00C2; Tue, 9 Aug 2022 12:54:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4383342BE5; Tue, 9 Aug 2022 12:54:23 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id D24A742BBD for ; Tue, 9 Aug 2022 12:54:21 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2791T66E017193 for ; Tue, 9 Aug 2022 03:54:21 -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-transfer-encoding : content-type; s=pfpt0220; bh=2IejpeZY/nkwaNuPwnjsg58FbpV/xxhag3Aym+WoklQ=; b=hHCcNdt+SlzNb9Obmj58DtA6Sj9M45UliLK5OrwMmNcJN4l/Ea2lPp+xnp8XThpGT4bq 0dt8kRfyl3sCkghJvMaynmOQnBMd9UUiJJbGDCUwjlzoQcNGIPSeIf5AJ8PVuUXMT8ME 27+N3OYEiP983y052jY2wsTy2wrKbPeuCuJno1b+bQqSd+I9IjTu4pbVxL08Wevfg5T2 Bp+tkdpg/zKJbTa8vAWGMKs9FNf4p+Oc4P7ViLiZPmii1BJ8DqO+6Nlhg2xz2hcrR1N7 K9VHI4jiH0EEhWw0u3UkGsmuJCj2czXtirh4C6c/SzwHyokndGb65YJBBK6fzpVyb9Tx 7Q== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3hudy6sphq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 09 Aug 2022 03:54:21 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 9 Aug 2022 03:54:19 -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; Tue, 9 Aug 2022 03:54:19 -0700 Received: from BG-LT92004.corp.innovium.com (unknown [10.193.69.70]) by maili.marvell.com (Postfix) with ESMTP id B29E43F7072; Tue, 9 Aug 2022 03:54:15 -0700 (PDT) From: Anoob Joseph To: Akhil Goyal , Jerin Jacob CC: Archana Muniganti , Tejasree Kondoj , Subject: [PATCH v2 07/18] crypto/cnxk: remove MAC len check for AEAD Date: Tue, 9 Aug 2022 16:23:45 +0530 Message-ID: <20220809105356.561-8-anoobj@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220809105356.561-1-anoobj@marvell.com> References: <20220808080606.220-1-anoobj@marvell.com> <20220809105356.561-1-anoobj@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: yXGNQsDIcR9xUYTu3OuwUqDKj4fvV0T9 X-Proofpoint-ORIG-GUID: yXGNQsDIcR9xUYTu3OuwUqDKj4fvV0T9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-08-09_03,2022-08-09_02,2022-06-22_01 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 For both AES-GCM and ChaChaPoly, digest size must be non-zero. So remove the conditional handling in the datapath. Signed-off-by: Anoob Joseph --- drivers/crypto/cnxk/cnxk_se.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h index 35d074ea34..2c44dba9a0 100644 --- a/drivers/crypto/cnxk/cnxk_se.h +++ b/drivers/crypto/cnxk/cnxk_se.h @@ -2453,6 +2453,7 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess, m_dst = sym_op->m_dst; if (sess->aes_gcm || sess->chacha_poly) { + struct rte_mbuf *m; uint8_t *salt; uint8_t *aad_data; uint16_t aad_len; @@ -2483,20 +2484,19 @@ fill_fc_params(struct rte_crypto_op *cop, struct cnxk_se_sess *sess, cpt_fc_salt_update(&sess->roc_se_ctx, salt); sess->salt = *(uint32_t *)salt; } - fc_params.iv_buf = salt + 4; - if (likely(sess->mac_len)) { - struct rte_mbuf *m = cpt_m_dst_get(cpt_op, m_src, m_dst); - /* hmac immediately following data is best case */ - if (unlikely(rte_pktmbuf_mtod(m, uint8_t *) + - mc_hash_off != - (uint8_t *)sym_op->aead.digest.data)) { - flags |= ROC_SE_VALID_MAC_BUF; - fc_params.mac_buf.size = sess->mac_len; - fc_params.mac_buf.vaddr = - sym_op->aead.digest.data; - inplace = 0; - } + fc_params.iv_buf = PLT_PTR_ADD(salt, 4); + fc_params.mac_buf.size = 0; + fc_params.mac_buf.vaddr = NULL; + m = cpt_m_dst_get(cpt_op, m_src, m_dst); + + /* Digest immediately following data is best case */ + if (unlikely(rte_pktmbuf_mtod(m, uint8_t *) + mc_hash_off != + (uint8_t *)sym_op->aead.digest.data)) { + flags |= ROC_SE_VALID_MAC_BUF; + fc_params.mac_buf.size = sess->mac_len; + fc_params.mac_buf.vaddr = sym_op->aead.digest.data; + inplace = 0; } } else { uint32_t ci_data_length = sym_op->cipher.data.length;