Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64733/?format=api
{ "id": 64733, "url": "http://patchwork.dpdk.org/api/patches/64733/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20200115182832.17012-3-marcinx.smoczynski@intel.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200115182832.17012-3-marcinx.smoczynski@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200115182832.17012-3-marcinx.smoczynski@intel.com", "date": "2020-01-15T18:28:28", "name": "[v3,2/6] crypto/aesni_gcm: cpu crypto support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2e48bbefde8d490b9b7af69ca207fb099eba4263", "submitter": { "id": 1293, "url": "http://patchwork.dpdk.org/api/people/1293/?format=api", "name": "Marcin Smoczynski", "email": "marcinx.smoczynski@intel.com" }, "delegate": { "id": 6690, "url": "http://patchwork.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20200115182832.17012-3-marcinx.smoczynski@intel.com/mbox/", "series": [ { "id": 8142, "url": "http://patchwork.dpdk.org/api/series/8142/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=8142", "date": "2020-01-15T18:28:26", "name": "Introduce CPU crypto mode", "version": 3, "mbox": "http://patchwork.dpdk.org/series/8142/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/64733/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/64733/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 7DB5DA0514;\n\tWed, 15 Jan 2020 19:30:45 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 7F8921C2A9;\n\tWed, 15 Jan 2020 19:30:29 +0100 (CET)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n by dpdk.org (Postfix) with ESMTP id 0DF231C29A\n for <dev@dpdk.org>; Wed, 15 Jan 2020 19:30:26 +0100 (CET)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n 15 Jan 2020 10:30:26 -0800", "from msmoczyx-mobl.ger.corp.intel.com ([10.104.125.3])\n by fmsmga001.fm.intel.com with ESMTP; 15 Jan 2020 10:30:24 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.70,323,1574150400\"; d=\"scan'208\";a=\"254502374\"", "From": "Marcin Smoczynski <marcinx.smoczynski@intel.com>", "To": "akhil.goyal@nxp.com, konstantin.ananyev@intel.com,\n roy.fan.zhang@intel.com,\n declan.doherty@intel.com, radu.nicolau@intel.com", "Cc": "dev@dpdk.org,\n\tMarcin Smoczynski <marcinx.smoczynski@intel.com>", "Date": "Wed, 15 Jan 2020 19:28:28 +0100", "Message-Id": "<20200115182832.17012-3-marcinx.smoczynski@intel.com>", "X-Mailer": "git-send-email 2.21.0.windows.1", "In-Reply-To": "<20200115182832.17012-1-marcinx.smoczynski@intel.com>", "References": "<20200115182832.17012-1-marcinx.smoczynski@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 2/6] crypto/aesni_gcm: cpu crypto support", "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://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add support for CPU crypto mode by introducing required handler.\nCrypto mode (sync/async) is chosen during sym session create if an\nappropriate flag is set in an xform type number.\n\nAuthenticated encryption and decryption are supported with tag\ngeneration/verification.\n\nSigned-off-by: Marcin Smoczynski <marcinx.smoczynski@intel.com>\n---\n drivers/crypto/aesni_gcm/aesni_gcm_ops.h | 9 ++\n drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 149 +++++++++++++++++-\n drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c | 3 +\n .../crypto/aesni_gcm/aesni_gcm_pmd_private.h | 18 ++-\n 4 files changed, 169 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_ops.h b/drivers/crypto/aesni_gcm/aesni_gcm_ops.h\nindex e272f1067..404c0adff 100644\n--- a/drivers/crypto/aesni_gcm/aesni_gcm_ops.h\n+++ b/drivers/crypto/aesni_gcm/aesni_gcm_ops.h\n@@ -65,4 +65,13 @@ struct aesni_gcm_ops {\n \taesni_gcm_finalize_t finalize_dec;\n };\n \n+/** GCM per-session operation handlers */\n+struct aesni_gcm_session_ops {\n+\taesni_gcm_t cipher;\n+\taesni_gcm_pre_t pre;\n+\taesni_gcm_init_t init;\n+\taesni_gcm_update_t update;\n+\taesni_gcm_finalize_t finalize;\n+};\n+\n #endif /* _AESNI_GCM_OPS_H_ */\ndiff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c\nindex 1a03be31d..860e9b369 100644\n--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c\n+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c\n@@ -25,9 +25,16 @@ aesni_gcm_set_session_parameters(const struct aesni_gcm_ops *gcm_ops,\n \tconst struct rte_crypto_sym_xform *aead_xform;\n \tuint8_t key_length;\n \tconst uint8_t *key;\n+\tuint32_t xform_type;\n+\n+\t/* check for CPU-crypto mode */\n+\txform_type = xform->type;\n+\tsess->mode = xform_type | RTE_CRYPTO_SYM_CPU_CRYPTO ?\n+\t\tAESNI_GCM_MODE_SYNC : AESNI_GCM_MODE_ASYNC;\n+\txform_type &= RTE_CRYPTO_SYM_XFORM_TYPE_MASK;\n \n \t/* AES-GMAC */\n-\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) {\n+\tif (xform_type == RTE_CRYPTO_SYM_XFORM_AUTH) {\n \t\tauth_xform = xform;\n \t\tif (auth_xform->auth.algo != RTE_CRYPTO_AUTH_AES_GMAC) {\n \t\t\tAESNI_GCM_LOG(ERR, \"Only AES GMAC is supported as an \"\n@@ -49,7 +56,7 @@ aesni_gcm_set_session_parameters(const struct aesni_gcm_ops *gcm_ops,\n \t\tsess->req_digest_length = auth_xform->auth.digest_length;\n \n \t/* AES-GCM */\n-\t} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {\n+\t} else if (xform_type == RTE_CRYPTO_SYM_XFORM_AEAD) {\n \t\taead_xform = xform;\n \n \t\tif (aead_xform->aead.algo != RTE_CRYPTO_AEAD_AES_GCM) {\n@@ -62,11 +69,24 @@ aesni_gcm_set_session_parameters(const struct aesni_gcm_ops *gcm_ops,\n \t\tsess->iv.offset = aead_xform->aead.iv.offset;\n \t\tsess->iv.length = aead_xform->aead.iv.length;\n \n+\t\t/* setup session handlers */\n+\t\tsess->ops.pre = gcm_ops->pre;\n+\t\tsess->ops.init = gcm_ops->init;\n+\n \t\t/* Select Crypto operation */\n-\t\tif (aead_xform->aead.op == RTE_CRYPTO_AEAD_OP_ENCRYPT)\n+\t\tif (aead_xform->aead.op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {\n \t\t\tsess->op = AESNI_GCM_OP_AUTHENTICATED_ENCRYPTION;\n-\t\telse\n+\t\t\tsess->ops.cipher = gcm_ops->enc;\n+\t\t\tsess->ops.update = gcm_ops->update_enc;\n+\t\t\tsess->ops.finalize = gcm_ops->finalize_enc;\n+\t\t}\n+\t\t/* op == RTE_CRYPTO_AEAD_OP_DECRYPT */\n+\t\telse {\n \t\t\tsess->op = AESNI_GCM_OP_AUTHENTICATED_DECRYPTION;\n+\t\t\tsess->ops.cipher = gcm_ops->dec;\n+\t\t\tsess->ops.update = gcm_ops->update_dec;\n+\t\t\tsess->ops.finalize = gcm_ops->finalize_dec;\n+\t\t}\n \n \t\tkey_length = aead_xform->aead.key.length;\n \t\tkey = aead_xform->aead.key.data;\n@@ -78,7 +98,6 @@ aesni_gcm_set_session_parameters(const struct aesni_gcm_ops *gcm_ops,\n \t\treturn -ENOTSUP;\n \t}\n \n-\n \t/* IV check */\n \tif (sess->iv.length != 16 && sess->iv.length != 12 &&\n \t\t\tsess->iv.length != 0) {\n@@ -356,6 +375,122 @@ process_gcm_crypto_op(struct aesni_gcm_qp *qp, struct rte_crypto_op *op,\n \treturn 0;\n }\n \n+static inline void\n+aesni_gcm_fill_error_code(struct rte_crypto_sym_vec *vec, int32_t errnum)\n+{\n+\tuint32_t i;\n+\n+\tfor (i = 0; i < vec->num; i++)\n+\t\tvec->status[i] = errnum;\n+}\n+\n+\n+static inline int32_t\n+aesni_gcm_sgl_op_finalize_encryption(struct aesni_gcm_session *s,\n+\tstruct gcm_context_data *gdata_ctx, uint8_t *digest)\n+{\n+\tif (s->req_digest_length != s->gen_digest_length) {\n+\t\tuint8_t tmpdigest[s->gen_digest_length];\n+\n+\t\ts->ops.finalize(&s->gdata_key, gdata_ctx, tmpdigest,\n+\t\t\ts->gen_digest_length);\n+\t\tmemcpy(digest, tmpdigest, s->req_digest_length);\n+\t} else {\n+\t\ts->ops.finalize(&s->gdata_key, gdata_ctx, digest,\n+\t\t\ts->gen_digest_length);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static inline int32_t\n+aesni_gcm_sgl_op_finalize_decryption(struct aesni_gcm_session *s,\n+\tstruct gcm_context_data *gdata_ctx, uint8_t *digest)\n+{\n+\tuint8_t tmpdigest[s->gen_digest_length];\n+\n+\ts->ops.finalize(&s->gdata_key, gdata_ctx, tmpdigest,\n+\t\ts->gen_digest_length);\n+\n+\treturn memcmp(digest, tmpdigest, s->req_digest_length) == 0 ? 0 :\n+\t\tEBADMSG;\n+}\n+\n+static inline void\n+aesni_gcm_process_gcm_sgl_op(struct aesni_gcm_session *s,\n+\tstruct gcm_context_data *gdata_ctx, struct rte_crypto_sgl *sgl,\n+\tvoid *iv, void *aad)\n+{\n+\tuint32_t i;\n+\n+\t/* init crypto operation */\n+\ts->ops.init(&s->gdata_key, gdata_ctx, iv, aad,\n+\t\t(uint64_t)s->aad_length);\n+\n+\t/* update with sgl data */\n+\tfor (i = 0; i < sgl->num; i++) {\n+\t\tstruct rte_crypto_vec *vec = &sgl->vec[i];\n+\n+\t\ts->ops.update(&s->gdata_key, gdata_ctx, vec->base, vec->base,\n+\t\t\tvec->len);\n+\t}\n+}\n+\n+/** Process CPU crypto bulk operations */\n+uint32_t\n+aesni_gcm_pmd_cpu_crypto_process(struct rte_cryptodev *dev,\n+\tstruct rte_cryptodev_sym_session *sess,\n+\t__rte_unused union rte_crypto_sym_ofs ofs,\n+\tstruct rte_crypto_sym_vec *vec)\n+{\n+\tvoid *sess_priv;\n+\tstruct aesni_gcm_session *s;\n+\tuint32_t processed;\n+\tuint32_t i;\n+\n+\tsess_priv = get_sym_session_private_data(sess, dev->driver_id);\n+\tif (unlikely(sess_priv == NULL)) {\n+\t\taesni_gcm_fill_error_code(vec, EINVAL);\n+\t\treturn 0;\n+\t}\n+\n+\ts = sess_priv;\n+\tif (unlikely(s->mode != AESNI_GCM_MODE_SYNC)) {\n+\t\taesni_gcm_fill_error_code(vec, EINVAL);\n+\t\treturn 0;\n+\t}\n+\n+\tprocessed = 0;\n+\tfor (i = 0; i < vec->num; ++i) {\n+\t\tstruct gcm_context_data gdata_ctx;\n+\t\tint32_t status;\n+\n+\t\taesni_gcm_process_gcm_sgl_op(s, &gdata_ctx, &vec->sgl[i],\n+\t\t\tvec->iv[i], vec->aad[i]);\n+\n+\t\tswitch (s->op) {\n+\t\tcase AESNI_GCM_OP_AUTHENTICATED_ENCRYPTION:\n+\t\t\tstatus = aesni_gcm_sgl_op_finalize_encryption(s,\n+\t\t\t\t&gdata_ctx, vec->digest[i]);\n+\t\t\tbreak;\n+\n+\t\tcase AESNI_GCM_OP_AUTHENTICATED_DECRYPTION:\n+\t\t\tstatus = aesni_gcm_sgl_op_finalize_decryption(s,\n+\t\t\t\t&gdata_ctx, vec->digest[i]);\n+\t\t\tbreak;\n+\n+\t\tdefault:\n+\t\t\tstatus = EINVAL;\n+\t\t}\n+\n+\t\tvec->status[i] = status;\n+\t\tif (status == 0)\n+\t\t\tprocessed++;\n+\t}\n+\n+\treturn processed;\n+}\n+\n /**\n * Process a completed job and return rte_mbuf which job processed\n *\n@@ -527,7 +662,8 @@ aesni_gcm_create(const char *name,\n \t\t\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |\n \t\t\tRTE_CRYPTODEV_FF_IN_PLACE_SGL |\n \t\t\tRTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |\n-\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;\n+\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_SYM_CPU_CRYPTO;\n \n \t/* Check CPU for support for AES instruction set */\n \tif (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AES))\n@@ -672,7 +808,6 @@ RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_GCM_PMD,\n RTE_PMD_REGISTER_CRYPTO_DRIVER(aesni_gcm_crypto_drv, aesni_gcm_pmd_drv.driver,\n \t\tcryptodev_driver_id);\n \n-\n RTE_INIT(aesni_gcm_init_log)\n {\n \taesni_gcm_logtype_driver = rte_log_register(\"pmd.crypto.aesni_gcm\");\ndiff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c\nindex 2f66c7c58..5228d98b1 100644\n--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c\n+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_ops.c\n@@ -331,9 +331,12 @@ struct rte_cryptodev_ops aesni_gcm_pmd_ops = {\n \t\t.queue_pair_release\t= aesni_gcm_pmd_qp_release,\n \t\t.queue_pair_count\t= aesni_gcm_pmd_qp_count,\n \n+\t\t.sym_cpu_process = aesni_gcm_pmd_cpu_crypto_process,\n+\n \t\t.sym_session_get_size\t= aesni_gcm_pmd_sym_session_get_size,\n \t\t.sym_session_configure\t= aesni_gcm_pmd_sym_session_configure,\n \t\t.sym_session_clear\t= aesni_gcm_pmd_sym_session_clear\n };\n \n struct rte_cryptodev_ops *rte_aesni_gcm_pmd_ops = &aesni_gcm_pmd_ops;\n+\ndiff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h\nindex 2039adb53..dc8d3c653 100644\n--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h\n+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h\n@@ -73,6 +73,11 @@ enum aesni_gcm_operation {\n \tAESNI_GMAC_OP_VERIFY\n };\n \n+enum aesni_gcm_mode {\n+\tAESNI_GCM_MODE_ASYNC,\n+\tAESNI_GCM_MODE_SYNC\n+};\n+\n /** AESNI GCM private session structure */\n struct aesni_gcm_session {\n \tstruct {\n@@ -90,8 +95,12 @@ struct aesni_gcm_session {\n \t/**< GCM operation type */\n \tenum aesni_gcm_key key;\n \t/**< GCM key type */\n+\tenum aesni_gcm_mode mode;\n+\t/**< Sync/async mode */\n \tstruct gcm_key_data gdata_key;\n \t/**< GCM parameters */\n+\tstruct aesni_gcm_session_ops ops;\n+\t/**< Session handlers */\n };\n \n \n@@ -109,10 +118,13 @@ aesni_gcm_set_session_parameters(const struct aesni_gcm_ops *ops,\n \t\tstruct aesni_gcm_session *sess,\n \t\tconst struct rte_crypto_sym_xform *xform);\n \n-\n-/**\n- * Device specific operations function pointer structure */\n+/* Device specific operations function pointer structure */\n extern struct rte_cryptodev_ops *rte_aesni_gcm_pmd_ops;\n \n+/** CPU crypto bulk process handler */\n+uint32_t\n+aesni_gcm_pmd_cpu_crypto_process(struct rte_cryptodev *dev,\n+\tstruct rte_cryptodev_sym_session *sess, union rte_crypto_sym_ofs ofs,\n+\tstruct rte_crypto_sym_vec *vec);\n \n #endif /* _AESNI_GCM_PMD_PRIVATE_H_ */\n", "prefixes": [ "v3", "2/6" ] }