From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2C90AA00E6 for ; Sun, 7 Jul 2019 16:11:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D92D84C90; Sun, 7 Jul 2019 16:11:06 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 0CDF1322C for ; Sun, 7 Jul 2019 16:11:04 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x67EArb8021612; Sun, 7 Jul 2019 07:11:04 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0818; bh=EDDLprZeUmdE7Y65rES1VEzXv9pIAPDLQ/2x/FAj+dQ=; b=aLjLBi1ur3QEu4gNZ+5L2BavjrGs/Zya5wb3uijmI5kNpsjuwCA6AYFiD2kw+cpJzIAb 9gc+qUIY9j+fLj3OTup+93v95ZWbyN3Tnc1q+480HSZBkXDz835LK18smwOZeVBIsJPz wGzdRZAOhljwZiJIXAzDJgRcf1TiTQ+ms1NhtUFM4fXLg8Pv0hwEKAb39GfLE68h8Pea QB38Z43Dzl6ixJtF478mAPuOJYMniMSFcCxdnugCmNdDLGHNmk7GKmOb+o3eMcPo2kpg nFadWWqpjD5z0Zx1JZyiYDDYlNDI+lyewMAytC2t2aS3CqT0rIwaWFZRyySSIZk3HQ0M XQ== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 2tjs0nv1q9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sun, 07 Jul 2019 07:11:03 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 7 Jul 2019 07:11:02 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.36.53) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Sun, 7 Jul 2019 07:11:02 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector2-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EDDLprZeUmdE7Y65rES1VEzXv9pIAPDLQ/2x/FAj+dQ=; b=Wr0ZmSkPUU3F52mmpllJYPtSqFIAkbf7uPKJqdpCOUyQL6CiL8XhQdjO+ZCCXTQ8dTK2fcsKwEc5GgOXPDouKljDf/ruQbQgQirUjPTDVp/Un2c6prOvIdU1CBCfsLMjaFLPz27FrYq0Wk6MXanisK06y5D6pBnTWOaoMBsBB1k= Received: from MN2PR18MB2877.namprd18.prod.outlook.com (20.179.20.218) by MN2PR18MB3422.namprd18.prod.outlook.com (10.255.239.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.18; Sun, 7 Jul 2019 14:11:01 +0000 Received: from MN2PR18MB2877.namprd18.prod.outlook.com ([fe80::595e:3b6c:3d12:7285]) by MN2PR18MB2877.namprd18.prod.outlook.com ([fe80::595e:3b6c:3d12:7285%7]) with mapi id 15.20.2052.020; Sun, 7 Jul 2019 14:11:01 +0000 From: Anoob Joseph To: Akhil Goyal , Pablo de Lara CC: Jerin Jacob Kollanukkaran , "Narayana Prasad Raju Athreya" , "dev@dpdk.org" Thread-Topic: [PATCH 2/2] common/cpt: remove redundant code in datapath Thread-Index: AQHVNAHrlXmlN/zZlE22hQkVjMVQp6a/M4Aw Date: Sun, 7 Jul 2019 14:11:00 +0000 Message-ID: References: <1562419420-30278-1-git-send-email-anoobj@marvell.com> <1562419420-30278-2-git-send-email-anoobj@marvell.com> In-Reply-To: <1562419420-30278-2-git-send-email-anoobj@marvell.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [117.98.217.105] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5b6c4d6f-ab7e-4eba-77c1-08d702e4f0bc x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:MN2PR18MB3422; x-ms-traffictypediagnostic: MN2PR18MB3422: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:89; x-forefront-prvs: 0091C8F1EB x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(136003)(376002)(39850400004)(396003)(346002)(13464003)(189003)(199004)(4326008)(81156014)(8676002)(14454004)(81166006)(25786009)(229853002)(102836004)(14444005)(6436002)(476003)(53936002)(74316002)(446003)(11346002)(305945005)(486006)(478600001)(8936002)(3846002)(6116002)(7736002)(68736007)(99286004)(110136005)(54906003)(76176011)(6246003)(53546011)(6506007)(186003)(7696005)(2906002)(26005)(256004)(316002)(66066001)(30864003)(52536014)(86362001)(73956011)(76116006)(71190400001)(71200400001)(33656002)(66446008)(66946007)(66476007)(66556008)(64756008)(55016002)(53946003)(9686003)(5660300002)(579004); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR18MB3422; H:MN2PR18MB2877.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: marvell.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: N6ytiWEOrEiltw1st8foc+Quww3O1KymOqxxg4nwUO2kI/Zd3DpU0ZsN6lBHz1qEfj8nYh57E0WXiUyOkgolkfRffzUfdX4rNx8BHQvNOiqPQabatVrzzxc9PoZH4siO9zwXR/Qmfpzj8kTNvtAY9lvNBvpCsT2MzCZ3h0Udrp/OP5xC64h8D//FcsRNhMp8rKYPIsCpf5f9fcVHYJgWeBuaIkNLuQ74IBNkiB/BfY52A+gwZOy51DUHn6OcTgNVhBOnsYEfyCZAv9Qtde9WSSS9rqbbEDLlJRbY6cfgBaCDP0mv5/TVn4LUAx9SOh9MHN/P0L4BrxbTquoGDv86vCpLqsUQLn0tWNGi+AntRZB5Fb9nFK3Aob1q+78Cunb5T1DD/J0qORxHm25VvOA2A8cbZ1a6glau9lpqeqiJEaQ= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5b6c4d6f-ab7e-4eba-77c1-08d702e4f0bc X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Jul 2019 14:11:00.9587 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: anoobj@marvell.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB3422 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-07-07_05:, , signatures=0 Subject: Re: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi Akhil, Pablo This patch is good to go if you don't have any comments. Thanks, Anoob > -----Original Message----- > From: Anoob Joseph > Sent: Saturday, July 6, 2019 6:54 PM > To: Akhil Goyal ; Pablo de Lara > > Cc: Anoob Joseph ; Jerin Jacob Kollanukkaran > ; Narayana Prasad Raju Athreya > ; dev@dpdk.org > Subject: [PATCH 2/2] common/cpt: remove redundant code in datapath >=20 > Removing redundant checks and unused local variables from datapath. >=20 > Signed-off-by: Anoob Joseph > --- > drivers/common/cpt/cpt_ucode.h | 133 ++++++++++-------------------------= ------ > 1 file changed, 33 insertions(+), 100 deletions(-) >=20 > diff --git a/drivers/common/cpt/cpt_ucode.h > b/drivers/common/cpt/cpt_ucode.h index c589b58..e197e4e 100644 > --- a/drivers/common/cpt/cpt_ucode.h > +++ b/drivers/common/cpt/cpt_ucode.h > @@ -89,8 +89,7 @@ cpt_fc_ciph_validate_key_aes(uint16_t key_len) } >=20 > static __rte_always_inline int > -cpt_fc_ciph_validate_key(cipher_type_t type, struct cpt_ctx *cpt_ctx, > - uint16_t key_len) > +cpt_fc_ciph_set_type(cipher_type_t type, struct cpt_ctx *ctx, uint16_t > +key_len) > { > int fc_type =3D 0; > switch (type) { > @@ -125,7 +124,7 @@ cpt_fc_ciph_validate_key(cipher_type_t type, struct > cpt_ctx *cpt_ctx, > if (unlikely(key_len !=3D 16)) > return -1; > /* No support for AEAD yet */ > - if (unlikely(cpt_ctx->hash_type)) > + if (unlikely(ctx->hash_type)) > return -1; > fc_type =3D ZUC_SNOW3G; > break; > @@ -134,14 +133,16 @@ cpt_fc_ciph_validate_key(cipher_type_t type, struct > cpt_ctx *cpt_ctx, > if (unlikely(key_len !=3D 16)) > return -1; > /* No support for AEAD yet */ > - if (unlikely(cpt_ctx->hash_type)) > + if (unlikely(ctx->hash_type)) > return -1; > fc_type =3D KASUMI; > break; > default: > return -1; > } > - return fc_type; > + > + ctx->fc_type =3D fc_type; > + return 0; > } >=20 > static __rte_always_inline void > @@ -181,7 +182,6 @@ cpt_fc_ciph_set_key_snow3g_uea2(struct cpt_ctx > *cpt_ctx, uint8_t *key, > cpt_ctx->snow3g =3D 1; > gen_key_snow3g(key, keyx); > memcpy(cpt_ctx->zs_ctx.ci_key, keyx, key_len); > - cpt_ctx->fc_type =3D ZUC_SNOW3G; > cpt_ctx->zsk_flags =3D 0; > } >=20 > @@ -192,7 +192,6 @@ cpt_fc_ciph_set_key_zuc_eea3(struct cpt_ctx *cpt_ctx, > uint8_t *key, > cpt_ctx->snow3g =3D 0; > memcpy(cpt_ctx->zs_ctx.ci_key, key, key_len); > memcpy(cpt_ctx->zs_ctx.zuc_const, zuc_d, 32); > - cpt_ctx->fc_type =3D ZUC_SNOW3G; > cpt_ctx->zsk_flags =3D 0; > } >=20 > @@ -203,7 +202,6 @@ cpt_fc_ciph_set_key_kasumi_f8_ecb(struct cpt_ctx > *cpt_ctx, uint8_t *key, > cpt_ctx->k_ecb =3D 1; > memcpy(cpt_ctx->k_ctx.ci_key, key, key_len); > cpt_ctx->zsk_flags =3D 0; > - cpt_ctx->fc_type =3D KASUMI; > } >=20 > static __rte_always_inline void > @@ -212,7 +210,6 @@ cpt_fc_ciph_set_key_kasumi_f8_cbc(struct cpt_ctx > *cpt_ctx, uint8_t *key, { > memcpy(cpt_ctx->k_ctx.ci_key, key, key_len); > cpt_ctx->zsk_flags =3D 0; > - cpt_ctx->fc_type =3D KASUMI; > } >=20 > static __rte_always_inline int > @@ -222,15 +219,13 @@ cpt_fc_ciph_set_key(void *ctx, cipher_type_t type, > uint8_t *key, > struct cpt_ctx *cpt_ctx =3D ctx; > mc_fc_context_t *fctx =3D &cpt_ctx->fctx; > uint64_t *ctrl_flags =3D NULL; > - int fc_type; > + int ret; >=20 > - /* Validate key before proceeding */ > - fc_type =3D cpt_fc_ciph_validate_key(type, cpt_ctx, key_len); > - if (unlikely(fc_type =3D=3D -1)) > + ret =3D cpt_fc_ciph_set_type(type, cpt_ctx, key_len); > + if (unlikely(ret)) > return -1; >=20 > - if (fc_type =3D=3D FC_GEN) { > - cpt_ctx->fc_type =3D FC_GEN; > + if (cpt_ctx->fc_type =3D=3D FC_GEN) { > ctrl_flags =3D (uint64_t *)&(fctx->enc.enc_ctrl.flags); > *ctrl_flags =3D rte_be_to_cpu_64(*ctrl_flags); > /* > @@ -467,7 +462,6 @@ cpt_digest_gen_prep(uint32_t flags, { > struct cpt_request_info *req; > uint32_t size, i; > - int32_t m_size; > uint16_t data_len, mac_len, key_len; > auth_type_t hash_type; > buf_ptr_t *meta_p; > @@ -488,7 +482,6 @@ cpt_digest_gen_prep(uint32_t flags, >=20 > m_vaddr =3D meta_p->vaddr; > m_dma =3D meta_p->dma_addr; > - m_size =3D meta_p->size; >=20 > /* > * Save initial space that followed app data for completion code & @@ - > 504,14 +497,12 @@ cpt_digest_gen_prep(uint32_t flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > req =3D m_vaddr; >=20 > size =3D sizeof(struct cpt_request_info); > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > hash_type =3D ctx->hash_type; > mac_len =3D ctx->mac_len; > @@ -625,7 +616,6 @@ cpt_digest_gen_prep(uint32_t flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* cpt alternate completion address saved earlier */ > req->alternate_caddr =3D (uint64_t *)((uint8_t *)c_vaddr - 8); @@ -678,= 13 > +668,11 @@ cpt_enc_hmac_prep(uint32_t flags, > vq_cmd_word3_t vq_cmd_w3; > void *c_vaddr; > uint64_t c_dma; > - int32_t m_size; > opcode_info_t opcode; >=20 > meta_p =3D &fc_params->meta_buf; > m_vaddr =3D meta_p->vaddr; > m_dma =3D meta_p->dma_addr; > - m_size =3D meta_p->size; >=20 > encr_offset =3D ENCR_OFFSET(d_offs); > auth_offset =3D AUTH_OFFSET(d_offs); > @@ -720,7 +708,6 @@ cpt_enc_hmac_prep(uint32_t flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* start cpt request info struct at 8 byte boundary */ > size =3D (uint8_t *)RTE_PTR_ALIGN(m_vaddr, 8) - @@ -731,7 +718,6 @@ > cpt_enc_hmac_prep(uint32_t flags, > size +=3D sizeof(struct cpt_request_info); > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > if (hash_type =3D=3D GMAC_TYPE) > encr_data_len =3D 0; > @@ -851,7 +837,6 @@ cpt_enc_hmac_prep(uint32_t flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > opcode.s.major |=3D CPT_DMA_MODE; >=20 > @@ -1003,7 +988,6 @@ cpt_enc_hmac_prep(uint32_t flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* cpt alternate completion address saved earlier */ > req->alternate_caddr =3D (uint64_t *)((uint8_t *)c_vaddr - 8); @@ > -1047,7 +1031,7 @@ cpt_dec_hmac_prep(uint32_t flags, > uint32_t iv_offset =3D 0, size; > int32_t inputlen, outputlen, enc_dlen, auth_dlen; > struct cpt_ctx *cpt_ctx; > - int32_t hash_type, mac_len, m_size; > + int32_t hash_type, mac_len; > uint8_t iv_len =3D 16; > struct cpt_request_info *req; > buf_ptr_t *meta_p, *aad_buf =3D NULL; > @@ -1065,7 +1049,6 @@ cpt_dec_hmac_prep(uint32_t flags, > meta_p =3D &fc_params->meta_buf; > m_vaddr =3D meta_p->vaddr; > m_dma =3D meta_p->dma_addr; > - m_size =3D meta_p->size; >=20 > encr_offset =3D ENCR_OFFSET(d_offs); > auth_offset =3D AUTH_OFFSET(d_offs); > @@ -1131,7 +1114,6 @@ cpt_dec_hmac_prep(uint32_t flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* start cpt request info structure at 8 byte alignment */ > size =3D (uint8_t *)RTE_PTR_ALIGN(m_vaddr, 8) - @@ -1142,7 +1124,6 > @@ cpt_dec_hmac_prep(uint32_t flags, > size +=3D sizeof(struct cpt_request_info); > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* Decryption */ > opcode.s.major =3D CPT_MAJOR_OP_FC; > @@ -1229,7 +1210,6 @@ cpt_dec_hmac_prep(uint32_t flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > opcode.s.major |=3D CPT_DMA_MODE; >=20 > @@ -1393,7 +1373,6 @@ cpt_dec_hmac_prep(uint32_t flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* cpt alternate completion address saved earlier */ > req->alternate_caddr =3D (uint64_t *)((uint8_t *)c_vaddr - 8); @@ > -1444,7 +1423,7 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags, > buf_ptr_t *buf_p; > uint32_t encr_offset =3D 0, auth_offset =3D 0; > uint32_t encr_data_len =3D 0, auth_data_len =3D 0; > - int flags, iv_len =3D 16, m_size; > + int flags, iv_len =3D 16; > void *m_vaddr, *c_vaddr; > uint64_t m_dma, c_dma, offset_ctrl; > uint64_t *offset_vaddr, offset_dma; > @@ -1456,7 +1435,6 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags, > buf_p =3D ¶ms->meta_buf; > m_vaddr =3D buf_p->vaddr; > m_dma =3D buf_p->dma_addr; > - m_size =3D buf_p->size; >=20 > cpt_ctx =3D params->ctx_buf.vaddr; > flags =3D cpt_ctx->zsk_flags; > @@ -1478,7 +1456,6 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* Reserve memory for cpt request info */ > req =3D m_vaddr; > @@ -1486,7 +1463,6 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags, > size =3D sizeof(struct cpt_request_info); > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > opcode.s.major =3D CPT_MAJOR_OP_ZUC_SNOW3G; >=20 > @@ -1616,7 +1592,6 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + OFF_CTRL_LEN + iv_len; > m_dma +=3D OFF_CTRL_LEN + iv_len; > - m_size -=3D OFF_CTRL_LEN + iv_len; >=20 > opcode.s.major |=3D CPT_DMA_MODE; >=20 > @@ -1726,7 +1701,6 @@ cpt_zuc_snow3g_enc_prep(uint32_t req_flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* cpt alternate completion address saved earlier */ > req->alternate_caddr =3D (uint64_t *)((uint8_t *)c_vaddr - 8); @@ > -1774,7 +1748,7 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags, > buf_ptr_t *buf_p; > uint32_t encr_offset; > uint32_t encr_data_len; > - int flags, m_size; > + int flags; > void *m_vaddr, *c_vaddr; > uint64_t m_dma, c_dma; > uint64_t *offset_vaddr, offset_dma; > @@ -1786,7 +1760,6 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags, > buf_p =3D ¶ms->meta_buf; > m_vaddr =3D buf_p->vaddr; > m_dma =3D buf_p->dma_addr; > - m_size =3D buf_p->size; >=20 > /* > * Microcode expects offsets in bytes > @@ -1813,7 +1786,6 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* Reserve memory for cpt request info */ > req =3D m_vaddr; > @@ -1821,7 +1793,6 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags, > size =3D sizeof(struct cpt_request_info); > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > opcode.s.major =3D CPT_MAJOR_OP_ZUC_SNOW3G; >=20 > @@ -1917,7 +1888,6 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + OFF_CTRL_LEN + iv_len; > m_dma +=3D OFF_CTRL_LEN + iv_len; > - m_size -=3D OFF_CTRL_LEN + iv_len; >=20 > opcode.s.major |=3D CPT_DMA_MODE; >=20 > @@ -2000,7 +1970,6 @@ cpt_zuc_snow3g_dec_prep(uint32_t req_flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* cpt alternate completion address saved earlier */ > req->alternate_caddr =3D (uint64_t *)((uint8_t *)c_vaddr - 8); @@ > -2049,7 +2018,7 @@ cpt_kasumi_enc_prep(uint32_t req_flags, > buf_ptr_t *buf_p; > uint32_t encr_offset, auth_offset; > uint32_t encr_data_len, auth_data_len; > - int flags, m_size; > + int flags; > uint8_t *iv_s, *iv_d, iv_len =3D 8; > uint8_t dir =3D 0; > void *m_vaddr, *c_vaddr; > @@ -2067,7 +2036,6 @@ cpt_kasumi_enc_prep(uint32_t req_flags, > buf_p =3D ¶ms->meta_buf; > m_vaddr =3D buf_p->vaddr; > m_dma =3D buf_p->dma_addr; > - m_size =3D buf_p->size; >=20 > encr_offset =3D ENCR_OFFSET(d_offs) / 8; > auth_offset =3D AUTH_OFFSET(d_offs) / 8; @@ -2100,7 +2068,6 @@ > cpt_kasumi_enc_prep(uint32_t req_flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* Reserve memory for cpt request info */ > req =3D m_vaddr; > @@ -2108,7 +2075,6 @@ cpt_kasumi_enc_prep(uint32_t req_flags, > size =3D sizeof(struct cpt_request_info); > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > opcode.s.major =3D CPT_MAJOR_OP_KASUMI | CPT_DMA_MODE; >=20 > @@ -2136,7 +2102,6 @@ cpt_kasumi_enc_prep(uint32_t req_flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + OFF_CTRL_LEN + iv_len; > m_dma +=3D OFF_CTRL_LEN + iv_len; > - m_size -=3D OFF_CTRL_LEN + iv_len; >=20 > /* DPTR has SG list */ > in_buffer =3D m_vaddr; > @@ -2253,7 +2218,6 @@ cpt_kasumi_enc_prep(uint32_t req_flags, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* cpt alternate completion address saved earlier */ > req->alternate_caddr =3D (uint64_t *)((uint8_t *)c_vaddr - 8); @@ -2299= ,7 > +2263,7 @@ cpt_kasumi_dec_prep(uint64_t d_offs, > buf_ptr_t *buf_p; > uint32_t encr_offset; > uint32_t encr_data_len; > - int flags, m_size; > + int flags; > uint8_t dir =3D 0; > void *m_vaddr, *c_vaddr; > uint64_t m_dma, c_dma; > @@ -2316,7 +2280,6 @@ cpt_kasumi_dec_prep(uint64_t d_offs, > buf_p =3D ¶ms->meta_buf; > m_vaddr =3D buf_p->vaddr; > m_dma =3D buf_p->dma_addr; > - m_size =3D buf_p->size; >=20 > encr_offset =3D ENCR_OFFSET(d_offs) / 8; > encr_data_len =3D ENCR_DLEN(d_lens); > @@ -2338,7 +2301,6 @@ cpt_kasumi_dec_prep(uint64_t d_offs, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* Reserve memory for cpt request info */ > req =3D m_vaddr; > @@ -2346,7 +2308,6 @@ cpt_kasumi_dec_prep(uint64_t d_offs, > size =3D sizeof(struct cpt_request_info); > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > opcode.s.major =3D CPT_MAJOR_OP_KASUMI | CPT_DMA_MODE; >=20 > @@ -2373,7 +2334,6 @@ cpt_kasumi_dec_prep(uint64_t d_offs, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + OFF_CTRL_LEN + iv_len; > m_dma +=3D OFF_CTRL_LEN + iv_len; > - m_size -=3D OFF_CTRL_LEN + iv_len; >=20 > /* DPTR has SG list */ > in_buffer =3D m_vaddr; > @@ -2448,7 +2408,6 @@ cpt_kasumi_dec_prep(uint64_t d_offs, >=20 > m_vaddr =3D (uint8_t *)m_vaddr + size; > m_dma +=3D size; > - m_size -=3D size; >=20 > /* cpt alternate completion address saved earlier */ > req->alternate_caddr =3D (uint64_t *)((uint8_t *)c_vaddr - 8); @@ -2627= ,9 > +2586,9 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform, > cipher_type_t enc_type =3D 0; /* NULL Cipher type */ > auth_type_t auth_type =3D 0; /* NULL Auth type */ > uint32_t cipher_key_len =3D 0; > - uint8_t zsk_flag =3D 0, aes_gcm =3D 0; > + uint8_t aes_gcm =3D 0; > aead_form =3D &xform->aead; > - void *ctx; > + void *ctx =3D SESS_PRIV(sess); >=20 > if (aead_form->op =3D=3D RTE_CRYPTO_AEAD_OP_ENCRYPT && > aead_form->algo =3D=3D RTE_CRYPTO_AEAD_AES_GCM) { @@ -2663,13 > +2622,12 @@ fill_sess_aead(struct rte_crypto_sym_xform *xform, > (unsigned int long)aead_form->key.length); > return -1; > } > - sess->zsk_flag =3D zsk_flag; > + sess->zsk_flag =3D 0; > sess->aes_gcm =3D aes_gcm; > sess->mac_len =3D aead_form->digest_length; > sess->iv_offset =3D aead_form->iv.offset; > sess->iv_length =3D aead_form->iv.length; > sess->aad_length =3D aead_form->aad_length; > - ctx =3D (void *)((uint8_t *)sess + sizeof(struct cpt_sess_misc)), >=20 > cpt_fc_ciph_set_key(ctx, enc_type, aead_form->key.data, > aead_form->key.length, NULL); > @@ -2686,10 +2644,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform > *xform, > struct rte_crypto_cipher_xform *c_form; > cipher_type_t enc_type =3D 0; /* NULL Cipher type */ > uint32_t cipher_key_len =3D 0; > - uint8_t zsk_flag =3D 0, aes_gcm =3D 0, aes_ctr =3D 0, is_null =3D 0; > - > - if (xform->type !=3D RTE_CRYPTO_SYM_XFORM_CIPHER) > - return -1; > + uint8_t zsk_flag =3D 0, aes_ctr =3D 0, is_null =3D 0; >=20 > c_form =3D &xform->cipher; >=20 > @@ -2771,7 +2726,7 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform= , > } >=20 > sess->zsk_flag =3D zsk_flag; > - sess->aes_gcm =3D aes_gcm; > + sess->aes_gcm =3D 0; > sess->aes_ctr =3D aes_ctr; > sess->iv_offset =3D c_form->iv.offset; > sess->iv_length =3D c_form->iv.length; > @@ -2791,9 +2746,6 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, > auth_type_t auth_type =3D 0; /* NULL Auth type */ > uint8_t zsk_flag =3D 0, aes_gcm =3D 0, is_null =3D 0; >=20 > - if (xform->type !=3D RTE_CRYPTO_SYM_XFORM_AUTH) > - goto error_out; > - > a_form =3D &xform->auth; >=20 > if (a_form->op =3D=3D RTE_CRYPTO_AUTH_OP_VERIFY) @@ -2865,11 > +2817,11 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, > case RTE_CRYPTO_AUTH_AES_CBC_MAC: > CPT_LOG_DP_ERR("Crypto: Unsupported hash algo %u", > a_form->algo); > - goto error_out; > + return -1; > default: > CPT_LOG_DP_ERR("Crypto: Undefined Hash algo %u specified", > a_form->algo); > - goto error_out; > + return -1; > } >=20 > sess->zsk_flag =3D zsk_flag; > @@ -2884,9 +2836,6 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, > a_form->key.length, a_form->digest_length); >=20 > return 0; > - > -error_out: > - return -1; > } >=20 > static __rte_always_inline int > @@ -2896,11 +2845,7 @@ fill_sess_gmac(struct rte_crypto_sym_xform > *xform, > struct rte_crypto_auth_xform *a_form; > cipher_type_t enc_type =3D 0; /* NULL Cipher type */ > auth_type_t auth_type =3D 0; /* NULL Auth type */ > - uint8_t zsk_flag =3D 0, aes_gcm =3D 0; > - void *ctx; > - > - if (xform->type !=3D RTE_CRYPTO_SYM_XFORM_AUTH) > - return -1; > + void *ctx =3D SESS_PRIV(sess); >=20 > a_form =3D &xform->auth; >=20 > @@ -2924,13 +2869,12 @@ fill_sess_gmac(struct rte_crypto_sym_xform > *xform, > return -1; > } >=20 > - sess->zsk_flag =3D zsk_flag; > - sess->aes_gcm =3D aes_gcm; > + sess->zsk_flag =3D 0; > + sess->aes_gcm =3D 0; > sess->is_gmac =3D 1; > sess->iv_offset =3D a_form->iv.offset; > sess->iv_length =3D a_form->iv.length; > sess->mac_len =3D a_form->digest_length; > - ctx =3D (void *)((uint8_t *)sess + sizeof(struct cpt_sess_misc)), >=20 > cpt_fc_ciph_set_key(ctx, enc_type, a_form->key.data, > a_form->key.length, NULL); > @@ -3130,9 +3074,6 @@ fill_fc_params(struct rte_crypto_op *cop, > uint64_t d_offs, d_lens; > struct rte_mbuf *m_src, *m_dst; > uint8_t cpt_op =3D sess_misc->cpt_op; > - uint8_t zsk_flag =3D sess_misc->zsk_flag; > - uint8_t aes_gcm =3D sess_misc->aes_gcm; > - uint16_t mac_len =3D sess_misc->mac_len; > #ifdef CPT_ALWAYS_USE_SG_MODE > uint8_t inplace =3D 0; > #else > @@ -3158,21 +3099,17 @@ fill_fc_params(struct rte_crypto_op *cop, > } > } >=20 > - if (zsk_flag) { > + if (sess_misc->zsk_flag) { > fc_params.auth_iv_buf =3D rte_crypto_op_ctod_offset(cop, > uint8_t *, > sess_misc->auth_iv_offset); > - if (zsk_flag =3D=3D K_F9) { > - CPT_LOG_DP_ERR("Should not reach here for " > - "kasumi F9\n"); > - } > - if (zsk_flag !=3D ZS_EA) > + if (sess_misc->zsk_flag !=3D ZS_EA) > inplace =3D 0; > } > m_src =3D sym_op->m_src; > m_dst =3D sym_op->m_dst; >=20 > - if (aes_gcm) { > + if (sess_misc->aes_gcm) { > uint8_t *salt; > uint8_t *aad_data; > uint16_t aad_len; > @@ -3206,7 +3143,7 @@ fill_fc_params(struct rte_crypto_op *cop, > sess_misc->salt =3D *(uint32_t *)salt; > } > fc_params.iv_buf =3D salt + 4; > - if (likely(mac_len)) { > + if (likely(sess_misc->mac_len)) { > struct rte_mbuf *m =3D (cpt_op & CPT_OP_ENCODE) ? > m_dst : > m_src; >=20 > @@ -3249,7 +3186,7 @@ fill_fc_params(struct rte_crypto_op *cop, > } > fc_params.iv_buf =3D salt + 4; > } > - if (likely(mac_len)) { > + if (likely(sess_misc->mac_len)) { > struct rte_mbuf *m; >=20 > m =3D (cpt_op & CPT_OP_ENCODE) ? m_dst : m_src; @@ > -3308,7 +3245,6 @@ fill_fc_params(struct rte_crypto_op *cop, > uint32_t pkt_len; >=20 > /* Try to make room as much as src has */ > - m_dst =3D sym_op->m_dst; > pkt_len =3D rte_pktmbuf_pkt_len(m_dst); >=20 > if (unlikely(pkt_len < rte_pktmbuf_pkt_len(m_src))) { > @@ -3501,7 +3437,6 @@ fill_digest_params(struct rte_crypto_op *cop, > uint64_t d_offs =3D 0, d_lens; > struct rte_mbuf *m_src, *m_dst; > uint16_t auth_op =3D sess->cpt_op & CPT_OP_AUTH_MASK; > - uint8_t zsk_flag =3D sess->zsk_flag; > uint16_t mac_len =3D sess->mac_len; > fc_params_t params; > char src[SRC_IOV_SIZE]; > @@ -3532,7 +3467,7 @@ fill_digest_params(struct rte_crypto_op *cop, >=20 > flags =3D VALID_MAC_BUF; > params.src_iov =3D (void *)src; > - if (unlikely(zsk_flag)) { > + if (unlikely(sess->zsk_flag)) { > /* > * Since for Zuc, Kasumi, Snow3g offsets are in bits > * we will send pass through even for auth only case, @@ - > 3542,10 +3477,9 @@ fill_digest_params(struct rte_crypto_op *cop, > auth_range_off =3D 0; > params.auth_iv_buf =3D rte_crypto_op_ctod_offset(cop, > uint8_t *, sess->auth_iv_offset); > - if (zsk_flag =3D=3D K_F9) { > + if (sess->zsk_flag =3D=3D K_F9) { > uint32_t length_in_bits, num_bytes; > uint8_t *src, direction =3D 0; > - uint32_t counter_num_bytes; >=20 > memcpy(iv_buf, rte_pktmbuf_mtod(cop->sym->m_src, > uint8_t *), 8); > @@ -3555,10 +3489,9 @@ fill_digest_params(struct rte_crypto_op *cop, > */ > length_in_bits =3D cop->sym->auth.data.length; > num_bytes =3D (length_in_bits >> 3); > - counter_num_bytes =3D num_bytes; > src =3D rte_pktmbuf_mtod(cop->sym->m_src, uint8_t *); > find_kasumif9_direction_and_length(src, > - counter_num_bytes, > + num_bytes, > &length_in_bits, > &direction); > length_in_bits -=3D 64; > -- > 2.7.4