From patchwork Fri Jan 5 09:39:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kumar, Ravi1" X-Patchwork-Id: 32955 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 14BFF1B1C5; Fri, 5 Jan 2018 10:40:42 +0100 (CET) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0071.outbound.protection.outlook.com [104.47.32.71]) by dpdk.org (Postfix) with ESMTP id 06B6E1B1BE for ; Fri, 5 Jan 2018 10:40:40 +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=DcgWuH+hDFt7TlFUQRoHiycZYm3Lwfx8s6GRX21xuEjwvcjtJL2nnjQ3f9qUURMgILt95eXpKKD1x/pxh+LN2kSMzNJrFIH/qRNFa35bSW2lkAlt1XT6cav7v024ELLAjywiMGTqPA3M/p++bQAaGEOLSd5QuNafNNEre9j81Gc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Ravi1.Kumar@amd.com; Received: from wallaby-smavila.amd.com (202.56.249.162) by BN6PR12MB1508.namprd12.prod.outlook.com (10.172.24.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Fri, 5 Jan 2018 09:40:37 +0000 From: Ravi Kumar To: dev@dpdk.org Cc: pablo.de.lara.guarch@intel.com Date: Fri, 5 Jan 2018 04:39:48 -0500 Message-Id: <1515145198-97367-10-git-send-email-Ravi1.kumar@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515145198-97367-1-git-send-email-Ravi1.kumar@amd.com> References: <1512047553-118101-1-git-send-email-Ravi1.kumar@amd.com> <1515145198-97367-1-git-send-email-Ravi1.kumar@amd.com> MIME-Version: 1.0 X-Originating-IP: [202.56.249.162] X-ClientProxiedBy: PN1PR01CA0084.INDPRD01.PROD.OUTLOOK.COM (10.174.144.152) To BN6PR12MB1508.namprd12.prod.outlook.com (10.172.24.149) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f99cc9ec-b10b-4f6c-4dab-08d5542060ad X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(48565401081)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060); SRVR:BN6PR12MB1508; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1508; 3:TBBxWoLzOdKwPIH3GpjuMmOV3th5YTgmHaceUrknhPnAKDqXlNst2RHuIQKIWJuyORCe4ajxNnXpXUHmymspagyj0yPjTqFSPTYNTBwn5kmf9P5hrpcVLsXMknWknKQutljMzJUnNOepvbWdTVYn9TDSBDQxBh3GJEHBRoLFejRvJ9DfK2ZlF0GESquZL4yCiC3EawHqBA1b5kk/5oNtnvhHTNtLg8ynV19O/K+ka7/rjLHg4wJZrrAy5INlGnpq; 25:sSs1/dUB0sYxSClD9LMv4wto5JRsO5QHtcIyQkEJmYLFMye+qDw4BZ4taUzwM1r3QMSabJ2aFjoADfM0sjwh0KNlTodzLQi4bDZB1tGabuUBoVvAWVAtr2zgwyXbEl3rZj+2GZedUvT0i2VsN+Z90HGMi7JsSWc9sXbuRNfUAMU2jU7QPwdohP03PP2UlQlGQ+euuZc5KCY3MfSkZxUuh+Bz/2jXBZeg2k/wANcP0QSZj/Wansdm5IJraKfi0Jh7g9nipXVgf99k0M5nmxn73wXZ8NNGg9T+SUt6Qr7RqwNINQXjZEZR1fq4jNUy9lDg1GT/CQNYxgoTfUnk8oFEwA==; 31:8Q0EJGEfQHFJbVJjrcFG53TFk59I4O6bwXn14ttXwttJDa+4oGsIFzOARA0m7l8r0umX4xmZ1rbs0WSooVoV0znhS3dPIk5zaZsRQCuN0V3kyRn87PPal9BmcBayK46YfZxSxKI4z7csIrd14+CXAMV+qWYRNrSyNU+2VbGfeovysKYydw1eOyfLL3UOl92JbzT/qr2ym9rteZK5GJSzTp4wUCDkemWvHmA+KXU8JZ0= X-MS-TrafficTypeDiagnostic: BN6PR12MB1508: X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1508; 20:8zDw/Zriz46I5q0/ruYsNOYAQgU4PnW7+5yTdVhRhrxkEoa9tjPADAhMZSJSOKjs7X7eSBS0F0SEOYPUjFmuDTK7sEnBCv6y6uzUjZ37TRqaR0mbYrUzmaQ0ZBK5wB7VEVYa5VM0D/TWnXeA5mbkT9PAn6xV954HvmGP06E2sE5/iiWRrvFsyBF9dMbEZitZEMkhPcbJBvoKB66vBAkPQ3DxKlLq+6P9GYWj4tnvPhQkWBdhg5GYEJA3z3yaUP0rg59kwtNnTpnWrF033MpOVc6kyj8sszP17t7Kkc46lk/IdqaqmEH5SkbCwqK+2IY48IvPN+y8IC0iCESN6pKV3yWjAh+xas6hjXdiuO+nr+V5ED3Goa+Bj/dFFKUPlst3Kofi4SAZArnXAwa65X5ZuE4ipVmJ+Bq0g9W1sLLzt57FQiafIzuMsCKbpvnqp9FENGewFmGJgKqboDnfSAsb0BaNJGIFFvvyCh+8ouKT9DmR3lUpOSO7c4WBDSGBYQFH; 4:WphWZTrJkXCG7rcoe69IkZaZMpSO18awIsk4ae/m7Nmv1YUrJjRCSZkGHnqbUDuEhX/ksmrHPqatukNCif3uwtcFXOPFLBnqCyw3WvLUohfKpJxFQi2A7gqds15mPX2pDZhMDDADa5cggq5atL+zFpLtOOVwWjp9xD2/db4ZVRfRwrc295UxYiFKEHIfXeUPoXo8WCEvSQQ9x1/K/zmm8U9NtxVG28UgxpVorHpFblNadzoBf1IdOyEJ0c39QPbMfM8xwI3ZU/e2bu8EeZkZ9Z/OKHivVofuoASvqIYcA85e8/rzve1lysGmZy+pUgbE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231023)(944501075)(6055026)(6041268)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:BN6PR12MB1508; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BN6PR12MB1508; X-Forefront-PRVS: 05437568AA X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(366004)(346002)(39380400002)(376002)(199004)(189003)(6486002)(2361001)(6116002)(106356001)(386003)(105586002)(3846002)(6916009)(2950100002)(16586007)(6666003)(16526018)(36756003)(4326008)(2906002)(316002)(97736004)(25786009)(478600001)(86362001)(68736007)(8676002)(48376002)(51416003)(81166006)(2351001)(81156014)(52116002)(8936002)(53936002)(305945005)(50226002)(76176011)(72206003)(50466002)(53416004)(7696005)(47776003)(66066001)(59450400001)(5660300001)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1508; H:wallaby-smavila.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; BN6PR12MB1508; 23:6wg/3vE9kj0JyfZ2PZElRg4IqQ+dxQgA6d2y83I/F?= ur6X7FCPaagZeyZQZij8JY3PolQiJl7UnKbY+sFx6fHN01OoGDgEzX4ZDjtEA3Z15zQIO+Nxt+QhowrMGeRrlR233EDNnQlNWpV3MPm3gFYBrD3HPAkp3RfSgaAeQNKVnWVbvPHxtzOnfCBduR4FfL67POkbR/SvMDdBIz2Kqcp1lwyVom7NdXmSXOpCzvE9KWHnmzta4jqdecdMxa64zS9B0j1MHZS7/UYePgBEuvyzZ2RNHrHSraPjZ3uUJNgFFIBNrQ1R2TmU/Z3V6YcFTw2eq/2AAtod5p4cAVMpPQ/XJgjuT9y0qzaQtiRXLC4npvxbufQ7WaomUoMpaCjvGgEBCbtqOz15+zYsw2z0mYIlspbQKLi40HS97X7Cx5o08vfemL9KgcHJ3ijATkM5g41w9U39mmLgYeGdjXgg0Zs2P5NctCMvm8LFkUDr/awKMIcmpEsSJQuGJV8Z9aMWxTmO+SmhR7UAoS3lUpYMrDwjoEGwuMWE2hFgstyCOEXmLCUEYMM2dZdPJ6B9M8TDDh0EIWdtwe/yTd4CXBfAPZA/rjzeJOf+4NvSc/LzIJnPl8b5LTOwiPJAJPnIPF9S8L69tUP07Ma/HAGuYufybVhqARFRQ/6X+uvRm9eIpO+7CuEarFsSz4CZ9o+aI7sftd8D7JyRER4U0/9Dpzz41Vt9fXRTp6pRynQh2iNvBiZQX8G3Z7UeweU2ikgP6iQkk49YIMs1CNmx9yTjj5+YVcCmoQUk4uEOGGOTf183f4frELPWJZGUxrAoqFDmKXpUUgAY77NRnVagxKtY5he1O4PyvoScv5W7hhBi80N3XKFgTWBpNUeJ54MiuIyHgWQWG5pT1jIZzNxCTQJG1/gOJRzkLnYgYairLDj1LUGXVbtMFHIlbJ3bu1i+P3dMm9DbEoCP3kBMyk9O7FekzGGutgrQzdPE4Tq61QxJuyUppWcCuPx0Q+ULadjLr2ImAHL4xxeqGLyCGErCex7MT9MgcsTDicUIjDZ5KOyuaDT8VpxvABadovWhcKUC+oTcs2PG9bDyQ9aoVje5RKpYt/5FL++ZiXHhP8ny1Vlw6BN/L0jjBIchPk0Q5EH7g3uAnx4DExc3lZjrEFp+QBrDXtLgEStKA== X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1508; 6:Rp9wPGX9Qz/kbG7cE3lsy23JUJttAXGMh1QC3/EbikbwDZPyiw5e1kanImfEI2s4Q7OZ966x2Y1D4SZxKPKgBAFwW1V/MLW78PGTBLl3JTBEo1w31kKaiWEpceTX0rVrMCc0HRGF5+Tx+HpALRTSfiOxvD+Ca3aTB59WPJFFqC/5drGhPCs6Mhd5iWP8xk9GtSFxLuYKvLRl+vwi3xGUQ1BbAtMtxKcnlfpTq95ovDs4bff2qwtEUxRkgtMHsC3x80I4hln+U9PeGeo9TFV3243SfbQhhMP/m3+ib4LEdmXkvStku+nj5kNEWRtbQsq33ozWXzNYL+aWzaKXCO4IBLyURArSKtbN9tnAwzS3LSI=; 5:0CSKMPz8XBSmHoL+NJ1ICqnPLEsvlKtRAVH++YJ3+2XIAMUT7KuTXIKrdLGqZAvk5b3MpE7BqaePJTHjUBZgFxjBHTWbdfRRpuu5e+Ob5iP5XHI3vNGDl9SJcuU91Go8Xs80ZUELhaH6RnfvsP1/kFR2y2h5uSd0OOLbDGSvv1c=; 24:VMrF4q1DSbc+Ee1v9arbNUG1tnpFN21qx8RC0Lnj2oHUGOSsS30F4pG1V4DHBPBO6NPgoc6GgaUOsVe1mGlxL6tIrID+3q4KDxCRq7NY3zk=; 7:hV2rsPVR6HzJq/SX+thgQjMKQTB3p72OAFmPSOQHRZNkzkuYPHrD0f+nti9yaCUWnDamKVtlvggeoHBUCXiZDwJthzJBdGYgDYOIene3lwXDHnOF9Z8ENgz5fxr98FtzW5dNc0w6ORSu20pYWx4Id12gw8iCrYBk5hPM3PkMsXLswmCJ/HffQp5VH/WKSPUQpUAToXbkqNX0NcZbHhh4+YBZm/nMT3dANUcBMTZ3ibxFD6alWs1V6Yj//NwOVOju SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1508; 20:UFrO6k7PZt7DbvV/jbiB89vzvVzfgNa4HqfUWsZHTSna+LDbI21o2zHjjD1XZNNMK2BJRbOsajF32Uah/TuY6PxLgb4T/BjE0a96PtRbc2tzP2fM+3D1cLAJa5RHx76NBNcZy4s9xt/gRV08hhfsYip9fZi/dHbmOjpC6QU60NHS6guFSevFCrfhw4iQJmGAMm5d3vmHM0owuYMSpapocoqfkHhmdV07UzYMWuPxj70/JQcF3EDeLSfm+azCCg7V X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2018 09:40:37.1230 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f99cc9ec-b10b-4f6c-4dab-08d5542060ad X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1508 Subject: [dpdk-dev] [PATCH v2 10/20] crypto/ccp: add aes cipher algo support 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() };