Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42154/?format=api
http://patchwork.dpdk.org/api/patches/42154/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20180703043722.18978-1-pablo.de.lara.guarch@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": "<20180703043722.18978-1-pablo.de.lara.guarch@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180703043722.18978-1-pablo.de.lara.guarch@intel.com", "date": "2018-07-03T04:37:22", "name": "crypto/snow3g: add dynamic logging", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "4e99f7ad23c363e593afd0c7aab6e75ad70d9374", "submitter": { "id": 9, "url": "http://patchwork.dpdk.org/api/people/9/?format=api", "name": "De Lara Guarch, Pablo", "email": "pablo.de.lara.guarch@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/20180703043722.18978-1-pablo.de.lara.guarch@intel.com/mbox/", "series": [ { "id": 372, "url": "http://patchwork.dpdk.org/api/series/372/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=372", "date": "2018-07-03T04:37:22", "name": "crypto/snow3g: add dynamic logging", "version": 1, "mbox": "http://patchwork.dpdk.org/series/372/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/42154/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/42154/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 C56FB1BEF3;\n\tTue, 3 Jul 2018 14:43:04 +0200 (CEST)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby dpdk.org (Postfix) with ESMTP id D1A6B7EB4\n\tfor <dev@dpdk.org>; Tue, 3 Jul 2018 14:43:02 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 Jul 2018 05:43:01 -0700", "from silpixa00399466.ir.intel.com (HELO\n\tsilpixa00399466.ger.corp.intel.com) ([10.237.223.220])\n\tby orsmga008.jf.intel.com with ESMTP; 03 Jul 2018 05:43:00 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.51,303,1526367600\"; d=\"scan'208\";a=\"54103422\"", "From": "Pablo de Lara <pablo.de.lara.guarch@intel.com>", "To": "dev@dpdk.org", "Cc": "Pablo de Lara <pablo.de.lara.guarch@intel.com>", "Date": "Tue, 3 Jul 2018 05:37:22 +0100", "Message-Id": "<20180703043722.18978-1-pablo.de.lara.guarch@intel.com>", "X-Mailer": "git-send-email 2.14.4", "Subject": "[dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Registered new dynamic logtype for driver and\nreplaced SNOW3G_LOG_ERR and CDEV_LOG_ERR\nwith the new SNOW3G_LOG macro, which uses the new logtype.\n\nSigned-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>\n---\n drivers/crypto/snow3g/rte_snow3g_pmd.c | 25 ++++++++++++++---------\n drivers/crypto/snow3g/rte_snow3g_pmd_ops.c | 10 ++++-----\n drivers/crypto/snow3g/rte_snow3g_pmd_private.h | 28 ++++++++------------------\n 3 files changed, 29 insertions(+), 34 deletions(-)", "diff": "diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c\nindex 72751e35e..bb990a07e 100644\n--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c\n+++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c\n@@ -79,7 +79,7 @@ snow3g_set_session_parameters(struct snow3g_session *sess,\n \t\tbreak;\n \tcase SNOW3G_OP_NOT_SUPPORTED:\n \tdefault:\n-\t\tSNOW3G_LOG_ERR(\"Unsupported operation chain order parameter\");\n+\t\tSNOW3G_LOG(ERR, \"Unsupported operation chain order parameter\");\n \t\treturn -ENOTSUP;\n \t}\n \n@@ -89,7 +89,7 @@ snow3g_set_session_parameters(struct snow3g_session *sess,\n \t\t\treturn -ENOTSUP;\n \n \t\tif (cipher_xform->cipher.iv.length != SNOW3G_IV_LENGTH) {\n-\t\t\tSNOW3G_LOG_ERR(\"Wrong IV length\");\n+\t\t\tSNOW3G_LOG(ERR, \"Wrong IV length\");\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tsess->cipher_iv_offset = cipher_xform->cipher.iv.offset;\n@@ -105,14 +105,14 @@ snow3g_set_session_parameters(struct snow3g_session *sess,\n \t\t\treturn -ENOTSUP;\n \n \t\tif (auth_xform->auth.digest_length != SNOW3G_DIGEST_LENGTH) {\n-\t\t\tSNOW3G_LOG_ERR(\"Wrong digest length\");\n+\t\t\tSNOW3G_LOG(ERR, \"Wrong digest length\");\n \t\t\treturn -EINVAL;\n \t\t}\n \n \t\tsess->auth_op = auth_xform->auth.op;\n \n \t\tif (auth_xform->auth.iv.length != SNOW3G_IV_LENGTH) {\n-\t\t\tSNOW3G_LOG_ERR(\"Wrong IV length\");\n+\t\t\tSNOW3G_LOG(ERR, \"Wrong IV length\");\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tsess->auth_iv_offset = auth_xform->auth.iv.offset;\n@@ -216,7 +216,7 @@ process_snow3g_cipher_op_bit(struct rte_crypto_op *op,\n \tsrc = rte_pktmbuf_mtod(op->sym->m_src, uint8_t *);\n \tif (op->sym->m_dst == NULL) {\n \t\top->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n-\t\tSNOW3G_LOG_ERR(\"bit-level in-place not supported\\n\");\n+\t\tSNOW3G_LOG(ERR, \"bit-level in-place not supported\\n\");\n \t\treturn 0;\n \t}\n \tdst = rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *);\n@@ -246,7 +246,7 @@ process_snow3g_hash_op(struct snow3g_qp *qp, struct rte_crypto_op **ops,\n \t\t/* Data must be byte aligned */\n \t\tif ((ops[i]->sym->auth.data.offset % BYTE_LEN) != 0) {\n \t\t\tops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n-\t\t\tSNOW3G_LOG_ERR(\"Offset\");\n+\t\t\tSNOW3G_LOG(ERR, \"Offset\");\n \t\t\tbreak;\n \t\t}\n \n@@ -295,7 +295,7 @@ process_ops(struct rte_crypto_op **ops, struct snow3g_session *session,\n \t\t\t\t(ops[i]->sym->m_dst != NULL &&\n \t\t\t\t!rte_pktmbuf_is_contiguous(\n \t\t\t\t\t\tops[i]->sym->m_dst))) {\n-\t\t\tSNOW3G_LOG_ERR(\"PMD supports only contiguous mbufs, \"\n+\t\t\tSNOW3G_LOG(ERR, \"PMD supports only contiguous mbufs, \"\n \t\t\t\t\"op (%p) provides noncontiguous mbuf as \"\n \t\t\t\t\"source/destination buffer.\\n\", ops[i]);\n \t\t\tops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;\n@@ -537,7 +537,7 @@ cryptodev_snow3g_create(const char *name,\n \n \tdev = rte_cryptodev_pmd_create(name, &vdev->device, init_params);\n \tif (dev == NULL) {\n-\t\tSNOW3G_LOG_ERR(\"failed to create cryptodev vdev\");\n+\t\tSNOW3G_LOG(ERR, \"failed to create cryptodev vdev\");\n \t\tgoto init_error;\n \t}\n \n@@ -559,7 +559,7 @@ cryptodev_snow3g_create(const char *name,\n \n \treturn 0;\n init_error:\n-\tSNOW3G_LOG_ERR(\"driver %s: cryptodev_snow3g_create failed\",\n+\tSNOW3G_LOG(ERR, \"driver %s: cryptodev_snow3g_create failed\",\n \t\t\tinit_params->name);\n \n \tcryptodev_snow3g_remove(vdev);\n@@ -621,3 +621,10 @@ RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SNOW3G_PMD,\n \t\"socket_id=<int>\");\n RTE_PMD_REGISTER_CRYPTO_DRIVER(snow3g_crypto_drv,\n \t\tcryptodev_snow3g_pmd_drv.driver, cryptodev_driver_id);\n+\n+RTE_INIT(snow3g_init_log);\n+static void\n+snow3g_init_log(void)\n+{\n+\tsnow3g_logtype_driver = rte_log_register(\"pmd.crypto.snow3g\");\n+}\ndiff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c\nindex f60b47598..ca9b8635b 100644\n--- a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c\n+++ b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c\n@@ -172,13 +172,13 @@ snow3g_pmd_qp_create_processed_ops_ring(struct snow3g_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\tSNOW3G_LOG_INFO(\"Reusing existing ring %s\"\n+\t\t\tSNOW3G_LOG(INFO, \"Reusing existing ring %s\"\n \t\t\t\t\t\" for processed packets\",\n \t\t\t\t\t qp->name);\n \t\t\treturn r;\n \t\t}\n \n-\t\tSNOW3G_LOG_ERR(\"Unable to reuse existing ring %s\"\n+\t\tSNOW3G_LOG(ERR, \"Unable to reuse existing ring %s\"\n \t\t\t\t\" for processed packets\",\n \t\t\t\t qp->name);\n \t\treturn NULL;\n@@ -271,19 +271,19 @@ snow3g_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,\n \tint ret;\n \n \tif (unlikely(sess == NULL)) {\n-\t\tSNOW3G_LOG_ERR(\"invalid session struct\");\n+\t\tSNOW3G_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\tSNOW3G_LOG(ERR,\n \t\t\t\"Couldn't get object from session mempool\");\n \t\treturn -ENOMEM;\n \t}\n \n \tret = snow3g_set_session_parameters(sess_private_data, xform);\n \tif (ret != 0) {\n-\t\tSNOW3G_LOG_ERR(\"failed configure session parameters\");\n+\t\tSNOW3G_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/snow3g/rte_snow3g_pmd_private.h b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h\nindex eea900e0a..f0cc60d3b 100644\n--- a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h\n+++ b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h\n@@ -1,5 +1,5 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2016-2017 Intel Corporation\n+ * Copyright(c) 2016-2018 Intel Corporation\n */\n \n #ifndef _RTE_SNOW3G_PMD_PRIVATE_H_\n@@ -10,25 +10,13 @@\n #define CRYPTODEV_NAME_SNOW3G_PMD\tcrypto_snow3g\n /**< SNOW 3G PMD device name */\n \n-#define SNOW3G_LOG_ERR(fmt, args...) \\\n-\tRTE_LOG(ERR, CRYPTODEV, \"[%s] %s() line %u: \" fmt \"\\n\", \\\n-\t\t\tRTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), \\\n-\t\t\t__func__, __LINE__, ## args)\n-\n-#ifdef RTE_LIBRTE_SNOW3G_DEBUG\n-#define SNOW3G_LOG_INFO(fmt, args...) \\\n-\tRTE_LOG(INFO, CRYPTODEV, \"[%s] %s() line %u: \" fmt \"\\n\", \\\n-\t\t\tRTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), \\\n-\t\t\t__func__, __LINE__, ## args)\n-\n-#define SNOW3G_LOG_DBG(fmt, args...) \\\n-\tRTE_LOG(DEBUG, CRYPTODEV, \"[%s] %s() line %u: \" fmt \"\\n\", \\\n-\t\t\tRTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), \\\n-\t\t\t__func__, __LINE__, ## args)\n-#else\n-#define SNOW3G_LOG_INFO(fmt, args...)\n-#define SNOW3G_LOG_DBG(fmt, args...)\n-#endif\n+/** SNOW 3G PMD LOGTYPE DRIVER */\n+int snow3g_logtype_driver;\n+\n+#define SNOW3G_LOG(level, fmt, ...) \\\n+\trte_log(RTE_LOG_ ## level, snow3g_logtype_driver, \\\n+\t\t\t\"%s() line %u: \" fmt \"\\n\", __func__, __LINE__, \\\n+\t\t\t\t\t## __VA_ARGS__)\n \n #define SNOW3G_DIGEST_LENGTH 4\n \n", "prefixes": [] }{ "id": 42154, "url": "