Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/27053/?format=api
{ "id": 27053, "url": "http://patches.dpdk.org/api/patches/27053/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20170719045902.12110-1-pablo.de.lara.guarch@intel.com/", "project": { "id": 1, "url": "http://patches.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": "<20170719045902.12110-1-pablo.de.lara.guarch@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20170719045902.12110-1-pablo.de.lara.guarch@intel.com", "date": "2017-07-19T04:59:02", "name": "[dpdk-dev] crypto/qat: fix session initialization", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "eebb8aaeb294530e7c1c8a3d8f5fff432e9554c4", "submitter": { "id": 9, "url": "http://patches.dpdk.org/api/people/9/?format=api", "name": "De Lara Guarch, Pablo", "email": "pablo.de.lara.guarch@intel.com" }, "delegate": { "id": 22, "url": "http://patches.dpdk.org/api/users/22/?format=api", "username": "pdelarag", "first_name": "Pablo", "last_name": "de Lara Guarch", "email": "pablo.de.lara.guarch@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20170719045902.12110-1-pablo.de.lara.guarch@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/27053/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/27053/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 8E7E12FDD;\n\tWed, 19 Jul 2017 14:58:45 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id CBDF62C50\n\tfor <dev@dpdk.org>; Wed, 19 Jul 2017 14:58:43 +0200 (CEST)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t19 Jul 2017 05:58:42 -0700", "from silpixa00399464.ir.intel.com (HELO\n\tsilpixa00399464.ger.corp.intel.com) ([10.237.222.157])\n\tby orsmga003.jf.intel.com with ESMTP; 19 Jul 2017 05:58:40 -0700" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.40,381,1496127600\"; d=\"scan'208\";a=\"994703111\"", "From": "Pablo de Lara <pablo.de.lara.guarch@intel.com>", "To": "fiona.trahe@intel.com, deepak.k.jain@intel.com, john.griffin@intel.com", "Cc": "dev@dpdk.org,\n\tPablo de Lara <pablo.de.lara.guarch@intel.com>", "Date": "Wed, 19 Jul 2017 05:59:02 +0100", "Message-Id": "<20170719045902.12110-1-pablo.de.lara.guarch@intel.com>", "X-Mailer": "git-send-email 2.9.4", "Subject": "[dpdk-dev] [PATCH] crypto/qat: fix session initialization", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<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": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "When creating a session, if there is a failure when\nsetting some of the parameters, QAT was not propagating\nthe error to the session initialization function.\nTherefore, it was reporting a success, when it should\nbe report a failure.\n\nFixes: b3bbd9e5f265 (\"cryptodev: support device independent sessions\")\n\nSigned-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>\n---\n drivers/crypto/qat/qat_crypto.c | 83 +++++++++++++++++++++--------------------\n drivers/crypto/qat/qat_crypto.h | 11 ++++--\n 2 files changed, 50 insertions(+), 44 deletions(-)", "diff": "diff --git a/drivers/crypto/qat/qat_crypto.c b/drivers/crypto/qat/qat_crypto.c\nindex ec481ae..d92de35 100644\n--- a/drivers/crypto/qat/qat_crypto.c\n+++ b/drivers/crypto/qat/qat_crypto.c\n@@ -295,11 +295,12 @@ qat_get_cipher_xform(struct rte_crypto_sym_xform *xform)\n \n \treturn NULL;\n }\n-void *\n+\n+int\n qat_crypto_sym_configure_session_cipher(struct rte_cryptodev *dev,\n-\t\tstruct rte_crypto_sym_xform *xform, void *session_private)\n+\t\tstruct rte_crypto_sym_xform *xform,\n+\t\tstruct qat_session *session)\n {\n-\tstruct qat_session *session = session_private;\n \tstruct qat_pmd_private *internals = dev->data->dev_private;\n \tstruct rte_crypto_cipher_xform *cipher_xform = NULL;\n \n@@ -440,14 +441,14 @@ qat_crypto_sym_configure_session_cipher(struct rte_cryptodev *dev,\n \t\t\t\t\t\tcipher_xform->key.length))\n \t\tgoto error_out;\n \n-\treturn session;\n+\treturn 0;\n \n error_out:\n \tif (session->bpi_ctx) {\n \t\tbpi_cipher_ctx_free(session->bpi_ctx);\n \t\tsession->bpi_ctx = NULL;\n \t}\n-\treturn NULL;\n+\treturn -1;\n }\n \n int\n@@ -498,36 +499,44 @@ qat_crypto_set_session_parameters(struct rte_cryptodev *dev,\n \tqat_cmd_id = qat_get_cmd_id(xform);\n \tif (qat_cmd_id < 0 || qat_cmd_id >= ICP_QAT_FW_LA_CMD_DELIMITER) {\n \t\tPMD_DRV_LOG(ERR, \"Unsupported xform chain requested\");\n-\t\tgoto error_out;\n+\t\treturn -1;\n \t}\n \tsession->qat_cmd = (enum icp_qat_fw_la_cmd_id)qat_cmd_id;\n \tswitch (session->qat_cmd) {\n \tcase ICP_QAT_FW_LA_CMD_CIPHER:\n-\tsession = qat_crypto_sym_configure_session_cipher(dev, xform, session);\n+\t\tif (qat_crypto_sym_configure_session_cipher(dev, xform, session) < 0)\n+\t\t\treturn -1;\n \t\tbreak;\n \tcase ICP_QAT_FW_LA_CMD_AUTH:\n-\tsession = qat_crypto_sym_configure_session_auth(dev, xform, session);\n+\t\tif (qat_crypto_sym_configure_session_auth(dev, xform, session) < 0)\n+\t\t\treturn -1;\n \t\tbreak;\n \tcase ICP_QAT_FW_LA_CMD_CIPHER_HASH:\n-\t\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD)\n-\t\t\tsession = qat_crypto_sym_configure_session_aead(xform,\n-\t\t\t\t\tsession);\n-\t\telse {\n-\t\t\tsession = qat_crypto_sym_configure_session_cipher(dev,\n-\t\t\t\t\txform, session);\n-\t\t\tsession = qat_crypto_sym_configure_session_auth(dev,\n-\t\t\t\t\txform, session);\n+\t\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {\n+\t\t\tif (qat_crypto_sym_configure_session_aead(xform,\n+\t\t\t\t\tsession) < 0)\n+\t\t\t\treturn -1;\n+\t\t} else {\n+\t\t\tif (qat_crypto_sym_configure_session_cipher(dev,\n+\t\t\t\t\txform, session) < 0)\n+\t\t\t\treturn -1;\n+\t\t\tif (qat_crypto_sym_configure_session_auth(dev,\n+\t\t\t\t\txform, session) < 0)\n+\t\t\t\treturn -1;\n \t\t}\n \t\tbreak;\n \tcase ICP_QAT_FW_LA_CMD_HASH_CIPHER:\n-\t\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD)\n-\t\t\tsession = qat_crypto_sym_configure_session_aead(xform,\n-\t\t\t\t\tsession);\n-\t\telse {\n-\t\t\tsession = qat_crypto_sym_configure_session_auth(dev,\n-\t\t\t\t\txform, session);\n-\t\t\tsession = qat_crypto_sym_configure_session_cipher(dev,\n-\t\t\t\t\txform, session);\n+\t\tif (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {\n+\t\t\tif (qat_crypto_sym_configure_session_aead(xform,\n+\t\t\t\t\tsession) < 0)\n+\t\t\t\treturn -1;\n+\t\t} else {\n+\t\t\tif (qat_crypto_sym_configure_session_auth(dev,\n+\t\t\t\t\txform, session) < 0)\n+\t\t\t\treturn -1;\n+\t\t\tif (qat_crypto_sym_configure_session_cipher(dev,\n+\t\t\t\t\txform, session) < 0)\n+\t\t\t\treturn -1;\n \t\t}\n \t\tbreak;\n \tcase ICP_QAT_FW_LA_CMD_TRNG_GET_RANDOM:\n@@ -541,26 +550,21 @@ qat_crypto_set_session_parameters(struct rte_cryptodev *dev,\n \tcase ICP_QAT_FW_LA_CMD_DELIMITER:\n \tPMD_DRV_LOG(ERR, \"Unsupported Service %u\",\n \t\tsession->qat_cmd);\n-\t\tgoto error_out;\n+\t\treturn -1;\n \tdefault:\n \tPMD_DRV_LOG(ERR, \"Unsupported Service %u\",\n \t\tsession->qat_cmd);\n-\t\tgoto error_out;\n+\t\treturn -1;\n \t}\n \n \treturn 0;\n-\n-error_out:\n-\treturn -1;\n }\n \n-struct qat_session *\n+int\n qat_crypto_sym_configure_session_auth(struct rte_cryptodev *dev,\n \t\t\t\tstruct rte_crypto_sym_xform *xform,\n-\t\t\t\tstruct qat_session *session_private)\n+\t\t\t\tstruct qat_session *session)\n {\n-\n-\tstruct qat_session *session = session_private;\n \tstruct rte_crypto_auth_xform *auth_xform = NULL;\n \tstruct qat_pmd_private *internals = dev->data->dev_private;\n \tauth_xform = qat_get_auth_xform(xform);\n@@ -690,17 +694,16 @@ qat_crypto_sym_configure_session_auth(struct rte_cryptodev *dev,\n \t}\n \n \tsession->digest_length = auth_xform->digest_length;\n-\treturn session;\n+\treturn 0;\n \n error_out:\n-\treturn NULL;\n+\treturn -1;\n }\n \n-struct qat_session *\n+int\n qat_crypto_sym_configure_session_aead(struct rte_crypto_sym_xform *xform,\n-\t\t\t\tstruct qat_session *session_private)\n+\t\t\t\tstruct qat_session *session)\n {\n-\tstruct qat_session *session = session_private;\n \tstruct rte_crypto_aead_xform *aead_xform = &xform->aead;\n \n \t/*\n@@ -769,10 +772,10 @@ qat_crypto_sym_configure_session_aead(struct rte_crypto_sym_xform *xform,\n \t}\n \n \tsession->digest_length = aead_xform->digest_length;\n-\treturn session;\n+\treturn 0;\n \n error_out:\n-\treturn NULL;\n+\treturn -1;\n }\n \n unsigned qat_crypto_sym_get_session_private_size(\ndiff --git a/drivers/crypto/qat/qat_crypto.h b/drivers/crypto/qat/qat_crypto.h\nindex d637dac..8f7c032 100644\n--- a/drivers/crypto/qat/qat_crypto.h\n+++ b/drivers/crypto/qat/qat_crypto.h\n@@ -50,6 +50,8 @@\n \t(((num) + (align) - 1) & ~((align) - 1))\n #define QAT_64_BTYE_ALIGN_MASK (~0x3f)\n \n+struct qat_session;\n+\n enum qat_device_gen {\n \tQAT_GEN1 = 1,\n \tQAT_GEN2,\n@@ -134,18 +136,19 @@ int\n qat_crypto_set_session_parameters(struct rte_cryptodev *dev,\n \t\tstruct rte_crypto_sym_xform *xform, void *session_private);\n \n-struct qat_session *\n+int\n qat_crypto_sym_configure_session_aead(struct rte_crypto_sym_xform *xform,\n \t\t\t\tstruct qat_session *session_private);\n \n-struct qat_session *\n+int\n qat_crypto_sym_configure_session_auth(struct rte_cryptodev *dev,\n \t\t\t\tstruct rte_crypto_sym_xform *xform,\n \t\t\t\tstruct qat_session *session_private);\n \n-void *\n+int\n qat_crypto_sym_configure_session_cipher(struct rte_cryptodev *dev,\n-\t\tstruct rte_crypto_sym_xform *xform, void *session_private);\n+\t\tstruct rte_crypto_sym_xform *xform,\n+\t\tstruct qat_session *session_private);\n \n \n extern void\n", "prefixes": [ "dpdk-dev" ] }