From patchwork Thu Aug 23 12:08:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Power, Ciara" X-Patchwork-Id: 43812 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 481E04CA7; Thu, 23 Aug 2018 14:08:32 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 069134C8D for ; Thu, 23 Aug 2018 14:08:27 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Aug 2018 05:08:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,278,1531810800"; d="scan'208";a="256613835" Received: from silpixa00399503.ir.intel.com ([10.237.222.102]) by fmsmga005.fm.intel.com with ESMTP; 23 Aug 2018 05:08:26 -0700 From: Ciara Power To: harry.van.haaren@intel.com, brian.archbold@intel.com, emma.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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch adds the telemetry UNIX socket. It is used to allow connections from external clients. On the initial connection from a client, ethdev stats are registered in the metrics library, to allow for their retrieval at a later stage. Signed-off-by: Ciara Power Signed-off-by: Brian Archbold --- lib/librte_telemetry/rte_telemetry.c | 205 ++++++++++++++++++++++++++ lib/librte_telemetry/rte_telemetry_internal.h | 4 + 2 files changed, 209 insertions(+) diff --git a/lib/librte_telemetry/rte_telemetry.c b/lib/librte_telemetry/rte_telemetry.c index 8d7b0e3..f984929 100644 --- a/lib/librte_telemetry/rte_telemetry.c +++ b/lib/librte_telemetry/rte_telemetry.c @@ -3,21 +3,159 @@ */ #include +#include +#include +#include #include #include #include +#include #include "rte_telemetry.h" #include "rte_telemetry_internal.h" #define SLEEP_TIME 10 +#define DEFAULT_DPDK_PATH "/var/run/.rte_telemetry" + +const char *socket_path = DEFAULT_DPDK_PATH; static telemetry_impl *static_telemetry; +int32_t +rte_telemetry_check_port_activity(int port_id) +{ + int pid; + + RTE_ETH_FOREACH_DEV(pid) { + if (pid == port_id) + return 1; + } + TELEMETRY_LOG_ERR("Error - port_id: %d is invalid, not active\n", + port_id); + return 0; +} + +static int32_t +rte_telemetry_reg_ethdev_to_metrics(uint16_t port_id) +{ + int ret, num_xstats, start_index, i; + struct rte_eth_xstat *eth_xstats; + + if (!rte_eth_dev_is_valid_port(port_id)) { + TELEMETRY_LOG_ERR("Error - port_id: %d is invalid\n", port_id); + return -EINVAL; + } + + num_xstats = rte_eth_xstats_get(port_id, NULL, 0); + if (num_xstats < 0) { + TELEMETRY_LOG_ERR("Error - rte_eth_xstats_get(%u) failed:" + " %d\n", port_id, num_xstats); + return -EPERM; + } + + eth_xstats = malloc(sizeof(struct rte_eth_xstat) * num_xstats); + if (eth_xstats == NULL) { + TELEMETRY_LOG_ERR("Error - Failed to malloc memory for" + " xstats\n"); + return -ENOMEM; + } + ret = rte_eth_xstats_get(port_id, eth_xstats, num_xstats); + if (ret < 0 || ret > num_xstats) { + free(eth_xstats); + TELEMETRY_LOG_ERR("Error - rte_eth_xstats_get(%u) len%i" + " failed: %d\n", port_id, num_xstats, ret); + return -EPERM; + } + struct rte_eth_xstat_name *eth_xstats_names; + eth_xstats_names = malloc(sizeof(struct rte_eth_xstat_name) * + num_xstats); + if (eth_xstats_names == NULL) { + free(eth_xstats); + TELEMETRY_LOG_ERR("Error - Failed to malloc memory for" + " xstats_names\n"); + return -ENOMEM; + } + ret = rte_eth_xstats_get_names(port_id, eth_xstats_names, + num_xstats); + if (ret < 0 || ret > num_xstats) { + free(eth_xstats); + free(eth_xstats_names); + TELEMETRY_LOG_ERR("Error - rte_eth_xstats_get_names(%u)" + " len%i failed: %d\n", port_id, num_xstats, + ret); + return -EPERM; + } + const char *xstats_names[num_xstats]; + + for (i = 0; i < num_xstats; i++) + xstats_names[i] = eth_xstats_names[eth_xstats[i].id].name; + + start_index = rte_metrics_reg_names(xstats_names, num_xstats); + + if (start_index < 0) { + TELEMETRY_LOG_ERR("Error - rte_metrics_reg_names failed -" + " metrics may already be registered\n"); + free(eth_xstats); + free(eth_xstats_names); + return -1; + } + free(eth_xstats_names); + free(eth_xstats); + return start_index; +} + +static int32_t +rte_telemetry_initial_accept(struct telemetry_impl *telemetry) +{ + int pid; + + RTE_ETH_FOREACH_DEV(pid) { + telemetry->reg_index = + rte_telemetry_reg_ethdev_to_metrics(pid); + break; + } + + if (telemetry->reg_index < 0) { + TELEMETRY_LOG_ERR("Error - failed to register ethdev " + "metrics\n"); + return -1; + } + telemetry->metrics_register_done = 1; + + return 0; +} + +static int32_t +rte_telemetry_accept_new_client(struct telemetry_impl *telemetry) +{ + int ret; + if (telemetry->accept_fd == 0 || telemetry->accept_fd == -1) { + ret = listen(telemetry->server_fd, 1); + if (ret < 0) { + TELEMETRY_LOG_ERR("Error - Listening error with " + "server fd\n"); + return -1; + } + telemetry->accept_fd = accept(telemetry->server_fd, NULL, NULL); + + if (telemetry->accept_fd > 0 && + telemetry->metrics_register_done == 0) { + ret = rte_telemetry_initial_accept(telemetry); + if (ret < 0) { + TELEMETRY_LOG_ERR("Error - Failed to run " + "initial configurations/tests\n"); + return -1; + } + } + } + return 0; +} + static int32_t rte_telemetry_run(void *userdata) { + int ret; struct telemetry_impl *telemetry = (struct telemetry_impl *)userdata; if (!telemetry) { TELEMETRY_LOG_WARN("Warning - TELEMETRY could not be " @@ -25,6 +163,12 @@ rte_telemetry_run(void *userdata) return -1; } + ret = rte_telemetry_accept_new_client(telemetry); + if (ret < 0) { + TELEMETRY_LOG_ERR("Error - Accept and read new client " + "failed\n"); + return -1; + } return 0; } @@ -50,6 +194,51 @@ static void pthread_exit(0); } +static int32_t +rte_telemetry_set_socket_nonblock(int fd) +{ + if (fd < 0) { + TELEMETRY_LOG_ERR("Error - Invalid fd provided\n"); + return -1; + } + + int flags = fcntl(fd, F_GETFL, 0); + if (flags < 0) + flags = 0; + return fcntl(fd, F_SETFL, flags | O_NONBLOCK); +} + +static int32_t +rte_telemetry_create_socket(struct telemetry_impl *telemetry) +{ + int ret; + + if (!telemetry) + return -1; + + telemetry->server_fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (telemetry->server_fd == -1) { + TELEMETRY_LOG_ERR("Error - Failed to open socket\n"); + return -1; + } + ret = rte_telemetry_set_socket_nonblock(telemetry->server_fd); + if (ret < 0) { + TELEMETRY_LOG_ERR("Error - Could not set socket to NONBLOCK\n"); + return -1; + } + struct sockaddr_un addr = {0}; + addr.sun_family = AF_UNIX; + strlcpy(addr.sun_path, socket_path, sizeof(addr.sun_path)); + unlink(socket_path); + + if (bind(telemetry->server_fd, (struct sockaddr *)&addr, + sizeof(addr)) < 0) { + TELEMETRY_LOG_ERR("Error - Socket binding error\n"); + return -1; + } + return 0; +} + int32_t rte_telemetry_init(uint32_t socket_id) { @@ -71,6 +260,14 @@ rte_telemetry_init(uint32_t socket_id) static_telemetry->socket_id = socket_id; rte_metrics_init(static_telemetry->socket_id); + ret = rte_telemetry_create_socket(static_telemetry); + if (ret < 0) { + ret = rte_telemetry_cleanup(); + if (ret < 0) + TELEMETRY_LOG_ERR("Error - TELEMETRY cleanup failed\n"); + return -EPERM; + } + pthread_attr_init(&attr); ret = rte_ctrl_thread_create(&static_telemetry->thread_id, telemetry_ctrl_thread, &attr, rte_telemetry_run_thread_func, @@ -88,7 +285,15 @@ rte_telemetry_init(uint32_t socket_id) int32_t rte_telemetry_cleanup(void) { + int ret; struct telemetry_impl *telemetry = static_telemetry; + + ret = close(telemetry->server_fd); + if (ret < 0) { + TELEMETRY_LOG_ERR("Error - Close TELEMETRY socket failed\n"); + free(telemetry); + return -EPERM; + } telemetry->thread_status = 0; pthread_join(telemetry->thread_id, NULL); free(telemetry); diff --git a/lib/librte_telemetry/rte_telemetry_internal.h b/lib/librte_telemetry/rte_telemetry_internal.h index 4e810a8..569d56a 100644 --- a/lib/librte_telemetry/rte_telemetry_internal.h +++ b/lib/librte_telemetry/rte_telemetry_internal.h @@ -24,9 +24,13 @@ extern int telemetry_log_level; TELEMETRY_LOG(INFO, fmt, ## args) typedef struct telemetry_impl { + int accept_fd; + int server_fd; pthread_t thread_id; int thread_status; uint32_t socket_id; + int reg_index; + int metrics_register_done; } telemetry_impl; #endif