From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id BF958A0597;
Tue, 21 Apr 2020 15:04:02 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 0CD001D6AB;
Tue, 21 Apr 2020 15:00:11 +0200 (CEST)
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
by dpdk.org (Postfix) with ESMTP id 74E091D651
for <dev@dpdk.org>; Tue, 21 Apr 2020 15:00:04 +0200 (CEST)
IronPort-SDR: EJ0b0PbS6ArVmfEYjbSRIoQNoZdOpjBj6vYxcJRZr1f0ZrLfj4F5vgz4F79tlfP/T6vss0B600
eKaVwexJ8hNg==
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga004.fm.intel.com ([10.253.24.48])
by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
21 Apr 2020 06:00:04 -0700
IronPort-SDR: Iws/31JOEWccdvG54WC8BNwuWbl3ERAQVkIIk/USZRpbAStSOCFgINz6YU+hjWt0cS+4WZlGvJ
bWGUcuJ8S6Og==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.72,410,1580803200"; d="scan'208";a="279629350"
Received: from silpixa00399953.ir.intel.com (HELO
silpixa00399953.ger.corp.intel.com) ([10.237.222.53])
by fmsmga004.fm.intel.com with ESMTP; 21 Apr 2020 06:00:01 -0700
From: Ciara Power <ciara.power@intel.com>
To: dev@dpdk.org,
kevin.laatz@intel.com
Cc: reshma.pattan@intel.com, jerinjacobk@gmail.com, david.marchand@redhat.com,
keith.wiles@intel.com, mb@smartsharesystems.com, thomas@monjalon.net,
Bruce Richardson <bruce.richardson@intel.com>,
Ciara Power <ciara.power@intel.com>
Date: Tue, 21 Apr 2020 13:39:48 +0100
Message-Id: <20200421123949.38270-17-ciara.power@intel.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20200421123949.38270-1-ciara.power@intel.com>
References: <20200319171907.60891-1-ciara.power@intel.com>
<20200421123949.38270-1-ciara.power@intel.com>
Subject: [dpdk-dev] [PATCH v3 16/17] eal: add eal telemetry callbacks
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Bruce Richardson <bruce.richardson@intel.com>
EAL now registers commands to provide some basic info from EAL.
Example:
Connecting to /var/run/dpdk/rte/dpdk_telemetry.v2
{"pid": 926, "version": "DPDK 20.05.0-rc0", "max_output_len": 16384}
--> /
{"/": ["/", "/eal/app_params", "/eal/params", "/ethdev/link_status", \
"/ethdev/list", "/ethdev/xstats", "/info", "/rawdev/list", \
"/rawdev/xstats"]}
--> /eal/app_params
{"/eal/app_params": ["-i"]}
--> /eal/params
{"/eal/params": ["./app/dpdk-testpmd"]}
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Ciara Power <ciara.power@intel.com>
---
v2:
- Removed /eal/version command as /info replaces it.
- Compile telemetry callbacks and include headers if not in Windows
execution environment.
---
lib/librte_eal/common/eal_common_options.c | 71 ++++++++++++++++++++++
lib/librte_eal/common/eal_options.h | 3 +
lib/librte_eal/freebsd/eal.c | 3 +
lib/librte_eal/linux/eal.c | 3 +
4 files changed, 80 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index e722064c27..e3774f6779 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -29,6 +29,9 @@
#include <rte_version.h>
#include <rte_devargs.h>
#include <rte_memcpy.h>
+#ifndef RTE_EXEC_ENV_WINDOWS
+#include <rte_telemetry.h>
+#endif
#include "eal_internal_cfg.h"
#include "eal_options.h"
@@ -132,6 +135,74 @@ static int master_lcore_parsed;
static int mem_parsed;
static int core_parsed;
+#ifndef RTE_EXEC_ENV_WINDOWS
+static char **eal_args;
+static char **eal_app_args;
+
+#define EAL_PARAM_REQ "/eal/params"
+#define EAL_APP_PARAM_REQ "/eal/app_params"
+
+/* callback handler for telemetry library to report out EAL flags */
+int
+handle_eal_info_request(const char *cmd, const char *params __rte_unused,
+ char *buffer, int buf_len)
+{
+ char **args;
+ int used = 0;
+ int i = 0;
+
+ if (strcmp(cmd, EAL_PARAM_REQ) == 0)
+ args = eal_args;
+ else
+ args = eal_app_args;
+
+ if (args == NULL || args[0] == NULL)
+ return rte_tel_json_empty_array(buffer, buf_len, used);
+
+ for ( ; args[i] != NULL; i++)
+ used = rte_tel_json_add_array_string(buffer, buf_len, used,
+ args[i]);
+ return used;
+}
+
+int
+eal_save_args(int argc, char **argv)
+{
+ int i, j;
+
+ rte_telemetry_register_cmd(EAL_PARAM_REQ, handle_eal_info_request);
+ rte_telemetry_register_cmd(EAL_APP_PARAM_REQ, handle_eal_info_request);
+
+ /* clone argv to report out later. We overprovision, but
+ * this does not waste huge amounts of memory
+ */
+ eal_args = calloc(argc + 1, sizeof(*eal_args));
+ if (eal_args == NULL)
+ return -1;
+
+ for (i = 0; i < argc; i++) {
+ eal_args[i] = strdup(argv[i]);
+ if (strcmp(argv[i], "--") == 0)
+ break;
+ }
+ eal_args[i++] = NULL; /* always finish with NULL */
+
+ /* allow reporting of any app args we know about too */
+ if (i >= argc)
+ return 0;
+
+ eal_app_args = calloc(argc - i + 1, sizeof(*eal_args));
+ if (eal_app_args == NULL)
+ return -1;
+
+ for (j = 0; i < argc; j++, i++)
+ eal_app_args[j] = strdup(argv[i]);
+ eal_app_args[j] = NULL;
+
+ return 0;
+}
+#endif
+
static int
eal_option_device_add(enum rte_devtype type, const char *optarg)
{
diff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h
index 225ad4bb59..5373e9f5e3 100644
--- a/lib/librte_eal/common/eal_options.h
+++ b/lib/librte_eal/common/eal_options.h
@@ -88,5 +88,8 @@ int eal_check_common_options(struct internal_config *internal_cfg);
void eal_common_usage(void);
enum rte_proc_type_t eal_proc_type_detect(void);
int eal_plugins_init(void);
+int eal_save_args(int argc, char **argv);
+int handle_eal_info_request(const char *cmd, const char *params __rte_unused,
+ char *buffer, int buf_len);
#endif /* EAL_OPTIONS_H */
diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c
index 2397bdfd50..3e7bb34ccc 100644
--- a/lib/librte_eal/freebsd/eal.c
+++ b/lib/librte_eal/freebsd/eal.c
@@ -716,6 +716,9 @@ rte_eal_init(int argc, char **argv)
eal_reset_internal_config(&internal_config);
+ /* clone argv to report out later in telemetry */
+ eal_save_args(argc, argv);
+
/* set log level as early as possible */
eal_log_level_parse(argc, argv);
diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c
index 4be885e8a5..4c3c769490 100644
--- a/lib/librte_eal/linux/eal.c
+++ b/lib/librte_eal/linux/eal.c
@@ -983,6 +983,9 @@ rte_eal_init(int argc, char **argv)
/* set log level as early as possible */
eal_log_level_parse(argc, argv);
+ /* clone argv to report out later in telemetry */
+ eal_save_args(argc, argv);
+
if (rte_eal_cpu_init() < 0) {
rte_eal_init_alert("Cannot detect lcores.");
rte_errno = ENOTSUP;
--
2.17.1