From patchwork Wed Jan 10 09:42:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kumar, Ravi1" X-Patchwork-Id: 33410 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 51C4D1B1E5; Wed, 10 Jan 2018 10:43:48 +0100 (CET) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0074.outbound.protection.outlook.com [104.47.42.74]) by dpdk.org (Postfix) with ESMTP id BC7901B231 for ; Wed, 10 Jan 2018 10:43:37 +0100 (CET) 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=inyWYOBER3e6+qtPnmL5/2ZIlpMI7QQ12FJdMiltrJU=; b=MQekhmvwOhhwAJ/LAFSoRq+fKBp2sfzTDfhxusMfEkaZWmTjO6IfLw/RtMhI+7LPwuxULPUXTyxS0IBaLg3no+JBdotZorWzpEI91UyQ6vaNFKh4seszozPz67kiJnDOiqtbHeIIHC8kmv2v2pdVe8RARH0t/yqYDprKpvhJgRw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Ravi1.Kumar@amd.com; Received: from wallaby-smavila.amd.com (202.56.249.162) by CY4PR12MB1509.namprd12.prod.outlook.com (10.172.68.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Wed, 10 Jan 2018 09:43:34 +0000 From: Ravi Kumar To: dev@dpdk.org Cc: pablo.de.lara.guarch@intel.com Date: Wed, 10 Jan 2018 04:42:50 -0500 Message-Id: <1515577379-18453-10-git-send-email-Ravi1.kumar@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515577379-18453-1-git-send-email-Ravi1.kumar@amd.com> References: <1515145198-97367-1-git-send-email-Ravi1.kumar@amd.com> <1515577379-18453-1-git-send-email-Ravi1.kumar@amd.com> MIME-Version: 1.0 X-Originating-IP: [202.56.249.162] X-ClientProxiedBy: MAXPR0101CA0024.INDPRD01.PROD.OUTLOOK.COM (10.174.62.34) To CY4PR12MB1509.namprd12.prod.outlook.com (10.172.68.22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 31b862d6-4559-45d1-77a4-08d5580e9e84 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020049)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:CY4PR12MB1509; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1509; 3:CXHSrnzWreUBYQv3zZ5Zx30kph+5kchHFmsf0x8jEMDm23E3j1CDFaCUg2/gu9Tazy9zgWMTRh2wRUN9Q4iGo/Y8X1/u+h1AS0jE5DzQtPrcJQK6BNKiBzOh1LQmsnLM8KmNWoXPMu3OdsfsFQbXIr8AnvQOJXHTkur7wd+/IWslj077yOLjEIk252CdrBiZ+PT0lt5nqpWuXB84+8Bf82FzgxjIknFy+NvDtCowcnFceDQX90CvQOPwrn+ejFaK; 25:x1F1gCyv4BWtheoLPh3UI1YN8hGXGwwNgvSpQYv5/lOSoWqBHQRgYFwEI5/IkidC/TW3F44icv4bm+aa6efcoc0uaqcDrXRems1yEwgcK1mbCrlNWovwFtPeEO57WnUm+JctGrFzrtJFkQXvH+OEIRi8rmidRv4rJQkvrIzyODTNijrg1uZUHjm/BT2GQ/DHNt+0dcbP/A3kzDC1PTkFgE70njKfqOmeJBGYc4spGS9YcP9Ryh43hQm3G7GixGBpE0aXfOs5+wQVcLaqJxWWZnJRO9VHxIFBl7o9h2dQOdoz9MyxJ42hOfRnv5ylis1jgr++qmz15FvD5f6ckicQDg==; 31:3DVBDKyeY6q+xmYT5jEPK+IXnmQk35+HJHoZ6tjy7kKb3Ez2/OKNzpo9CAvvw337t1LYfO4eziY0Eypnd8PDoYwqbaqwEY7trX9IbOXeO1B+Rt+0c/ZD7Awkt/gttq3sqWJ8ErgXUFXqbXxFge9Z+JxqDwCWB/u5pmxiAR0iv3BAT5D+RpH7Z9KB10vzBLuNwNAqMKsWgjtsqCcLVSZYQfoMt2OCeYht65G95iiipmo= X-MS-TrafficTypeDiagnostic: CY4PR12MB1509: X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1509; 20:gNaF9D1Vk+2gqt3ESVCgVR+Yr7FpZDrQCtJxu6ONaxp5w7tBS9pLlv+7hs/TQa4tz/zedGAY4SaHNDtN39oFngHXF3dXWFNXaFijL6jXy25fJ/CWGO1g9j6S122eQZgGPbxhSPXjtzuD/Z4WXEqvUO6nsb0CePqm5lNrz+g7te4tbQ4ZQirJ9nUEFH9OPt/4NylEFNqXRRF2IIrErMdw8a7ds1PYJe9hgSs+3G0sb4ydevq0MtPjhvMmXPUVx8dog9uXygxaMUdtNUoj1dOwqQl1Qz7Wz4Gm7NaI3XkK/3arZZ9L78LbTaEGKehkt1SItwE7VeISTQKaULlODhpnB707ryjHFTKZiV9HrpQ255y1cCX5JUxEtnDCj7u5lH87qQqCaqqDicVP4H0eium5VT0Cud0dVOstmkn84ZC3L2nqCWyt62vJclKUQTzeqTJFzbFnzDlstSV1KtcDpsKBFdd+M8NF0zBAKrbCftE0sHI3kpLWKtTa64ZMQlEfkppJ; 4:xuraIDgVxeVX4OZhFumNRvkOOBPWc4mIHsy22bM1K8rUk+ANVPbJqwRy9YEhawsvpD9poPUsohag1w1AiGBI2W9s6/O4eSNIpXBjpRzLcE4Wk4D2xNnv8aw+6XxT1cdnrh/CWGLHgJKYt1usuraRyL2fFE1lYkvGbqSie2pVG8PWzw0bmWs3sRl3xHgM1v06o8uoa6mj4lAK368di/MB/VSr2hbqNDTSzZCNWZmO7UhpuQAL/u97Z0Ty/IiF+7LSgMnV7VBQxUKFfTJ2ZjMas5PPq4VgWjTEnQAKSWwnFqn6Bd6+asGK0rM9NeCaYZrB X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231023)(944501119)(6055026)(6041268)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:CY4PR12MB1509; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY4PR12MB1509; X-Forefront-PRVS: 0548586081 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39860400002)(396003)(346002)(376002)(39380400002)(189003)(199004)(25786009)(8676002)(81166006)(47776003)(48376002)(6666003)(2950100002)(81156014)(6916009)(66066001)(50226002)(68736007)(36756003)(8936002)(16586007)(72206003)(50466002)(16526018)(316002)(53936002)(478600001)(5660300001)(86362001)(4326008)(386003)(2361001)(2351001)(6486002)(53416004)(97736004)(51416003)(76176011)(106356001)(105586002)(7736002)(6116002)(3846002)(2906002)(59450400001)(305945005)(7696005)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1509; H:wallaby-smavila.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1509; 23:nmvSjmgkGYGyhdilOTc7KqDPV0RZsdR7ADKtM2HDo?= RgWQkhQ1ids5K8vbXX6O39ha2VjplId53ZSIuQowXa0bRxFDGgWjMEeg7GM0J48NNF9bJmXo4vqpYCPpHHujhVwaTAMGM4dJOWDDljUofjv/MB7slzW3m1n2HpZ+ikdz8JWy8bF+33RX2M07xFbr76b/S3z77qxt5d61bzI5dvoYDHmlzXGZN1j27UYdSNCnGMdZDdqCyzwjWvb0O/36d23FqaDslMLGrnGs9fuddlscHSAlct5u8K6WlT0t4QYCY84HyfXovEMPSLk9TR8GQd5ew20zsfKhOGYWmdmpxh0WUu4TfGEJu04l1osv0QPWZ5qDpb6+aFH7fO4ahpmeEr6U6HWKqYln8K3gXHm4ya7BrNT4iUwbm9UYaW9KJi1J2CXZ6mb+oNPq+w7k89fVcGfrR7C5QfqrL9at4G4cQ2EdT3ixuSL8nOZYuN2kdB83RuGLZIEUEnMbIpvRfF3Tnf1HzsOwM9RcL0JP9BrgHM+/JGk3R1ALvFkc+x1CnmfP++b28e5acD1Rxs5RXkbZ5H8T5pkwlwW5WtFfuc9BfzSib9LLx2fvt+Dl/n05amLEEFIjePNoR3nwXTl48HqkvYlM+G3jI9SlwxQxyKCSX8ZYqmvQUviwYVhYMhffEXsD+UWMiPBr9OoVZvTCo/I4mBL8HgykH2+mWMmQH72iakf9i4FNrKU2vcpxJWvD7vFIgCumDUnActMjI4dMTEcJUXh4A02HPSA7V1pJK9WKNCJTBJ7BKbZNz+fLSY78apNZtiLudj50vM0t0+vnjnYdU/CQmuwHo7omjHkILsLnqHSGakcPA0VruZhek1UTbMcW9RUqxJpX9ospuPwAcwd+p39qdh8zuu2RWU+i3fYdO5eaFjhKMq3SAjgWGZBBUHn0/oNlJTZCEe+E4/O1tALIShVkBm+jcODNxiP9ScLATeKAUMDceGLiU7fpLeIwsCY/V0ofr2/JvINer4s6V3SRVNlW0jitKzmxa2XEE3ibF/Za35dc7UfO0pYL4O2cTxOZVBnnLJIEwwsQk2R4kxw7mJN26je7KkBuiq2gcIV2omkpLWJcH77AveNGsw5ofau+LKBUocNqJs7lAnESnoIENST6JdXILjbBcE7t1ynInLVzA== X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1509; 6:9wy2t7gCzB5yHizxyWewifEaJ6f9p7Ryg7QCUvZxErju3mDhJdZu9GtCFEwXzRQR3UQzfcmrIpxtZxA8WcC3Rq3ODTPHWN+AitBVCzySlC0KJftTVQJ7NGG0hUnDBH9//CFqJHuxK1NVI04tl8AzHuGcavaBCwNfNzcdUrViY3lyELXzkvzKKof5pUGKqkdlIuXaY+RO0yKo9Y+hkMaqjEKLyunZO6rS0dYX1ZR/jer5H4QGtsnW9JXT6IktIM1AB2YrC2YLGVus2VKWSNDF+vCX0dbUPozFlmDLriKaWC8Zuh9ypWYMcY4b5HBUhZTNvGWVa0BKQmvkKyfcUBScLAGADh+l8o3z/DCbPfXenX8=; 5:h8970U41CzRSUfUISi7vxmfdpY8M6CZzPvxzlAAU0iYHoz5wBTWd/iI0av1wZOlu9IaLBW6MJ6JvDMmJU9VEzN8Qs1ax/x/jTinMhWJhuTMEQHGBLHp3dqbtSvNdC8m0XUrye/HQurxEiNqA+HQcAt0PkuxcLYKxXO54L1gUvNI=; 24:drWbStNAIUI2ZR193Qj6ysCJbufdhqZIbvQ7PkrTP+bS88PrcCRkvkRUHV1jc4vyO7Cro1jJy8pHyNKxemUyGFqj48/T1ZSZDQf3KJjH9ms=; 7:2swB1KwcfmpfrlB1umtqyEuv+jA24cXTc6CxmjUBeHZRMTFnNW+KLkP3bqcSA86s9VwNYZRRtg27ISVdEkVeM/A94pmKIuESVcXizw0C1MekrfnEg2s88r/zVZeruICwtbhxR97asf4Y7OBnLJdValYJEIteYKhi1Z5dtNLVvqrEPVZhMbkXu0vMR2h1PrUNvzPR4eNNs6IITvoABYKlGnwfHkjaAZhpa4SFvCqJ7DHv0wFAHwwuvu+1SMNCI25O SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1509; 20:+iuECcd+cdPuzMHA/bfbKztek1HBiJZqub7XT9nxGMibzETvXkxPPfh0n/Aw0NLOpfy9/KLQU7DTTrxOzkzA6Pq5kpPzWKxABu6bPpm7+OM0amYH1qbb41EnaApzkhbvw+rRfqhqXV39SSSIC6getgEtyJ8zy5rEK/aJBGzkXmEL+i9sSEzhcrcH34s+x/X8FYqkJC/3m0U1u28gfuBVEdS+VmtEVLE5I0R9BqVVJdcR3o31iq6u/wZlNJyx5nCt X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 09:43:34.5842 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 31b862d6-4559-45d1-77a4-08d5580e9e84 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1509 Subject: [dpdk-dev] [PATCH v3 10/19] crypto/ccp: support aes cipher algo 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" Signed-off-by: Ravi Kumar --- drivers/crypto/ccp/ccp_crypto.c | 197 ++++++++++++++++++++++++++++++++++++++- drivers/crypto/ccp/ccp_crypto.h | 13 +++ drivers/crypto/ccp/ccp_dev.h | 53 +++++++++++ drivers/crypto/ccp/ccp_pmd_ops.c | 60 ++++++++++++ 4 files changed, 321 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_crypto.c index c17e84f..b097355 100644 --- a/drivers/crypto/ccp/ccp_crypto.c +++ b/drivers/crypto/ccp/ccp_crypto.c @@ -80,6 +80,7 @@ ccp_configure_session_cipher(struct ccp_session *sess, const struct rte_crypto_sym_xform *xform) { const struct rte_crypto_cipher_xform *cipher_xform = NULL; + size_t i; cipher_xform = &xform->cipher; @@ -99,6 +100,21 @@ ccp_configure_session_cipher(struct ccp_session *sess, sess->iv.length = cipher_xform->iv.length; switch (cipher_xform->algo) { + case RTE_CRYPTO_CIPHER_AES_CTR: + sess->cipher.algo = CCP_CIPHER_ALGO_AES_CTR; + sess->cipher.um.aes_mode = CCP_AES_MODE_CTR; + sess->cipher.engine = CCP_ENGINE_AES; + break; + case RTE_CRYPTO_CIPHER_AES_ECB: + sess->cipher.algo = CCP_CIPHER_ALGO_AES_CBC; + sess->cipher.um.aes_mode = CCP_AES_MODE_ECB; + sess->cipher.engine = CCP_ENGINE_AES; + break; + case RTE_CRYPTO_CIPHER_AES_CBC: + sess->cipher.algo = CCP_CIPHER_ALGO_AES_CBC; + sess->cipher.um.aes_mode = CCP_AES_MODE_CBC; + sess->cipher.engine = CCP_ENGINE_AES; + break; default: CCP_LOG_ERR("Unsupported cipher algo"); return -1; @@ -106,10 +122,27 @@ ccp_configure_session_cipher(struct ccp_session *sess, switch (sess->cipher.engine) { + case CCP_ENGINE_AES: + if (sess->cipher.key_length == 16) + sess->cipher.ut.aes_type = CCP_AES_TYPE_128; + else if (sess->cipher.key_length == 24) + sess->cipher.ut.aes_type = CCP_AES_TYPE_192; + else if (sess->cipher.key_length == 32) + sess->cipher.ut.aes_type = CCP_AES_TYPE_256; + else { + CCP_LOG_ERR("Invalid cipher key length"); + return -1; + } + for (i = 0; i < sess->cipher.key_length ; i++) + sess->cipher.key_ccp[sess->cipher.key_length - i - 1] = + sess->cipher.key[i]; + break; default: CCP_LOG_ERR("Invalid CCP Engine"); return -ENOTSUP; } + sess->cipher.nonce_phys = rte_mem_virt2phy(sess->cipher.nonce); + sess->cipher.key_phys = rte_mem_virt2phy(sess->cipher.key_ccp); return 0; } @@ -235,6 +268,18 @@ ccp_cipher_slot(struct ccp_session *session) int count = 0; switch (session->cipher.algo) { + case CCP_CIPHER_ALGO_AES_CBC: + count = 2; + /**< op + passthrough for iv */ + break; + case CCP_CIPHER_ALGO_AES_ECB: + count = 1; + /**cipher.algo); @@ -297,10 +342,146 @@ ccp_compute_slot_count(struct ccp_session *session) return count; } +static void +ccp_perform_passthru(struct ccp_passthru *pst, + struct ccp_queue *cmd_q) +{ + struct ccp_desc *desc; + union ccp_function function; + + desc = &cmd_q->qbase_desc[cmd_q->qidx]; + + CCP_CMD_ENGINE(desc) = CCP_ENGINE_PASSTHRU; + + CCP_CMD_SOC(desc) = 0; + CCP_CMD_IOC(desc) = 0; + CCP_CMD_INIT(desc) = 0; + CCP_CMD_EOM(desc) = 0; + CCP_CMD_PROT(desc) = 0; + + function.raw = 0; + CCP_PT_BYTESWAP(&function) = pst->byte_swap; + CCP_PT_BITWISE(&function) = pst->bit_mod; + CCP_CMD_FUNCTION(desc) = function.raw; + + CCP_CMD_LEN(desc) = pst->len; + + if (pst->dir) { + CCP_CMD_SRC_LO(desc) = (uint32_t)(pst->src_addr); + CCP_CMD_SRC_HI(desc) = high32_value(pst->src_addr); + CCP_CMD_SRC_MEM(desc) = CCP_MEMTYPE_SYSTEM; + + CCP_CMD_DST_LO(desc) = (uint32_t)(pst->dest_addr); + CCP_CMD_DST_HI(desc) = 0; + CCP_CMD_DST_MEM(desc) = CCP_MEMTYPE_SB; + + if (pst->bit_mod != CCP_PASSTHRU_BITWISE_NOOP) + CCP_CMD_LSB_ID(desc) = cmd_q->sb_key; + } else { + + CCP_CMD_SRC_LO(desc) = (uint32_t)(pst->src_addr); + CCP_CMD_SRC_HI(desc) = 0; + CCP_CMD_SRC_MEM(desc) = CCP_MEMTYPE_SB; + + CCP_CMD_DST_LO(desc) = (uint32_t)(pst->dest_addr); + CCP_CMD_DST_HI(desc) = high32_value(pst->dest_addr); + CCP_CMD_DST_MEM(desc) = CCP_MEMTYPE_SYSTEM; + } + + cmd_q->qidx = (cmd_q->qidx + 1) % COMMANDS_PER_QUEUE; +} + +static int +ccp_perform_aes(struct rte_crypto_op *op, + struct ccp_queue *cmd_q, + struct ccp_batch_info *b_info) +{ + struct ccp_session *session; + union ccp_function function; + uint8_t *lsb_buf; + struct ccp_passthru pst = {0}; + struct ccp_desc *desc; + phys_addr_t src_addr, dest_addr, key_addr; + uint8_t *iv; + + session = (struct ccp_session *)get_session_private_data( + op->sym->session, + ccp_cryptodev_driver_id); + function.raw = 0; + + iv = rte_crypto_op_ctod_offset(op, uint8_t *, session->iv.offset); + if (session->cipher.um.aes_mode != CCP_AES_MODE_ECB) { + if (session->cipher.um.aes_mode == CCP_AES_MODE_CTR) { + rte_memcpy(session->cipher.nonce + AES_BLOCK_SIZE, + iv, session->iv.length); + pst.src_addr = (phys_addr_t)session->cipher.nonce_phys; + CCP_AES_SIZE(&function) = 0x1F; + } else { + lsb_buf = + &(b_info->lsb_buf[b_info->lsb_buf_idx*CCP_SB_BYTES]); + rte_memcpy(lsb_buf + + (CCP_SB_BYTES - session->iv.length), + iv, session->iv.length); + pst.src_addr = b_info->lsb_buf_phys + + (b_info->lsb_buf_idx * CCP_SB_BYTES); + b_info->lsb_buf_idx++; + } + + pst.dest_addr = (phys_addr_t)(cmd_q->sb_iv * CCP_SB_BYTES); + pst.len = CCP_SB_BYTES; + pst.dir = 1; + pst.bit_mod = CCP_PASSTHRU_BITWISE_NOOP; + pst.byte_swap = CCP_PASSTHRU_BYTESWAP_256BIT; + ccp_perform_passthru(&pst, cmd_q); + } + + desc = &cmd_q->qbase_desc[cmd_q->qidx]; + + src_addr = rte_pktmbuf_mtophys_offset(op->sym->m_src, + op->sym->cipher.data.offset); + if (likely(op->sym->m_dst != NULL)) + dest_addr = rte_pktmbuf_mtophys_offset(op->sym->m_dst, + op->sym->cipher.data.offset); + else + dest_addr = src_addr; + key_addr = session->cipher.key_phys; + + /* prepare desc for aes command */ + CCP_CMD_ENGINE(desc) = CCP_ENGINE_AES; + CCP_CMD_INIT(desc) = 1; + CCP_CMD_EOM(desc) = 1; + + CCP_AES_ENCRYPT(&function) = session->cipher.dir; + CCP_AES_MODE(&function) = session->cipher.um.aes_mode; + CCP_AES_TYPE(&function) = session->cipher.ut.aes_type; + CCP_CMD_FUNCTION(desc) = function.raw; + + CCP_CMD_LEN(desc) = op->sym->cipher.data.length; + + CCP_CMD_SRC_LO(desc) = ((uint32_t)src_addr); + CCP_CMD_SRC_HI(desc) = high32_value(src_addr); + CCP_CMD_SRC_MEM(desc) = CCP_MEMTYPE_SYSTEM; + + CCP_CMD_DST_LO(desc) = ((uint32_t)dest_addr); + CCP_CMD_DST_HI(desc) = high32_value(dest_addr); + CCP_CMD_DST_MEM(desc) = CCP_MEMTYPE_SYSTEM; + + CCP_CMD_KEY_LO(desc) = ((uint32_t)key_addr); + CCP_CMD_KEY_HI(desc) = high32_value(key_addr); + CCP_CMD_KEY_MEM(desc) = CCP_MEMTYPE_SYSTEM; + + if (session->cipher.um.aes_mode != CCP_AES_MODE_ECB) + CCP_CMD_LSB_ID(desc) = cmd_q->sb_iv; + + cmd_q->qidx = (cmd_q->qidx + 1) % COMMANDS_PER_QUEUE; + op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; + return 0; +} + static inline int ccp_crypto_cipher(struct rte_crypto_op *op, - struct ccp_queue *cmd_q __rte_unused, - struct ccp_batch_info *b_info __rte_unused) + struct ccp_queue *cmd_q, + struct ccp_batch_info *b_info) { int result = 0; struct ccp_session *session; @@ -310,6 +491,18 @@ ccp_crypto_cipher(struct rte_crypto_op *op, ccp_cryptodev_driver_id); switch (session->cipher.algo) { + case CCP_CIPHER_ALGO_AES_CBC: + result = ccp_perform_aes(op, cmd_q, b_info); + b_info->desccnt += 2; + break; + case CCP_CIPHER_ALGO_AES_CTR: + result = ccp_perform_aes(op, cmd_q, b_info); + b_info->desccnt += 2; + break; + case CCP_CIPHER_ALGO_AES_ECB: + result = ccp_perform_aes(op, cmd_q, b_info); + b_info->desccnt += 1; + break; default: CCP_LOG_ERR("Unsupported cipher algo %d", session->cipher.algo); diff --git a/drivers/crypto/ccp/ccp_crypto.h b/drivers/crypto/ccp/ccp_crypto.h index 4455497..614cd47 100644 --- a/drivers/crypto/ccp/ccp_crypto.h +++ b/drivers/crypto/ccp/ccp_crypto.h @@ -46,7 +46,20 @@ #include "ccp_dev.h" +#define AES_BLOCK_SIZE 16 +#define CMAC_PAD_VALUE 0x80 +#define CTR_NONCE_SIZE 4 +#define CTR_IV_SIZE 8 #define CCP_SHA3_CTX_SIZE 200 + +/**Macro helpers for CCP command creation*/ +#define CCP_AES_SIZE(p) ((p)->aes.size) +#define CCP_AES_ENCRYPT(p) ((p)->aes.encrypt) +#define CCP_AES_MODE(p) ((p)->aes.mode) +#define CCP_AES_TYPE(p) ((p)->aes.type) +#define CCP_PT_BYTESWAP(p) ((p)->pt.byteswap) +#define CCP_PT_BITWISE(p) ((p)->pt.bitwise) + /** * CCP supported AES modes */ diff --git a/drivers/crypto/ccp/ccp_dev.h b/drivers/crypto/ccp/ccp_dev.h index a5c9ef3..759afc1 100644 --- a/drivers/crypto/ccp/ccp_dev.h +++ b/drivers/crypto/ccp/ccp_dev.h @@ -48,6 +48,7 @@ /**< CCP sspecific */ #define MAX_HW_QUEUES 5 #define CCP_MAX_TRNG_RETRIES 10 +#define CCP_ALIGN(x, y) ((((x) + (y - 1)) / y) * y) /**< CCP Register Mappings */ #define Q_MASK_REG 0x000 @@ -104,10 +105,52 @@ #define LSB_SIZE 16 #define LSB_ITEM_SIZE 32 #define SLSB_MAP_SIZE (MAX_LSB_CNT * LSB_SIZE) +#define LSB_ENTRY_NUMBER(LSB_ADDR) (LSB_ADDR / LSB_ITEM_SIZE) /* General CCP Defines */ #define CCP_SB_BYTES 32 +/* Word 0 */ +#define CCP_CMD_DW0(p) ((p)->dw0) +#define CCP_CMD_SOC(p) (CCP_CMD_DW0(p).soc) +#define CCP_CMD_IOC(p) (CCP_CMD_DW0(p).ioc) +#define CCP_CMD_INIT(p) (CCP_CMD_DW0(p).init) +#define CCP_CMD_EOM(p) (CCP_CMD_DW0(p).eom) +#define CCP_CMD_FUNCTION(p) (CCP_CMD_DW0(p).function) +#define CCP_CMD_ENGINE(p) (CCP_CMD_DW0(p).engine) +#define CCP_CMD_PROT(p) (CCP_CMD_DW0(p).prot) + +/* Word 1 */ +#define CCP_CMD_DW1(p) ((p)->length) +#define CCP_CMD_LEN(p) (CCP_CMD_DW1(p)) + +/* Word 2 */ +#define CCP_CMD_DW2(p) ((p)->src_lo) +#define CCP_CMD_SRC_LO(p) (CCP_CMD_DW2(p)) + +/* Word 3 */ +#define CCP_CMD_DW3(p) ((p)->dw3) +#define CCP_CMD_SRC_MEM(p) ((p)->dw3.src_mem) +#define CCP_CMD_SRC_HI(p) ((p)->dw3.src_hi) +#define CCP_CMD_LSB_ID(p) ((p)->dw3.lsb_cxt_id) +#define CCP_CMD_FIX_SRC(p) ((p)->dw3.fixed) + +/* Words 4/5 */ +#define CCP_CMD_DW4(p) ((p)->dw4) +#define CCP_CMD_DST_LO(p) (CCP_CMD_DW4(p).dst_lo) +#define CCP_CMD_DW5(p) ((p)->dw5.fields.dst_hi) +#define CCP_CMD_DST_HI(p) (CCP_CMD_DW5(p)) +#define CCP_CMD_DST_MEM(p) ((p)->dw5.fields.dst_mem) +#define CCP_CMD_FIX_DST(p) ((p)->dw5.fields.fixed) +#define CCP_CMD_SHA_LO(p) ((p)->dw4.sha_len_lo) +#define CCP_CMD_SHA_HI(p) ((p)->dw5.sha_len_hi) + +/* Word 6/7 */ +#define CCP_CMD_DW6(p) ((p)->key_lo) +#define CCP_CMD_KEY_LO(p) (CCP_CMD_DW6(p)) +#define CCP_CMD_DW7(p) ((p)->dw7) +#define CCP_CMD_KEY_HI(p) ((p)->dw7.key_hi) +#define CCP_CMD_KEY_MEM(p) ((p)->dw7.key_mem) /* bitmap */ enum { @@ -412,6 +455,16 @@ struct ccp_desc { }; /** + * ccp memory type + */ +enum ccp_memtype { + CCP_MEMTYPE_SYSTEM = 0, + CCP_MEMTYPE_SB, + CCP_MEMTYPE_LOCAL, + CCP_MEMTYPE_LAST, +}; + +/** * cmd id to follow order */ enum ccp_cmd_order { diff --git a/drivers/crypto/ccp/ccp_pmd_ops.c b/drivers/crypto/ccp/ccp_pmd_ops.c index d483a74..5f56242 100644 --- a/drivers/crypto/ccp/ccp_pmd_ops.c +++ b/drivers/crypto/ccp/ccp_pmd_ops.c @@ -39,6 +39,66 @@ #include "ccp_crypto.h" static const struct rte_cryptodev_capabilities ccp_pmd_capabilities[] = { + { /* AES ECB */ + .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, + {.sym = { + .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER, + {.cipher = { + .algo = RTE_CRYPTO_CIPHER_AES_ECB, + .block_size = 16, + .key_size = { + .min = 16, + .max = 32, + .increment = 8 + }, + .iv_size = { + .min = 0, + .max = 0, + .increment = 0 + } + }, } + }, } + }, + { /* AES CBC */ + .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, + {.sym = { + .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER, + {.cipher = { + .algo = RTE_CRYPTO_CIPHER_AES_CBC, + .block_size = 16, + .key_size = { + .min = 16, + .max = 32, + .increment = 8 + }, + .iv_size = { + .min = 16, + .max = 16, + .increment = 0 + } + }, } + }, } + }, + { /* AES CTR */ + .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, + {.sym = { + .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER, + {.cipher = { + .algo = RTE_CRYPTO_CIPHER_AES_CTR, + .block_size = 16, + .key_size = { + .min = 16, + .max = 32, + .increment = 8 + }, + .iv_size = { + .min = 16, + .max = 16, + .increment = 0 + } + }, } + }, } + }, RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST() };