Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/56196/?format=api
{ "id": 56196, "url": "http://patches.dpdk.org/api/patches/56196/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1562419420-30278-2-git-send-email-anoobj@marvell.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1562419420-30278-2-git-send-email-anoobj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1562419420-30278-2-git-send-email-anoobj@marvell.com", "date": "2019-07-06T13:23:40", "name": "[2/2] common/cpt: remove redundant code in datapath", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "134d3a43c34242babe587c803801cd50f0e91928", "submitter": { "id": 1205, "url": "http://patches.dpdk.org/api/people/1205/?format=api", "name": "Anoob Joseph", "email": "anoobj@marvell.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1562419420-30278-2-git-send-email-anoobj@marvell.com/mbox/", "series": [ { "id": 5380, "url": "http://patches.dpdk.org/api/series/5380/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=5380", "date": "2019-07-06T13:23:40", "name": "[1/2] common/cpt: remove redundant bit swaps", "version": 1, "mbox": "http://patches.dpdk.org/series/5380/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/56196/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/56196/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id F028E4C8F;\n\tSat, 6 Jul 2019 15:51:24 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n\t[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id CE7A737AF\n\tfor <dev@dpdk.org>; Sat, 6 Jul 2019 15:51:22 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n\tby mx0a-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id\n\tx66DpLdq002928; Sat, 6 Jul 2019 06:51:21 -0700", "from sc-exch02.marvell.com ([199.233.58.182])\n\tby mx0a-0016f401.pphosted.com with ESMTP id 2tjs0nrn5k-2\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); \n\tSat, 06 Jul 2019 06:51:21 -0700", "from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH02.marvell.com\n\t(10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3;\n\tSat, 6 Jul 2019 06:51:20 -0700", "from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com\n\t(10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend\n\tTransport; Sat, 6 Jul 2019 06:51:20 -0700", "from ajoseph83.caveonetworks.com.com (unknown [10.29.45.56])\n\tby maili.marvell.com (Postfix) with ESMTP id 72BD03F73A1;\n\tSat, 6 Jul 2019 06:23:52 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n\th=from : to : cc :\n\tsubject : date : message-id : in-reply-to : references : mime-version\n\t: content-transfer-encoding : content-type; s=pfpt0818;\n\tbh=N9b1rB9jGuzeCF+BEr5u5vzdrrnpV+OS8JwBH+G4hP8=;\n\tb=mhEMxyp/LXTVseKIRWYlQ4ez6hcvxhKUzjahFL8CcHY0nXeXU22XkHvS8JrVEmB79NqX\n\tXq1T7cn7J3iugJIYR/RjMyDOZmWCYJQGALj8cl0vU48OIgIFVwNTDk/ER8tDym+u2jDh\n\tEV1cCHSIqiCmbuwwgsQrk8ddRggG9JWMijp9YRJwISsgGNy0u94xLO+wlu+lueOuLOjU\n\tJ1U1jmxvb3rPI9VAFFCLowq2769Wz1CCmBfhNxtSFCDwjI7cvK2O5RuYiJ6oGyDQ87pa\n\tqPoWSGpNd4fGBVXf0TSYPN3kA6JY87ZUed1MAleMDTzhyvyPSNPti0N6MyoRJFgwYaqR\n\t7w== ", "From": "Anoob Joseph <anoobj@marvell.com>", "To": "Akhil Goyal <akhil.goyal@nxp.com>, Pablo de Lara\n\t<pablo.de.lara.guarch@intel.com>", "CC": "Anoob Joseph <anoobj@marvell.com>, Jerin Jacob <jerinj@marvell.com>,\n\tNarayana Prasad <pathreya@marvell.com>, <dev@dpdk.org>", "Date": "Sat, 6 Jul 2019 18:53:40 +0530", "Message-ID": "<1562419420-30278-2-git-send-email-anoobj@marvell.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1562419420-30278-1-git-send-email-anoobj@marvell.com>", "References": "<1562419420-30278-1-git-send-email-anoobj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:, ,\n\tdefinitions=2019-07-06_04:, , signatures=0", "Subject": "[dpdk-dev] [PATCH 2/2] common/cpt: remove redundant code in datapath", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Removing redundant checks and unused local variables from datapath.\n\nSigned-off-by: Anoob Joseph <anoobj@marvell.com>\n---\n drivers/common/cpt/cpt_ucode.h | 133 ++++++++++-------------------------------\n 1 file changed, 33 insertions(+), 100 deletions(-)", "diff": "diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h\nindex c589b58..e197e4e 100644\n--- a/drivers/common/cpt/cpt_ucode.h\n+++ b/drivers/common/cpt/cpt_ucode.h\n@@ -89,8 +89,7 @@ cpt_fc_ciph_validate_key_aes(uint16_t key_len)\n }\n \n static __rte_always_inline int\n-cpt_fc_ciph_validate_key(cipher_type_t type, struct cpt_ctx *cpt_ctx,\n-\t\tuint16_t key_len)\n+cpt_fc_ciph_set_type(cipher_type_t type, struct cpt_ctx *ctx, uint16_t key_len)\n {\n \tint fc_type = 0;\n \tswitch (type) {\n@@ -125,7 +124,7 @@ cpt_fc_ciph_validate_key(cipher_type_t type, struct cpt_ctx *cpt_ctx,\n \t\tif (unlikely(key_len != 16))\n \t\t\treturn -1;\n \t\t/* No support for AEAD yet */\n-\t\tif (unlikely(cpt_ctx->hash_type))\n+\t\tif (unlikely(ctx->hash_type))\n \t\t\treturn -1;\n \t\tfc_type = ZUC_SNOW3G;\n \t\tbreak;\n@@ -134,14 +133,16 @@ cpt_fc_ciph_validate_key(cipher_type_t type, struct cpt_ctx *cpt_ctx,\n \t\tif (unlikely(key_len != 16))\n \t\t\treturn -1;\n \t\t/* No support for AEAD yet */\n-\t\tif (unlikely(cpt_ctx->hash_type))\n+\t\tif (unlikely(ctx->hash_type))\n \t\t\treturn -1;\n \t\tfc_type = KASUMI;\n \t\tbreak;\n \tdefault:\n \t\treturn -1;\n \t}\n-\treturn fc_type;\n+\n+\tctx->fc_type = fc_type;\n+\treturn 0;\n }\n \n static __rte_always_inline void\n@@ -181,7 +182,6 @@ cpt_fc_ciph_set_key_snow3g_uea2(struct cpt_ctx *cpt_ctx, uint8_t *key,\n \tcpt_ctx->snow3g = 1;\n \tgen_key_snow3g(key, keyx);\n \tmemcpy(cpt_ctx->zs_ctx.ci_key, keyx, key_len);\n-\tcpt_ctx->fc_type = ZUC_SNOW3G;\n \tcpt_ctx->zsk_flags = 0;\n }\n \n@@ -192,7 +192,6 @@ cpt_fc_ciph_set_key_zuc_eea3(struct cpt_ctx *cpt_ctx, uint8_t *key,\n \tcpt_ctx->snow3g = 0;\n \tmemcpy(cpt_ctx->zs_ctx.ci_key, key, key_len);\n \tmemcpy(cpt_ctx->zs_ctx.zuc_const, zuc_d, 32);\n-\tcpt_ctx->fc_type = ZUC_SNOW3G;\n \tcpt_ctx->zsk_flags = 0;\n }\n \n@@ -203,7 +202,6 @@ cpt_fc_ciph_set_key_kasumi_f8_ecb(struct cpt_ctx *cpt_ctx, uint8_t *key,\n \tcpt_ctx->k_ecb = 1;\n \tmemcpy(cpt_ctx->k_ctx.ci_key, key, key_len);\n \tcpt_ctx->zsk_flags = 0;\n-\tcpt_ctx->fc_type = KASUMI;\n }\n \n static __rte_always_inline void\n@@ -212,7 +210,6 @@ cpt_fc_ciph_set_key_kasumi_f8_cbc(struct cpt_ctx *cpt_ctx, uint8_t *key,\n {\n \tmemcpy(cpt_ctx->k_ctx.ci_key, key, key_len);\n \tcpt_ctx->zsk_flags = 0;\n-\tcpt_ctx->fc_type = KASUMI;\n }\n \n static __rte_always_inline int\n@@ -222,15 +219,13 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, uint8_t *key,\n \tstruct cpt_ctx *cpt_ctx = ctx;\n \tmc_fc_context_t *fctx = &cpt_ctx->fctx;\n \tuint64_t *ctrl_flags = NULL;\n-\tint fc_type;\n+\tint ret;\n \n-\t/* Validate key before proceeding */\n-\tfc_type = cpt_fc_ciph_validate_key(type, cpt_ctx, key_len);\n-\tif (unlikely(fc_type == -1))\n+\tret = cpt_fc_ciph_set_type(type, cpt_ctx, key_len);\n+\tif (unlikely(ret))\n \t\treturn -1;\n \n-\tif (fc_type == FC_GEN) {\n-\t\tcpt_ctx->fc_type = FC_GEN;\n+\tif (cpt_ctx->fc_type == FC_GEN) {\n \t\tctrl_flags = (uint64_t *)&(fctx->enc.enc_ctrl.flags);\n \t\t*ctrl_flags = rte_be_to_cpu_64(*ctrl_flags);\n \t\t/*\n@@ -467,7 +462,6 @@ cpt_digest_gen_prep(uint32_t flags,\n {\n \tstruct cpt_request_info *req;\n \tuint32_t size, i;\n-\tint32_t m_size;\n \tuint16_t data_len, mac_len, key_len;\n \tauth_type_t hash_type;\n \tbuf_ptr_t *meta_p;\n@@ -488,7 +482,6 @@ cpt_digest_gen_prep(uint32_t flags,\n \n \tm_vaddr = meta_p->vaddr;\n \tm_dma = meta_p->dma_addr;\n-\tm_size = meta_p->size;\n \n \t/*\n \t * Save initial space that followed app data for completion code &\n@@ -504,14 +497,12 @@ cpt_digest_gen_prep(uint32_t flags,\n \n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \treq = m_vaddr;\n \n \tsize = sizeof(struct cpt_request_info);\n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \thash_type = ctx->hash_type;\n \tmac_len = ctx->mac_len;\n@@ -625,7 +616,6 @@ cpt_digest_gen_prep(uint32_t flags,\n \n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \t/* cpt alternate completion address saved earlier */\n \treq->alternate_caddr = (uint64_t *)((uint8_t *)c_vaddr - 8);\n@@ -678,13 +668,11 @@ cpt_enc_hmac_prep(uint32_t flags,\n \tvq_cmd_word3_t vq_cmd_w3;\n \tvoid *c_vaddr;\n \tuint64_t c_dma;\n-\tint32_t m_size;\n \topcode_info_t opcode;\n \n \tmeta_p = &fc_params->meta_buf;\n \tm_vaddr = meta_p->vaddr;\n \tm_dma = meta_p->dma_addr;\n-\tm_size = meta_p->size;\n \n \tencr_offset = ENCR_OFFSET(d_offs);\n \tauth_offset = AUTH_OFFSET(d_offs);\n@@ -720,7 +708,6 @@ cpt_enc_hmac_prep(uint32_t flags,\n \n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \t/* start cpt request info struct at 8 byte boundary */\n \tsize = (uint8_t *)RTE_PTR_ALIGN(m_vaddr, 8) -\n@@ -731,7 +718,6 @@ cpt_enc_hmac_prep(uint32_t flags,\n \tsize += sizeof(struct cpt_request_info);\n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \tif (hash_type == GMAC_TYPE)\n \t\tencr_data_len = 0;\n@@ -851,7 +837,6 @@ cpt_enc_hmac_prep(uint32_t flags,\n \n \t\tm_vaddr = (uint8_t *)m_vaddr + size;\n \t\tm_dma += size;\n-\t\tm_size -= size;\n \n \t\topcode.s.major |= CPT_DMA_MODE;\n \n@@ -1003,7 +988,6 @@ cpt_enc_hmac_prep(uint32_t flags,\n \n \t\tm_vaddr = (uint8_t *)m_vaddr + size;\n \t\tm_dma += size;\n-\t\tm_size -= size;\n \n \t\t/* cpt alternate completion address saved earlier */\n \t\treq->alternate_caddr = (uint64_t *)((uint8_t *)c_vaddr - 8);\n@@ -1047,7 +1031,7 @@ cpt_dec_hmac_prep(uint32_t flags,\n \tuint32_t iv_offset = 0, size;\n \tint32_t inputlen, outputlen, enc_dlen, auth_dlen;\n \tstruct cpt_ctx *cpt_ctx;\n-\tint32_t hash_type, mac_len, m_size;\n+\tint32_t hash_type, mac_len;\n \tuint8_t iv_len = 16;\n \tstruct cpt_request_info *req;\n \tbuf_ptr_t *meta_p, *aad_buf = NULL;\n@@ -1065,7 +1049,6 @@ cpt_dec_hmac_prep(uint32_t flags,\n \tmeta_p = &fc_params->meta_buf;\n \tm_vaddr = meta_p->vaddr;\n \tm_dma = meta_p->dma_addr;\n-\tm_size = meta_p->size;\n \n \tencr_offset = ENCR_OFFSET(d_offs);\n \tauth_offset = AUTH_OFFSET(d_offs);\n@@ -1131,7 +1114,6 @@ cpt_dec_hmac_prep(uint32_t flags,\n \n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \t/* start cpt request info structure at 8 byte alignment */\n \tsize = (uint8_t *)RTE_PTR_ALIGN(m_vaddr, 8) -\n@@ -1142,7 +1124,6 @@ cpt_dec_hmac_prep(uint32_t flags,\n \tsize += sizeof(struct cpt_request_info);\n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \t/* Decryption */\n \topcode.s.major = CPT_MAJOR_OP_FC;\n@@ -1229,7 +1210,6 @@ cpt_dec_hmac_prep(uint32_t flags,\n \n \t\tm_vaddr = (uint8_t *)m_vaddr + size;\n \t\tm_dma += size;\n-\t\tm_size -= size;\n \n \t\topcode.s.major |= CPT_DMA_MODE;\n \n@@ -1393,7 +1373,6 @@ cpt_dec_hmac_prep(uint32_t flags,\n \n \t\tm_vaddr = (uint8_t *)m_vaddr + size;\n \t\tm_dma += size;\n-\t\tm_size -= size;\n \n \t\t/* cpt alternate completion address saved earlier */\n \t\treq->alternate_caddr = (uint64_t *)((uint8_t *)c_vaddr - 8);\n@@ -1444,7 +1423,7 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags,\n \tbuf_ptr_t *buf_p;\n \tuint32_t encr_offset = 0, auth_offset = 0;\n \tuint32_t encr_data_len = 0, auth_data_len = 0;\n-\tint flags, iv_len = 16, m_size;\n+\tint flags, iv_len = 16;\n \tvoid *m_vaddr, *c_vaddr;\n \tuint64_t m_dma, c_dma, offset_ctrl;\n \tuint64_t *offset_vaddr, offset_dma;\n@@ -1456,7 +1435,6 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags,\n \tbuf_p = ¶ms->meta_buf;\n \tm_vaddr = buf_p->vaddr;\n \tm_dma = buf_p->dma_addr;\n-\tm_size = buf_p->size;\n \n \tcpt_ctx = params->ctx_buf.vaddr;\n \tflags = cpt_ctx->zsk_flags;\n@@ -1478,7 +1456,6 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags,\n \n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \t/* Reserve memory for cpt request info */\n \treq = m_vaddr;\n@@ -1486,7 +1463,6 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags,\n \tsize = sizeof(struct cpt_request_info);\n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \topcode.s.major = CPT_MAJOR_OP_ZUC_SNOW3G;\n \n@@ -1616,7 +1592,6 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags,\n \n \t\tm_vaddr = (uint8_t *)m_vaddr + OFF_CTRL_LEN + iv_len;\n \t\tm_dma += OFF_CTRL_LEN + iv_len;\n-\t\tm_size -= OFF_CTRL_LEN + iv_len;\n \n \t\topcode.s.major |= CPT_DMA_MODE;\n \n@@ -1726,7 +1701,6 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags,\n \n \t\tm_vaddr = (uint8_t *)m_vaddr + size;\n \t\tm_dma += size;\n-\t\tm_size -= size;\n \n \t\t/* cpt alternate completion address saved earlier */\n \t\treq->alternate_caddr = (uint64_t *)((uint8_t *)c_vaddr - 8);\n@@ -1774,7 +1748,7 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags,\n \tbuf_ptr_t *buf_p;\n \tuint32_t encr_offset;\n \tuint32_t encr_data_len;\n-\tint flags, m_size;\n+\tint flags;\n \tvoid *m_vaddr, *c_vaddr;\n \tuint64_t m_dma, c_dma;\n \tuint64_t *offset_vaddr, offset_dma;\n@@ -1786,7 +1760,6 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags,\n \tbuf_p = ¶ms->meta_buf;\n \tm_vaddr = buf_p->vaddr;\n \tm_dma = buf_p->dma_addr;\n-\tm_size = buf_p->size;\n \n \t/*\n \t * Microcode expects offsets in bytes\n@@ -1813,7 +1786,6 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags,\n \n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \t/* Reserve memory for cpt request info */\n \treq = m_vaddr;\n@@ -1821,7 +1793,6 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags,\n \tsize = sizeof(struct cpt_request_info);\n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \topcode.s.major = CPT_MAJOR_OP_ZUC_SNOW3G;\n \n@@ -1917,7 +1888,6 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags,\n \n \t\tm_vaddr = (uint8_t *)m_vaddr + OFF_CTRL_LEN + iv_len;\n \t\tm_dma += OFF_CTRL_LEN + iv_len;\n-\t\tm_size -= OFF_CTRL_LEN + iv_len;\n \n \t\topcode.s.major |= CPT_DMA_MODE;\n \n@@ -2000,7 +1970,6 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags,\n \n \t\tm_vaddr = (uint8_t *)m_vaddr + size;\n \t\tm_dma += size;\n-\t\tm_size -= size;\n \n \t\t/* cpt alternate completion address saved earlier */\n \t\treq->alternate_caddr = (uint64_t *)((uint8_t *)c_vaddr - 8);\n@@ -2049,7 +2018,7 @@ cpt_kasumi_enc_prep(uint32_t req_flags,\n \tbuf_ptr_t *buf_p;\n \tuint32_t encr_offset, auth_offset;\n \tuint32_t encr_data_len, auth_data_len;\n-\tint flags, m_size;\n+\tint flags;\n \tuint8_t *iv_s, *iv_d, iv_len = 8;\n \tuint8_t dir = 0;\n \tvoid *m_vaddr, *c_vaddr;\n@@ -2067,7 +2036,6 @@ cpt_kasumi_enc_prep(uint32_t req_flags,\n \tbuf_p = ¶ms->meta_buf;\n \tm_vaddr = buf_p->vaddr;\n \tm_dma = buf_p->dma_addr;\n-\tm_size = buf_p->size;\n \n \tencr_offset = ENCR_OFFSET(d_offs) / 8;\n \tauth_offset = AUTH_OFFSET(d_offs) / 8;\n@@ -2100,7 +2068,6 @@ cpt_kasumi_enc_prep(uint32_t req_flags,\n \n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \t/* Reserve memory for cpt request info */\n \treq = m_vaddr;\n@@ -2108,7 +2075,6 @@ cpt_kasumi_enc_prep(uint32_t req_flags,\n \tsize = sizeof(struct cpt_request_info);\n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \topcode.s.major = CPT_MAJOR_OP_KASUMI | CPT_DMA_MODE;\n \n@@ -2136,7 +2102,6 @@ cpt_kasumi_enc_prep(uint32_t req_flags,\n \n \tm_vaddr = (uint8_t *)m_vaddr + OFF_CTRL_LEN + iv_len;\n \tm_dma += OFF_CTRL_LEN + iv_len;\n-\tm_size -= OFF_CTRL_LEN + iv_len;\n \n \t/* DPTR has SG list */\n \tin_buffer = m_vaddr;\n@@ -2253,7 +2218,6 @@ cpt_kasumi_enc_prep(uint32_t req_flags,\n \n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \t/* cpt alternate completion address saved earlier */\n \treq->alternate_caddr = (uint64_t *)((uint8_t *)c_vaddr - 8);\n@@ -2299,7 +2263,7 @@ cpt_kasumi_dec_prep(uint64_t d_offs,\n \tbuf_ptr_t *buf_p;\n \tuint32_t encr_offset;\n \tuint32_t encr_data_len;\n-\tint flags, m_size;\n+\tint flags;\n \tuint8_t dir = 0;\n \tvoid *m_vaddr, *c_vaddr;\n \tuint64_t m_dma, c_dma;\n@@ -2316,7 +2280,6 @@ cpt_kasumi_dec_prep(uint64_t d_offs,\n \tbuf_p = ¶ms->meta_buf;\n \tm_vaddr = buf_p->vaddr;\n \tm_dma = buf_p->dma_addr;\n-\tm_size = buf_p->size;\n \n \tencr_offset = ENCR_OFFSET(d_offs) / 8;\n \tencr_data_len = ENCR_DLEN(d_lens);\n@@ -2338,7 +2301,6 @@ cpt_kasumi_dec_prep(uint64_t d_offs,\n \n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \t/* Reserve memory for cpt request info */\n \treq = m_vaddr;\n@@ -2346,7 +2308,6 @@ cpt_kasumi_dec_prep(uint64_t d_offs,\n \tsize = sizeof(struct cpt_request_info);\n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \topcode.s.major = CPT_MAJOR_OP_KASUMI | CPT_DMA_MODE;\n \n@@ -2373,7 +2334,6 @@ cpt_kasumi_dec_prep(uint64_t d_offs,\n \n \tm_vaddr = (uint8_t *)m_vaddr + OFF_CTRL_LEN + iv_len;\n \tm_dma += OFF_CTRL_LEN + iv_len;\n-\tm_size -= OFF_CTRL_LEN + iv_len;\n \n \t/* DPTR has SG list */\n \tin_buffer = m_vaddr;\n@@ -2448,7 +2408,6 @@ cpt_kasumi_dec_prep(uint64_t d_offs,\n \n \tm_vaddr = (uint8_t *)m_vaddr + size;\n \tm_dma += size;\n-\tm_size -= size;\n \n \t/* cpt alternate completion address saved earlier */\n \treq->alternate_caddr = (uint64_t *)((uint8_t *)c_vaddr - 8);\n@@ -2627,9 +2586,9 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform,\n \tcipher_type_t enc_type = 0; /* NULL Cipher type */\n \tauth_type_t auth_type = 0; /* NULL Auth type */\n \tuint32_t cipher_key_len = 0;\n-\tuint8_t zsk_flag = 0, aes_gcm = 0;\n+\tuint8_t aes_gcm = 0;\n \taead_form = &xform->aead;\n-\tvoid *ctx;\n+\tvoid *ctx = SESS_PRIV(sess);\n \n \tif (aead_form->op == RTE_CRYPTO_AEAD_OP_ENCRYPT &&\n \t aead_form->algo == RTE_CRYPTO_AEAD_AES_GCM) {\n@@ -2663,13 +2622,12 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform,\n \t\t\t (unsigned int long)aead_form->key.length);\n \t\treturn -1;\n \t}\n-\tsess->zsk_flag = zsk_flag;\n+\tsess->zsk_flag = 0;\n \tsess->aes_gcm = aes_gcm;\n \tsess->mac_len = aead_form->digest_length;\n \tsess->iv_offset = aead_form->iv.offset;\n \tsess->iv_length = aead_form->iv.length;\n \tsess->aad_length = aead_form->aad_length;\n-\tctx = (void *)((uint8_t *)sess + sizeof(struct cpt_sess_misc)),\n \n \tcpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data,\n \t\t\taead_form->key.length, NULL);\n@@ -2686,10 +2644,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform,\n \tstruct rte_crypto_cipher_xform *c_form;\n \tcipher_type_t enc_type = 0; /* NULL Cipher type */\n \tuint32_t cipher_key_len = 0;\n-\tuint8_t zsk_flag = 0, aes_gcm = 0, aes_ctr = 0, is_null = 0;\n-\n-\tif (xform->type != RTE_CRYPTO_SYM_XFORM_CIPHER)\n-\t\treturn -1;\n+\tuint8_t zsk_flag = 0, aes_ctr = 0, is_null = 0;\n \n \tc_form = &xform->cipher;\n \n@@ -2771,7 +2726,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform,\n \t}\n \n \tsess->zsk_flag = zsk_flag;\n-\tsess->aes_gcm = aes_gcm;\n+\tsess->aes_gcm = 0;\n \tsess->aes_ctr = aes_ctr;\n \tsess->iv_offset = c_form->iv.offset;\n \tsess->iv_length = c_form->iv.length;\n@@ -2791,9 +2746,6 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform,\n \tauth_type_t auth_type = 0; /* NULL Auth type */\n \tuint8_t zsk_flag = 0, aes_gcm = 0, is_null = 0;\n \n-\tif (xform->type != RTE_CRYPTO_SYM_XFORM_AUTH)\n-\t\tgoto error_out;\n-\n \ta_form = &xform->auth;\n \n \tif (a_form->op == RTE_CRYPTO_AUTH_OP_VERIFY)\n@@ -2865,11 +2817,11 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform,\n \tcase RTE_CRYPTO_AUTH_AES_CBC_MAC:\n \t\tCPT_LOG_DP_ERR(\"Crypto: Unsupported hash algo %u\",\n \t\t\t a_form->algo);\n-\t\tgoto error_out;\n+\t\treturn -1;\n \tdefault:\n \t\tCPT_LOG_DP_ERR(\"Crypto: Undefined Hash algo %u specified\",\n \t\t\t a_form->algo);\n-\t\tgoto error_out;\n+\t\treturn -1;\n \t}\n \n \tsess->zsk_flag = zsk_flag;\n@@ -2884,9 +2836,6 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform,\n \t\t\t a_form->key.length, a_form->digest_length);\n \n \treturn 0;\n-\n-error_out:\n-\treturn -1;\n }\n \n static __rte_always_inline int\n@@ -2896,11 +2845,7 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform,\n \tstruct rte_crypto_auth_xform *a_form;\n \tcipher_type_t enc_type = 0; /* NULL Cipher type */\n \tauth_type_t auth_type = 0; /* NULL Auth type */\n-\tuint8_t zsk_flag = 0, aes_gcm = 0;\n-\tvoid *ctx;\n-\n-\tif (xform->type != RTE_CRYPTO_SYM_XFORM_AUTH)\n-\t\treturn -1;\n+\tvoid *ctx = SESS_PRIV(sess);\n \n \ta_form = &xform->auth;\n \n@@ -2924,13 +2869,12 @@ fill_sess_gmac(struct rte_crypto_sym_xform *xform,\n \t\treturn -1;\n \t}\n \n-\tsess->zsk_flag = zsk_flag;\n-\tsess->aes_gcm = aes_gcm;\n+\tsess->zsk_flag = 0;\n+\tsess->aes_gcm = 0;\n \tsess->is_gmac = 1;\n \tsess->iv_offset = a_form->iv.offset;\n \tsess->iv_length = a_form->iv.length;\n \tsess->mac_len = a_form->digest_length;\n-\tctx = (void *)((uint8_t *)sess + sizeof(struct cpt_sess_misc)),\n \n \tcpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data,\n \t\t\ta_form->key.length, NULL);\n@@ -3130,9 +3074,6 @@ fill_fc_params(struct rte_crypto_op *cop,\n \tuint64_t d_offs, d_lens;\n \tstruct rte_mbuf *m_src, *m_dst;\n \tuint8_t cpt_op = sess_misc->cpt_op;\n-\tuint8_t zsk_flag = sess_misc->zsk_flag;\n-\tuint8_t aes_gcm = sess_misc->aes_gcm;\n-\tuint16_t mac_len = sess_misc->mac_len;\n #ifdef CPT_ALWAYS_USE_SG_MODE\n \tuint8_t inplace = 0;\n #else\n@@ -3158,21 +3099,17 @@ fill_fc_params(struct rte_crypto_op *cop,\n \t\t}\n \t}\n \n-\tif (zsk_flag) {\n+\tif (sess_misc->zsk_flag) {\n \t\tfc_params.auth_iv_buf = rte_crypto_op_ctod_offset(cop,\n \t\t\t\t\tuint8_t *,\n \t\t\t\t\tsess_misc->auth_iv_offset);\n-\t\tif (zsk_flag == K_F9) {\n-\t\t\tCPT_LOG_DP_ERR(\"Should not reach here for \"\n-\t\t\t\"kasumi F9\\n\");\n-\t\t}\n-\t\tif (zsk_flag != ZS_EA)\n+\t\tif (sess_misc->zsk_flag != ZS_EA)\n \t\t\tinplace = 0;\n \t}\n \tm_src = sym_op->m_src;\n \tm_dst = sym_op->m_dst;\n \n-\tif (aes_gcm) {\n+\tif (sess_misc->aes_gcm) {\n \t\tuint8_t *salt;\n \t\tuint8_t *aad_data;\n \t\tuint16_t aad_len;\n@@ -3206,7 +3143,7 @@ fill_fc_params(struct rte_crypto_op *cop,\n \t\t\tsess_misc->salt = *(uint32_t *)salt;\n \t\t}\n \t\tfc_params.iv_buf = salt + 4;\n-\t\tif (likely(mac_len)) {\n+\t\tif (likely(sess_misc->mac_len)) {\n \t\t\tstruct rte_mbuf *m = (cpt_op & CPT_OP_ENCODE) ? m_dst :\n \t\t\t\t\t m_src;\n \n@@ -3249,7 +3186,7 @@ fill_fc_params(struct rte_crypto_op *cop,\n \t\t\t}\n \t\t\tfc_params.iv_buf = salt + 4;\n \t\t}\n-\t\tif (likely(mac_len)) {\n+\t\tif (likely(sess_misc->mac_len)) {\n \t\t\tstruct rte_mbuf *m;\n \n \t\t\tm = (cpt_op & CPT_OP_ENCODE) ? m_dst : m_src;\n@@ -3308,7 +3245,6 @@ fill_fc_params(struct rte_crypto_op *cop,\n \t\t\tuint32_t pkt_len;\n \n \t\t\t/* Try to make room as much as src has */\n-\t\t\tm_dst = sym_op->m_dst;\n \t\t\tpkt_len = rte_pktmbuf_pkt_len(m_dst);\n \n \t\t\tif (unlikely(pkt_len < rte_pktmbuf_pkt_len(m_src))) {\n@@ -3501,7 +3437,6 @@ fill_digest_params(struct rte_crypto_op *cop,\n \tuint64_t d_offs = 0, d_lens;\n \tstruct rte_mbuf *m_src, *m_dst;\n \tuint16_t auth_op = sess->cpt_op & CPT_OP_AUTH_MASK;\n-\tuint8_t zsk_flag = sess->zsk_flag;\n \tuint16_t mac_len = sess->mac_len;\n \tfc_params_t params;\n \tchar src[SRC_IOV_SIZE];\n@@ -3532,7 +3467,7 @@ fill_digest_params(struct rte_crypto_op *cop,\n \n \tflags = VALID_MAC_BUF;\n \tparams.src_iov = (void *)src;\n-\tif (unlikely(zsk_flag)) {\n+\tif (unlikely(sess->zsk_flag)) {\n \t\t/*\n \t\t * Since for Zuc, Kasumi, Snow3g offsets are in bits\n \t\t * we will send pass through even for auth only case,\n@@ -3542,10 +3477,9 @@ fill_digest_params(struct rte_crypto_op *cop,\n \t\tauth_range_off = 0;\n \t\tparams.auth_iv_buf = rte_crypto_op_ctod_offset(cop,\n \t\t\t\t\tuint8_t *, sess->auth_iv_offset);\n-\t\tif (zsk_flag == K_F9) {\n+\t\tif (sess->zsk_flag == K_F9) {\n \t\t\tuint32_t length_in_bits, num_bytes;\n \t\t\tuint8_t *src, direction = 0;\n-\t\t\tuint32_t counter_num_bytes;\n \n \t\t\tmemcpy(iv_buf, rte_pktmbuf_mtod(cop->sym->m_src,\n \t\t\t\t\t\t\tuint8_t *), 8);\n@@ -3555,10 +3489,9 @@ fill_digest_params(struct rte_crypto_op *cop,\n \t\t\t */\n \t\t\tlength_in_bits = cop->sym->auth.data.length;\n \t\t\tnum_bytes = (length_in_bits >> 3);\n-\t\t\tcounter_num_bytes = num_bytes;\n \t\t\tsrc = rte_pktmbuf_mtod(cop->sym->m_src, uint8_t *);\n \t\t\tfind_kasumif9_direction_and_length(src,\n-\t\t\t\t\t\tcounter_num_bytes,\n+\t\t\t\t\t\tnum_bytes,\n \t\t\t\t\t\t&length_in_bits,\n \t\t\t\t\t\t&direction);\n \t\t\tlength_in_bits -= 64;\n", "prefixes": [ "2/2" ] }