Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/43812/?format=api
{ "id": 43812, "url": "http://patches.dpdk.org/api/patches/43812/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1535026093-101872-3-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-3-git-send-email-ciara.power@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1535026093-101872-3-git-send-email-ciara.power@intel.com", "date": "2018-08-23T12:08:04", "name": "[02/11] telemetry: add initial connection socket", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "30a0c715d4c32d812af2d2797d5ae0266fa035c9", "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-3-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/43812/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/43812/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 481E04CA7;\n\tThu, 23 Aug 2018 14:08:32 +0200 (CEST)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby dpdk.org (Postfix) with ESMTP id 069134C8D\n\tfor <dev@dpdk.org>; Thu, 23 Aug 2018 14:08:27 +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:27 -0700", "from silpixa00399503.ir.intel.com ([10.237.222.102])\n\tby fmsmga005.fm.intel.com with ESMTP; 23 Aug 2018 05:08:26 -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=\"256613835\"", "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:04 +0100", "Message-Id": "<1535026093-101872-3-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 02/11] telemetry: add initial connection socket", "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 the telemetry UNIX socket. It is used to\nallow connections from external clients.\n\nOn the initial connection from a client, ethdev stats are\nregistered in the metrics library, to allow for their retrieval\nat a later stage.\n\nSigned-off-by: Ciara Power <ciara.power@intel.com>\nSigned-off-by: Brian Archbold <brian.archbold@intel.com>\n---\n lib/librte_telemetry/rte_telemetry.c | 205 ++++++++++++++++++++++++++\n lib/librte_telemetry/rte_telemetry_internal.h | 4 +\n 2 files changed, 209 insertions(+)", "diff": "diff --git a/lib/librte_telemetry/rte_telemetry.c b/lib/librte_telemetry/rte_telemetry.c\nindex 8d7b0e3..f984929 100644\n--- a/lib/librte_telemetry/rte_telemetry.c\n+++ b/lib/librte_telemetry/rte_telemetry.c\n@@ -3,21 +3,159 @@\n */\n \n #include <unistd.h>\n+#include <fcntl.h>\n+#include <sys/socket.h>\n+#include <sys/un.h>\n \n #include <rte_eal.h>\n #include <rte_ethdev.h>\n #include <rte_metrics.h>\n+#include <rte_string_fns.h>\n \n #include \"rte_telemetry.h\"\n #include \"rte_telemetry_internal.h\"\n \n #define SLEEP_TIME 10\n \n+#define DEFAULT_DPDK_PATH \"/var/run/.rte_telemetry\"\n+\n+const char *socket_path = DEFAULT_DPDK_PATH;\n static telemetry_impl *static_telemetry;\n \n+int32_t\n+rte_telemetry_check_port_activity(int port_id)\n+{\n+\tint pid;\n+\n+\tRTE_ETH_FOREACH_DEV(pid) {\n+\t\tif (pid == port_id)\n+\t\t\treturn 1;\n+\t}\n+\tTELEMETRY_LOG_ERR(\"Error - port_id: %d is invalid, not active\\n\",\n+\t\tport_id);\n+\treturn 0;\n+}\n+\n+static int32_t\n+rte_telemetry_reg_ethdev_to_metrics(uint16_t port_id)\n+{\n+\tint ret, num_xstats, start_index, i;\n+\tstruct rte_eth_xstat *eth_xstats;\n+\n+\tif (!rte_eth_dev_is_valid_port(port_id)) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - port_id: %d is invalid\\n\", port_id);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tnum_xstats = rte_eth_xstats_get(port_id, NULL, 0);\n+\tif (num_xstats < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - rte_eth_xstats_get(%u) failed:\"\n+\t\t\t\" %d\\n\", port_id, num_xstats);\n+\t\treturn -EPERM;\n+\t}\n+\n+\teth_xstats = malloc(sizeof(struct rte_eth_xstat) * num_xstats);\n+\tif (eth_xstats == NULL) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Failed to malloc memory for\"\n+\t\t\t\" xstats\\n\");\n+\t\treturn -ENOMEM;\n+\t}\n+\tret = rte_eth_xstats_get(port_id, eth_xstats, num_xstats);\n+\tif (ret < 0 || ret > num_xstats) {\n+\t\tfree(eth_xstats);\n+\t\tTELEMETRY_LOG_ERR(\"Error - rte_eth_xstats_get(%u) len%i\"\n+\t\t\t\" failed: %d\\n\", port_id, num_xstats, ret);\n+\t\treturn -EPERM;\n+\t}\n+\tstruct rte_eth_xstat_name *eth_xstats_names;\n+\teth_xstats_names = malloc(sizeof(struct rte_eth_xstat_name) *\n+\t\t num_xstats);\n+\tif (eth_xstats_names == NULL) {\n+\t\tfree(eth_xstats);\n+\t\tTELEMETRY_LOG_ERR(\"Error - Failed to malloc memory for\"\n+\t\t\t\" xstats_names\\n\");\n+\t\treturn -ENOMEM;\n+\t}\n+\tret = rte_eth_xstats_get_names(port_id, eth_xstats_names,\n+\t\t num_xstats);\n+\tif (ret < 0 || ret > num_xstats) {\n+\t\tfree(eth_xstats);\n+\t\tfree(eth_xstats_names);\n+\t\tTELEMETRY_LOG_ERR(\"Error - rte_eth_xstats_get_names(%u)\"\n+\t\t\t\" len%i failed: %d\\n\", port_id, num_xstats,\n+\t\t\t\t ret);\n+\t\treturn -EPERM;\n+\t}\n+\tconst char *xstats_names[num_xstats];\n+\n+\tfor (i = 0; i < num_xstats; i++)\n+\t\txstats_names[i] = eth_xstats_names[eth_xstats[i].id].name;\n+\n+\tstart_index = rte_metrics_reg_names(xstats_names, num_xstats);\n+\n+\tif (start_index < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - rte_metrics_reg_names failed -\"\n+\t\t\t\" metrics may already be registered\\n\");\n+\t\tfree(eth_xstats);\n+\t\tfree(eth_xstats_names);\n+\t\treturn -1;\n+\t}\n+\tfree(eth_xstats_names);\n+\tfree(eth_xstats);\n+\treturn start_index;\n+}\n+\n+static int32_t\n+rte_telemetry_initial_accept(struct telemetry_impl *telemetry)\n+{\n+\tint pid;\n+\n+\tRTE_ETH_FOREACH_DEV(pid) {\n+\t\ttelemetry->reg_index =\n+\t\t\trte_telemetry_reg_ethdev_to_metrics(pid);\n+\t\tbreak;\n+\t}\n+\n+\tif (telemetry->reg_index < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - failed to register ethdev \"\n+\t\t\t\"metrics\\n\");\n+\t\treturn -1;\n+\t}\n+\ttelemetry->metrics_register_done = 1;\n+\n+\treturn 0;\n+}\n+\n+static int32_t\n+rte_telemetry_accept_new_client(struct telemetry_impl *telemetry)\n+{\n+\tint ret;\n+\tif (telemetry->accept_fd == 0 || telemetry->accept_fd == -1) {\n+\t\tret = listen(telemetry->server_fd, 1);\n+\t\tif (ret < 0) {\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - Listening error with \"\n+\t\t\t\t\"server fd\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\ttelemetry->accept_fd = accept(telemetry->server_fd, NULL, NULL);\n+\n+\t\tif (telemetry->accept_fd > 0 &&\n+\t\t\ttelemetry->metrics_register_done == 0) {\n+\t\t\tret = rte_telemetry_initial_accept(telemetry);\n+\t\t\tif (ret < 0) {\n+\t\t\t\tTELEMETRY_LOG_ERR(\"Error - Failed to run \"\n+\t\t\t\t\t\"initial configurations/tests\\n\");\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n+\t}\n+\treturn 0;\n+}\n+\n static int32_t\n rte_telemetry_run(void *userdata)\n {\n+\tint ret;\n \tstruct telemetry_impl *telemetry = (struct telemetry_impl *)userdata;\n \tif (!telemetry) {\n \t\tTELEMETRY_LOG_WARN(\"Warning - TELEMETRY could not be \"\n@@ -25,6 +163,12 @@ rte_telemetry_run(void *userdata)\n \t\treturn -1;\n \t}\n \n+\tret = rte_telemetry_accept_new_client(telemetry);\n+\tif (ret < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Accept and read new client \"\n+\t\t\t\"failed\\n\");\n+\t\treturn -1;\n+\t}\n \treturn 0;\n }\n \n@@ -50,6 +194,51 @@ static void\n \tpthread_exit(0);\n }\n \n+static int32_t\n+rte_telemetry_set_socket_nonblock(int fd)\n+{\n+\tif (fd < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Invalid fd provided\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tint flags = fcntl(fd, F_GETFL, 0);\n+\tif (flags < 0)\n+\t\tflags = 0;\n+\treturn fcntl(fd, F_SETFL, flags | O_NONBLOCK);\n+}\n+\n+static int32_t\n+rte_telemetry_create_socket(struct telemetry_impl *telemetry)\n+{\n+\tint ret;\n+\n+\tif (!telemetry)\n+\t\treturn -1;\n+\n+\ttelemetry->server_fd = socket(AF_UNIX, SOCK_STREAM, 0);\n+\tif (telemetry->server_fd == -1) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Failed to open socket\\n\");\n+\t\treturn -1;\n+\t}\n+\tret = rte_telemetry_set_socket_nonblock(telemetry->server_fd);\n+\tif (ret < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Could not set socket to NONBLOCK\\n\");\n+\t\treturn -1;\n+\t}\n+\tstruct sockaddr_un addr = {0};\n+\taddr.sun_family = AF_UNIX;\n+\tstrlcpy(addr.sun_path, socket_path, sizeof(addr.sun_path));\n+\tunlink(socket_path);\n+\n+\tif (bind(telemetry->server_fd, (struct sockaddr *)&addr,\n+\t\tsizeof(addr)) < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Socket binding error\\n\");\n+\t\treturn -1;\n+\t}\n+\treturn 0;\n+}\n+\n int32_t\n rte_telemetry_init(uint32_t socket_id)\n {\n@@ -71,6 +260,14 @@ rte_telemetry_init(uint32_t socket_id)\n \n \tstatic_telemetry->socket_id = socket_id;\n \trte_metrics_init(static_telemetry->socket_id);\n+\tret = rte_telemetry_create_socket(static_telemetry);\n+\tif (ret < 0) {\n+\t\tret = rte_telemetry_cleanup();\n+\t\tif (ret < 0)\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - TELEMETRY cleanup failed\\n\");\n+\t\treturn -EPERM;\n+\t}\n+\n \tpthread_attr_init(&attr);\n \tret = rte_ctrl_thread_create(&static_telemetry->thread_id,\n \t\ttelemetry_ctrl_thread, &attr, rte_telemetry_run_thread_func,\n@@ -88,7 +285,15 @@ rte_telemetry_init(uint32_t socket_id)\n int32_t\n rte_telemetry_cleanup(void)\n {\n+\tint ret;\n \tstruct telemetry_impl *telemetry = static_telemetry;\n+\n+\tret = close(telemetry->server_fd);\n+\tif (ret < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Close TELEMETRY socket failed\\n\");\n+\t\tfree(telemetry);\n+\t\treturn -EPERM;\n+\t}\n \ttelemetry->thread_status = 0;\n \tpthread_join(telemetry->thread_id, NULL);\n \tfree(telemetry);\ndiff --git a/lib/librte_telemetry/rte_telemetry_internal.h b/lib/librte_telemetry/rte_telemetry_internal.h\nindex 4e810a8..569d56a 100644\n--- a/lib/librte_telemetry/rte_telemetry_internal.h\n+++ b/lib/librte_telemetry/rte_telemetry_internal.h\n@@ -24,9 +24,13 @@ extern int telemetry_log_level;\n \tTELEMETRY_LOG(INFO, fmt, ## args)\n \n typedef struct telemetry_impl {\n+\tint accept_fd;\n+\tint server_fd;\n \tpthread_t thread_id;\n \tint thread_status;\n \tuint32_t socket_id;\n+\tint reg_index;\n+\tint metrics_register_done;\n } telemetry_impl;\n \n #endif\n", "prefixes": [ "02/11" ] }