Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/43818/?format=api
{ "id": 43818, "url": "http://patches.dpdk.org/api/patches/43818/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1535026093-101872-9-git-send-email-ciara.power@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": "<1535026093-101872-9-git-send-email-ciara.power@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1535026093-101872-9-git-send-email-ciara.power@intel.com", "date": "2018-08-23T12:08:10", "name": "[08/11] telemetry: add vdev kvargs for selftest", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "149a3260e2577ca449eec69895e74f16e6cfa84a", "submitter": { "id": 978, "url": "http://patches.dpdk.org/api/people/978/?format=api", "name": "Power, Ciara", "email": "ciara.power@intel.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1535026093-101872-9-git-send-email-ciara.power@intel.com/mbox/", "series": [ { "id": 1038, "url": "http://patches.dpdk.org/api/series/1038/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1038", "date": "2018-08-23T12:08:02", "name": "introduce telemetry library", "version": 1, "mbox": "http://patches.dpdk.org/series/1038/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/43818/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/43818/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 0528558C3;\n\tThu, 23 Aug 2018 14:08:43 +0200 (CEST)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby dpdk.org (Postfix) with ESMTP id 850AE4CC3\n\tfor <dev@dpdk.org>; Thu, 23 Aug 2018 14:08:36 +0200 (CEST)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t23 Aug 2018 05:08:36 -0700", "from silpixa00399503.ir.intel.com ([10.237.222.102])\n\tby fmsmga005.fm.intel.com with ESMTP; 23 Aug 2018 05:08:35 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.53,278,1531810800\"; d=\"scan'208\";a=\"256613876\"", "From": "Ciara Power <ciara.power@intel.com>", "To": "harry.van.haaren@intel.com, brian.archbold@intel.com,\n\temma.kenny@intel.com, ciara.power@intel.com", "Cc": "dev@dpdk.org", "Date": "Thu, 23 Aug 2018 13:08:10 +0100", "Message-Id": "<1535026093-101872-9-git-send-email-ciara.power@intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1535026093-101872-1-git-send-email-ciara.power@intel.com>", "References": "<1535026093-101872-1-git-send-email-ciara.power@intel.com>", "Subject": "[dpdk-dev] [PATCH 08/11] telemetry: add vdev kvargs for selftest", "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": "This patch adds functionality to run the selftest by passing\nin an argument to vdev, \"selftest\".\n\nTo run the tests that were added in the previous patch, the\nargument \"selftest=1\" must be added to the vdev arguments.\nThis will enable the user to run telemetry with or without tests,\nas required.\n\nSigned-off-by: Ciara Power <ciara.power@intel.com>\nSigned-off-by: Brian Archbold <brian.archbold@intel.com>\n---\n drivers/telemetry/telemetry/telemetry_driver.c | 50 ++++++++++++++++++++++----\n lib/librte_telemetry/rte_telemetry.c | 35 +++++++++---------\n lib/librte_telemetry/rte_telemetry.h | 8 ++++-\n lib/librte_telemetry/rte_telemetry_internal.h | 1 +\n 4 files changed, 70 insertions(+), 24 deletions(-)", "diff": "diff --git a/drivers/telemetry/telemetry/telemetry_driver.c b/drivers/telemetry/telemetry/telemetry_driver.c\nindex 125a89c..a97c199 100644\n--- a/drivers/telemetry/telemetry/telemetry_driver.c\n+++ b/drivers/telemetry/telemetry/telemetry_driver.c\n@@ -8,21 +8,57 @@\n #include <rte_malloc.h>\n #include <rte_bus_vdev.h>\n #include <rte_lcore.h>\n+#include <rte_kvargs.h>\n+\n+#define SELFTEST_ARG \"selftest\"\n+\n+static int\n+assign_selftest(const char *key __rte_unused, const char *value, void *opaque)\n+{\n+\tint *selftest = opaque;\n+\t*selftest = atoi(value);\n+\treturn 0;\n+}\n \n static int\n telemetry_probe(struct rte_vdev_device *vdev)\n {\n+\tstatic const char *const args[] = {\n+\t\tSELFTEST_ARG\n+\t};\n+\n+\tconst char *params;\n \tint ret;\n+\tstruct telemetry_args telemetry_args;\n+\ttelemetry_args.selftest = 0;\n \n-\tRTE_SET_USED(vdev);\n-\tret = rte_telemetry_selftest();\n-\tif (ret < 0) {\n-\t\tprintf(\"Error - Selftest failed\\n\");\n-\t\treturn -1;\n+\tparams = rte_vdev_device_args(vdev);\n+\tif (params != NULL && params[0] != '\\0') {\n+\t\tstruct rte_kvargs *kvlist = rte_kvargs_parse(params, args);\n+\n+\t\tif (!kvlist) {\n+\t\t\tprintf(\"Error - Could not create kvlist\\n\");\n+\t\t} else {\n+\t\t\tret = rte_kvargs_process(kvlist, SELFTEST_ARG,\n+\t\t\tassign_selftest, &telemetry_args.selftest);\n+\t\t\tif (ret != 0) {\n+\t\t\t\tprintf(\"Error - Processing the arguments\\n\");\n+\t\t\t\trte_kvargs_free(kvlist);\n+\t\t\t\treturn ret;\n+\t\t\t}\n+\t\t}\n+\t\trte_kvargs_free(kvlist);\n+\t}\n+\tif (telemetry_args.selftest) {\n+\t\tret = rte_telemetry_selftest();\n+\t\tif (ret < 0) {\n+\t\t\tprintf(\"Error - Selftest failed\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\tprintf(\"Success - Selftest passed\\n\");\n \t}\n-\tprintf(\"Success - Selftest passed\\n\");\n \n-\tret = rte_telemetry_init(rte_socket_id());\n+\tret = rte_telemetry_init(rte_socket_id(), &telemetry_args);\n \tif (ret < 0) {\n \t\tprintf(\"Error - Telemetry initialisation failed\\n\");\n \t\treturn -1;\ndiff --git a/lib/librte_telemetry/rte_telemetry.c b/lib/librte_telemetry/rte_telemetry.c\nindex ecf644b..1f7528d 100644\n--- a/lib/librte_telemetry/rte_telemetry.c\n+++ b/lib/librte_telemetry/rte_telemetry.c\n@@ -666,18 +666,21 @@ rte_telemetry_initial_accept(struct telemetry_impl *telemetry)\n \t\treturn -1;\n \t}\n \ttelemetry->metrics_register_done = 1;\n-\tret = rte_telemetry_socket_messaging_testing(telemetry->reg_index,\n-\t\ttelemetry->server_fd);\n-\tif (ret < 0)\n-\t\treturn -1;\n+\tif (telemetry->selftest) {\n+\t\tret =\n+\t\trte_telemetry_socket_messaging_testing(telemetry->reg_index,\n+\t\t\ttelemetry->server_fd);\n+\t\tif (ret < 0)\n+\t\t\treturn -1;\n \n-\tret = rte_telemetry_parser_test(telemetry);\n-\tif (ret < 0) {\n-\t\tTELEMETRY_LOG_ERR(\"Error - Parser Tests Failed\\n\");\n-\t\treturn -1;\n+\t\tret = rte_telemetry_parser_test(telemetry);\n+\t\tif (ret < 0) {\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - Parser Tests Failed\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\tTELEMETRY_LOG_INFO(\"Success - All Parser Tests Passed\\n\");\n+\t\ttelemetry->selftest = 0;\n \t}\n-\tTELEMETRY_LOG_INFO(\"Success - All Parser Tests Passed\\n\");\n-\n \treturn 0;\n }\n \n@@ -856,7 +859,7 @@ rte_telemetry_create_socket(struct telemetry_impl *telemetry)\n }\n \n int32_t\n-rte_telemetry_init(uint32_t socket_id)\n+rte_telemetry_init(uint32_t socket_id, struct telemetry_args *args)\n {\n \tint ret;\n \tpthread_attr_t attr;\n@@ -873,7 +876,7 @@ rte_telemetry_init(uint32_t socket_id)\n \t\tTELEMETRY_LOG_ERR(\"Error - Memory could not be allocated\\n\");\n \t\treturn -ENOMEM;\n \t}\n-\n+\tstatic_telemetry->selftest = args->selftest;\n \tstatic_telemetry->socket_id = socket_id;\n \trte_metrics_init(static_telemetry->socket_id);\n \tret = rte_telemetry_create_socket(static_telemetry);\n@@ -1167,10 +1170,10 @@ rte_telemetry_selftest(void)\n \tconst char *invalid_client_path = SELFTEST_INVALID_CLIENT;\n \tconst char *valid_client_path = SELFTEST_VALID_CLIENT;\n \tint ret, sockfd;\n+\tstruct telemetry_args args;\n+\targs.selftest = 0;\n \n-\tTELEMETRY_LOG_INFO(\"Selftest\\n\");\n-\n-\tret = rte_telemetry_init(rte_socket_id());\n+\tret = rte_telemetry_init(rte_socket_id(), &args);\n \tif (ret < 0) {\n \t\tTELEMETRY_LOG_ERR(\"Error - Valid initialisation test\"\n \t\t\t\" failed\\n\");\n@@ -1178,7 +1181,7 @@ rte_telemetry_selftest(void)\n \t}\n \tTELEMETRY_LOG_INFO(\"Success - Valid initialisation test passed\\n\");\n \n-\tret = rte_telemetry_init(rte_socket_id());\n+\tret = rte_telemetry_init(rte_socket_id(), &args);\n \tif (ret != -EALREADY) {\n \t\tTELEMETRY_LOG_ERR(\"Error - Invalid initialisation test \"\n \t\t\t\"failed\\n\");\ndiff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h\nindex 4f187b7..ac66595 100644\n--- a/lib/librte_telemetry/rte_telemetry.h\n+++ b/lib/librte_telemetry/rte_telemetry.h\n@@ -7,12 +7,18 @@\n #ifndef _RTE_TELEMETRY_H_\n #define _RTE_TELEMETRY_H_\n \n+typedef struct telemetry_args {\n+\tint selftest;\n+} telemetry_args;\n+\n /**\n * Get the telemetry_impl structure device pointer initialised.\n *\n * @param socket_id\n * Unsigned integer representing the socket id to be used\n * for the telemetry structure.\n+ * @param args\n+ * Struct containing arguments from telemetry_args\n *\n * @return\n * 0 on successful initialisation.\n@@ -24,7 +30,7 @@\n * -EALREADY if Telemetry is already initialised.\n */\n int32_t\n-rte_telemetry_init(uint32_t socket_id);\n+rte_telemetry_init(uint32_t socket_id, struct telemetry_args *args);\n \n /**\n * Clean up and free memory.\ndiff --git a/lib/librte_telemetry/rte_telemetry_internal.h b/lib/librte_telemetry/rte_telemetry_internal.h\nindex 3e21b79..3270711 100644\n--- a/lib/librte_telemetry/rte_telemetry_internal.h\n+++ b/lib/librte_telemetry/rte_telemetry_internal.h\n@@ -41,6 +41,7 @@ typedef struct telemetry_impl {\n \tTAILQ_HEAD(, telemetry_client) client_list_head;\n \tstruct telemetry_client *request_client;\n \tint register_fail_count;\n+\tint selftest;\n } telemetry_impl;\n \n int32_t\n", "prefixes": [ "08/11" ] }