From patchwork Tue Jul 3 15:24:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shally Verma X-Patchwork-Id: 42159 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 9204B1BF4A; Tue, 3 Jul 2018 17:25:24 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0062.outbound.protection.outlook.com [104.47.36.62]) by dpdk.org (Postfix) with ESMTP id 6DC8F1BF59 for ; Tue, 3 Jul 2018 17:25:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yCcaYBpKF2EBt9zPzlSFYf5pDnHg+nWJLsMwD32ffzc=; b=lrhnVbrhLOsHDFM2hkbdBGkS0v7IgNVr5yT1ON1HVovnBQzC7+8zj41t3lHklsszv+CYsmKCVVDh0bxe7vgT15QRsX1Cmmx7hm1fNeC5lx2hgt6X4N9SV8fFinlH4lN7IR6srAa6MDz531LSsR8L8zXRo8+5NT6eHd6yrmtPRB4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Shally.Verma@cavium.com; Received: from hyd1sverma-dt.caveonetworks.com (115.113.156.2) by DM5PR0701MB3640.namprd07.prod.outlook.com (2603:10b6:4:7e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Tue, 3 Jul 2018 15:25:18 +0000 From: Shally Verma To: pablo.de.lara.guarch@intel.com Cc: dev@dpdk.org, pathreya@caviumnetworks.com, nmurthy@caviumnetworks.com, Umesh Kartha , Sunila Sahu , Ashish Gupta Date: Tue, 3 Jul 2018 20:54:24 +0530 Message-Id: <1530631466-26427-3-git-send-email-shally.verma@caviumnetworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1530631466-26427-1-git-send-email-shally.verma@caviumnetworks.com> References: <1530631466-26427-1-git-send-email-shally.verma@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [115.113.156.2] X-ClientProxiedBy: PN1PR0101CA0014.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00:e::24) To DM5PR0701MB3640.namprd07.prod.outlook.com (2603:10b6:4:7e::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bff9de47-c88c-4dca-b560-08d5e0f9306b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600053)(711020)(2017052603328)(7153060)(7193020); SRVR:DM5PR0701MB3640; X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3640; 3:T4HjB0Nt3zOGoTptH+djXq4e4eEqjmlJm4qSa/lsYiiCDhL9HQ9S3rY2uyG0eOdXwJfjtUEyJ/fmC/V5NmjLfM09u9X8l1BNKq5fxCNWqTDp8Lxw568SVYkNpnclHcjoZkgpQx/HalyVGizCiWdncvU3jCU8ZIv68Q1mZJ8HIxtKlV2NyMLYBhjJP8GKU0OTVUgAWM8Va9LQExkmtZTMvHuohQ45m8FfQzNoPEvXj1d8Whu8VhtFrerc0r15LGXt; 25:Z6tbt6rXH+QkgFUKj2gY/hBkeYYLMGaXeLZ58lhgk0MmXfdd4c7SQYkz31yIHEnV+AZ3ZQhZyBylQrf8pbQCz3tNYCuB9UQypqs2EtBGh2hGAviCeFR6P3kRnUSBeDlcEW/4lBLOYqnqgf04nikVCykEClPD1AAHsq4Kc7jcoTBNvjjoJ+wYW+hxkEow3u2p4+9YGxW0HY6aKO95iQiWFt6duWtmFik8XhWY75MeO2J1pUYXfyR2YHLyEZO+0KkZkTggxd46emJceLsXXdrwB3/C8smWnwHiy1w0z5x1Jb6YUZmFQnRglHCEWKYhxh1j0+7FcYGqfLK6pfxp2OJ06g==; 31:eQVjif2dDMfjS0bMONzYsiG2bkPG6ZNNyxHMKc6zxT7baFu3zW68VO/I93n9oXFFVTyspWkZ7/8WaFcw2cDrO8b81xpSnX16gDJ40wC1LdxpCunz5/VRNWoYYXY0IRNy15tMZ7kvMgp3ItqhtA5/o6EwTkg0D2FrP4ANHC6i0NOsBKKOK1p4ntquYfZXYoGDdR/tgfOHx44GYaeZqXkYMl2ZHkBVI+ZvIz4und7mHxU= X-MS-TrafficTypeDiagnostic: DM5PR0701MB3640: X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3640; 20:rDKW5Kfcc9oLyK780jeJoVOX0z27/gy675wrvJbrCkvgXops9iWWPy3IVZOOuAJaD+ssNpIEjtOIn+UOqRiKX7D8pHNtHKAt1GtjpSkOBYqCckh+nthaiitz+9kPkPpC+mOSCQyxxk/+AmnsvT11G+2Tx589cbPB8aWLeT59inLH/cFrfbBkI74elbH0c7PXmQF+rTUEBBBY0rx43967wflS0cRoO7Navxa1c3dBMb72n15KhDtFPy1cvqfQbnVJRO/nLBIplMaodPCgsabRi3X0n8AsbAHyaWevIhM7t0GrlvRq+uV2HPWuhZEhsBg92wLNKAAJKyB26L18GrG9dkjyizMFwXxJ6iGZnMjjpl4Co2c+T67hFqlm+Kq6HCk+g5zUydAN8UZqnYFNMZxQLm+xUqgvw5NgwHkLT8F33SwJvvDCTyCLL9rYdwDWssGXFp920XDMC4aS4gMi3iFaAgduJxkD2wgfN1tp89hgq+0YhdqqE2AVzFOyUUJivvGLT2+clpZ3wUaGW8w9FN4Okq8AJRrCDoT4hAO1MnqMdu5aRWYMPnJ3ksf7rBRXUW6fuoYc3fXZj0gu+2hG6q8qjw82O1Fgu+gYK+0fhnXVy8U=; 4:47YEzHqmDoJHk0g7KyuhREOrxWNhMPSNL5RFPboEz3IZLsgXxECRRgE0wsaigAFAa9cHgyCp11u17hlUTo3htQAbRRnaq45kCTfvySOa9GEAQMwmAJkC7pZSqqor8IRNTytvuWbSuUlyEWlxar636RPhJpRY4snK43fnPUgDYhThQJMg35uAcM0UTLnp81JeBzxNDUJDnZ1DYcepK9cGmYXAGdaqa4cguZzghYDUgOwKR2+LMe1esmc49uT+R+a6r3AWQvmHmeFuX8jbIH0U9g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(10201501046)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DM5PR0701MB3640; BCL:0; PCL:0; RULEID:; SRVR:DM5PR0701MB3640; X-Forefront-PRVS: 0722981D2A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(346002)(376002)(39860400002)(396003)(366004)(199004)(189003)(50226002)(53936002)(55236004)(316002)(6506007)(107886003)(54906003)(42882007)(305945005)(386003)(68736007)(51416003)(575784001)(7736002)(4326008)(72206003)(8676002)(6486002)(478600001)(25786009)(81156014)(81166006)(76176011)(2361001)(6512007)(97736004)(69596002)(6116002)(16526019)(3846002)(186003)(2351001)(44832011)(5660300001)(6666003)(6916009)(53416004)(8936002)(66066001)(47776003)(476003)(106356001)(16586007)(956004)(2616005)(11346002)(105586002)(2906002)(52116002)(446003)(50466002)(5024004)(14444005)(26005)(48376002)(36756003)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR0701MB3640; H:hyd1sverma-dt.caveonetworks.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR0701MB3640; 23:rMCpSncnbQDBE+8XlPib0Yy5BLUGKDBLW7jeBsI?= bGtuV+XRuRnrhlHDykUOTmLQRGyg34e6h+CvOZV0mSM/OVtcmIH4/Q1TdG2mgDkqjM1aeYT3hhYgR6LqVTygTNc+OyDiTq6Rb68u7vWitM/n9PI0V3tLb2DVawkJdNhapc8LRi6OmgzretfqU6PHob8+hHjTMrR8L2goQBAMlLWTe70P1Fp7Ref2uDh7ZbWsaryxPSalxvC+me+Fcc87zw5+ih6x7t47B8qa4X77F4Jkh50WGDsAWDI2UE6Oz56JJCsXmsBYls7zZxXx0hOY4+9ffLP/FZEKHvebYSgDI0/Y1PY98hC9jCfaJgvEM/fDChQ/WVU/vduaUKmNgg4+yyNFnuh3ZwCaerfDWDbu4+rjpqrnqNqALdEay4HrpDgzXC4lZLtDI4dP8nO0OLTQPOo1loeXxzO1n3LojB3ap0CVfvN47G0hCrvjfJN8obFaUGmiFc7kGV+igXNIHXZO+pyLgYk0CPRn39zZNQkFgBNY9xizO6jY7XoTVFvQHpiJ2OEWcXseYrsVB51hpqu0Q7vPu/O1pgO2fK6ZYZ6fFeYzU8/J4sOJt8w6tQatjXUVwFgOGmWpftyqt8JDMZXD+q4yN7N/h+yhwrW2f2YBwCQmTvHtV2c0uBB9tQy8/LwfWv7ZsbmyVGqKEI09UQVjGChTWGBeC9J/10dJPBf2Jjx6ndiESAX2tUvqZL+UM9EdMEKFGCDW3zeJE6bliuT1a2rCRDAwFMQEyIM/klHVtIRAukjgCpY8aXdpSzqBZmr10ldw6uj9kNevyI7dmIe9C7ieTb8V2YBlO3WfB4eRzDQb8I4C0t67YBFhX+0Aa0vXr9iyd0nudVjEzdZO1fjFUUmt5puAlXHG6KseDjbGhM+Owl+Kg9w1Mb2O7Zxl43khkL3gfh51ISwEUjWPHiQRSnnhv0Cs8TAkEGSQV6dQ0WftQtXE3yuZ+Co+Hg420Ctknqmu4g3tiaQT3/QuDfQ7xTUuccqx3Xle/mF+qcB7Sp+uBB+c6Ij810/huSFzktiuLElMvvbsfYYx9OEl54kaqeJTXOrRk6nHU2AkQf5VZFxesiI7DSAc7HhoWFCpXwI5pTBpj7zI1RFXpPEhonN4QZV6ouvGFFuMG1vZh8gNYLAVIpNtW3qbMjCpeFj4fw73PKGbil3wwcrA/QOgVlJ9NZYla/qUs0lWqilyu1Kn33XUAoPCT6oGbl9tS+hbVEXlL1doBxw7q7faFLreYpyNebttl2gF1ZLPkSAqTrlFtiOCLxUUTFuh9pqbDuUfBXJ6JhDUZ/X1c/cwUE9hWq4gp524q7DoKh7FLwlgRGcmZbeAqPbwsVeuTcLlH1gD7DW8R8JQHPAnAP00/fztml98op4SMqQQ3omPyFsIDekhb4H/aPQ== X-Microsoft-Antispam-Message-Info: zb+foCQzrICQvLHsFJqD7cSBcuvRoj7YQiYVsXoMxtJQDIObyNAgDpdOopAaoCN212kAVjawJb8QFbeSGT0al/5M9fjNfFDIOCdNX142inDofiGK1Fnio/c8t5QEU3tgRl3bsAp96w7MtFY4ucKVlInN8B4hn4V5Mtr16WEzOiFsqFo4+cD1ODdjGs3ZrtI2Fbk1jsDnRUohpeySqQdGb4cZJXhvbAPFpFQA9KROTHHUess32mvotOQeDNW4m74t5bdg1zsomFhjk9wgDu02PWV+bADNWHKQOLME+cJyoL/PsvEsg7Xn+5vUe8q8dTIbHtv+g3stBSREEGELU1E48qQGaQQRWun8iiq2eym3W1s= X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3640; 6:TBmIfC7RiPSx2nFCvbKZjqEi4lH1gpIyDyBWpt/XWsEsg7cLAQfe17bA3r4Ayu3a6f+aZneu+/6CpgtEuVDxrm5mRXnllOiwXaimfkpUDSTd5++fPRGYiHn7oyAMyN+9lxVi2lXjsdspqoM8f+Ug2bsP1h/pl1aIAlI4L9d9rPU+luGslihhe4SPjZzsh+sGO6Vo9JKpOy3iAwWHdBO9QQxagotpzAfYAJyhkFdFX17wcE+D98lJxDY1FPFsxT+D8uXeDihedCmzlzjcivqI3wnB7GFNg8aOC3nKGybNUW4D3zjVPM91a/MknG21qimNiFWe+S3da5hKID4t6dnSB6RRSga5IH4b+xvm7It5lOUXn/99P1DNQAG4suMbOHYN+u6FTjPtsjR3Ro51TlotzrlOmcskugKbmhtwNi9P2iRPpcr2JMfdvTE0GV8nJ4u85Nm+91NpwVp5l/h6YBxA7A==; 5:UZa+hGpnm9qfAYq6Zw38jwNNciHBkVcLOpTeJY4dSc53qHoBikCUNWIjfayJqJcTUFW55QZ8g07GUJh8bkteKQzlPyPjKLNwfdtJd3oB6rdQ2j+pBX3oMFlwex8YatzbLG8o0DhTuhSplxjN1umcPVCyXuSkNC9fiahU+G3YJ7M=; 24:9lwKwY3te8eqCFrLdP98yrvukW9XWd3PTE5F1Grejrlb4zZKocTgd9EuRjmnzNkV+3LyDY1NnUv9jbgpQ6fhX8RmiUYEKPGULnAgMTZ2YFI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3640; 7:oxuBq21lq3IYmia9norMQjvnYvL1DsOqCwgk+iusKIyexDt18TcDucPMEkoH6UHk3JcPYqcK5lv3NNHxu4NSwqZ4W/cXZnpcgE+uv+1S//ENlCSFyWRprp5mCVvL60g6Jqhx3eNxtwONwGmOHBDgZNd3ZyttQ05I3K9XPyCGjRW76cNAYmPm1SpSgHzw7DIJIgkTSOjMvA52Zoq5OC9Sa3fp1ZPnamBeq9Jc+toxKltB0UsNCFDnW75XITnGV4l0 X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jul 2018 15:25:18.2570 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bff9de47-c88c-4dca-b560-08d5e0f9306b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR0701MB3640 Subject: [dpdk-dev] [PATCH v4 2/4] cryptodev: support asymmetric operations 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" From: Umesh Kartha Extend DPDK librte_cryptodev to: - define asym op type in rte_crypto_op_type and associated op pool create/alloc APIs - define asym session and associated session APIs If PMD shows in its feature flag that it supports both sym and asym then it must support those on all its qps. Signed-off-by: Shally Verma Signed-off-by: Sunila Sahu Signed-off-by: Ashish Gupta Signed-off-by: Umesh Kartha --- lib/librte_cryptodev/rte_crypto.h | 37 ++++- lib/librte_cryptodev/rte_cryptodev.c | 201 ++++++++++++++++++++++++- lib/librte_cryptodev/rte_cryptodev.h | 124 ++++++++++++++- lib/librte_cryptodev/rte_cryptodev_pmd.h | 58 ++++++- lib/librte_cryptodev/rte_cryptodev_version.map | 10 +- 5 files changed, 423 insertions(+), 7 deletions(-) diff --git a/lib/librte_cryptodev/rte_crypto.h b/lib/librte_cryptodev/rte_crypto.h index a16be65..fd5ef3a 100644 --- a/lib/librte_cryptodev/rte_crypto.h +++ b/lib/librte_cryptodev/rte_crypto.h @@ -23,6 +23,7 @@ extern "C" { #include #include "rte_crypto_sym.h" +#include "rte_crypto_asym.h" /** Crypto operation types */ enum rte_crypto_op_type { @@ -30,6 +31,8 @@ enum rte_crypto_op_type { /**< Undefined operation type */ RTE_CRYPTO_OP_TYPE_SYMMETRIC, /**< Symmetric operation */ + RTE_CRYPTO_OP_TYPE_ASYMMETRIC + /**< Asymmetric operation */ }; /** Status of crypto operation */ @@ -114,6 +117,10 @@ struct rte_crypto_op { union { struct rte_crypto_sym_op sym[0]; /**< Symmetric operation parameters */ + + struct rte_crypto_asym_op asym[0]; + /**< Asymmetric operation parameters */ + }; /**< operation specific parameters */ }; @@ -134,6 +141,9 @@ __rte_crypto_op_reset(struct rte_crypto_op *op, enum rte_crypto_op_type type) case RTE_CRYPTO_OP_TYPE_SYMMETRIC: __rte_crypto_sym_op_reset(op->sym); break; + case RTE_CRYPTO_OP_TYPE_ASYMMETRIC: + memset(op->asym, 0, sizeof(struct rte_crypto_asym_op)); + break; case RTE_CRYPTO_OP_TYPE_UNDEFINED: default: break; @@ -300,9 +310,14 @@ __rte_crypto_op_get_priv_data(struct rte_crypto_op *op, uint32_t size) if (likely(op->mempool != NULL)) { priv_size = __rte_crypto_op_get_priv_data_size(op->mempool); - if (likely(priv_size >= size)) - return (void *)((uint8_t *)(op + 1) + + if (likely(priv_size >= size)) { + if (op->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) + return (void *)((uint8_t *)(op + 1) + sizeof(struct rte_crypto_sym_op)); + if (op->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) + return (void *)((uint8_t *)(op + 1) + + sizeof(struct rte_crypto_asym_op)); + } } return NULL; @@ -405,6 +420,24 @@ rte_crypto_op_attach_sym_session(struct rte_crypto_op *op, return __rte_crypto_sym_op_attach_sym_session(op->sym, sess); } +/** + * Attach a asymmetric session to a crypto operation + * + * @param op crypto operation, must be of type asymmetric + * @param sess cryptodev session + */ +static inline int +rte_crypto_op_attach_asym_session(struct rte_crypto_op *op, + struct rte_cryptodev_asym_session *sess) +{ + if (unlikely(op->type != RTE_CRYPTO_OP_TYPE_ASYMMETRIC)) + return -1; + + op->sess_type = RTE_CRYPTO_OP_WITH_SESSION; + op->asym->session = sess; + return 0; +} + #ifdef __cplusplus } #endif diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c index 7e58212..47fc2e5 100644 --- a/lib/librte_cryptodev/rte_cryptodev.c +++ b/lib/librte_cryptodev/rte_cryptodev.c @@ -166,6 +166,31 @@ rte_crypto_aead_operation_strings[] = { [RTE_CRYPTO_AEAD_OP_DECRYPT] = "decrypt" }; +/** + * Asymmetric crypto transform operation strings identifiers. + */ +const char *rte_crypto_asym_xform_strings[] = { + [RTE_CRYPTO_ASYM_XFORM_NONE] = "none", + [RTE_CRYPTO_ASYM_XFORM_RSA] = "rsa", + [RTE_CRYPTO_ASYM_XFORM_MODEX] = "modexp", + [RTE_CRYPTO_ASYM_XFORM_MODINV] = "modinv", + [RTE_CRYPTO_ASYM_XFORM_DH] = "dh", + [RTE_CRYPTO_ASYM_XFORM_DSA] = "dsa", +}; + +/** + * Asymmetric crypto operation strings identifiers. + */ +const char *rte_crypto_asym_op_strings[] = { + [RTE_CRYPTO_ASYM_OP_ENCRYPT] = "encrypt", + [RTE_CRYPTO_ASYM_OP_DECRYPT] = "decrypt", + [RTE_CRYPTO_ASYM_OP_SIGN] = "sign", + [RTE_CRYPTO_ASYM_OP_VERIFY] = "verify", + [RTE_CRYPTO_ASYM_OP_PRIVATE_KEY_GENERATE] = "priv_key_generate", + [RTE_CRYPTO_ASYM_OP_PUBLIC_KEY_GENERATE] = "pub_key_generate", + [RTE_CRYPTO_ASYM_OP_SHARED_SECRET_COMPUTE] = "sharedsecret_compute", +}; + int rte_cryptodev_get_cipher_algo_enum(enum rte_crypto_cipher_algorithm *algo_enum, const char *algo_string) @@ -1111,6 +1136,41 @@ rte_cryptodev_sym_session_init(uint8_t dev_id, return 0; } +int __rte_experimental +rte_cryptodev_asym_session_init(uint8_t dev_id, + struct rte_cryptodev_asym_session *sess, + struct rte_crypto_asym_xform *xforms, + struct rte_mempool *mp) +{ + struct rte_cryptodev *dev; + uint8_t index; + int ret; + + dev = rte_cryptodev_pmd_get_dev(dev_id); + + if (sess == NULL || xforms == NULL || dev == NULL) + return -EINVAL; + + index = dev->driver_id; + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->asym_session_configure, + -ENOTSUP); + + if (sess->sess_private_data[index] == NULL) { + ret = dev->dev_ops->asym_session_configure(dev, + xforms, + sess, mp); + if (ret < 0) { + CDEV_LOG_ERR( + "dev_id %d failed to configure session details", + dev_id); + return ret; + } + } + + return 0; +} + struct rte_cryptodev_sym_session * rte_cryptodev_sym_session_create(struct rte_mempool *mp) { @@ -1130,6 +1190,25 @@ rte_cryptodev_sym_session_create(struct rte_mempool *mp) return sess; } +struct rte_cryptodev_asym_session * __rte_experimental +rte_cryptodev_asym_session_create(struct rte_mempool *mp) +{ + struct rte_cryptodev_asym_session *sess; + + /* Allocate a session structure from the session pool */ + if (rte_mempool_get(mp, (void **)&sess)) { + CDEV_LOG_ERR("couldn't get object from session mempool"); + return NULL; + } + + /* Clear device session pointer. + * Include the flag indicating presence of private data + */ + memset(sess, 0, (sizeof(void *) * nb_drivers) + sizeof(uint8_t)); + + return sess; +} + int rte_cryptodev_queue_pair_attach_sym_session(uint8_t dev_id, uint16_t qp_id, struct rte_cryptodev_sym_session *sess) @@ -1200,6 +1279,24 @@ rte_cryptodev_sym_session_clear(uint8_t dev_id, return 0; } +int __rte_experimental +rte_cryptodev_asym_session_clear(uint8_t dev_id, + struct rte_cryptodev_asym_session *sess) +{ + struct rte_cryptodev *dev; + + dev = rte_cryptodev_pmd_get_dev(dev_id); + + if (dev == NULL || sess == NULL) + return -EINVAL; + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->asym_session_clear, -ENOTSUP); + + dev->dev_ops->asym_session_clear(dev, sess); + + return 0; +} + int rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess) { @@ -1224,6 +1321,31 @@ rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess) return 0; } +int __rte_experimental +rte_cryptodev_asym_session_free(struct rte_cryptodev_asym_session *sess) +{ + uint8_t i; + void *sess_priv; + struct rte_mempool *sess_mp; + + if (sess == NULL) + return -EINVAL; + + /* Check that all device private data has been freed */ + for (i = 0; i < nb_drivers; i++) { + sess_priv = get_asym_session_private_data(sess, i); + if (sess_priv != NULL) + return -EBUSY; + } + + /* Return session to mempool */ + sess_mp = rte_mempool_from_obj(sess); + rte_mempool_put(sess_mp, sess); + + return 0; +} + + unsigned int rte_cryptodev_get_header_session_size(void) { @@ -1241,6 +1363,17 @@ rte_cryptodev_sym_get_header_session_size(void) return ((sizeof(void *) * nb_drivers) + sizeof(uint8_t)); } +unsigned int __rte_experimental +rte_cryptodev_asym_get_header_session_size(void) +{ + /* + * Header contains pointers to the private data + * of all registered drivers, and a flag which + * indicates presence of private data + */ + return ((sizeof(void *) * nb_drivers) + sizeof(uint8_t)); +} + unsigned int rte_cryptodev_get_private_session_size(uint8_t dev_id) { @@ -1276,6 +1409,29 @@ rte_cryptodev_sym_get_private_session_size(uint8_t dev_id) } +unsigned int __rte_experimental +rte_cryptodev_asym_get_private_session_size(uint8_t dev_id) +{ + struct rte_cryptodev *dev; + unsigned int header_size = sizeof(void *) * nb_drivers; + unsigned int priv_sess_size; + + if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) + return 0; + + dev = rte_cryptodev_pmd_get_dev(dev_id); + + if (*dev->dev_ops->asym_session_get_size == NULL) + return 0; + + priv_sess_size = (*dev->dev_ops->asym_session_get_size)(dev); + if (priv_sess_size < header_size) + return header_size; + + return priv_sess_size; + +} + int __rte_experimental rte_cryptodev_sym_session_set_private_data( struct rte_cryptodev_sym_session *sess, @@ -1308,6 +1464,39 @@ rte_cryptodev_sym_session_get_private_data( return (uint8_t *)sess + off_set; } + +int __rte_experimental +rte_cryptodev_asym_session_set_private_data( + struct rte_cryptodev_asym_session *sess, + void *data, + uint16_t size) +{ + uint16_t off_set = sizeof(void *) * nb_drivers; + uint8_t *private_data_present = (uint8_t *)sess + off_set; + + if (sess == NULL) + return -EINVAL; + + *private_data_present = 1; + off_set += sizeof(uint8_t); + rte_memcpy((uint8_t *)sess + off_set, data, size); + return 0; +} + +void * __rte_experimental +rte_cryptodev_asym_session_get_app_private_data( + struct rte_cryptodev_asym_session *sess) +{ + uint16_t off_set = sizeof(void *) * nb_drivers; + uint8_t *private_data_present = (uint8_t *)sess + off_set; + + if (sess == NULL || !*private_data_present) + return NULL; + + off_set += sizeof(uint8_t); + return (uint8_t *)sess + off_set; +} + /** Initialise rte_crypto_op mempool element */ static void rte_crypto_op_init(struct rte_mempool *mempool, @@ -1335,8 +1524,16 @@ rte_crypto_op_pool_create(const char *name, enum rte_crypto_op_type type, struct rte_crypto_op_pool_private *priv; unsigned elt_size = sizeof(struct rte_crypto_op) + - sizeof(struct rte_crypto_sym_op) + - priv_size; + priv_size; + + if (type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) { + elt_size += sizeof(struct rte_crypto_sym_op); + } else if (type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) { + elt_size += sizeof(struct rte_crypto_asym_op); + } else { + CDEV_LOG_ERR("Invalid op_type\n"); + return NULL; + } /* lookup mempool in case already allocated */ struct rte_mempool *mp = rte_mempool_lookup(name); diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h index ccc0f73..89dcd40 100644 --- a/lib/librte_cryptodev/rte_cryptodev.h +++ b/lib/librte_cryptodev/rte_cryptodev.h @@ -867,9 +867,14 @@ rte_cryptodev_enqueue_burst(uint8_t dev_id, uint16_t qp_id, */ struct rte_cryptodev_sym_session { __extension__ void *sess_private_data[0]; - /**< Private session material */ + /**< Private symmetric session material */ }; +/** Cryptodev asymmetric crypto session */ +struct rte_cryptodev_asym_session { + __extension__ void *sess_private_data[0]; + /**< Private asymmetric session material */ +}; /** * Create symmetric crypto session header (generic with no private data) @@ -884,6 +889,18 @@ struct rte_cryptodev_sym_session * rte_cryptodev_sym_session_create(struct rte_mempool *mempool); /** + * Create asymmetric crypto session header (generic with no private data) + * + * @param mempool mempool to allocate asymmetric session + * objects from + * @return + * - On success return pointer to asym-session + * - On failure returns NULL + */ +struct rte_cryptodev_asym_session * __rte_experimental +rte_cryptodev_asym_session_create(struct rte_mempool *mempool); + +/** * Frees symmetric crypto session header, after checking that all * the device private data has been freed, returning it * to its original mempool. @@ -899,6 +916,21 @@ int rte_cryptodev_sym_session_free(struct rte_cryptodev_sym_session *sess); /** + * Frees asymmetric crypto session header, after checking that all + * the device private data has been freed, returning it + * to its original mempool. + * + * @param sess Session header to be freed. + * + * @return + * - 0 if successful. + * - -EINVAL if session is NULL. + * - -EBUSY if not all device private data has been freed. + */ +int __rte_experimental +rte_cryptodev_asym_session_free(struct rte_cryptodev_asym_session *sess); + +/** * Fill out private data for the device id, based on its device type. * * @param dev_id ID of device that we want the session to be used on @@ -920,6 +952,27 @@ rte_cryptodev_sym_session_init(uint8_t dev_id, struct rte_mempool *mempool); /** + * Initialize asymmetric session on a device with specific asymmetric xform + * + * @param dev_id ID of device that we want the session to be used on + * @param sess Session to be set up on a device + * @param xforms Asymmetric crypto transform operations to apply on flow + * processed with this session + * @param mempool Mempool to be used for internal allocation. + * + * @return + * - On success, zero. + * - -EINVAL if input parameters are invalid. + * - -ENOTSUP if crypto device does not support the crypto transform. + * - -ENOMEM if the private session could not be allocated. + */ +int __rte_experimental +rte_cryptodev_asym_session_init(uint8_t dev_id, + struct rte_cryptodev_asym_session *sess, + struct rte_crypto_asym_xform *xforms, + struct rte_mempool *mempool); + +/** * Frees private data for the device id, based on its device type, * returning it to its mempool. It is the application's responsibility * to ensure that private session data is not cleared while there are @@ -937,6 +990,20 @@ rte_cryptodev_sym_session_clear(uint8_t dev_id, struct rte_cryptodev_sym_session *sess); /** + * Frees resources held by asymmetric session during rte_cryptodev_session_init + * + * @param dev_id ID of device that uses the asymmetric session. + * @param sess Asymmetric session setup on device using + * rte_cryptodev_session_init + * @return + * - 0 if successful. + * - -EINVAL if device is invalid or session is NULL. + */ +int __rte_experimental +rte_cryptodev_asym_session_clear(uint8_t dev_id, + struct rte_cryptodev_asym_session *sess); + +/** * @deprecated * Get the size of the header session, for all registered drivers. * @@ -971,6 +1038,15 @@ unsigned int rte_cryptodev_sym_get_header_session_size(void); /** + * Get the size of the asymmetric session header, for all registered drivers. + * + * @return + * Size of the asymmetric header session. + */ +unsigned int __rte_experimental +rte_cryptodev_asym_get_header_session_size(void); + +/** * Get the size of the private symmetric session data * for a device. * @@ -985,6 +1061,19 @@ unsigned int rte_cryptodev_sym_get_private_session_size(uint8_t dev_id); /** + * Get the size of the private data for asymmetric session + * on device + * + * @param dev_id The device identifier. + * + * @return + * - Size of the asymmetric private data, if successful + * - 0 if device is invalid or does not have private session + */ +unsigned int __rte_experimental +rte_cryptodev_asym_get_private_session_size(uint8_t dev_id); + +/** * @deprecated * Attach queue pair with sym session. * @@ -1072,6 +1161,39 @@ void * __rte_experimental rte_cryptodev_sym_session_get_private_data( struct rte_cryptodev_sym_session *sess); +/** + * Set private data for a session. + * + * @param sess Session pointer allocated by + * *rte_cryptodev_asym_session_create*. + * @param data Pointer to the private data. + * @param size Size of the private data. + * + * @return + * - On success, zero. + * - On failure, a negative value. + */ +int __rte_experimental +rte_cryptodev_asym_session_set_private_data( + struct rte_cryptodev_asym_session *sess, + void *data, + uint16_t size); + +/** + * Get private data of a session. + * + * @param sess Session pointer allocated by + * *rte_cryptodev_asym_session_create*. + * + * @return + * - On success return pointer to private data. + * - On failure returns NULL. + */ +void * __rte_experimental +rte_cryptodev_asym_session_get_app_private_data( + struct rte_cryptodev_asym_session *sess); + + #ifdef __cplusplus } #endif diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h index db8b976..b94e844 100644 --- a/lib/librte_cryptodev/rte_cryptodev_pmd.h +++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h @@ -275,6 +275,17 @@ typedef int (*cryptodev_sym_create_session_pool_t)( */ typedef unsigned (*cryptodev_sym_get_session_private_size_t)( struct rte_cryptodev *dev); +/** + * Get the size of a asymmetric cryptodev session + * + * @param dev Crypto device pointer + * + * @return + * - On success returns the size of the session structure for device + * - On failure returns 0 + */ +typedef unsigned int (*cryptodev_asym_get_session_private_size_t)( + struct rte_cryptodev *dev); /** * Configure a Crypto session on a device. @@ -294,7 +305,24 @@ typedef int (*cryptodev_sym_configure_session_t)(struct rte_cryptodev *dev, struct rte_crypto_sym_xform *xform, struct rte_cryptodev_sym_session *session, struct rte_mempool *mp); - +/** + * Configure a Crypto asymmetric session on a device. + * + * @param dev Crypto device pointer + * @param xform Single or chain of crypto xforms + * @param priv_sess Pointer to cryptodev's private session structure + * @param mp Mempool where the private session is allocated + * + * @return + * - Returns 0 if private session structure have been created successfully. + * - Returns -EINVAL if input parameters are invalid. + * - Returns -ENOTSUP if crypto device does not support the crypto transform. + * - Returns -ENOMEM if the private session could not be allocated. + */ +typedef int (*cryptodev_asym_configure_session_t)(struct rte_cryptodev *dev, + struct rte_crypto_asym_xform *xform, + struct rte_cryptodev_asym_session *session, + struct rte_mempool *mp); /** * Free driver private session data. * @@ -305,6 +333,15 @@ typedef void (*cryptodev_sym_free_session_t)(struct rte_cryptodev *dev, struct rte_cryptodev_sym_session *sess); /** + * Free asymmetric session private data. + * + * @param dev Crypto device pointer + * @param sess Cryptodev session structure + */ +typedef void (*cryptodev_asym_free_session_t)(struct rte_cryptodev *dev, + struct rte_cryptodev_asym_session *sess); + +/** * Optional API for drivers to attach sessions with queue pair. * @param dev Crypto device pointer * @param qp_id queue pair id for attaching session @@ -357,10 +394,16 @@ struct rte_cryptodev_ops { cryptodev_sym_get_session_private_size_t session_get_size; /**< Return private session. */ + cryptodev_asym_get_session_private_size_t asym_session_get_size; + /**< Return asym session private size. */ cryptodev_sym_configure_session_t session_configure; /**< Configure a Crypto session. */ + cryptodev_asym_configure_session_t asym_session_configure; + /**< Configure asymmetric Crypto session. */ cryptodev_sym_free_session_t session_clear; /**< Clear a Crypto sessions private data. */ + cryptodev_asym_free_session_t asym_session_clear; + /**< Clear a Crypto sessions private data. */ cryptodev_sym_queue_pair_attach_session_t qp_attach_session; /**< Attach session to queue pair. */ cryptodev_sym_queue_pair_detach_session_t qp_detach_session; @@ -508,6 +551,19 @@ set_session_private_data(struct rte_cryptodev_sym_session *sess, sess->sess_private_data[driver_id] = private_data; } +static inline void * +get_asym_session_private_data(const struct rte_cryptodev_asym_session *sess, + uint8_t driver_id) { + return sess->sess_private_data[driver_id]; +} + +static inline void +set_asym_session_private_data(struct rte_cryptodev_asym_session *sess, + uint8_t driver_id, void *private_data) +{ + sess->sess_private_data[driver_id] = private_data; +} + #ifdef __cplusplus } #endif diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map index be8f4c1..9cdc0ee 100644 --- a/lib/librte_cryptodev/rte_cryptodev_version.map +++ b/lib/librte_cryptodev/rte_cryptodev_version.map @@ -95,8 +95,16 @@ DPDK_18.05 { } DPDK_17.11; EXPERIMENTAL { - global: + global: + rte_cryptodev_asym_get_header_session_size; + rte_cryptodev_asym_get_private_session_size; + rte_cryptodev_asym_session_clear; + rte_cryptodev_asym_session_create; + rte_cryptodev_asym_session_free; + rte_cryptodev_asym_session_get_app_private_data; + rte_cryptodev_asym_session_init; + rte_cryptodev_asym_session_set_private_data; rte_cryptodev_sym_session_get_private_data; rte_cryptodev_sym_session_set_private_data; };