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 734AFA052F; Tue, 21 Jan 2020 07:04:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EEE504C74; Tue, 21 Jan 2020 07:04:09 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2084.outbound.protection.outlook.com [40.107.220.84]) by dpdk.org (Postfix) with ESMTP id 7290EDE3 for ; Tue, 21 Jan 2020 07:04:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z4wvNbnDM9Xg1hW3X2a7BRuWK8I9Pe1pxar94iCiZlQFKih8GPYU4aJ0sHQ79cO02TQezl1NrtamVGTA7dvRiXnAoDa+TiSWhITouoPkwyetC6/devNq5uguOsmKoWfC+Tb6RbyUZbKBBWe2Yw7RvNib+jbOymfP6OLaGTYQd13GcCRZbmcZrQ8joNEfIJMwCCoVA470/zQf8ZbjTgtPTf2jkACNJrWkOT+JhQBU9oYOUVIEm3ldN6vHASkEl1xOaevR7ZAE9VgIkPp82D0Cr4o4QkZSfmX9ww9e5cpKI+OdKmv8VRFgtBg8Cbn57690EOlf8R0cJaQlxWEnmsQ0JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XY0+MrKG1dK0vOCjviIY7kgxOa23xKfRJoRDEsCddWE=; b=M/uLOMaxeWNtgPK+bXG3VnHkF1+zdWNRO1fwwh5dCFscuOXJC9lrXxIwCvdJv/GmPPhwSA7BfAiEluseb2GEpq3nWW3sVVYtv929fQuRiT0DrHU4y9tScXhODlc+jcMChuujMfua9qEziAgKVn3A2lDSHgWSict84C8+kYVQEDXzDlVO69ovtfUYEFOX/hl/noMJ91HIHVY92iG6FzuQj/4L4rHf/sZvqoZmo//fPsv5REpjLYELevH7cyldk9pqs2m8Vv7J14R3nygmL4K20eOq2SdDD3jVivGhScXI30K5E5XK1JfDgOkiy2U7ONhaZ1Qqyk4eFW7Ur+z20n+GZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XY0+MrKG1dK0vOCjviIY7kgxOa23xKfRJoRDEsCddWE=; b=NWvanDfBTgxabJbm4Bz9u17me/BPHmrap0PeySkue/vYJEzRuR5/iAaLsOfilUP3bgqKshOulJQBBex9FyZAkwfctv0YJv+7mnB+PwHyvIvIKV45zjk9XYSBDilgSy3i9qEvwZw+3BpJuSpCjk60Cic6c+IphsKBhqsRB9/C2ak= Received: from MW2PR12MB2570.namprd12.prod.outlook.com (52.132.181.13) by MW2PR12MB2475.namprd12.prod.outlook.com (52.132.177.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23; Tue, 21 Jan 2020 06:04:06 +0000 Received: from MW2PR12MB2570.namprd12.prod.outlook.com ([fe80::ec36:5d88:cc24:c660]) by MW2PR12MB2570.namprd12.prod.outlook.com ([fe80::ec36:5d88:cc24:c660%3]) with mapi id 15.20.2644.024; Tue, 21 Jan 2020 06:04:06 +0000 From: "Kumar, Ravi1" To: "Sebastian, Selwin" , "dev@dpdk.org" CC: "Sebastian, Selwin" Thread-Topic: [dpdk-dev] [PATCH v1] crypto/ccp: aes-gcm driver bug fix Thread-Index: AQHVvxZiOCtoMmGEsk6HRyv50ee+qKf0wt1w Date: Tue, 21 Jan 2020 06:04:06 +0000 Message-ID: References: <20191230190740.23852-1-Selwin.Sebastian@amd.com> In-Reply-To: <20191230190740.23852-1-Selwin.Sebastian@amd.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Enabled=true; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SetDate=2020-01-21T06:05:58Z; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Method=Standard; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Name=Internal Use Only - Unrestricted; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ActionId=dbd93287-6b45-443e-b551-000026d141a4; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ContentBits=1 msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_enabled: true msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_setdate: 2020-01-21T06:05:58Z msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_method: Standard msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_name: Internal Use Only - Unrestricted msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_siteid: 3dd8961f-e488-4e60-8e11-a82d994e183d msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_actionid: 5dadb23e-3871-4ff3-9573-00003a818dc4 msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_contentbits: 0 authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ravi1.Kumar@amd.com; x-originating-ip: [165.204.157.251] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 2409b8e5-9514-43dd-6fe9-08d79e37b98a x-ms-traffictypediagnostic: MW2PR12MB2475:|MW2PR12MB2475: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:132; x-forefront-prvs: 0289B6431E x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(396003)(376002)(346002)(39860400002)(136003)(199004)(189003)(55016002)(4326008)(9686003)(110136005)(316002)(7696005)(8676002)(186003)(66476007)(33656002)(66556008)(64756008)(81166006)(81156014)(66946007)(76116006)(66446008)(5660300002)(8936002)(26005)(2906002)(478600001)(71200400001)(86362001)(6506007)(52536014); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR12MB2475; H:MW2PR12MB2570.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 0pXOJ5yNXjVefzc52yBwMT8DwSljHgNUqXUjWnO3YnpEXbbYnVo5p9+FsRvlhvr4V80yGk/IaXNwPIEhDKdwPqTATGhPJWpsp6E60puWKeDb1n4E1zkGNgXuN1fgKQ6NinEDdAG1cB9wZO/2B9WysmL58y84lkW9cdBFyTUj9RmKOofrTJabNXxH8aWmjRVks4kHMC8FBkS+aQ1gJa7mNgOMY2G/voVoOqCiBjLaIeu+bRsq3wtmo8Qe2S2yF3F6cHGxTiBHa5w4I8rkqEH0LJ9k1LrOOaGIpVYcAgxwZV4fFjyjIuz8UMgzTF/x4BVHrmwxWUcn3sUt2qPg7R7Lnzz706TviffuewdXbjF2DHQLST+jtYz3aWHLIwpwLZCMiXxfGU+hNuGL4YHK1UROA8TlWjMhHAckmeXlhnAmNFVXtxeDiKkh+Uxt6DLzQvJY Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2409b8e5-9514-43dd-6fe9-08d79e37b98a X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2020 06:04:06.7882 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: qM7x7UYrdMocwocvmh7g3O8G4/P3RPGUc7Pg9AkYn1B0PcR/ThhOHtzAEYMtnzqUS3Ut0g8mYsGQx85DVMX4IQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2475 Subject: Re: [dpdk-dev] [PATCH v1] crypto/ccp: aes-gcm driver bug fix 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" [AMD Official Use Only - Internal Distribution Only] Looks good to me.=20 Acked-by: Ravi Kumar Regards, Ravi > > >-----Original Message----- >From: dev On Behalf Of Selwin Sebastian >Sent: Tuesday, December 31, 2019 12:38 AM >To: dev@dpdk.org >Cc: Sebastian, Selwin >Subject: [dpdk-dev] [PATCH v1] crypto/ccp: aes-gcm driver bug fix > >[CAUTION: External Email] > >fixes ccp crypto driver to make aes-gcm output match with openssl/NIST out= put > >Signed-off-by: Selwin Sebastian >--- > drivers/crypto/ccp/ccp_crypto.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > >diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_cryp= to.c index 4256734d1..19009f5f2 100644 >--- a/drivers/crypto/ccp/ccp_crypto.c >+++ b/drivers/crypto/ccp/ccp_crypto.c >@@ -1515,8 +1515,8 @@ ccp_perform_passthru(struct ccp_passthru *pst, > > CCP_CMD_SOC(desc) =3D 0; > CCP_CMD_IOC(desc) =3D 0; >- CCP_CMD_INIT(desc) =3D 0; >- CCP_CMD_EOM(desc) =3D 0; >+ CCP_CMD_INIT(desc) =3D 1; >+ CCP_CMD_EOM(desc) =3D 1; > CCP_CMD_PROT(desc) =3D 0; > > function.raw =3D 0; >@@ -2383,7 +2383,7 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct= ccp_queue *cmd_q) > op->sym->session, > ccp_cryptodev_driver_id); > iv =3D rte_crypto_op_ctod_offset(op, uint8_t *, session->iv.offset= ); >- key_addr =3D session->cipher.key_phys; >+ key_addr =3D=20 >+ (phys_addr_t)rte_mem_virt2phy(session->cipher.key_ccp); > > src_addr =3D rte_pktmbuf_mtophys_offset(op->sym->m_src, > op->sym->aead.data.offset); = @@ -2393,7 +2393,8 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct = ccp_queue *cmd_q) > else > dest_addr =3D src_addr; > rte_pktmbuf_append(op->sym->m_src, session->auth.ctx_len); >- digest_dest_addr =3D op->sym->aead.digest.phys_addr; >+ digest_dest_addr =3D >+ =20 >+ (phys_addr_t)rte_mem_virt2phy(op->sym->aead.digest.data); > temp =3D (uint64_t *)(op->sym->aead.digest.data + AES_BLOCK_SIZE); > *temp++ =3D rte_bswap64(session->auth.aad_length << 3); > *temp =3D rte_bswap64(op->sym->aead.data.length << 3); @@ -2401,10= +2402,10 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct ccp_queue= *cmd_q) > non_align_len =3D op->sym->aead.data.length % AES_BLOCK_SIZE; > length =3D CCP_ALIGN(op->sym->aead.data.length, AES_BLOCK_SIZE); > >- aad_addr =3D op->sym->aead.aad.phys_addr; >+ aad_addr =3D=20 >+ (phys_addr_t)rte_mem_virt2phy(op->sym->aead.aad.data); > > /* CMD1 IV Passthru */ >- rte_memcpy(session->cipher.nonce + AES_BLOCK_SIZE, iv, >+ rte_memcpy(session->cipher.nonce, iv, > session->iv.length); > pst.src_addr =3D session->cipher.nonce_phys; > pst.dest_addr =3D (phys_addr_t)(cmd_q->sb_iv * CCP_SB_BYTES); @@ -= 2512,12 +2513,12 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct cc= p_queue *cmd_q) > /* Last block (AAD_len || PT_len)*/ > CCP_CMD_LEN(desc) =3D AES_BLOCK_SIZE; > >- CCP_CMD_SRC_LO(desc) =3D ((uint32_t)digest_dest_addr + AES_BLOCK_S= IZE); >- CCP_CMD_SRC_HI(desc) =3D high32_value(digest_dest_addr + AES_BLOCK= _SIZE); >+ CCP_CMD_SRC_LO(desc) =3D ((uint32_t)digest_dest_addr); >+ CCP_CMD_SRC_HI(desc) =3D high32_value(digest_dest_addr); > CCP_CMD_SRC_MEM(desc) =3D CCP_MEMTYPE_SYSTEM; > >- CCP_CMD_DST_LO(desc) =3D ((uint32_t)digest_dest_addr); >- CCP_CMD_DST_HI(desc) =3D high32_value(digest_dest_addr); >+ CCP_CMD_DST_LO(desc) =3D ((uint32_t)digest_dest_addr + AES_BLOCK_S= IZE); >+ CCP_CMD_DST_HI(desc) =3D high32_value(digest_dest_addr +=20 >+ AES_BLOCK_SIZE); > CCP_CMD_SRC_MEM(desc) =3D CCP_MEMTYPE_SYSTEM; > > CCP_CMD_KEY_LO(desc) =3D ((uint32_t)key_addr); >-- >2.17.1