From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <Ravi1.Kumar@amd.com>
Received: from NAM01-BY2-obe.outbound.protection.outlook.com
(mail-by2nam01on0069.outbound.protection.outlook.com [104.47.34.69])
by dpdk.org (Postfix) with ESMTP id 2EFD91AFF6
for <dev@dpdk.org>; Fri, 9 Mar 2018 09:36:07 +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=6f9yhkDoQFv86vF9GQxpTQZuqOYIMx2MtH4bVxzagq4=;
b=qYgNYjP6CgpJc1HVREuKyrLatO3tSRN5FjZE7jogeusVoxZICOtnx5xaf1ZNOPb2I69yYIMYcOgKJrUIxkMmbit4G91+VL1Lfp269CPfnpLV+h2GxaAcjmlVycs/Qg4O27R9/NHc/XX1ZOUezUTAQ0u7lM/2tPx+3LCxMEyq2eM=
Authentication-Results: spf=none (sender IP is )
smtp.mailfrom=Ravi1.Kumar@amd.com;
Received: from wallaby-smavila.amd.com (202.56.249.162) by
MWHPR12MB1518.namprd12.prod.outlook.com (2603:10b6:301:b::22) with Microsoft
SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.14; Fri, 9
Mar 2018 08:36:04 +0000
From: Ravi Kumar <Ravi1.kumar@amd.com>
To: dev@dpdk.org
Cc: pablo.de.lara.guarch@intel.com
Date: Fri, 9 Mar 2018 03:35:17 -0500
Message-Id: <1520584520-130522-17-git-send-email-Ravi1.kumar@amd.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1520584520-130522-1-git-send-email-Ravi1.kumar@amd.com>
References: <1515577379-18453-1-git-send-email-Ravi1.kumar@amd.com>
<1520584520-130522-1-git-send-email-Ravi1.kumar@amd.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [202.56.249.162]
X-ClientProxiedBy: MA1PR0101CA0050.INDPRD01.PROD.OUTLOOK.COM
(2603:1096:a00:20::12) To MWHPR12MB1518.namprd12.prod.outlook.com
(2603:10b6:301:b::22)
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 69f3fbdd-b5bf-4b6c-3d7b-08d58598cc65
X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0;
RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020);
SRVR:MWHPR12MB1518;
X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1518;
3:CiZ8RBiE5p4arymqlBhffGPO412JhNQiF4RvL9UQSjtrd64Kw5PClZ44gXo16CZf9mYpI6zwpcvHjfAk1wv4VVdAecFN30ysut2dpx7TXoI7F0WNOAZl9srVftR0ZtkILn0tN9DeHg008tkxNeMpgLRlz3LhJn6XA3qfyo+lv9YwaGZ/R3pWD0UkRyKd4xtMwGBv08UR4LbGE7ej0Aa21D72J1Q9++PasbfNS9F0MntGuM2Iaw78huakXex8ldzD;
25:UmQYc5TTm9CCLKxq+GLd0PFp4zMjt33+kKPodqFOqGtwYFvgV/5OTQAUcZIwFySmKPpW9FDoaNzwW3wbyiSfridGFkTkOq/yW0rF4idcC2UX/GGnbRiFwPd4A4tSTe+Ds5X0HfgsL6b1dtgmCemmrFXsyn9T1u/GZd4bvImOteolIGeMXZaBgdweUJR89ODr+HXzoSBL6xkfFjxrQfVNH7gBF29e5FPj0KmwQLceLbMK7FIEim/+JXaw0ATyguPs83iS//j2553N+Eluk/cc7BaK6JQ40mbv2PgUgfXFKY4wQ0ZGHHWMf1O7eiyR1ey2xDoAeXIcYW4N19Xau4HTgg==;
31:TN3ZsSCUmLbR1AsCMTwixT7tQt/RcPCT77K6laaTkYHSiGpq6v6NSWvmLCylG3jq7eNmwHOb8daccZCXhdSib1AZePVJh5Vl5QCU6VUeS5/2X+4BnhtVCiiVCs1QrXJPZnJiyaoapsLNMx8SG8A6fPOBIujimYEGKqd9ZW+IOaGItHq/YCgH11CavkZybqzxdoflpBGcfLzzcyuaB7zepjk8lV5HXE4LRNCxokhxxtc=
X-MS-TrafficTypeDiagnostic: MWHPR12MB1518:
X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1518;
20:ahnNbIa4Sz0CtcbKUUn7JiRh5S9dDZSWVTV021HeSd6oD/QgLMw11La5JCiJEMPzHayPBbut9fdaLW6jIS9SU9NNicMfCwu7PDq69irr8muc+l1wtWqSOqrQqlXZiosciQfgf8QahIacBW00S0iSocd9fa1qdqjXVNe+Ng+0aLB4f1FYa3xAczS6biGxmaTC2B1aDfhnc+7HWWbBddWx3LVFuVAWKXLyxZMlaJRaQfBPGm+tw6nCUctNi00aj3piC0dZsBLGO/6YxedsB41uU9EbVwnp9JCTT9kQfzcQTjmAJKPoFlhy5JaXhm4XJgVtlmHz4jM9en8pkSB5szCQJmcsLesfkoPPUM3CL3JsvQoHQPQCXNmKSXsDtcqAtXLgYm2RLU/jAU5q+8DOIGY0YDkn0EuLrYBcE2M2HNGU4D8DEbzAICxGTzY6/BF2lxibZPtd8OVx6BZndhPNkjpWyoxBdsuJG6lAxtP6ECMD4WgLBUQdCXf4ocFFTDw2ucGB;
4:ZEtCm9kJaOZFKEHJWFzHnzeHeZ5CLUb2xvUZWcIaufGctRUglN3nb2/MYF6JwbbsoYYGTkwYhMG3buXWOWrZy7PERtEAGmwdlTvdj3EMeOhrif8Th0TDBo4cPEscjPJTcqapu1MJFPQRppq1S6jFTsfADC4dsMLTjAK4vN9PJH0wm4NPRGPkPZjXms8mRtfeGJGyTDhXdk8xtr1WuU2f31edBG/FPCiaXs/ONJ85DF50X9v9X/6z+hlas/cwlAu18wqVAfaweSTUvxHcaurmZ5SqCnZ2q+sYqV70QMxTnQ2YGayKiULYzLeAgE2foA+X
X-Microsoft-Antispam-PRVS: <MWHPR12MB15185CD35FBCF34940B0B3B1AEDE0@MWHPR12MB1518.namprd12.prod.outlook.com>
X-Exchange-Antispam-Report-Test: UriScan:(767451399110);
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(3231220)(944501244)(52105095)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);
SRVR:MWHPR12MB1518; BCL:0; PCL:0; RULEID:; SRVR:MWHPR12MB1518;
X-Forefront-PRVS: 0606BBEB39
X-Forefront-Antispam-Report: SFV:NSPM;
SFS:(10009020)(39860400002)(39380400002)(396003)(366004)(376002)(346002)(199004)(189003)(16586007)(26005)(81156014)(16526019)(8676002)(186003)(81166006)(25786009)(7736002)(3846002)(386003)(305945005)(4326008)(6116002)(6666003)(316002)(86362001)(76176011)(52116002)(8936002)(51416003)(50226002)(5660300001)(2906002)(2950100002)(6916009)(59450400001)(7696005)(36756003)(106356001)(105586002)(6486002)(68736007)(48376002)(97736004)(53416004)(2361001)(2351001)(53936002)(50466002)(478600001)(47776003)(66066001)(72206003);
DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1518; 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; MWHPR12MB1518;
23:n1evmLlrfCBarnD0SfZCxqyvXt0AXKRJxL1WTr9n3?=
=?us-ascii?Q?rZ2rz8yXhGPXwy/C2bU3oUdeR0VlRYp76qTivIcFTLKh0OGj4ljAtwIXjbim?=
=?us-ascii?Q?jqUE7A7TgscG1PP2R5KxPGD+TnhhKBVfiGlP2VcIpE2tkXhek1jVz+UJ9a5G?=
=?us-ascii?Q?l7P0x2XcxzThGBcnX24nm2k6BnuYIi5UJh6jp9YlNBlcuCnaRG4lao2Ncxji?=
=?us-ascii?Q?hdINozWG1yfv9F2H9Z1n4AjfIYD4oJUihsHsihwPhyMLgURldoZOUHleNguJ?=
=?us-ascii?Q?1KTj4et8LnvMCqvp+LTgbUciCrJmVTMiNTTfWnee//Ul+1mvDap9eU4067jf?=
=?us-ascii?Q?ORyMNYHN8D3TS0Q/4JWMw11Lo+rufCNkCPox+ypPbYGI91dK6/MEAjQet38T?=
=?us-ascii?Q?9/D6Wdo02J/m2Pv2Bg5V3PqlgL85LJJCvD+QETOXHAySqdgULquSMfEmNtrY?=
=?us-ascii?Q?+XPsGWTuumx6rEbRIBg2sItusXVE3Jepr/s3dh8Om9veytOy0bwyRnwXOGKQ?=
=?us-ascii?Q?coyJGnXxqBDL1EKzLAgXRE2hm/hQhBnRwFrQIe5FEzYIl229CtQhPEk2WA7o?=
=?us-ascii?Q?A81ob3XflGOhmyHNn+5xD/rb05/SlCm7az8VZUxQlAy8pjtnwgYd59E71Y2q?=
=?us-ascii?Q?xD62RclCE6FvkzL5h6AvhKWbmc+KgRDvUPRaGVp0isrBb4Hq47goKhFfNlFM?=
=?us-ascii?Q?uT4ICPriEPrzzC2wcPJz/SiALgPdlCXAQRbMAQBrqR3hNqmZGWQy+dTNn50e?=
=?us-ascii?Q?2su/SUZEh8xela8Nb5vGBKdbrkvoQPhU1m/qN3efxkAMuwrvGsApsztNlmaE?=
=?us-ascii?Q?bmN9WWiZVLxPg54OSV4iITbPSoEHERIld1brRLyy2L6GF5vrsUAPA5xwf+rR?=
=?us-ascii?Q?Eu1vjEvSgDtGedWw7mR99duxXH+ZA6w3t5A38gCDRSdEAWHdc2Z/gnNQCFPk?=
=?us-ascii?Q?hYAMhQJMa5f8ONaPew1NqvEJfs8O86eUFDv1tYrWYK0PBa6/5WNEo3Vr4gbI?=
=?us-ascii?Q?MUIMRRjeTDi3SP3CvG1z2dY9QsQ4rIIZcSOaD5VIyKfwmJCoYJaQ3/d7DWmk?=
=?us-ascii?Q?jqvZ7OrCbt5oJc4RTlYAQO9OVTbaGbA3LoIpcHxWRrEuq1faguKvlq2YYRN9?=
=?us-ascii?Q?Wpw7vVEZxsKPZvhz6Lh28xftsJgc68sFqBOX1C2cpgJsYjNttdGkAkqU92Xz?=
=?us-ascii?Q?mkMArnyY0cnPKk=3D?=
X-Microsoft-Antispam-Message-Info: GCuR9FzmpwOVQTdIRBEPwWZ/oDWhUs1mvTPiDB3EHWihShLhNH1Kx0txGa2geXzG4LCQyFX1f8BIITBrIVAKH+6tgxj5oq5TO8qdZTR9R239usAyxFBzsnmG7nZidXYBjC9oEAX8InpR4Kp3xK1DDaEkKiG11/Jo9jQtDPfBnO1mFKeS2J8C8GZzvnFxBZC+
X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1518;
6:rlBx8n5RQCmLAqByT/0M9raJj478/YSCGlv5AemjhNSizs3abybNLydScYwV0tySCVajwhDYIqg5QmfF7KK7haWzDQSTseV0ZRP6GuGmF1gKYFxbZeQz6VDmh2oPprERDRENfghTMNtZKH6zQplKJKQ2E0hfuoxJc+uLnbIvG5ySd8kWSYXmOR3NwJ8fqfb45+QJhv7Jjb644S9mqsA3FWZ7OENDrg77GK90E8jFW9raI3ELHITI6kjxFtc6b+gTIOK2djd13u6jAOp7O9OFWW5YBbT6G5gSFX3Pya4Gm4cuD2jTecvJfywvvb1b9mKJ6lHZFaLYMKK+F29QlDmedqU+AMRSeGx1Dri/mnM5rzY=;
5:4o/JixmoQ7ivkNd9ySrZsK1Nileu+TIvSY8bOoSYBsm8SWQMhA7qnWM/kiXUOzHl2hwp6KoFamrRouBH9Bld4EfHlL7WgMaLknwzQzxME5tqomIjPKEi8Kio0hEDjAK8+ALK991MORRBYbFwSS8NdBFO+qPMhPIrdbctP9VQ32I=;
24:T3BLuIwpqFvFk8hlDoixM/HkJe3VWDoKR3uhzkK7JKILms0jxrvuj5iV0hoff9WFzeOiz0wPYjm3aQtJvvoyDhjH5xgVm/hMfEv9i9Saer8=;
7:LSTSAnnuOnLG9fyC34+6hqMYhphPAHado+RUvH8LPN4l2NjOpjxqrZfka57phK99J/A7qOE4nTWUg0MLNswNCnM6cQ89n0G4lXodfy/YQdmDG1Mr7O8kN0kYHX7+5ThcJo7xOMMYnZ5UzIkLWqmd6Od1kvUj6GVe5N1I5lvHzTNYsVKzI5HzotF6BTkJ0uAZ8gY7xsU4QKeeltR0JAHEbECGDlKlbGKvyQpUABBMb7pRUE/qSgO6js+djTLdFZ2w
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1518;
20:UnLkUXZkMRDXTMFx2sGQ869eH+Jwc8BYJW/3tss0iou38m1B7whfp+0sXpbBM7ut9gj/DEAdz0suKu/ot6696vMF7P4YsEqWQ8WlYOKOqckj8QbumK8qeHxalG44Cn9rn6q8rlyqvbypE+n9UKB4nwvoxsIYhkJ0aE+tY4ub73Y0fQNAxRcmYPDDzvhEvIexOsSVxSFiKmt21b0SjreXQgJxPRDj+Kk1IR3ELazo2uz5ERpl7WJOGQWeR+ePO1Kr
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2018 08:36:04.5065 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 69f3fbdd-b5bf-4b6c-3d7b-08d58598cc65
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1518
Subject: [dpdk-dev] [PATCH v4 17/20] crypto/ccp: support cpu based md5 and
sha2 family authentication algo
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Mar 2018 08:36:07 -0000
Signed-off-by: Ravi Kumar <Ravi1.kumar@amd.com>
---
config/common_base | 1 +
drivers/crypto/ccp/ccp_crypto.c | 282 ++++++++++++++++++++++++++++++++++-
drivers/crypto/ccp/ccp_crypto.h | 5 +-
drivers/crypto/ccp/ccp_pmd_ops.c | 23 +++
drivers/crypto/ccp/ccp_pmd_private.h | 10 ++
5 files changed, 316 insertions(+), 5 deletions(-)
diff --git a/config/common_base b/config/common_base
index 28237f0..65e34ae 100644
--- a/config/common_base
+++ b/config/common_base
@@ -532,6 +532,7 @@ CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO=y
# Compile PMD for AMD CCP crypto device
#
CONFIG_RTE_LIBRTE_PMD_CCP=n
+CONFIG_RTE_LIBRTE_PMD_CCP_CPU_AUTH=n
#
# Compile PMD for Marvell Crypto device
diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_crypto.c
index cb63bc6..133db76 100644
--- a/drivers/crypto/ccp/ccp_crypto.c
+++ b/drivers/crypto/ccp/ccp_crypto.c
@@ -53,6 +53,12 @@
#include "ccp_pci.h"
#include "ccp_pmd_private.h"
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+#include <openssl/conf.h>
+#include <openssl/err.h>
+#include <openssl/hmac.h>
+#endif
+
/* SHA initial context values */
static uint32_t ccp_sha1_init[SHA_COMMON_DIGEST_SIZE / sizeof(uint32_t)] = {
SHA1_H4, SHA1_H3,
@@ -786,6 +792,17 @@ ccp_configure_session_auth(struct ccp_session *sess,
else
sess->auth.op = CCP_AUTH_OP_VERIFY;
switch (auth_xform->algo) {
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ case RTE_CRYPTO_AUTH_MD5_HMAC:
+ sess->auth.algo = CCP_AUTH_ALGO_MD5_HMAC;
+ sess->auth.offset = (CCP_SB_BYTES << 1) - MD5_DIGEST_SIZE;
+ sess->auth.key_length = auth_xform->key.length;
+ sess->auth.block_size = MD5_BLOCK_SIZE;
+ memset(sess->auth.key, 0, sess->auth.block_size);
+ rte_memcpy(sess->auth.key, auth_xform->key.data,
+ auth_xform->key.length);
+ break;
+#endif
case RTE_CRYPTO_AUTH_SHA1:
sess->auth.engine = CCP_ENGINE_SHA;
sess->auth.algo = CCP_AUTH_ALGO_SHA1;
@@ -795,6 +812,17 @@ ccp_configure_session_auth(struct ccp_session *sess,
sess->auth.offset = CCP_SB_BYTES - SHA1_DIGEST_SIZE;
break;
case RTE_CRYPTO_AUTH_SHA1_HMAC:
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ if (auth_xform->key.length > SHA1_BLOCK_SIZE)
+ return -1;
+ sess->auth.algo = CCP_AUTH_ALGO_SHA1_HMAC;
+ sess->auth.offset = CCP_SB_BYTES - SHA1_DIGEST_SIZE;
+ sess->auth.block_size = SHA1_BLOCK_SIZE;
+ sess->auth.key_length = auth_xform->key.length;
+ memset(sess->auth.key, 0, sess->auth.block_size);
+ rte_memcpy(sess->auth.key, auth_xform->key.data,
+ auth_xform->key.length);
+#else
if (auth_xform->key.length > SHA1_BLOCK_SIZE)
return -1;
sess->auth.engine = CCP_ENGINE_SHA;
@@ -810,6 +838,7 @@ ccp_configure_session_auth(struct ccp_session *sess,
auth_xform->key.length);
if (generate_partial_hash(sess))
return -1;
+#endif
break;
case RTE_CRYPTO_AUTH_SHA224:
sess->auth.algo = CCP_AUTH_ALGO_SHA224;
@@ -820,6 +849,17 @@ ccp_configure_session_auth(struct ccp_session *sess,
sess->auth.offset = CCP_SB_BYTES - SHA224_DIGEST_SIZE;
break;
case RTE_CRYPTO_AUTH_SHA224_HMAC:
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ if (auth_xform->key.length > SHA224_BLOCK_SIZE)
+ return -1;
+ sess->auth.algo = CCP_AUTH_ALGO_SHA224_HMAC;
+ sess->auth.offset = CCP_SB_BYTES - SHA224_DIGEST_SIZE;
+ sess->auth.block_size = SHA224_BLOCK_SIZE;
+ sess->auth.key_length = auth_xform->key.length;
+ memset(sess->auth.key, 0, sess->auth.block_size);
+ rte_memcpy(sess->auth.key, auth_xform->key.data,
+ auth_xform->key.length);
+#else
if (auth_xform->key.length > SHA224_BLOCK_SIZE)
return -1;
sess->auth.algo = CCP_AUTH_ALGO_SHA224_HMAC;
@@ -835,6 +875,7 @@ ccp_configure_session_auth(struct ccp_session *sess,
auth_xform->key.length);
if (generate_partial_hash(sess))
return -1;
+#endif
break;
case RTE_CRYPTO_AUTH_SHA3_224:
sess->auth.algo = CCP_AUTH_ALGO_SHA3_224;
@@ -869,6 +910,17 @@ ccp_configure_session_auth(struct ccp_session *sess,
sess->auth.offset = CCP_SB_BYTES - SHA256_DIGEST_SIZE;
break;
case RTE_CRYPTO_AUTH_SHA256_HMAC:
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ if (auth_xform->key.length > SHA256_BLOCK_SIZE)
+ return -1;
+ sess->auth.algo = CCP_AUTH_ALGO_SHA256_HMAC;
+ sess->auth.offset = CCP_SB_BYTES - SHA256_DIGEST_SIZE;
+ sess->auth.block_size = SHA256_BLOCK_SIZE;
+ sess->auth.key_length = auth_xform->key.length;
+ memset(sess->auth.key, 0, sess->auth.block_size);
+ rte_memcpy(sess->auth.key, auth_xform->key.data,
+ auth_xform->key.length);
+#else
if (auth_xform->key.length > SHA256_BLOCK_SIZE)
return -1;
sess->auth.algo = CCP_AUTH_ALGO_SHA256_HMAC;
@@ -884,6 +936,7 @@ ccp_configure_session_auth(struct ccp_session *sess,
auth_xform->key.length);
if (generate_partial_hash(sess))
return -1;
+#endif
break;
case RTE_CRYPTO_AUTH_SHA3_256:
sess->auth.algo = CCP_AUTH_ALGO_SHA3_256;
@@ -918,6 +971,17 @@ ccp_configure_session_auth(struct ccp_session *sess,
sess->auth.offset = (CCP_SB_BYTES << 1) - SHA384_DIGEST_SIZE;
break;
case RTE_CRYPTO_AUTH_SHA384_HMAC:
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ if (auth_xform->key.length > SHA384_BLOCK_SIZE)
+ return -1;
+ sess->auth.algo = CCP_AUTH_ALGO_SHA384_HMAC;
+ sess->auth.offset = (CCP_SB_BYTES << 1) - SHA384_DIGEST_SIZE;
+ sess->auth.block_size = SHA384_BLOCK_SIZE;
+ sess->auth.key_length = auth_xform->key.length;
+ memset(sess->auth.key, 0, sess->auth.block_size);
+ rte_memcpy(sess->auth.key, auth_xform->key.data,
+ auth_xform->key.length);
+#else
if (auth_xform->key.length > SHA384_BLOCK_SIZE)
return -1;
sess->auth.algo = CCP_AUTH_ALGO_SHA384_HMAC;
@@ -933,6 +997,7 @@ ccp_configure_session_auth(struct ccp_session *sess,
auth_xform->key.length);
if (generate_partial_hash(sess))
return -1;
+#endif
break;
case RTE_CRYPTO_AUTH_SHA3_384:
sess->auth.algo = CCP_AUTH_ALGO_SHA3_384;
@@ -967,6 +1032,17 @@ ccp_configure_session_auth(struct ccp_session *sess,
sess->auth.offset = (CCP_SB_BYTES << 1) - SHA512_DIGEST_SIZE;
break;
case RTE_CRYPTO_AUTH_SHA512_HMAC:
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ if (auth_xform->key.length > SHA512_BLOCK_SIZE)
+ return -1;
+ sess->auth.algo = CCP_AUTH_ALGO_SHA512_HMAC;
+ sess->auth.offset = (CCP_SB_BYTES << 1) - SHA512_DIGEST_SIZE;
+ sess->auth.block_size = SHA512_BLOCK_SIZE;
+ sess->auth.key_length = auth_xform->key.length;
+ memset(sess->auth.key, 0, sess->auth.block_size);
+ rte_memcpy(sess->auth.key, auth_xform->key.data,
+ auth_xform->key.length);
+#else
if (auth_xform->key.length > SHA512_BLOCK_SIZE)
return -1;
sess->auth.algo = CCP_AUTH_ALGO_SHA512_HMAC;
@@ -982,6 +1058,7 @@ ccp_configure_session_auth(struct ccp_session *sess,
auth_xform->key.length);
if (generate_partial_hash(sess))
return -1;
+#endif
break;
case RTE_CRYPTO_AUTH_SHA3_512:
sess->auth.algo = CCP_AUTH_ALGO_SHA3_512;
@@ -1012,7 +1089,7 @@ ccp_configure_session_auth(struct ccp_session *sess,
sess->auth.engine = CCP_ENGINE_AES;
sess->auth.um.aes_mode = CCP_AES_MODE_CMAC;
sess->auth.key_length = auth_xform->key.length;
- /**<padding and hash result*/
+ /* padding and hash result */
sess->auth.ctx_len = CCP_SB_BYTES << 1;
sess->auth.offset = AES_BLOCK_SIZE;
sess->auth.block_size = AES_BLOCK_SIZE;
@@ -1208,14 +1285,22 @@ ccp_auth_slot(struct ccp_session *session)
count = 3;
/**< op + lsb passthrough cpy to/from*/
break;
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ case CCP_AUTH_ALGO_MD5_HMAC:
+ break;
+#endif
case CCP_AUTH_ALGO_SHA1_HMAC:
case CCP_AUTH_ALGO_SHA224_HMAC:
case CCP_AUTH_ALGO_SHA256_HMAC:
+#ifndef RTE_LIBRTE_PMD_CCP_CPU_AUTH
count = 6;
+#endif
break;
case CCP_AUTH_ALGO_SHA384_HMAC:
case CCP_AUTH_ALGO_SHA512_HMAC:
+#ifndef RTE_LIBRTE_PMD_CCP_CPU_AUTH
count = 7;
+#endif
/**
* 1. Load PHash1 = H(k ^ ipad); to LSB
* 2. generate IHash = H(hash on meassage with PHash1
@@ -1322,6 +1407,122 @@ ccp_compute_slot_count(struct ccp_session *session)
return count;
}
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+static uint8_t
+algo_select(int sessalgo,
+ const EVP_MD **algo)
+{
+ int res = 0;
+
+ switch (sessalgo) {
+ case CCP_AUTH_ALGO_MD5_HMAC:
+ *algo = EVP_md5();
+ break;
+ case CCP_AUTH_ALGO_SHA1_HMAC:
+ *algo = EVP_sha1();
+ break;
+ case CCP_AUTH_ALGO_SHA224_HMAC:
+ *algo = EVP_sha224();
+ break;
+ case CCP_AUTH_ALGO_SHA256_HMAC:
+ *algo = EVP_sha256();
+ break;
+ case CCP_AUTH_ALGO_SHA384_HMAC:
+ *algo = EVP_sha384();
+ break;
+ case CCP_AUTH_ALGO_SHA512_HMAC:
+ *algo = EVP_sha512();
+ break;
+ default:
+ res = -EINVAL;
+ break;
+ }
+ return res;
+}
+
+static int
+process_cpu_auth_hmac(uint8_t *src, uint8_t *dst,
+ __rte_unused uint8_t *iv,
+ EVP_PKEY *pkey,
+ int srclen,
+ EVP_MD_CTX *ctx,
+ const EVP_MD *algo,
+ uint16_t d_len)
+{
+ size_t dstlen;
+ unsigned char temp_dst[64];
+
+ if (EVP_DigestSignInit(ctx, NULL, algo, NULL, pkey) <= 0)
+ goto process_auth_err;
+
+ if (EVP_DigestSignUpdate(ctx, (char *)src, srclen) <= 0)
+ goto process_auth_err;
+
+ if (EVP_DigestSignFinal(ctx, temp_dst, &dstlen) <= 0)
+ goto process_auth_err;
+
+ memcpy(dst, temp_dst, d_len);
+ return 0;
+process_auth_err:
+ CCP_LOG_ERR("Process cpu auth failed");
+ return -EINVAL;
+}
+
+static int cpu_crypto_auth(struct ccp_qp *qp,
+ struct rte_crypto_op *op,
+ struct ccp_session *sess,
+ EVP_MD_CTX *ctx)
+{
+ uint8_t *src, *dst;
+ int srclen, status;
+ struct rte_mbuf *mbuf_src, *mbuf_dst;
+ const EVP_MD *algo = NULL;
+ EVP_PKEY *pkey;
+
+ algo_select(sess->auth.algo, &algo);
+ pkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, NULL, sess->auth.key,
+ sess->auth.key_length);
+ mbuf_src = op->sym->m_src;
+ mbuf_dst = op->sym->m_dst ? op->sym->m_dst : op->sym->m_src;
+ srclen = op->sym->auth.data.length;
+ src = rte_pktmbuf_mtod_offset(mbuf_src, uint8_t *,
+ op->sym->auth.data.offset);
+
+ if (sess->auth.op == CCP_AUTH_OP_VERIFY) {
+ dst = qp->temp_digest;
+ } else {
+ dst = op->sym->auth.digest.data;
+ if (dst == NULL) {
+ dst = rte_pktmbuf_mtod_offset(mbuf_dst, uint8_t *,
+ op->sym->auth.data.offset +
+ sess->auth.digest_length);
+ }
+ }
+ status = process_cpu_auth_hmac(src, dst, NULL,
+ pkey, srclen,
+ ctx,
+ algo,
+ sess->auth.digest_length);
+ if (status) {
+ op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+ return status;
+ }
+
+ if (sess->auth.op == CCP_AUTH_OP_VERIFY) {
+ if (memcmp(dst, op->sym->auth.digest.data,
+ sess->auth.digest_length) != 0) {
+ op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+ } else {
+ op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+ }
+ } else {
+ op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+ }
+ EVP_PKEY_free(pkey);
+ return 0;
+}
+#endif
+
static void
ccp_perform_passthru(struct ccp_passthru *pst,
struct ccp_queue *cmd_q)
@@ -2417,14 +2618,24 @@ ccp_crypto_auth(struct rte_crypto_op *op,
result = ccp_perform_sha(op, cmd_q);
b_info->desccnt += 3;
break;
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ case CCP_AUTH_ALGO_MD5_HMAC:
+ break;
+#endif
case CCP_AUTH_ALGO_SHA1_HMAC:
case CCP_AUTH_ALGO_SHA224_HMAC:
case CCP_AUTH_ALGO_SHA256_HMAC:
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ break;
+#endif
result = ccp_perform_hmac(op, cmd_q);
b_info->desccnt += 6;
break;
case CCP_AUTH_ALGO_SHA384_HMAC:
case CCP_AUTH_ALGO_SHA512_HMAC:
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ break;
+#endif
result = ccp_perform_hmac(op, cmd_q);
b_info->desccnt += 7;
break;
@@ -2488,7 +2699,7 @@ ccp_crypto_aead(struct rte_crypto_op *op,
}
int
-process_ops_to_enqueue(const struct ccp_qp *qp,
+process_ops_to_enqueue(struct ccp_qp *qp,
struct rte_crypto_op **op,
struct ccp_queue *cmd_q,
uint16_t nb_ops,
@@ -2497,11 +2708,22 @@ process_ops_to_enqueue(const struct ccp_qp *qp,
int i, result = 0;
struct ccp_batch_info *b_info;
struct ccp_session *session;
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ EVP_MD_CTX *auth_ctx = NULL;
+#endif
if (rte_mempool_get(qp->batch_mp, (void **)&b_info)) {
CCP_LOG_ERR("batch info allocation failed");
return 0;
}
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ auth_ctx = EVP_MD_CTX_create();
+ if (unlikely(!auth_ctx)) {
+ CCP_LOG_ERR("Unable to create auth ctx");
+ return 0;
+ }
+ b_info->auth_ctr = 0;
+#endif
/* populate batch info necessary for dequeue */
b_info->op_idx = 0;
b_info->lsb_buf_idx = 0;
@@ -2523,6 +2745,11 @@ process_ops_to_enqueue(const struct ccp_qp *qp,
break;
case CCP_CMD_AUTH:
result = ccp_crypto_auth(op[i], cmd_q, b_info);
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ b_info->auth_ctr++;
+ result = cpu_crypto_auth(qp, op[i],
+ session, auth_ctx);
+#endif
break;
case CCP_CMD_CIPHER_HASH:
result = ccp_crypto_cipher(op[i], cmd_q, b_info);
@@ -2532,6 +2759,12 @@ process_ops_to_enqueue(const struct ccp_qp *qp,
break;
case CCP_CMD_HASH_CIPHER:
result = ccp_crypto_auth(op[i], cmd_q, b_info);
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ result = cpu_crypto_auth(qp, op[i],
+ session, auth_ctx);
+ if (op[i]->status != RTE_CRYPTO_OP_STATUS_SUCCESS)
+ continue;
+#endif
if (result)
break;
result = ccp_crypto_cipher(op[i], cmd_q, b_info);
@@ -2565,6 +2798,9 @@ process_ops_to_enqueue(const struct ccp_qp *qp,
rte_ring_enqueue(qp->processed_pkts, (void *)b_info);
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ EVP_MD_CTX_destroy(auth_ctx);
+#endif
return i;
}
@@ -2633,13 +2869,27 @@ static inline void ccp_auth_dq_prepare(struct rte_crypto_op *op)
}
static int
-ccp_prepare_ops(struct rte_crypto_op **op_d,
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ccp_prepare_ops(struct ccp_qp *qp,
+#else
+ccp_prepare_ops(struct ccp_qp *qp __rte_unused,
+#endif
+ struct rte_crypto_op **op_d,
struct ccp_batch_info *b_info,
uint16_t nb_ops)
{
int i, min_ops;
struct ccp_session *session;
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ EVP_MD_CTX *auth_ctx = NULL;
+
+ auth_ctx = EVP_MD_CTX_create();
+ if (unlikely(!auth_ctx)) {
+ CCP_LOG_ERR("Unable to create auth ctx");
+ return 0;
+ }
+#endif
min_ops = RTE_MIN(nb_ops, b_info->opcnt);
for (i = 0; i < min_ops; i++) {
@@ -2652,8 +2902,25 @@ ccp_prepare_ops(struct rte_crypto_op **op_d,
op_d[i]->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
break;
case CCP_CMD_AUTH:
+#ifndef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ ccp_auth_dq_prepare(op_d[i]);
+#endif
+ break;
case CCP_CMD_CIPHER_HASH:
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ cpu_crypto_auth(qp, op_d[i],
+ session, auth_ctx);
+#else
+ ccp_auth_dq_prepare(op_d[i]);
+#endif
+ break;
case CCP_CMD_HASH_CIPHER:
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ op_d[i]->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+#else
+ ccp_auth_dq_prepare(op_d[i]);
+#endif
+ break;
case CCP_CMD_COMBINED:
ccp_auth_dq_prepare(op_d[i]);
break;
@@ -2662,6 +2929,9 @@ ccp_prepare_ops(struct rte_crypto_op **op_d,
}
}
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ EVP_MD_CTX_destroy(auth_ctx);
+#endif
b_info->opcnt -= min_ops;
return min_ops;
}
@@ -2681,6 +2951,10 @@ process_ops_to_dequeue(struct ccp_qp *qp,
} else if (rte_ring_dequeue(qp->processed_pkts,
(void **)&b_info))
return 0;
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ if (b_info->auth_ctr == b_info->opcnt)
+ goto success;
+#endif
cur_head_offset = CCP_READ_REG(b_info->cmd_q->reg_base,
CMD_Q_HEAD_LO_BASE);
@@ -2700,7 +2974,7 @@ process_ops_to_dequeue(struct ccp_qp *qp,
success:
- nb_ops = ccp_prepare_ops(op, b_info, nb_ops);
+ nb_ops = ccp_prepare_ops(qp, op, b_info, nb_ops);
rte_atomic64_add(&b_info->cmd_q->free_slots, b_info->desccnt);
b_info->desccnt = 0;
if (b_info->opcnt > 0) {
diff --git a/drivers/crypto/ccp/ccp_crypto.h b/drivers/crypto/ccp/ccp_crypto.h
index 8459b71..f526329 100644
--- a/drivers/crypto/ccp/ccp_crypto.h
+++ b/drivers/crypto/ccp/ccp_crypto.h
@@ -94,6 +94,9 @@
#define SHA512_BLOCK_SIZE 128
#define SHA3_512_BLOCK_SIZE 72
+/* Maximum length for digest */
+#define DIGEST_LENGTH_MAX 64
+
/* SHA LSB intialiazation values */
#define SHA1_H0 0x67452301UL
@@ -372,7 +375,7 @@ int ccp_compute_slot_count(struct ccp_session *session);
* @param nb_ops No. of ops to be submitted
* @return 0 on success otherwise -1
*/
-int process_ops_to_enqueue(const struct ccp_qp *qp,
+int process_ops_to_enqueue(struct ccp_qp *qp,
struct rte_crypto_op **op,
struct ccp_queue *cmd_q,
uint16_t nb_ops,
diff --git a/drivers/crypto/ccp/ccp_pmd_ops.c b/drivers/crypto/ccp/ccp_pmd_ops.c
index bb59d15..1b67070 100644
--- a/drivers/crypto/ccp/ccp_pmd_ops.c
+++ b/drivers/crypto/ccp/ccp_pmd_ops.c
@@ -39,6 +39,29 @@
#include "ccp_crypto.h"
static const struct rte_cryptodev_capabilities ccp_pmd_capabilities[] = {
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ { /* MD5 HMAC */
+ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+ {.sym = {
+ .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+ {.auth = {
+ .algo = RTE_CRYPTO_AUTH_MD5_HMAC,
+ .block_size = 64,
+ .key_size = {
+ .min = 1,
+ .max = 64,
+ .increment = 1
+ },
+ .digest_size = {
+ .min = 16,
+ .max = 16,
+ .increment = 0
+ },
+ .aad_size = { 0 }
+ }, }
+ }, }
+ },
+#endif
{ /* SHA1 */
.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
{.sym = {
diff --git a/drivers/crypto/ccp/ccp_pmd_private.h b/drivers/crypto/ccp/ccp_pmd_private.h
index d278a8c..cd9f6ae 100644
--- a/drivers/crypto/ccp/ccp_pmd_private.h
+++ b/drivers/crypto/ccp/ccp_pmd_private.h
@@ -32,6 +32,7 @@
#define _CCP_PMD_PRIVATE_H_
#include <rte_cryptodev.h>
+#include "ccp_crypto.h"
#define CRYPTODEV_NAME_CCP_PMD crypto_ccp
@@ -87,6 +88,10 @@ struct ccp_batch_info {
phys_addr_t lsb_buf_phys;
/**< LSB intermediate buf for passthru */
int lsb_buf_idx;
+#ifdef RTE_LIBRTE_PMD_CCP_CPU_AUTH
+ uint16_t auth_ctr;
+ /**< auth only ops batch */
+#endif
} __rte_cache_aligned;
/**< CCP crypto queue pair */
@@ -107,6 +112,11 @@ struct ccp_qp {
/**< Store ops pulled out of queue */
struct rte_cryptodev *dev;
/**< rte crypto device to which this qp belongs */
+ uint8_t temp_digest[DIGEST_LENGTH_MAX];
+ /**< Buffer used to store the digest generated
+ * by the driver when verifying a digest provided
+ * by the user (using authentication verify operation)
+ */
} __rte_cache_aligned;
--
2.7.4