From patchwork Mon Mar 19 12:23:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kumar, Ravi1" X-Patchwork-Id: 36257 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 017291AFF6; Mon, 19 Mar 2018 13:24:46 +0100 (CET) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0042.outbound.protection.outlook.com [104.47.33.42]) by dpdk.org (Postfix) with ESMTP id C5CEF1AFEB for ; Mon, 19 Mar 2018 13:24: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=rI5sC8umvyyV8Ol280qfLPkACtlrJXz6BwkRoyL1i+A=; b=JBPOfwtvuGEi29nGPd2Mc+D+NKDHEgVQMVeyJ2SqVKpb2eqUcvWuaMxWssje/eQazvxJevX2eWK2Oyy93HOVyboPwxZ4JXcQPk9AaCQfUohHfcOYgFBKKa0ex+kk8OKEcEqMGjd5/hjXkJg7Md9d73y0LcgQ7GBxZG37MS1Dh6c= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Ravi1.Kumar@amd.com; Received: from wallaby-smavila.amd.com (202.56.249.162) by BN6PR12MB1505.namprd12.prod.outlook.com (10.172.24.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.14; Mon, 19 Mar 2018 12:24:38 +0000 From: Ravi Kumar To: dev@dpdk.org Cc: pablo.de.lara.guarch@intel.com, hemant.agrawal@nxp.com Date: Mon, 19 Mar 2018 08:23:46 -0400 Message-Id: <1521462233-13590-12-git-send-email-Ravi1.kumar@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521462233-13590-1-git-send-email-Ravi1.kumar@amd.com> References: <1520584520-130522-1-git-send-email-Ravi1.kumar@amd.com> <1521462233-13590-1-git-send-email-Ravi1.kumar@amd.com> MIME-Version: 1.0 X-Originating-IP: [202.56.249.162] X-ClientProxiedBy: MAXPR0101CA0025.INDPRD01.PROD.OUTLOOK.COM (10.174.62.139) To BN6PR12MB1505.namprd12.prod.outlook.com (10.172.24.146) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b7ecae16-091e-4dbd-b166-08d58d9462aa X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BN6PR12MB1505; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1505; 3:cy0fk3cCbsTy3Vh/V/r7lhUHov9mvSx7iSio+FNxbp7JSGzeTTMixuTG+Qlt1IyX0w55fzn1pG9lWSfrXY7wF1SY6vcuOOOBx5EASEfjpWPMjdVyel33HlEoqdHU6PhCLP//8vr/B+BSMep7J5C/b2c4yfsdlRcZuSQkpOZXECJ2Pn+UiB1l0ZSbU5InqRCzA8RALkbT2D3/2R3l3IrRsSbvQmU9KfETAmW0pZP9IAB0LeWZ+QsS04ZfLNsQhNxJ; 25:GYeNcaZUalBMNBsFNSyWvjWCeaa734XKG1ajCMtYJmzp7PDgfDVystD6fpd7c/mVG/wpOua7aOMadFHsva588qCn5yZRnSy4t/g+cs/+yOn/07L+tYjvZe6z31ZT4p9/chT0BCsR6tahF6RYNmdpGlhKZ/ybJPIk63tiOvI1VZh/GGlRIc2DLBFguW0o2IjGfS+ufrbLLZhQaSUy+P3JAKFQCbpn8kxja0bZFF1WWyeGfpdUjmRP6ZdLssrNHnCv6+U+Ll6/xrszJxYmy6n5PqKcdDlIA/1OI9jUSQweyY80sB4X3lPf6Dy25/zWPGC+1FrM7SWEGLd+Np3cJlmAxw==; 31:Cq9JvYQyGVNqf7iJ60SILtDG1PTNwDC1aZwxlV+o0zRt0Aoiz/CSl5BoHVVn8g4PBQp2OWr0SoA46TCCY+mf+voZzFw4+l8KHLP1nInVgEa5FfEegGgbGX0E5i8/BvvDjBD4N4OHz6xEqvBmInFF67Qkt5EzuzsavAVv3hcZBdHhEaqeRYbsG+g3bQab/F+LXhGi8FqPRnAWF7khLBMCOnCjyrSps7FuTP7sEmU1NHU= X-MS-TrafficTypeDiagnostic: BN6PR12MB1505: X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1505; 20:MWpOFzNhqNmAoV8CcQx/vFvm8gKkYXBvglmKqTHM9/jaOSijfa0zjypeEE/fKhA4l6qjyigpJwmsxUQS2/3/sgWgo5ey7Riy49zlrzhGXeSKiUVfn99RIo0G7UTU8mboEB71Y7dVhIp3lN8+nU5l47xOrzJGtojeBWniWL5MZfXlm9TzthMN1zbC8ZyDrFVYVfpYZ712QuWMgIcWcnLoaAJX6yxBZlsD2ZIFCuaaxDSkYQzqkrqxJhyQCovl0QysHbhFUUUWIDcsGLJccUG66Y34VfNg7coBw0C29rpRw+93GoUYApKYOOvPxsrCJFP+CCIfJDd4m7pnwRGd+Vfr3IH8L3ff0PgIYYbOaxOw2lYpoqml/e487q3pR8MuDGP/t8rCen5Wz9U+5p8j/QpBe+f2GjmnB3D7DvBWBNrTO8StvdKuf5sMcQI6uI4v5xFukve6X0uI73OjehfJL9/3nbazKg+0uRzv7JLKoHyeOI9l+oGzpGkgKhwIYBWsuBmf; 4:+yrmZ4NG2iaQoPezWVcIi3P1OMRDPKm0h1Q6jfAP2XA0NojcSa+oGbC0SDN/Y0GU+pHVJvzK4348/gSVbfBD3nn9pAyaUoNvBfevD6qHUGyq7HP/8Z85xkllkLS1dO0vrY/m/lkBg0UqOcPaLy9AWqO2c6TkIu5CvhFl4kqmRtqw5tpjAwuiwp0a01JsMqe5fVRZgaWuMDKDLGaE44/H4ub1VlI9iAAA+0GTo0TlVy4rRK6gJP7Iy1cDzq6MldmvAw+CzlrYsCdJ0TYd6nir9nab8FX7MLgqUjlStWmULnk1tkfNi3sDTlF4lyixfIWX X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:BN6PR12MB1505; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1505; X-Forefront-PRVS: 06167FAD59 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39380400002)(39860400002)(346002)(376002)(366004)(199004)(189003)(97736004)(105586002)(2361001)(2351001)(72206003)(48376002)(4326008)(50226002)(76176011)(59450400001)(8676002)(26005)(316002)(8936002)(53936002)(106356001)(16586007)(186003)(7696005)(51416003)(16526019)(52116002)(386003)(81166006)(81156014)(8656006)(25786009)(575784001)(66066001)(68736007)(86362001)(47776003)(6486002)(5660300001)(6666003)(7736002)(53416004)(6116002)(305945005)(3846002)(478600001)(2950100002)(36756003)(6916009)(2906002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1505; 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; BN6PR12MB1505; 23:RkcJt+t4UPzk9uRcx6HmEbGv5VGnfdwI04BipMZoW?= 2H+If6bv54fzwSiNTC6N6AFMeb+JeZV9bRxJBfUA+AF4VEbmZaKQo4zhL9Ae+9+BJrweRV792qG86L8Ax3Oe0tySJ1v8+tFxlGC4VXEkQtpgD/0FVJfdSgGNK0sJHIMG9+MuZD2jUUZU3v5fLHcdyqyvpneuEKZFbCgJid+e1F9ejpepzIZDOZWS4211I7cm1lcB0n78JOfmpBJv8p7ACCHAWySY5k9lNWGsTLUaVy1k5vBowM8oHg1QeC1cQAvQatbrkKU401tZ8/boJ5c4Lno9xNXwpuL1kMAEILVXJgYXcGJBRjiKnRVJYNjhg1aVfqYSGS0I5vngTpXWqsaUHIv2odrQdem7UzlzMZEIXj2/8n7OgjyqrO8MNPz9ci8HI9PzM+tZNYxXX44+CjFjiQuLGjiql62YU5y6W7v8R0i/d2gMX3b60RIqzWS4dNDHEA3Xah9tUVpcBxuu/VGWV4mbDL8hvh2aSurziZ3NSOgr9UbpNq2LhDyfZD4RkLX/E38Opz6tbtsfwhP1Xym74ZWqOC5Oiz+cNNU/J5ZGjT/yKKw2TDqZIKtXxAUMJw/ywgyZ/Rmn367lZHO6J9LXDG3++25jjy/xHXymuq9RsQZHyv5/wuw5Kiag5/D6Vmr8CJE3mI3/JoUxaLe4UjsMrkLcgTwUZayap8K0bZyIFfPHFd9OHORNoVFXQ6wee82FKG82OSTGWLAPJhBVLcjGk9QmCMvAf/nx6MYSen16LEOL/xF8HA4wiThSKgr3KVLDHpJhzNJErPxjjMlFiYJnMmgvpQ0mDnCkNCdAMHk2Tf6dGLHy0Cve2rfdYo8SN3hN7jc7nq3+Olav9yZydWK469AcTsbGUNpnK7PedAa9TrchQAxXYqkQ3Y8W48pwM/9Jhtec6UzFgJjfO2Lm3YAdBCrthxAXA7/2kRb19NMFINeoQjs/Qvg4q9J5anA80qXjvJpEOfweJ68dxsgCLRR7F2Jt+v1OedV4YpBEzaE1zuQfiSiY7S5/Sau8TlQGBIa4jUfRUBfL/cqg6rFAOscT3znSTNz9DdGE3WTGBehjATxut37cHHkafmbFZEI/XEcpJ9fJtjzZ3mOi95QbMXCaHeaomdZkgFjbpYH4qHJaKOjIzIjbodlWDMZmBZqTBR5tIvsI0AdpiKf2gVTUBP+4cyKFzMflHfobbEHzkI4gCjRuQ== X-Microsoft-Antispam-Message-Info: w1uQNusEXGotmctDrzkGfvf/LO3Uiyr+MotLhRLI/N+fH9kWc+PCO9ocmVH1WngFbBlnQvzOZm1Etgb9KVOcHru/TLT2Su442kngzdBxqN23lRHRb5BXhHrYJ/4LIp2FbH+sIZimI4h1D1lV/tFtoDd/AmBahoz8BzSzIjRd++qrHplPL8U/5yMz3KVnbcCA X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1505; 6:gHOqsEZMgZ9aek3UTzkVbLDYA/yCklTAWBKiPaJKeGGMF1Xt1/MZG/zjL4vkTV/SCCmVPHZ6Kst1NfZlasuC4oneIzQnzy0AyaOpA+uok/w/jijHSENAXjbYlZqbQciA6H93ARk2tVQi5uw69XACakp4PY7xWePPg5Wst7V9CWjv/rfeHhE23uY5G7pNRVNdInYm3LrmlC5X8O0bQ6b8ftfQtIk9FczX0JwnUssQYZ23KdtTsXCEtBftLkb+uXRoYc2mgcLM2UFfS3Pkt6UCuvd3lcdQA1LBJ/11DvVmHev1i/+PT1RmTxzw6+Co28J7nHFiReFnYIuNkuGHPpUk0n0Rs4chv3+FzvOdSW7Iv4k=; 5:lm+YVaIuKShc8s2wQdXMF71RgeXor1QbhiLBmIKFR9MMtW3qnivN/6M3LIeS1C6ZWzNrqXzIpGliFpptZlj+vyOsEiujUVCLKotjC/S91oFD69HcF1tYQKnEuVgLbLK5pRWwyU2RHXiwRVS0gT5xDxtnUcfS019Ad380E1AIlAQ=; 24:7HQvfHuSXOs9DZBKxEja/TsNO2QESYyg+9zEnY6gNW4PRUUGqhm4yyLomR11CVeAnG6q4oZx84Ot4ciWPuJAz/8anMOIMgDN9B69dDrfpPM=; 7:GlqY1+w/aDsDa6clXFGKbJNQCbygTRiH5QYNhvwJR5/7xjbMGn4OSW9ma7plwszAPSqZP6MSpdUslBhB1ILVboYijScmABg0pZR73uN2ZQ9myFJcEWYSLWB/69phPsCpRbVwLPvK9TdT+AK5mvHkhjdWueq7RB2w6joMHwcernnJzcCkZ2N78MOFcQD3IkWM3ORZgtgrc6HDOhcbtpzRVJz3d95OOUJGY3IUcbd6+T+iDD+L/Ko9lQI3A+qwE1Vm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1505; 20:iAsziQ+5TYKRwrdRA6CZHhveoyZAIrSYk+xP5dPIz+i7hK/bO2M9SqZAFQ+4OAQoqOfLkZj5GAwU83UKd2yxAA0XnDknRcg8l8kGviD7AANtkZhTqAdoAPUbecZFCbPN1B6ZK5V+dTu/vyGZO8yoSeb7RgEOkV/tW8q9dqTHD5dxQJ4whyLuSZEPE30PRi/qryvGAT1rO5C1y2mHPa+Z/L4rVXyiihoH5RyMjPze6C9Gi2ld9Iemid4ah6YHGLDy X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2018 12:24:38.0002 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7ecae16-091e-4dbd-b166-08d58d9462aa X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1505 Subject: [dpdk-dev] [PATCH v5 12/19] crypto/ccp: support aes-cmac auth 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 | 277 ++++++++++++++++++++++++++++++++++++++- drivers/crypto/ccp/ccp_pmd_ops.c | 20 +++ 2 files changed, 295 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_crypto.c index a946f42..6d8a0d6 100644 --- a/drivers/crypto/ccp/ccp_crypto.c +++ b/drivers/crypto/ccp/ccp_crypto.c @@ -10,6 +10,8 @@ #include #include #include +#include /*sub key apis*/ +#include /*sub key apis*/ #include #include @@ -48,6 +50,84 @@ ccp_get_cmd_id(const struct rte_crypto_sym_xform *xform) return res; } +/* prepare temporary keys K1 and K2 */ +static void prepare_key(unsigned char *k, unsigned char *l, int bl) +{ + int i; + /* Shift block to left, including carry */ + for (i = 0; i < bl; i++) { + k[i] = l[i] << 1; + if (i < bl - 1 && l[i + 1] & 0x80) + k[i] |= 1; + } + /* If MSB set fixup with R */ + if (l[0] & 0x80) + k[bl - 1] ^= bl == 16 ? 0x87 : 0x1b; +} + +/* subkeys K1 and K2 generation for CMAC */ +static int +generate_cmac_subkeys(struct ccp_session *sess) +{ + const EVP_CIPHER *algo; + EVP_CIPHER_CTX *ctx; + unsigned char *ccp_ctx; + size_t i; + int dstlen, totlen; + unsigned char zero_iv[AES_BLOCK_SIZE] = {0}; + unsigned char dst[2 * AES_BLOCK_SIZE] = {0}; + unsigned char k1[AES_BLOCK_SIZE] = {0}; + unsigned char k2[AES_BLOCK_SIZE] = {0}; + + if (sess->auth.ut.aes_type == CCP_AES_TYPE_128) + algo = EVP_aes_128_cbc(); + else if (sess->auth.ut.aes_type == CCP_AES_TYPE_192) + algo = EVP_aes_192_cbc(); + else if (sess->auth.ut.aes_type == CCP_AES_TYPE_256) + algo = EVP_aes_256_cbc(); + else { + CCP_LOG_ERR("Invalid CMAC type length"); + return -1; + } + + ctx = EVP_CIPHER_CTX_new(); + if (!ctx) { + CCP_LOG_ERR("ctx creation failed"); + return -1; + } + if (EVP_EncryptInit(ctx, algo, (unsigned char *)sess->auth.key, + (unsigned char *)zero_iv) <= 0) + goto key_generate_err; + if (EVP_CIPHER_CTX_set_padding(ctx, 0) <= 0) + goto key_generate_err; + if (EVP_EncryptUpdate(ctx, dst, &dstlen, zero_iv, + AES_BLOCK_SIZE) <= 0) + goto key_generate_err; + if (EVP_EncryptFinal_ex(ctx, dst + dstlen, &totlen) <= 0) + goto key_generate_err; + + memset(sess->auth.pre_compute, 0, CCP_SB_BYTES * 2); + + ccp_ctx = (unsigned char *)(sess->auth.pre_compute + CCP_SB_BYTES - 1); + prepare_key(k1, dst, AES_BLOCK_SIZE); + for (i = 0; i < AES_BLOCK_SIZE; i++, ccp_ctx--) + *ccp_ctx = k1[i]; + + ccp_ctx = (unsigned char *)(sess->auth.pre_compute + + (2 * CCP_SB_BYTES) - 1); + prepare_key(k2, k1, AES_BLOCK_SIZE); + for (i = 0; i < AES_BLOCK_SIZE; i++, ccp_ctx--) + *ccp_ctx = k2[i]; + + EVP_CIPHER_CTX_free(ctx); + + return 0; + +key_generate_err: + CCP_LOG_ERR("CMAC Init failed"); + return -1; +} + /* configure session */ static int ccp_configure_session_cipher(struct ccp_session *sess, @@ -144,6 +224,7 @@ ccp_configure_session_auth(struct ccp_session *sess, const struct rte_crypto_sym_xform *xform) { const struct rte_crypto_auth_xform *auth_xform = NULL; + size_t i; auth_xform = &xform->auth; @@ -153,6 +234,33 @@ ccp_configure_session_auth(struct ccp_session *sess, else sess->auth.op = CCP_AUTH_OP_VERIFY; switch (auth_xform->algo) { + case RTE_CRYPTO_AUTH_AES_CMAC: + sess->auth.algo = CCP_AUTH_ALGO_AES_CMAC; + sess->auth.engine = CCP_ENGINE_AES; + sess->auth.um.aes_mode = CCP_AES_MODE_CMAC; + sess->auth.key_length = auth_xform->key.length; + /**auth.ctx_len = CCP_SB_BYTES << 1; + sess->auth.offset = AES_BLOCK_SIZE; + sess->auth.block_size = AES_BLOCK_SIZE; + if (sess->auth.key_length == 16) + sess->auth.ut.aes_type = CCP_AES_TYPE_128; + else if (sess->auth.key_length == 24) + sess->auth.ut.aes_type = CCP_AES_TYPE_192; + else if (sess->auth.key_length == 32) + sess->auth.ut.aes_type = CCP_AES_TYPE_256; + else { + CCP_LOG_ERR("Invalid CMAC key length"); + return -1; + } + rte_memcpy(sess->auth.key, auth_xform->key.data, + sess->auth.key_length); + for (i = 0; i < sess->auth.key_length; i++) + sess->auth.key_ccp[sess->auth.key_length - i - 1] = + sess->auth.key[i]; + if (generate_cmac_subkeys(sess)) + return -1; + break; default: CCP_LOG_ERR("Unsupported hash algo"); return -ENOTSUP; @@ -290,6 +398,15 @@ ccp_auth_slot(struct ccp_session *session) int count = 0; switch (session->auth.algo) { + case CCP_AUTH_ALGO_AES_CMAC: + count = 4; + /** + * op + * extra descriptor in padding case + * (k1/k2(255:128) with iv(127:0)) + * Retrieve result + */ + break; default: CCP_LOG_ERR("Unsupported auth algo %d", session->auth.algo); @@ -389,6 +506,158 @@ ccp_perform_passthru(struct ccp_passthru *pst, } static int +ccp_perform_aes_cmac(struct rte_crypto_op *op, + struct ccp_queue *cmd_q) +{ + struct ccp_session *session; + union ccp_function function; + struct ccp_passthru pst; + struct ccp_desc *desc; + uint32_t tail; + uint8_t *src_tb, *append_ptr, *ctx_addr; + phys_addr_t src_addr, dest_addr, key_addr; + int length, non_align_len; + + session = (struct ccp_session *)get_session_private_data( + op->sym->session, + ccp_cryptodev_driver_id); + key_addr = rte_mem_virt2phy(session->auth.key_ccp); + + src_addr = rte_pktmbuf_mtophys_offset(op->sym->m_src, + op->sym->auth.data.offset); + append_ptr = (uint8_t *)rte_pktmbuf_append(op->sym->m_src, + session->auth.ctx_len); + dest_addr = (phys_addr_t)rte_mem_virt2phy((void *)append_ptr); + + function.raw = 0; + CCP_AES_ENCRYPT(&function) = CCP_CIPHER_DIR_ENCRYPT; + CCP_AES_MODE(&function) = session->auth.um.aes_mode; + CCP_AES_TYPE(&function) = session->auth.ut.aes_type; + + if (op->sym->auth.data.length % session->auth.block_size == 0) { + + ctx_addr = session->auth.pre_compute; + memset(ctx_addr, 0, AES_BLOCK_SIZE); + pst.src_addr = (phys_addr_t)rte_mem_virt2phy((void *)ctx_addr); + 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_NOOP; + ccp_perform_passthru(&pst, cmd_q); + + desc = &cmd_q->qbase_desc[cmd_q->qidx]; + memset(desc, 0, Q_DESC_SIZE); + + /* prepare desc for aes-cmac command */ + CCP_CMD_ENGINE(desc) = CCP_ENGINE_AES; + CCP_CMD_EOM(desc) = 1; + CCP_CMD_FUNCTION(desc) = function.raw; + + CCP_CMD_LEN(desc) = op->sym->auth.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_KEY_LO(desc) = ((uint32_t)key_addr); + CCP_CMD_KEY_HI(desc) = high32_value(key_addr); + CCP_CMD_KEY_MEM(desc) = CCP_MEMTYPE_SYSTEM; + CCP_CMD_LSB_ID(desc) = cmd_q->sb_iv; + + cmd_q->qidx = (cmd_q->qidx + 1) % COMMANDS_PER_QUEUE; + + rte_wmb(); + + tail = + (uint32_t)(cmd_q->qbase_phys_addr + cmd_q->qidx * Q_DESC_SIZE); + CCP_WRITE_REG(cmd_q->reg_base, CMD_Q_TAIL_LO_BASE, tail); + CCP_WRITE_REG(cmd_q->reg_base, CMD_Q_CONTROL_BASE, + cmd_q->qcontrol | CMD_Q_RUN); + } else { + ctx_addr = session->auth.pre_compute + CCP_SB_BYTES; + memset(ctx_addr, 0, AES_BLOCK_SIZE); + pst.src_addr = (phys_addr_t)rte_mem_virt2phy((void *)ctx_addr); + 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_NOOP; + ccp_perform_passthru(&pst, cmd_q); + + length = (op->sym->auth.data.length / AES_BLOCK_SIZE); + length *= AES_BLOCK_SIZE; + non_align_len = op->sym->auth.data.length - length; + /* prepare desc for aes-cmac command */ + /*Command 1*/ + desc = &cmd_q->qbase_desc[cmd_q->qidx]; + memset(desc, 0, Q_DESC_SIZE); + + CCP_CMD_ENGINE(desc) = CCP_ENGINE_AES; + CCP_CMD_INIT(desc) = 1; + CCP_CMD_FUNCTION(desc) = function.raw; + + CCP_CMD_LEN(desc) = 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_KEY_LO(desc) = ((uint32_t)key_addr); + CCP_CMD_KEY_HI(desc) = high32_value(key_addr); + CCP_CMD_KEY_MEM(desc) = CCP_MEMTYPE_SYSTEM; + CCP_CMD_LSB_ID(desc) = cmd_q->sb_iv; + + cmd_q->qidx = (cmd_q->qidx + 1) % COMMANDS_PER_QUEUE; + + /*Command 2*/ + append_ptr = append_ptr + CCP_SB_BYTES; + memset(append_ptr, 0, AES_BLOCK_SIZE); + src_tb = rte_pktmbuf_mtod_offset(op->sym->m_src, + uint8_t *, + op->sym->auth.data.offset + + length); + rte_memcpy(append_ptr, src_tb, non_align_len); + append_ptr[non_align_len] = CMAC_PAD_VALUE; + + desc = &cmd_q->qbase_desc[cmd_q->qidx]; + memset(desc, 0, Q_DESC_SIZE); + + CCP_CMD_ENGINE(desc) = CCP_ENGINE_AES; + CCP_CMD_EOM(desc) = 1; + CCP_CMD_FUNCTION(desc) = function.raw; + CCP_CMD_LEN(desc) = AES_BLOCK_SIZE; + + CCP_CMD_SRC_LO(desc) = ((uint32_t)(dest_addr + CCP_SB_BYTES)); + CCP_CMD_SRC_HI(desc) = high32_value(dest_addr + CCP_SB_BYTES); + CCP_CMD_SRC_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; + CCP_CMD_LSB_ID(desc) = cmd_q->sb_iv; + + cmd_q->qidx = (cmd_q->qidx + 1) % COMMANDS_PER_QUEUE; + + rte_wmb(); + tail = + (uint32_t)(cmd_q->qbase_phys_addr + cmd_q->qidx * Q_DESC_SIZE); + CCP_WRITE_REG(cmd_q->reg_base, CMD_Q_TAIL_LO_BASE, tail); + CCP_WRITE_REG(cmd_q->reg_base, CMD_Q_CONTROL_BASE, + cmd_q->qcontrol | CMD_Q_RUN); + } + /* Retrieve result */ + pst.dest_addr = dest_addr; + pst.src_addr = (phys_addr_t)(cmd_q->sb_iv * CCP_SB_BYTES); + pst.len = CCP_SB_BYTES; + pst.dir = 0; + pst.bit_mod = CCP_PASSTHRU_BITWISE_NOOP; + pst.byte_swap = CCP_PASSTHRU_BYTESWAP_256BIT; + ccp_perform_passthru(&pst, cmd_q); + + op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED; + return 0; +} + +static int ccp_perform_aes(struct rte_crypto_op *op, struct ccp_queue *cmd_q, struct ccp_batch_info *b_info) @@ -617,8 +886,8 @@ ccp_crypto_cipher(struct rte_crypto_op *op, static inline int ccp_crypto_auth(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; @@ -629,6 +898,10 @@ ccp_crypto_auth(struct rte_crypto_op *op, ccp_cryptodev_driver_id); switch (session->auth.algo) { + case CCP_AUTH_ALGO_AES_CMAC: + result = ccp_perform_aes_cmac(op, cmd_q); + b_info->desccnt += 4; + break; default: CCP_LOG_ERR("Unsupported auth algo %d", session->auth.algo); diff --git a/drivers/crypto/ccp/ccp_pmd_ops.c b/drivers/crypto/ccp/ccp_pmd_ops.c index a3b0d5c..ab526f3 100644 --- a/drivers/crypto/ccp/ccp_pmd_ops.c +++ b/drivers/crypto/ccp/ccp_pmd_ops.c @@ -13,6 +13,26 @@ #include "ccp_crypto.h" static const struct rte_cryptodev_capabilities ccp_pmd_capabilities[] = { + { /*AES-CMAC */ + .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, + {.sym = { + .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH, + {.auth = { + .algo = RTE_CRYPTO_AUTH_AES_CMAC, + .block_size = 16, + .key_size = { + .min = 16, + .max = 32, + .increment = 8 + }, + .digest_size = { + .min = 16, + .max = 16, + .increment = 0 + }, + }, } + }, } + }, { /* AES ECB */ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC, {.sym = {