Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/40997/?format=api
{ "id": 40997, "url": "http://patchwork.dpdk.org/api/patches/40997/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1528782287-16670-1-git-send-email-naga.sureshx.somarowthu@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": "<1528782287-16670-1-git-send-email-naga.sureshx.somarowthu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1528782287-16670-1-git-send-email-naga.sureshx.somarowthu@intel.com", "date": "2018-06-12T05:44:47", "name": "crypto/openssl: add dynamic logging to openssl", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "29b0eba8728af852d291b4a6cfa019041bc76737", "submitter": { "id": 1053, "url": "http://patchwork.dpdk.org/api/people/1053/?format=api", "name": "Naga Suresh Somarowthu", "email": "naga.sureshx.somarowthu@intel.com" }, "delegate": { "id": 22, "url": "http://patchwork.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://patchwork.dpdk.org/project/dpdk/patch/1528782287-16670-1-git-send-email-naga.sureshx.somarowthu@intel.com/mbox/", "series": [ { "id": 87, "url": "http://patchwork.dpdk.org/api/series/87/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=87", "date": "2018-06-12T05:44:47", "name": "crypto/openssl: add dynamic logging to openssl", "version": 1, "mbox": "http://patchwork.dpdk.org/series/87/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/40997/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/40997/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 396C11E3B9;\n\tTue, 12 Jun 2018 07:45:08 +0200 (CEST)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby dpdk.org (Postfix) with ESMTP id 84F1E1E3B7\n\tfor <dev@dpdk.org>; Tue, 12 Jun 2018 07:45:06 +0200 (CEST)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t11 Jun 2018 22:45:05 -0700", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby orsmga003.jf.intel.com with ESMTP; 11 Jun 2018 22:45:04 -0700", "from wgcvswdev001.ir.intel.com (wgcvswdev001.ir.intel.com\n\t[10.102.246.100])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tw5C5j3D5002090; Tue, 12 Jun 2018 06:45:03 +0100", "from wgcvswdev001.ir.intel.com (localhost [127.0.0.1])\n\tby wgcvswdev001.ir.intel.com with ESMTP id w5C5j2dR016988;\n\tTue, 12 Jun 2018 06:45:02 +0100", "(from jmparthx@localhost)\n\tby wgcvswdev001.ir.intel.com with ? id w5C5j2mP016984;\n\tTue, 12 Jun 2018 06:45:02 +0100" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.51,213,1526367600\"; d=\"scan'208\";a=\"58481604\"", "From": "Naga Suresh Somarowthu <naga.sureshx.somarowthu@intel.com>", "To": "dev@dpdk.org", "Cc": "pablo.de.lara.guarch@intel.com, reshma.pattan@intel.com,\n\tNaga Suresh Somarowthu <naga.sureshx.somarowthu@intel.com>", "Date": "Tue, 12 Jun 2018 06:44:47 +0100", "Message-Id": "<1528782287-16670-1-git-send-email-naga.sureshx.somarowthu@intel.com>", "X-Mailer": "git-send-email 1.7.12.2", "Subject": "[dpdk-dev] [PATCH] crypto/openssl: add dynamic logging to openssl", "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>,\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": "<https://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": "1.added new logtype for openssl driver.\n2.registered new logtype.\n3.OPENSSL_LOG_ERR and CDEV_LOG_ERR are\nreplaced with new logtype name OPENSSL_PMD_LOG.\n\nSigned-off-by: Naga Suresh Somarowthu <naga.sureshx.somarowthu@intel.com>\n---\n drivers/crypto/openssl/rte_openssl_pmd.c | 40 ++++++++++++++----------\n drivers/crypto/openssl/rte_openssl_pmd_ops.c | 14 ++++-----\n drivers/crypto/openssl/rte_openssl_pmd_private.h | 25 ++++-----------\n 3 files changed, 37 insertions(+), 42 deletions(-)", "diff": "diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c\nindex 93c6d7e5d..6a2324982 100644\n--- a/drivers/crypto/openssl/rte_openssl_pmd.c\n+++ b/drivers/crypto/openssl/rte_openssl_pmd.c\n@@ -119,7 +119,7 @@ get_cipher_key_ede(uint8_t *key, int keylen, uint8_t *key_ede)\n \t\tmemcpy(key_ede + 16, key, 8);\n \t\tbreak;\n \tdefault:\n-\t\tOPENSSL_LOG_ERR(\"Unsupported key size\");\n+\t\tOPENSSL_PMD_LOG(ERR, \"Unsupported key size\");\n \t\tres = -EINVAL;\n \t}\n \n@@ -677,7 +677,7 @@ openssl_set_session_parameters(struct openssl_session *sess,\n \t\tret = openssl_set_session_cipher_parameters(\n \t\t\t\tsess, cipher_xform);\n \t\tif (ret != 0) {\n-\t\t\tOPENSSL_LOG_ERR(\n+\t\t\tOPENSSL_PMD_LOG(ERR,\n \t\t\t\t\"Invalid/unsupported cipher parameters\");\n \t\t\treturn ret;\n \t\t}\n@@ -686,7 +686,7 @@ openssl_set_session_parameters(struct openssl_session *sess,\n \tif (auth_xform) {\n \t\tret = openssl_set_session_auth_parameters(sess, auth_xform);\n \t\tif (ret != 0) {\n-\t\t\tOPENSSL_LOG_ERR(\n+\t\t\tOPENSSL_PMD_LOG(ERR,\n \t\t\t\t\"Invalid/unsupported auth parameters\");\n \t\t\treturn ret;\n \t\t}\n@@ -695,7 +695,7 @@ openssl_set_session_parameters(struct openssl_session *sess,\n \tif (aead_xform) {\n \t\tret = openssl_set_session_aead_parameters(sess, aead_xform);\n \t\tif (ret != 0) {\n-\t\t\tOPENSSL_LOG_ERR(\n+\t\t\tOPENSSL_PMD_LOG(ERR,\n \t\t\t\t\"Invalid/unsupported AEAD parameters\");\n \t\t\treturn ret;\n \t\t}\n@@ -884,7 +884,7 @@ process_openssl_cipher_encrypt(struct rte_mbuf *mbuf_src, uint8_t *dst,\n \treturn 0;\n \n process_cipher_encrypt_err:\n-\tOPENSSL_LOG_ERR(\"Process openssl cipher encrypt failed\");\n+\tOPENSSL_PMD_LOG(ERR, \"Process openssl cipher encrypt failed\");\n \treturn -EINVAL;\n }\n \n@@ -908,7 +908,7 @@ process_openssl_cipher_bpi_encrypt(uint8_t *src, uint8_t *dst,\n \treturn 0;\n \n process_cipher_encrypt_err:\n-\tOPENSSL_LOG_ERR(\"Process openssl cipher bpi encrypt failed\");\n+\tOPENSSL_PMD_LOG(ERR, \"Process openssl cipher bpi encrypt failed\");\n \treturn -EINVAL;\n }\n /** Process standard openssl cipher decryption */\n@@ -932,7 +932,7 @@ process_openssl_cipher_decrypt(struct rte_mbuf *mbuf_src, uint8_t *dst,\n \treturn 0;\n \n process_cipher_decrypt_err:\n-\tOPENSSL_LOG_ERR(\"Process openssl cipher decrypt failed\");\n+\tOPENSSL_PMD_LOG(ERR, \"Process openssl cipher decrypt failed\");\n \treturn -EINVAL;\n }\n \n@@ -989,7 +989,7 @@ process_openssl_cipher_des3ctr(struct rte_mbuf *mbuf_src, uint8_t *dst,\n \treturn 0;\n \n process_cipher_des3ctr_err:\n-\tOPENSSL_LOG_ERR(\"Process openssl cipher des 3 ede ctr failed\");\n+\tOPENSSL_PMD_LOG(ERR, \"Process openssl cipher des 3 ede ctr failed\");\n \treturn -EINVAL;\n }\n \n@@ -1027,7 +1027,7 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset,\n \treturn 0;\n \n process_auth_encryption_gcm_err:\n-\tOPENSSL_LOG_ERR(\"Process openssl auth encryption gcm failed\");\n+\tOPENSSL_PMD_LOG(ERR, \"Process openssl auth encryption gcm failed\");\n \treturn -EINVAL;\n }\n \n@@ -1068,7 +1068,7 @@ process_openssl_auth_encryption_ccm(struct rte_mbuf *mbuf_src, int offset,\n \treturn 0;\n \n process_auth_encryption_ccm_err:\n-\tOPENSSL_LOG_ERR(\"Process openssl auth encryption ccm failed\");\n+\tOPENSSL_PMD_LOG(ERR, \"Process openssl auth encryption ccm failed\");\n \treturn -EINVAL;\n }\n \n@@ -1106,7 +1106,7 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset,\n \treturn 0;\n \n process_auth_decryption_gcm_err:\n-\tOPENSSL_LOG_ERR(\"Process openssl auth decryption gcm failed\");\n+\tOPENSSL_PMD_LOG(ERR, \"Process openssl auth decryption gcm failed\");\n \treturn -EINVAL;\n }\n \n@@ -1145,7 +1145,7 @@ process_openssl_auth_decryption_ccm(struct rte_mbuf *mbuf_src, int offset,\n \treturn 0;\n \n process_auth_decryption_ccm_err:\n-\tOPENSSL_LOG_ERR(\"Process openssl auth decryption ccm failed\");\n+\tOPENSSL_PMD_LOG(ERR, \"Process openssl auth decryption ccm failed\");\n \treturn -EINVAL;\n }\n \n@@ -1198,7 +1198,7 @@ process_openssl_auth(struct rte_mbuf *mbuf_src, uint8_t *dst, int offset,\n \treturn 0;\n \n process_auth_err:\n-\tOPENSSL_LOG_ERR(\"Process openssl auth failed\");\n+\tOPENSSL_PMD_LOG(ERR, \"Process openssl auth failed\");\n \treturn -EINVAL;\n }\n \n@@ -1251,7 +1251,7 @@ process_openssl_auth_hmac(struct rte_mbuf *mbuf_src, uint8_t *dst, int offset,\n \treturn 0;\n \n process_auth_err:\n-\tOPENSSL_LOG_ERR(\"Process openssl auth failed\");\n+\tOPENSSL_PMD_LOG(ERR, \"Process openssl auth failed\");\n \treturn -EINVAL;\n }\n \n@@ -1646,7 +1646,7 @@ cryptodev_openssl_create(const char *name,\n \n \tdev = rte_cryptodev_pmd_create(name, &vdev->device, init_params);\n \tif (dev == NULL) {\n-\t\tOPENSSL_LOG_ERR(\"failed to create cryptodev vdev\");\n+\t\tOPENSSL_PMD_LOG(ERR, \"failed to create cryptodev vdev\");\n \t\tgoto init_error;\n \t}\n \n@@ -1671,7 +1671,7 @@ cryptodev_openssl_create(const char *name,\n \treturn 0;\n \n init_error:\n-\tOPENSSL_LOG_ERR(\"driver %s: cryptodev_openssl_create failed\",\n+\tOPENSSL_PMD_LOG(ERR, \"driver %s: create failed\",\n \t\t\tinit_params->name);\n \n \tcryptodev_openssl_remove(vdev);\n@@ -1735,3 +1735,11 @@ RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_OPENSSL_PMD,\n \t\"socket_id=<int>\");\n RTE_PMD_REGISTER_CRYPTO_DRIVER(openssl_crypto_drv,\n \t\tcryptodev_openssl_pmd_drv.driver, cryptodev_driver_id);\n+\n+RTE_INIT(openssl_init_log);\n+static void\n+openssl_init_log(void)\n+{\n+\topenssl_logtype_driver = rte_log_register(\"pmd.crypto.openssl\");\n+}\n+\ndiff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c\nindex 1cb87d59a..ad3156e11 100644\n--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c\n+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c\n@@ -588,14 +588,14 @@ openssl_pmd_qp_create_processed_ops_ring(struct openssl_qp *qp,\n \tr = rte_ring_lookup(qp->name);\n \tif (r) {\n \t\tif (rte_ring_get_size(r) >= ring_size) {\n-\t\t\tOPENSSL_LOG_INFO(\n-\t\t\t\t\"Reusing existing ring %s for processed ops\",\n+\t\t\tOPENSSL_PMD_LOG(INFO,\n+\t\t\t\t\t\"Reusing existing ring %s for processed ops\",\n \t\t\t\t qp->name);\n \t\t\treturn r;\n \t\t}\n \n-\t\tOPENSSL_LOG_ERR(\n-\t\t\t\"Unable to reuse existing ring %s for processed ops\",\n+\t\tOPENSSL_PMD_LOG(ERR,\n+\t\t\t\t\"Unable to reuse existing ring %s for processed ops\",\n \t\t\t qp->name);\n \t\treturn NULL;\n \t}\n@@ -688,19 +688,19 @@ openssl_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,\n \tint ret;\n \n \tif (unlikely(sess == NULL)) {\n-\t\tOPENSSL_LOG_ERR(\"invalid session struct\");\n+\t\tOPENSSL_PMD_LOG(ERR, \"invalid session struct\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (rte_mempool_get(mempool, &sess_private_data)) {\n-\t\tCDEV_LOG_ERR(\n+\t\tOPENSSL_PMD_LOG(ERR,\n \t\t\t\"Couldn't get object from session mempool\");\n \t\treturn -ENOMEM;\n \t}\n \n \tret = openssl_set_session_parameters(sess_private_data, xform);\n \tif (ret != 0) {\n-\t\tOPENSSL_LOG_ERR(\"failed configure session parameters\");\n+\t\tOPENSSL_PMD_LOG(ERR, \"failed configure session parameters\");\n \n \t\t/* Return session to mempool */\n \t\trte_mempool_put(mempool, sess_private_data);\ndiff --git a/drivers/crypto/openssl/rte_openssl_pmd_private.h b/drivers/crypto/openssl/rte_openssl_pmd_private.h\nindex bc8dc7cdc..37c4616cf 100644\n--- a/drivers/crypto/openssl/rte_openssl_pmd_private.h\n+++ b/drivers/crypto/openssl/rte_openssl_pmd_private.h\n@@ -12,25 +12,12 @@\n #define CRYPTODEV_NAME_OPENSSL_PMD\tcrypto_openssl\n /**< Open SSL Crypto PMD device name */\n \n-#define OPENSSL_LOG_ERR(fmt, args...) \\\n-\tRTE_LOG(ERR, CRYPTODEV, \"[%s] %s() line %u: \" fmt \"\\n\", \\\n-\t\t\tRTE_STR(CRYPTODEV_NAME_OPENSSL_PMD), \\\n-\t\t\t__func__, __LINE__, ## args)\n-\n-#ifdef RTE_LIBRTE_OPENSSL_DEBUG\n-#define OPENSSL_LOG_INFO(fmt, args...) \\\n-\tRTE_LOG(INFO, CRYPTODEV, \"[%s] %s() line %u: \" fmt \"\\n\", \\\n-\t\t\tRTE_STR(CRYPTODEV_NAME_OPENSSL_PMD), \\\n-\t\t\t__func__, __LINE__, ## args)\n-\n-#define OPENSSL_LOG_DBG(fmt, args...) \\\n-\tRTE_LOG(DEBUG, CRYPTODEV, \"[%s] %s() line %u: \" fmt \"\\n\", \\\n-\t\t\tRTE_STR(CRYPTODEV_NAME_OPENSSL_PMD), \\\n-\t\t\t__func__, __LINE__, ## args)\n-#else\n-#define OPENSSL_LOG_INFO(fmt, args...)\n-#define OPENSSL_LOG_DBG(fmt, args...)\n-#endif\n+/** OPENSSL PMD LOGTYPE DRIVER */\n+int openssl_logtype_driver;\n+#define OPENSSL_PMD_LOG(level, fmt, ...) \\\n+\trte_log(RTE_LOG_ ## level, openssl_logtype_driver, \\\n+\t\t\t\"%s() line %u: \" fmt \"\\n\", __func__, __LINE__, \\\n+\t\t\t\t\t## __VA_ARGS__)\n \n /* Maximum length for digest (SHA-512 needs 64 bytes) */\n #define DIGEST_LENGTH_MAX 64\n", "prefixes": [] }