From patchwork Thu Mar 2 21:26:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary R Hook X-Patchwork-Id: 9601567 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5E7CD600CB for ; Thu, 2 Mar 2017 21:27:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C04A237A5 for ; Thu, 2 Mar 2017 21:27:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4065C285F8; Thu, 2 Mar 2017 21:27:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBE2D237A5 for ; Thu, 2 Mar 2017 21:27:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750915AbdCBV1y (ORCPT ); Thu, 2 Mar 2017 16:27:54 -0500 Received: from mail-dm3nam03on0071.outbound.protection.outlook.com ([104.47.41.71]:59200 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751185AbdCBV1v (ORCPT ); Thu, 2 Mar 2017 16:27:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=WdqqkafyOe4T3H6PqoDDD2jkTvLAF1fMGF8wvWAKOFA=; b=BMbf4My8TrVAHT/8En74pUsrw06qoIde+tEaBGFHqWIGB0mEuhcCTElGqrvkfpuvF5jk2/sowhUX+avwuB+YOB/YM6Uj4fc4ob2pPDle+4fOi/lzaeQEMAhOsOXnXLKi630WPU45dOljYcw9C2nsM2DMBGVtIzHt+kTCiwx8z3Y= Authentication-Results: amd.com; dkim=none (message not signed) header.d=none;amd.com; dmarc=none action=none header.from=amd.com; Received: from [10.236.19.42] (165.204.77.1) by DM5PR12MB1404.namprd12.prod.outlook.com (10.168.238.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Thu, 2 Mar 2017 21:27:01 +0000 Subject: [PATCH V2 2/3] crypto: ccp - Enable support for AES GCM on v5 CCPs From: Gary R Hook To: CC: , , , Date: Thu, 2 Mar 2017 15:26:54 -0600 Message-ID: <20170302212654.30959.31.stgit@taos> In-Reply-To: <20170302212331.30959.44149.stgit@taos> References: <20170302212331.30959.44149.stgit@taos> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR1001CA0023.namprd10.prod.outlook.com (10.174.84.36) To DM5PR12MB1404.namprd12.prod.outlook.com (10.168.238.143) X-MS-Office365-Filtering-Correlation-Id: 2ed544bd-f7dc-431f-a00a-08d461b2ddc0 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:DM5PR12MB1404; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1404; 3:5qEQJFDg/+B6ecIoiV8SRqk1vPVGWzist4hNsbmqiw8MqUhyfPBTWKaeTIQdorX+51Kky6hjUTPtJD422XJ2ESkSEeZMWxVnWjxwVwHXKWvsd9Z9iFz3Z1yb9v5P2NG/lunqim/bVfFZJMCAbQSaLysWxxQ53WlNsZ5OV1sPx75neEcIZEZLwu09sPYYmx6wAGQu6k30F0/3R7c6Oq9dj+ZNMUpeqa4DFRPxBpIvlSlnW19MqDDYN4KKC/ozrAhWHk/bi/0LWP8EIk0nZ6vlFv4z0hSkhqszqtXUjO4/2BY=; 25:gOOMi4hAnQBbJVW4UTKBTOy3WTYyAYDoldhXj7/GRWDqqp0MSywzjcwn+pNxPO9opo3YcRm+yyirROSP9gTpIhoQOX3iHCkp+Y3O8lTXx06fdl6KzC+xBJSplw3mou/LTkhkSNfMegciopc1D1yiDXpieKXfYVTjFul+UXrfjRCExSuIbBn2Zh9GtDjDMfMEuOAqJvwP9pGDNSNBh1PzchMxkUeKtZ2/RwQ8Bp665QQeGAfd9loupJokcUQ9kElEtSZRY2DfmcjkR5LF3nCNWq2jzOKN+5VP6UVMwQCKL8PipFq6YRENuXDGCpFGsKCdRL84RldT7dvDXEyhSGlsu9vRcKP2mVQ3QCNyTj7YFoKrj4Yqbg9pNSOh9l+jUsvXi5QsJw9WHakDaCy+W+lW5hgixu+hNnxsDimq7Rw5Re165GsD8KmooMm9kteH5c/JmaG5XNUMlc9uUQ5GWO7u1g== X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1404; 31:MwDbERtFDIU6UEPMtTFTtTPX64cjPNt5ovf180QtAj5hSeCXCkOUuvwejXMtGJTsRWh9uast/vb1IP9ouQvIJB4i7T6NXWj8rX4SshqQeh9pNd8qw3rj6r1Nca0Dy4Fym/bWt/wgNnzgomqStnkssZ2ffLaXKYc5iCuCMvUrAWIC8m4IFFiq9XeusDBaPhj7qbQFZ5H+2sQX0SIys1yhSJ8FY1mgqNEum7c/VmcvaHqROnG1dnwCrmf78aqO+1Zf; 20:Wh3OOsevxDuchJ5tImJLlEPQlC0o05mjFxR2W2x2STACEWym98Rpy0ENMY7gmot0DDv6xsZJREtOZ6WPNoJlAYPncqOtRbDfjivgtCmPVhBXKQeAK8Bsu7WzpmpU3GyPf0LKlBpdzRW3IVnuHCdtM9WnfOdJw0lBHLUhUIMmovfVxijYbFpzBuJc76clFEZlMkWoHjALcrT2MVMBCVWUbkDePLOehpexDINcvMaos5LXYI52xoRzMSu85BAluRDJlC0ZpNmZ80dqGl9rfDGyyDlXubs5y7pMY9vvPJpZMtxbOm8+6dqL5x+rWT71IXA8yX1VWwLpRtXD6V5KYflXKZdHQdlxzt9EDVUWug+JZ6MDJ4qP/V/K1TglYr+KjbWH8WyFkaHzbQWKfs/b2CxIoxX8J3YaHFJxwgSDtgwCIu85QU6NCM+1wPXl9whcQUp+E7XdIBhox7axOmXaoQJRBACi0DFT1fSgb2y+jz7qaduEne4VNpD/sa8Pcmn1Pr5N X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123558025)(20161123564025)(20161123560025)(20161123555025)(6072148); SRVR:DM5PR12MB1404; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB1404; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1404; 4:nPf4ze090bQImevJJsFQyioCt8JL4g2OGrnLjUv711BIFU+Zaz8CQNEby3yuxrifX9OckDypX+1ZxPmCg5lKbDg8jk/X2X9tn/1lijGP5V3idI5TkQqsbLWdfG0GhPEiyhiUq7uTj6zqqegaVRUrog9SmzQv5CXDqnLjmS0fpuQX7Srs6WFMcHs/t1r2Rd1VJY71f9Lec9HR3JLCxU8sP0uxkBN25AgIIYgH5ENbd0LdpZkCQ3J39gzPBJqpe1FBXwf4x3kcioBO95DCtY9Xicn3jrxu0kwdh1fDRFJCRxFLGBlGRZkdpup2KhRPqIzaIB2+a29Ja6Duvv68NxjbL3XPZSrNeGFCf9n3dhvlFD42rZ1PToJjzsqymBOGpRXzBaN023qC8DUsyGqT7QZ92Sy0ruMk5QfmaN59hVhxh1IamkmjbTd7FtEIlSPLsCW612AhUiGu7Bhf0ggZP7pgkBz3O0BOo9Un5TEYV9ttD0cWKilLGMrvt/I/oiegHuaqiV621zH1/VulewO0151aKFIvNSY3oDhZ63ElcjHQZ2rj/h0ZqP/rKLwppi2xt3iJYibJZ3PSsGABWQT60v2tuQhAWDsW8fyVt5M2/f/NgpwD1iS1rACQATmCdlfIpxoc7C5xr3Ev5f5WIgWT2icn7q3dHGuuXKVeGdjnzsBQR40= X-Forefront-PRVS: 023495660C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6049001)(7916002)(39850400002)(39410400002)(39450400003)(39840400002)(39860400002)(2351001)(2906002)(81166006)(4001350100001)(47776003)(6916009)(103116003)(2950100002)(6666003)(33716001)(42186005)(92566002)(54906002)(66066001)(9686003)(4326008)(8676002)(25786008)(53936002)(6486002)(76176999)(54356999)(90366009)(77096006)(23676002)(50986999)(38730400002)(230700001)(83506001)(305945005)(7736002)(110136004)(50466002)(33646002)(5660300001)(1076002)(3846002)(189998001)(6116002)(86362001)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1404; H:[10.236.19.42]; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjEyTUIxNDA0OzIzOlgxUGZNTHk2OUlMQmtJVVk1VXlTYlZkUXlq?= =?utf-8?B?azBvMEp1alk4bkxSRGd6RDdaMmRxWDAzOTIyVjEyTHR3aWtYODFGbmFrVDV6?= =?utf-8?B?VTlmaklTUUhFV1lQKytMNEJoN2JJcmdlZ2RENkRHa2FDTEJiN0I1WEZ4dlJS?= =?utf-8?B?SjZWWC9KTWw1QU9ZUjM0T0RQamczSzR0SmZ4am1UYXdTM3U0dG43WWpmQ3hn?= =?utf-8?B?WlpLdU1DdkFmcUk2U2hVd2pwcWN2UE9FckV0dS85OFNMcjdBNkFaY1d5UFFJ?= =?utf-8?B?VnFoMDhnWnZYZ2hBbFROMWtBOWNXWUhGNG8rdDRDWnYyOUs4WVBQOGZZUU50?= =?utf-8?B?eFBoMzU4byszU1RycU5qbHllV3JYZENxYnpZL0UwemZoQStyRzJoRjJqWjhD?= =?utf-8?B?TFp3aFJzbC83MFY2MmNQZE9mbzNRSzdwZ0s2aTRxd1FMcjRpalprdG9vOFl2?= =?utf-8?B?Tll5ckNIN3l6cHhveEluaktDeDhUNVpXZW5WSkRBakZkL2FGRVFvT3l3elVO?= =?utf-8?B?WG5NU3Fxb2o3eGFtN0VaVnM3MnNCd1RiVnRuWU84c2JsOXFYNE9GN09menJj?= =?utf-8?B?M09FbkpZaU41UCtBV2FVblJ4R29CRlVBYTkrYy9GbzVmOWlUV0d5ck5oekJR?= =?utf-8?B?blU2U3VRL3B0dGkxVHB2RTlhcE9iaDkvUHBRYS95NmJubTJvblBKd2MweDI4?= =?utf-8?B?MmNpOU1vR0Q0ZFB5ZXlDZ0k3eElxbmh2ejgrN1dvUHZtTDRpdzVUdkl3cy9S?= =?utf-8?B?OWVvZ3FTNmxjeUdwNm5lS21SV1k2V2U0VHN2NUNqS052TUVhS2U0QzdHaTNO?= =?utf-8?B?eWRvVHRhckMrYVdtUFZYODBBOG02YWRBajloOVU5OWdKODFwS3g2cVBTRzdH?= =?utf-8?B?SHNrckRpYUpLSVNpQ2tSQ2YrM3BqY2ZEMVNNTU55czA0RnVMOFlkQ1Njc0hx?= =?utf-8?B?UEZnK2p5SDl5Z0xiS0syTm41dWJ1bWEzYmdIRFFta2dvL2dhQ2RVSzNValNC?= =?utf-8?B?aFRpMzN2ZUpxNmV6OGF1Y1hSdWFvTC9BOWF0LzEwamV0NStLUzBJc1huMTMz?= =?utf-8?B?OFd3TFNTVGdnZmlSLzQwbFppMElxWTUyRlFqcnVObWFtbnVZd3h1TWRwZUdx?= =?utf-8?B?L1RNd3k0QkNmUjQyZ2hNSU9OMUdUYUUxNzBlUDZ0alE5MzFHNC9aK3U2V3o2?= =?utf-8?B?K3h1RXdNa005SnJJWkJxa0FUWFAyNXlUMUtZZk5rd3RIZjNFVTRPUUIyL3dR?= =?utf-8?B?WkNjemZMUUYvaTF1b2hDZ3g4Z3NCajU1eUFRcVhsOFJxSGFlbWFGNHd4c0JK?= =?utf-8?B?MjJPT2lVNUt1NGVhNFNRa0lHWmdiRURvbFlENStCRkMvc2Q5dGtDVkJyVEl3?= =?utf-8?B?cjVFOWFHWG41M2lnc3E5elJBRWNuV2lVZGprSWFlZWVOcHY5L3NueERkb0s5?= =?utf-8?B?d2Y1S1dGd0JReTc2MDdkSmQ3dmJtaVpUUVFNS3Y5bjkxRkFhbllJQjBJdzdh?= =?utf-8?B?TDFMR3lqa20rSS9HY0hYM0dYckxVQzdpV1N1bDh1T1E1SnM2NVlONTFHMGRx?= =?utf-8?B?UWZkYWRUYlpLd2dIb3NETW5VUisxV3ZIMXlkREhYOXpmYmp3SXJoSXdIamdm?= =?utf-8?B?cWZLMEV2dmZKdFJlTUtkRHkwY3FMOXNHdnloOU1uYld0K0Z2SVVQUzZRPT0=?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1404; 6:4LSIGVLH2VjSwE03ValJNdFtnn6VmsLQ/A5pie+rCfXph9UEKr8hvj64FuDEVQ4NzwouuwU7wIkBWxEwRPxzfkPYD1LAOK9pfP6BHnFWsVTyxCCc8zSCgOyC0FUqfyywUOsZAbnD4R7iz07smaZqP/xjVZeNXXZZeB51JQbdkbCCyYh4i/2Zwu4V9B7pldVfqRnL1lhZOQthoO8+1M3mgTyCPntdypyHXSd0YpaLBUMvJCsihAYYRcGE67/kmeCWEw4hRpBSl0w+Z7XMZRB/wwnp263RLSspmfXyznZ+6HgrBdRa7uSJROSidPX2Hwo2MbIJEy+SwJ4XeKcMk7XUgNXgFp34nqtBEDoIjPdz+1WyTEs+sf2XipvwxUii0Hzw6tAyZLM4rFicyhdkoR14g88fSFHx+JGDPgpiyGGjEiw=; 5:tUO02JOMUAKsHHx5muFVb/HEUG39ccpvT0pZbq7aLA/PHABMf/kGIGtHMaJUAoHl12djFbOTtw8y+n7qojr5AQ3mka5pJE3geMKBaovlgKC2yeVVQzzl4fh7JZ0sf1VM6C9TQvnw8jv0tDR6mmRXbw==; 24:cEsNjZi9BtLZxi9iCLjDyRPG6iZWSE53aZDdJnGpvSL7SRw/CLO2p/ZWE0lUYpZj9MnmN87LiHU4TYHprM2vUiBlgKvhJGJAc3IjIuNPjb4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1404; 7:x//Pkikl93DI1V+TpfhJKtcWmVg8BevWPRYMP1VEtXt7rPasMyDQp1kFCGhHkZ9OKIrjByYUlpFeX1BnR9849sB4wdqYpes0URcdMh1S4KdhNMrLKODpphzEa1pqrZ6uamW9SU+b3Trn9+M1qMEh31pJYEzlxgqyzrjEcaZFyoqyLBOziofocY6NLLdWfSxyRdVuV22YZqiWXOmTo2m80wAeplswMgwQ3Cs7qnaVLXeeDbWJwcxyMXoB+p8WoN8dEbf9QcuvpJILMFLcsZG95Srnkr0FzNYTEejStpfSwQnBR1yov5OtsvT0TortiC3KnokTXhPTSi47TNY36jQCmw==; 20:d09Wf+IX/WwdwSgojARX8m85r3D9t+oih4+FZRITIazgbOuwgi1ZeRPmKI0lbFypCPCMDlgu6PbsKf4IiNMVyHPvyvRzZBBG9hCqhVyr4wMIgafW10FSLyq82y2MUpSHHP4+TclmysbbGyYkfR+v3gDLXgUf+HGDo1XigR7XiC1mL1V0chOxIeVKvlqlRBxZW8JT5o6xn34Jx0BYZlmCEjWN0jg5fCluzUaxzCAcG72jeVvDjmgFFnreXqvI1/az X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2017 21:27:01.2408 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1404 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A version 5 device provides the primitive commands required for AES GCM. This patch adds support for en/decryption. Signed-off-by: Gary R Hook --- drivers/crypto/ccp/Makefile | 1 drivers/crypto/ccp/ccp-crypto-aes-galois.c | 257 ++++++++++++++++++++++++++++ drivers/crypto/ccp/ccp-crypto-main.c | 12 + drivers/crypto/ccp/ccp-crypto.h | 14 ++ drivers/crypto/ccp/ccp-dev-v5.c | 2 drivers/crypto/ccp/ccp-dev.h | 1 drivers/crypto/ccp/ccp-ops.c | 252 +++++++++++++++++++++++++++ include/linux/ccp.h | 9 + 8 files changed, 548 insertions(+) create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-galois.c diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile index 346ceb8..9ca1722 100644 --- a/drivers/crypto/ccp/Makefile +++ b/drivers/crypto/ccp/Makefile @@ -12,4 +12,5 @@ ccp-crypto-objs := ccp-crypto-main.o \ ccp-crypto-aes.o \ ccp-crypto-aes-cmac.o \ ccp-crypto-aes-xts.o \ + ccp-crypto-aes-galois.o \ ccp-crypto-sha.o diff --git a/drivers/crypto/ccp/ccp-crypto-aes-galois.c b/drivers/crypto/ccp/ccp-crypto-aes-galois.c new file mode 100644 index 0000000..8bc18c9 --- /dev/null +++ b/drivers/crypto/ccp/ccp-crypto-aes-galois.c @@ -0,0 +1,257 @@ +/* + * AMD Cryptographic Coprocessor (CCP) AES GCM crypto API support + * + * Copyright (C) 2016 Advanced Micro Devices, Inc. + * + * Author: Gary R Hook + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ccp-crypto.h" + +#define AES_GCM_IVSIZE 12 + +static int ccp_aes_gcm_complete(struct crypto_async_request *async_req, int ret) +{ + return ret; +} + +static int ccp_aes_gcm_setkey(struct crypto_aead *tfm, const u8 *key, + unsigned int key_len) +{ + struct ccp_ctx *ctx = crypto_aead_ctx(tfm); + + switch (key_len) { + case AES_KEYSIZE_128: + ctx->u.aes.type = CCP_AES_TYPE_128; + break; + case AES_KEYSIZE_192: + ctx->u.aes.type = CCP_AES_TYPE_192; + break; + case AES_KEYSIZE_256: + ctx->u.aes.type = CCP_AES_TYPE_256; + break; + default: + crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); + return -EINVAL; + } + + ctx->u.aes.mode = CCP_AES_MODE_GCM; + ctx->u.aes.key_len = key_len; + + memcpy(ctx->u.aes.key, key, key_len); + sg_init_one(&ctx->u.aes.key_sg, ctx->u.aes.key, key_len); + + return 0; +} + +static int ccp_aes_gcm_setauthsize(struct crypto_aead *tfm, + unsigned int authsize) +{ + return 0; +} + +static int ccp_aes_gcm_crypt(struct aead_request *req, bool encrypt) +{ + struct crypto_aead *tfm = crypto_aead_reqtfm(req); + struct ccp_ctx *ctx = crypto_aead_ctx(tfm); + struct ccp_aes_req_ctx *rctx = aead_request_ctx(req); + struct scatterlist *iv_sg = NULL; + unsigned int iv_len = 0; + int i; + int ret = 0; + + if (!ctx->u.aes.key_len) + return -EINVAL; + + if (ctx->u.aes.mode != CCP_AES_MODE_GCM) + return -EINVAL; + + if (!req->iv) + return -EINVAL; + + /* + * 5 parts: + * plaintext/ciphertext input + * AAD + * key + * IV + * Destination+tag buffer + */ + + /* According to the way AES GCM has been implemented here, + * per RFC 4106 it seems, the provided IV is fixed at 12 bytes, + * occupies the beginning of the IV array. Write a 32-bit + * integer after that (bytes 13-16) with a value of "1". + */ + memcpy(rctx->iv, req->iv, AES_GCM_IVSIZE); + for (i = 0; i < 3; i++) + rctx->iv[i + AES_GCM_IVSIZE] = 0; + rctx->iv[AES_BLOCK_SIZE - 1] = 1; + + /* Set up a scatterlist for the IV */ + iv_sg = &rctx->iv_sg; + iv_len = AES_BLOCK_SIZE; + sg_init_one(iv_sg, rctx->iv, iv_len); + + /* The AAD + plaintext are concatenated in the src buffer */ + memset(&rctx->cmd, 0, sizeof(rctx->cmd)); + INIT_LIST_HEAD(&rctx->cmd.entry); + rctx->cmd.engine = CCP_ENGINE_AES; + rctx->cmd.u.aes.type = ctx->u.aes.type; + rctx->cmd.u.aes.mode = ctx->u.aes.mode; + rctx->cmd.u.aes.action = + (encrypt) ? CCP_AES_ACTION_ENCRYPT : CCP_AES_ACTION_DECRYPT; + rctx->cmd.u.aes.key = &ctx->u.aes.key_sg; + rctx->cmd.u.aes.key_len = ctx->u.aes.key_len; + rctx->cmd.u.aes.iv = iv_sg; + rctx->cmd.u.aes.iv_len = iv_len; + rctx->cmd.u.aes.src = req->src; + rctx->cmd.u.aes.src_len = req->cryptlen; + rctx->cmd.u.aes.aad_len = req->assoclen; + + /* The cipher text + the tag are in the dst buffer */ + rctx->cmd.u.aes.dst = req->dst; + + ret = ccp_crypto_enqueue_request(&req->base, &rctx->cmd); + + return ret; +} + +static int ccp_aes_gcm_encrypt(struct aead_request *req) +{ + return ccp_aes_gcm_crypt(req, true); +} + +static int ccp_aes_gcm_decrypt(struct aead_request *req) +{ + return ccp_aes_gcm_crypt(req, false); +} + +static int ccp_aes_gcm_cra_init(struct crypto_aead *tfm) +{ + struct ccp_ctx *ctx = crypto_aead_ctx(tfm); + + ctx->complete = ccp_aes_gcm_complete; + ctx->u.aes.key_len = 0; + + crypto_aead_set_reqsize(tfm, sizeof(struct ccp_aes_req_ctx)); + + return 0; +} + +static void ccp_aes_gcm_cra_exit(struct crypto_tfm *tfm) +{ +} + +static struct aead_alg ccp_aes_gcm_defaults = { + .setkey = ccp_aes_gcm_setkey, + .setauthsize = ccp_aes_gcm_setauthsize, + .encrypt = ccp_aes_gcm_encrypt, + .decrypt = ccp_aes_gcm_decrypt, + .init = ccp_aes_gcm_cra_init, + .ivsize = AES_GCM_IVSIZE, + .maxauthsize = AES_BLOCK_SIZE, + .base = { + .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | + CRYPTO_ALG_ASYNC | + CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_NEED_FALLBACK, + .cra_blocksize = AES_BLOCK_SIZE, + .cra_ctxsize = sizeof(struct ccp_ctx), + .cra_priority = CCP_CRA_PRIORITY, + .cra_type = &crypto_ablkcipher_type, + .cra_exit = ccp_aes_gcm_cra_exit, + .cra_module = THIS_MODULE, + }, +}; + +struct ccp_aes_aead_def { + enum ccp_aes_mode mode; + unsigned int version; + const char *name; + const char *driver_name; + unsigned int blocksize; + unsigned int ivsize; + struct aead_alg *alg_defaults; +}; + +static struct ccp_aes_aead_def aes_aead_algs[] = { + { + .mode = CCP_AES_MODE_GHASH, + .version = CCP_VERSION(5, 0), + .name = "gcm(aes)", + .driver_name = "gcm-aes-ccp", + .blocksize = 1, + .ivsize = AES_BLOCK_SIZE, + .alg_defaults = &ccp_aes_gcm_defaults, + }, +}; + +static int ccp_register_aes_aead(struct list_head *head, + const struct ccp_aes_aead_def *def) +{ + struct ccp_crypto_aead *ccp_aead; + struct aead_alg *alg; + int ret; + + ccp_aead = kzalloc(sizeof(*ccp_aead), GFP_KERNEL); + if (!ccp_aead) + return -ENOMEM; + + INIT_LIST_HEAD(&ccp_aead->entry); + + ccp_aead->mode = def->mode; + + /* Copy the defaults and override as necessary */ + alg = &ccp_aead->alg; + *alg = *def->alg_defaults; + snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name); + snprintf(alg->base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s", + def->driver_name); + alg->base.cra_blocksize = def->blocksize; + alg->base.cra_ablkcipher.ivsize = def->ivsize; + + ret = crypto_register_aead(alg); + if (ret) { + pr_err("%s ablkcipher algorithm registration error (%d)\n", + alg->base.cra_name, ret); + kfree(ccp_aead); + return ret; + } + + list_add(&ccp_aead->entry, head); + + return 0; +} + +int ccp_register_aes_aeads(struct list_head *head) +{ + int i, ret; + unsigned int ccpversion = ccp_version(); + + for (i = 0; i < ARRAY_SIZE(aes_aead_algs); i++) { + if (aes_aead_algs[i].version > ccpversion) + continue; + ret = ccp_register_aes_aead(head, &aes_aead_algs[i]); + if (ret) + return ret; + } + + return 0; +} diff --git a/drivers/crypto/ccp/ccp-crypto-main.c b/drivers/crypto/ccp/ccp-crypto-main.c index e0380e5..a33b8d6 100644 --- a/drivers/crypto/ccp/ccp-crypto-main.c +++ b/drivers/crypto/ccp/ccp-crypto-main.c @@ -36,6 +36,7 @@ /* List heads for the supported algorithms */ static LIST_HEAD(hash_algs); static LIST_HEAD(cipher_algs); +static LIST_HEAD(aead_algs); /* For any tfm, requests for that tfm must be returned on the order * received. With multiple queues available, the CCP can process more @@ -335,6 +336,10 @@ static int ccp_register_algs(void) ret = ccp_register_aes_xts_algs(&cipher_algs); if (ret) return ret; + + ret = ccp_register_aes_aeads(&aead_algs); + if (ret) + return ret; } if (!sha_disable) { @@ -350,6 +355,7 @@ static void ccp_unregister_algs(void) { struct ccp_crypto_ahash_alg *ahash_alg, *ahash_tmp; struct ccp_crypto_ablkcipher_alg *ablk_alg, *ablk_tmp; + struct ccp_crypto_aead *aead_alg, *aead_tmp; list_for_each_entry_safe(ahash_alg, ahash_tmp, &hash_algs, entry) { crypto_unregister_ahash(&ahash_alg->alg); @@ -362,6 +368,12 @@ static void ccp_unregister_algs(void) list_del(&ablk_alg->entry); kfree(ablk_alg); } + + list_for_each_entry_safe(aead_alg, aead_tmp, &aead_algs, entry) { + crypto_unregister_aead(&aead_alg->alg); + list_del(&aead_alg->entry); + kfree(aead_alg); + } } static int ccp_crypto_init(void) diff --git a/drivers/crypto/ccp/ccp-crypto.h b/drivers/crypto/ccp/ccp-crypto.h index 95cce27..34da62d 100644 --- a/drivers/crypto/ccp/ccp-crypto.h +++ b/drivers/crypto/ccp/ccp-crypto.h @@ -19,6 +19,8 @@ #include #include #include +#include +#include #include #include #include @@ -33,6 +35,14 @@ struct ccp_crypto_ablkcipher_alg { struct crypto_alg alg; }; +struct ccp_crypto_aead { + struct list_head entry; + + u32 mode; + + struct aead_alg alg; +}; + struct ccp_crypto_ahash_alg { struct list_head entry; @@ -95,6 +105,9 @@ struct ccp_aes_req_ctx { struct scatterlist iv_sg; u8 iv[AES_BLOCK_SIZE]; + struct scatterlist tag_sg; + u8 tag[AES_BLOCK_SIZE]; + /* Fields used for RFC3686 requests */ u8 *rfc3686_info; u8 rfc3686_iv[AES_BLOCK_SIZE]; @@ -212,6 +225,7 @@ struct scatterlist *ccp_crypto_sg_table_add(struct sg_table *table, int ccp_register_aes_algs(struct list_head *head); int ccp_register_aes_cmac_algs(struct list_head *head); int ccp_register_aes_xts_algs(struct list_head *head); +int ccp_register_aes_aeads(struct list_head *head); int ccp_register_sha_algs(struct list_head *head); #endif diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c index d9e1876..d44a738 100644 --- a/drivers/crypto/ccp/ccp-dev-v5.c +++ b/drivers/crypto/ccp/ccp-dev-v5.c @@ -289,6 +289,8 @@ static int ccp5_perform_aes(struct ccp_op *op) CCP_AES_TYPE(&function) = op->u.aes.type; if (op->u.aes.mode == CCP_AES_MODE_CFB) CCP_AES_SIZE(&function) = 0x7f; + if ((op->u.aes.mode == CCP_AES_MODE_GCTR) && op->eom) + CCP_AES_SIZE(&function) = op->u.aes.size; CCP5_CMD_FUNCTION(&desc) = function.raw; diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h index 830f35e..8f313e6 100644 --- a/drivers/crypto/ccp/ccp-dev.h +++ b/drivers/crypto/ccp/ccp-dev.h @@ -466,6 +466,7 @@ struct ccp_aes_op { enum ccp_aes_type type; enum ccp_aes_mode mode; enum ccp_aes_action action; + unsigned int size; }; struct ccp_xts_aes_op { diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c index 213a752..83c8cf7 100644 --- a/drivers/crypto/ccp/ccp-ops.c +++ b/drivers/crypto/ccp/ccp-ops.c @@ -600,6 +600,255 @@ static int ccp_run_aes_cmac_cmd(struct ccp_cmd_queue *cmd_q, return ret; } +static int ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q, + struct ccp_cmd *cmd) +{ + struct ccp_aes_engine *aes = &cmd->u.aes; + struct ccp_dm_workarea key, ctx, final_wa, tag; + struct ccp_data src, dst; + struct ccp_data aad; + struct ccp_op op; + + unsigned long long *final; + unsigned int dm_offset; + unsigned int ilen; + bool in_place = true; /* Default value */ + int ret; + + struct scatterlist *p_inp, sg_inp[2]; + struct scatterlist *p_tag, sg_tag[2]; + struct scatterlist *p_outp, sg_outp[2]; + struct scatterlist *p_aad; + + if (!aes->iv) + return -EINVAL; + + if (!((aes->key_len == AES_KEYSIZE_128) || + (aes->key_len == AES_KEYSIZE_192) || + (aes->key_len == AES_KEYSIZE_256))) + return -EINVAL; + + if (!aes->key) /* Gotta have a key SGL */ + return -EINVAL; + + /* First, decompose the source buffer into AAD & PT, + * and the destination buffer into AAD, CT & tag, or + * the input into CT & tag. + * It is expected that the input and output SGs will + * be valid, even if the AAD and input lengths are 0. + */ + p_aad = aes->src; + p_inp = scatterwalk_ffwd(sg_inp, aes->src, aes->aad_len); + p_outp = scatterwalk_ffwd(sg_outp, aes->dst, aes->aad_len); + if (aes->action == CCP_AES_ACTION_ENCRYPT) { + ilen = aes->src_len; + p_tag = scatterwalk_ffwd(sg_tag, p_outp, ilen); + } else { + /* Input length for decryption includes tag */ + ilen = aes->src_len - AES_BLOCK_SIZE; + p_tag = scatterwalk_ffwd(sg_tag, p_inp, ilen); + } + + memset(&op, 0, sizeof(op)); + op.cmd_q = cmd_q; + op.jobid = CCP_NEW_JOBID(cmd_q->ccp); + op.sb_key = cmd_q->sb_key; /* Pre-allocated */ + op.sb_ctx = cmd_q->sb_ctx; /* Pre-allocated */ + op.init = 1; + op.u.aes.type = aes->type; + + /* Copy the key to the LSB */ + ret = ccp_init_dm_workarea(&key, cmd_q, + CCP_AES_CTX_SB_COUNT * CCP_SB_BYTES, + DMA_TO_DEVICE); + if (ret) + return ret; + + dm_offset = CCP_SB_BYTES - aes->key_len; + ccp_set_dm_area(&key, dm_offset, aes->key, 0, aes->key_len); + ret = ccp_copy_to_sb(cmd_q, &key, op.jobid, op.sb_key, + CCP_PASSTHRU_BYTESWAP_256BIT); + if (ret) { + cmd->engine_error = cmd_q->cmd_error; + goto e_key; + } + + /* Copy the context (IV) to the LSB. + * There is an assumption here that the IV is 96 bits in length, plus + * a nonce of 32 bits. If no IV is present, use a zeroed buffer. + */ + ret = ccp_init_dm_workarea(&ctx, cmd_q, + CCP_AES_CTX_SB_COUNT * CCP_SB_BYTES, + DMA_BIDIRECTIONAL); + if (ret) + goto e_key; + + dm_offset = CCP_AES_CTX_SB_COUNT * CCP_SB_BYTES - aes->iv_len; + ccp_set_dm_area(&ctx, dm_offset, aes->iv, 0, aes->iv_len); + + ret = ccp_copy_to_sb(cmd_q, &ctx, op.jobid, op.sb_ctx, + CCP_PASSTHRU_BYTESWAP_256BIT); + if (ret) { + cmd->engine_error = cmd_q->cmd_error; + goto e_ctx; + } + + op.init = 1; + if (aes->aad_len > 0) { + /* Step 1: Run a GHASH over the Additional Authenticated Data */ + ret = ccp_init_data(&aad, cmd_q, p_aad, aes->aad_len, + AES_BLOCK_SIZE, + DMA_TO_DEVICE); + if (ret) + goto e_ctx; + + op.u.aes.mode = CCP_AES_MODE_GHASH; + op.u.aes.action = CCP_AES_GHASHAAD; + + while (aad.sg_wa.bytes_left) { + ccp_prepare_data(&aad, NULL, &op, AES_BLOCK_SIZE, true); + + ret = cmd_q->ccp->vdata->perform->aes(&op); + if (ret) { + cmd->engine_error = cmd_q->cmd_error; + goto e_aad; + } + + ccp_process_data(&aad, NULL, &op); + op.init = 0; + } + } + + op.u.aes.mode = CCP_AES_MODE_GCTR; + op.u.aes.action = aes->action; + + if (ilen > 0) { + /* Step 2: Run a GCTR over the plaintext */ + in_place = (sg_virt(p_inp) == sg_virt(p_outp)) ? true : false; + + ret = ccp_init_data(&src, cmd_q, p_inp, ilen, + AES_BLOCK_SIZE, + in_place ? DMA_BIDIRECTIONAL + : DMA_TO_DEVICE); + if (ret) + goto e_ctx; + + if (in_place) { + dst = src; + } else { + ret = ccp_init_data(&dst, cmd_q, p_outp, ilen, + AES_BLOCK_SIZE, DMA_FROM_DEVICE); + if (ret) + goto e_src; + } + + op.soc = 0; + op.eom = 0; + op.init = 1; + while (src.sg_wa.bytes_left) { + ccp_prepare_data(&src, &dst, &op, AES_BLOCK_SIZE, true); + if (!src.sg_wa.bytes_left) { + unsigned int nbytes = aes->src_len + % AES_BLOCK_SIZE; + + if (nbytes) { + op.eom = 1; + op.u.aes.size = (nbytes * 8) - 1; + } + } + + ret = cmd_q->ccp->vdata->perform->aes(&op); + if (ret) { + cmd->engine_error = cmd_q->cmd_error; + goto e_dst; + } + + ccp_process_data(&src, &dst, &op); + op.init = 0; + } + } + + /* Step 3: Update the IV portion of the context with the original IV */ + ret = ccp_copy_from_sb(cmd_q, &ctx, op.jobid, op.sb_ctx, + CCP_PASSTHRU_BYTESWAP_256BIT); + if (ret) { + cmd->engine_error = cmd_q->cmd_error; + goto e_dst; + } + + ccp_set_dm_area(&ctx, dm_offset, aes->iv, 0, aes->iv_len); + + ret = ccp_copy_to_sb(cmd_q, &ctx, op.jobid, op.sb_ctx, + CCP_PASSTHRU_BYTESWAP_256BIT); + if (ret) { + cmd->engine_error = cmd_q->cmd_error; + goto e_dst; + } + + /* Step 4: Concatenate the lengths of the AAD and source, and + * hash that 16 byte buffer. + */ + ret = ccp_init_dm_workarea(&final_wa, cmd_q, AES_BLOCK_SIZE, + DMA_BIDIRECTIONAL); + if (ret) + goto e_dst; + final = (unsigned long long *) final_wa.address; + final[0] = cpu_to_be64(aes->aad_len * 8); + final[1] = cpu_to_be64(ilen * 8); + + op.u.aes.mode = CCP_AES_MODE_GHASH; + op.u.aes.action = CCP_AES_GHASHFINAL; + op.src.type = CCP_MEMTYPE_SYSTEM; + op.src.u.dma.address = final_wa.dma.address; + op.src.u.dma.length = AES_BLOCK_SIZE; + op.dst.type = CCP_MEMTYPE_SYSTEM; + op.dst.u.dma.address = final_wa.dma.address; + op.dst.u.dma.length = AES_BLOCK_SIZE; + op.eom = 1; + op.u.aes.size = 0; + ret = cmd_q->ccp->vdata->perform->aes(&op); + if (ret) + goto e_dst; + + if (aes->action == CCP_AES_ACTION_ENCRYPT) { + /* Put the ciphered tag after the ciphertext. */ + ccp_get_dm_area(&final_wa, 0, p_tag, 0, AES_BLOCK_SIZE); + } else { + /* Does this ciphered tag match the input? */ + ret = ccp_init_dm_workarea(&tag, cmd_q, AES_BLOCK_SIZE, + DMA_BIDIRECTIONAL); + if (ret) + goto e_tag; + ccp_set_dm_area(&tag, 0, p_tag, 0, AES_BLOCK_SIZE); + + ret = memcmp(tag.address, final_wa.address, AES_BLOCK_SIZE); + ccp_dm_free(&tag); + } + +e_tag: + ccp_dm_free(&final_wa); + +e_dst: + if (aes->src_len && !in_place) + ccp_free_data(&dst, cmd_q); + +e_src: + if (aes->src_len) + ccp_free_data(&src, cmd_q); + +e_aad: + if (aes->aad_len) + ccp_free_data(&aad, cmd_q); + +e_ctx: + ccp_dm_free(&ctx); + +e_key: + ccp_dm_free(&key); + + return ret; +} + static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) { struct ccp_aes_engine *aes = &cmd->u.aes; @@ -613,6 +862,9 @@ static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) if (aes->mode == CCP_AES_MODE_CMAC) return ccp_run_aes_cmac_cmd(cmd_q, cmd); + if (aes->mode == CCP_AES_MODE_GCM) + return ccp_run_aes_gcm_cmd(cmd_q, cmd); + if (!((aes->key_len == AES_KEYSIZE_128) || (aes->key_len == AES_KEYSIZE_192) || (aes->key_len == AES_KEYSIZE_256))) diff --git a/include/linux/ccp.h b/include/linux/ccp.h index 90a1fbe..6f78295 100644 --- a/include/linux/ccp.h +++ b/include/linux/ccp.h @@ -123,6 +123,10 @@ enum ccp_aes_mode { CCP_AES_MODE_CFB, CCP_AES_MODE_CTR, CCP_AES_MODE_CMAC, + CCP_AES_MODE_GHASH, + CCP_AES_MODE_GCTR, + CCP_AES_MODE_GCM, + CCP_AES_MODE_GMAC, CCP_AES_MODE__LAST, }; @@ -137,6 +141,9 @@ enum ccp_aes_action { CCP_AES_ACTION_ENCRYPT, CCP_AES_ACTION__LAST, }; +/* Overloaded field */ +#define CCP_AES_GHASHAAD CCP_AES_ACTION_DECRYPT +#define CCP_AES_GHASHFINAL CCP_AES_ACTION_ENCRYPT /** * struct ccp_aes_engine - CCP AES operation @@ -181,6 +188,8 @@ struct ccp_aes_engine { struct scatterlist *cmac_key; /* K1/K2 cmac key required for * final cmac cmd */ u32 cmac_key_len; /* In bytes */ + + u32 aad_len; /* In bytes */ }; /***** XTS-AES engine *****/