Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/47513/?format=api
{ "id": 47513, "url": "https://patches.dpdk.org/api/patches/47513/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20181027091750.17254-5-harry.van.haaren@intel.com/", "project": { "id": 1, "url": "https://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": "<20181027091750.17254-5-harry.van.haaren@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20181027091750.17254-5-harry.van.haaren@intel.com", "date": "2018-10-27T09:17:42", "name": "[v10,04/12] telemetry: add initial connection socket", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "97ec5c64e83845d17cb65c180ac09df8a2c5be31", "submitter": { "id": 317, "url": "https://patches.dpdk.org/api/people/317/?format=api", "name": "Van Haaren, Harry", "email": "harry.van.haaren@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20181027091750.17254-5-harry.van.haaren@intel.com/mbox/", "series": [ { "id": 2132, "url": "https://patches.dpdk.org/api/series/2132/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=2132", "date": "2018-10-27T09:17:38", "name": "Introduce Telemetry Library", "version": 10, "mbox": "https://patches.dpdk.org/series/2132/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/47513/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/47513/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 DA2525681;\n\tSat, 27 Oct 2018 11:19:46 +0200 (CEST)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n\tby dpdk.org (Postfix) with ESMTP id 8320A4C8C\n\tfor <dev@dpdk.org>; Sat, 27 Oct 2018 11:19:33 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t27 Oct 2018 02:19:33 -0700", "from silpixa00399779.ir.intel.com (HELO\n\tsilpixa00399779.ger.corp.intel.com) ([10.237.223.188])\n\tby orsmga008.jf.intel.com with ESMTP; 27 Oct 2018 02:19:30 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.54,431,1534834800\"; d=\"scan'208\";a=\"84903877\"", "From": "Harry van Haaren <harry.van.haaren@intel.com>", "To": "dev@dpdk.org", "Cc": "thomas@monjalon.net, bruce.richardson@intel.com,\n\tstephen@networkplumber.org, gaetan.rivet@6wind.com,\n\tshreyansh.jain@nxp.com, \n\tmattias.ronnblom@ericsson.com, Ciara Power <ciara.power@intel.com>,\n\tBrian Archbold <brian.archbold@intel.com>,\n\tKevin Laatz <kevin.laatz@intel.com>", "Date": "Sat, 27 Oct 2018 10:17:42 +0100", "Message-Id": "<20181027091750.17254-5-harry.van.haaren@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20181027091750.17254-1-harry.van.haaren@intel.com>", "References": "<20181026235933.79779-1-harry.van.haaren@intel.com>\n\t<20181027091750.17254-1-harry.van.haaren@intel.com>", "Subject": "[dpdk-dev] [PATCH v10 04/12] telemetry: add initial connection\n\tsocket", "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": "From: Ciara Power <ciara.power@intel.com>\n\nThis 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>\nSigned-off-by: Kevin Laatz <kevin.laatz@intel.com>\nAcked-by: Harry van Haaren <harry.van.haaren@intel.com>\n---\n lib/librte_telemetry/rte_telemetry.c | 225 ++++++++++++++++++\n lib/librte_telemetry/rte_telemetry_internal.h | 4 +\n 2 files changed, 229 insertions(+)", "diff": "diff --git a/lib/librte_telemetry/rte_telemetry.c b/lib/librte_telemetry/rte_telemetry.c\nindex 7f4ad0342..e9b3330ca 100644\n--- a/lib/librte_telemetry/rte_telemetry.c\n+++ b/lib/librte_telemetry/rte_telemetry.c\n@@ -3,23 +3,163 @@\n */\n \n #include <unistd.h>\n+#include <fcntl.h>\n #include <pthread.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_option.h>\n+#include <rte_string_fns.h>\n \n #include \"rte_telemetry.h\"\n #include \"rte_telemetry_internal.h\"\n \n+#define BUF_SIZE 1024\n #define SLEEP_TIME 10\n \n static telemetry_impl *static_telemetry;\n \n+static void\n+rte_telemetry_get_runtime_dir(char *socket_path, size_t size)\n+{\n+\tsnprintf(socket_path, size, \"%s/telemetry\", rte_eal_get_runtime_dir());\n+}\n+\n+int32_t\n+rte_telemetry_is_port_active(int port_id)\n+{\n+\tint ret;\n+\n+\tret = rte_eth_find_next(port_id);\n+\tif (ret == port_id)\n+\t\treturn 1;\n+\n+\tTELEMETRY_LOG_ERR(\"port_id: %d is invalid, not active\",\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, ret_val, i;\n+\tstruct rte_eth_xstat *eth_xstats = NULL;\n+\tstruct rte_eth_xstat_name *eth_xstats_names = NULL;\n+\n+\tif (!rte_eth_dev_is_valid_port(port_id)) {\n+\t\tTELEMETRY_LOG_ERR(\"port_id: %d is invalid\", 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(\"rte_eth_xstats_get(%u) failed: %d\",\n+\t\t\t\tport_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(\"Failed to malloc memory for xstats\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tret = rte_eth_xstats_get(port_id, eth_xstats, num_xstats);\n+\tconst char *xstats_names[num_xstats];\n+\teth_xstats_names = malloc(sizeof(struct rte_eth_xstat_name) * num_xstats);\n+\tif (ret < 0 || ret > num_xstats) {\n+\t\tTELEMETRY_LOG_ERR(\"rte_eth_xstats_get(%u) len%i failed: %d\",\n+\t\t\t\tport_id, num_xstats, ret);\n+\t\tret_val = -EPERM;\n+\t\tgoto free_xstats;\n+\t}\n+\n+\tif (eth_xstats_names == NULL) {\n+\t\tTELEMETRY_LOG_ERR(\"Failed to malloc memory for xstats_names\");\n+\t\tret_val = -ENOMEM;\n+\t\tgoto free_xstats;\n+\t}\n+\n+\tret = rte_eth_xstats_get_names(port_id, eth_xstats_names, num_xstats);\n+\tif (ret < 0 || ret > num_xstats) {\n+\t\tTELEMETRY_LOG_ERR(\"rte_eth_xstats_get_names(%u) len%i failed: %d\",\n+\t\t\t\tport_id, num_xstats, ret);\n+\t\tret_val = -EPERM;\n+\t\tgoto free_xstats;\n+\t}\n+\n+\tfor (i = 0; i < num_xstats; i++)\n+\t\txstats_names[i] = eth_xstats_names[eth_xstats[i].id].name;\n+\n+\tret_val = rte_metrics_reg_names(xstats_names, num_xstats);\n+\tif (ret_val < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"rte_metrics_reg_names failed - metrics may already be registered\");\n+\t\tret_val = -1;\n+\t\tgoto free_xstats;\n+\t}\n+\n+\tgoto free_xstats;\n+\n+free_xstats:\n+\tfree(eth_xstats);\n+\tfree(eth_xstats_names);\n+\treturn ret_val;\n+}\n+\n+static int32_t\n+rte_telemetry_initial_accept(struct telemetry_impl *telemetry)\n+{\n+\tuint16_t 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(\"Failed to register ethdev metrics\");\n+\t\treturn -1;\n+\t}\n+\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+\n+\tif (telemetry->accept_fd <= 0) {\n+\t\tret = listen(telemetry->server_fd, 1);\n+\t\tif (ret < 0) {\n+\t\t\tTELEMETRY_LOG_ERR(\"Listening error with server fd\");\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(\"Failed to run initial configurations/tests\");\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int32_t\n rte_telemetry_run(void *userdata)\n {\n+\tint ret;\n \tstruct telemetry_impl *telemetry = userdata;\n \n \tif (telemetry == NULL) {\n@@ -27,6 +167,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(\"Accept and read new client failed\");\n+\t\treturn -1;\n+\t}\n+\n \treturn 0;\n }\n \n@@ -50,6 +196,67 @@ static void\n \tpthread_exit(0);\n }\n \n+static int32_t\n+rte_telemetry_set_socket_nonblock(int fd)\n+{\n+\tint flags;\n+\n+\tif (fd < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Invalid fd provided\");\n+\t\treturn -1;\n+\t}\n+\n+\tflags = fcntl(fd, F_GETFL, 0);\n+\tif (flags < 0)\n+\t\tflags = 0;\n+\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+\tstruct sockaddr_un addr;\n+\tchar socket_path[BUF_SIZE];\n+\n+\tif (telemetry == NULL)\n+\t\treturn -1;\n+\n+\ttelemetry->server_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);\n+\tif (telemetry->server_fd == -1) {\n+\t\tTELEMETRY_LOG_ERR(\"Failed to open socket\");\n+\t\treturn -1;\n+\t}\n+\n+\tret = rte_telemetry_set_socket_nonblock(telemetry->server_fd);\n+\tif (ret < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Could not set socket to NONBLOCK\");\n+\t\tgoto close_socket;\n+\t}\n+\n+\taddr.sun_family = AF_UNIX;\n+\trte_telemetry_get_runtime_dir(socket_path, sizeof(socket_path));\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(\"Socket binding error\");\n+\t\tgoto close_socket;\n+\t}\n+\n+\treturn 0;\n+\n+close_socket:\n+\tif (close(telemetry->server_fd) < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Close TELEMETRY socket failed\");\n+\t\treturn -EPERM;\n+\t}\n+\n+\treturn -1;\n+}\n+\n int32_t __rte_experimental\n rte_telemetry_init()\n {\n@@ -77,6 +284,14 @@ rte_telemetry_init()\n \t\treturn -EPERM;\n \t}\n \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(\"TELEMETRY cleanup failed\");\n+\t\treturn -EPERM;\n+\t}\n+\n \tret = rte_ctrl_thread_create(&static_telemetry->thread_id,\n \t\ttelemetry_ctrl_thread, &attr, rte_telemetry_run_thread_func,\n \t\t(void *)static_telemetry);\n@@ -95,11 +310,21 @@ rte_telemetry_init()\n int32_t __rte_experimental\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(\"Close TELEMETRY socket failed\");\n+\t\tfree(telemetry);\n+\t\treturn -EPERM;\n+\t}\n+\n \ttelemetry->thread_status = 0;\n \tpthread_join(telemetry->thread_id, NULL);\n \tfree(telemetry);\n \tstatic_telemetry = NULL;\n+\n \treturn 0;\n }\n \ndiff --git a/lib/librte_telemetry/rte_telemetry_internal.h b/lib/librte_telemetry/rte_telemetry_internal.h\nindex 4e810a84c..569d56ab8 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": [ "v10", "04/12" ] }