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 B621EA0597;
Wed, 8 Apr 2020 19:10:35 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 813891C1D3;
Wed, 8 Apr 2020 19:08:31 +0200 (CEST)
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
by dpdk.org (Postfix) with ESMTP id 2C1281C1D3
for <dev@dpdk.org>; Wed, 8 Apr 2020 19:08:29 +0200 (CEST)
IronPort-SDR: AKR2i6lgnJkL6UWGxZdoRnjtLZ0ORPyNS6Kz31aKkNQy+X05p4NGzVjmnHrB49vVRQRW7HpHq+
NBpHRHtBuVsw==
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga006.fm.intel.com ([10.253.24.20])
by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
08 Apr 2020 10:08:28 -0700
IronPort-SDR: YUWwf3QXkUvb96Mu7CCNBSmIme8kvTg3FyFzeiprgLN5VwYvX+amTTw1e2EmRbcvJnJ3DJ9nZY
tudwCBngyOXQ==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.72,359,1580803200"; d="scan'208";a="452880264"
Received: from silpixa00399953.ir.intel.com (HELO
silpixa00399953.ger.corp.intel.com) ([10.237.222.53])
by fmsmga006.fm.intel.com with ESMTP; 08 Apr 2020 10:08:26 -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,
Ciara Power <ciara.power@intel.com>, david.hunt@intel.com,
Bruce Richardson <bruce.richardson@intel.com>
Date: Wed, 8 Apr 2020 17:49:51 +0100
Message-Id: <20200408164956.47864-12-ciara.power@intel.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20200408164956.47864-1-ciara.power@intel.com>
References: <20200319171907.60891-1-ciara.power@intel.com>
<20200408164956.47864-1-ciara.power@intel.com>
Subject: [dpdk-dev] [PATCH v2 11/16] examples/l3fwd-power: enable use of new
telemetry
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>
The l3fwd-power example app now registers a stats command with
telemetry, and provides a callback function to handle formatting the
power stats.
An example usage is shown below:
Connecting to /var/run/dpdk/rte/dpdk_telemetry.v2
{"pid": 6726, "version": "DPDK 20.05.0-rc0", "max_output_len": 16384}
--> /
{"/": ["/", "/ethdev/link_status", "/ethdev/list", "/ethdev/xstats", \
"/info", "/l3fwd-power/stats", "/rawdev/list", "/rawdev/xstats"]}
--> /l3fwd-power/stats
{"/l3fwd-power/stats": {"empty_poll": 281625000, "full_poll": 0, \
"busy_percent": 0}}
The existing stats tracking done by the app using the metrics
library is unaffected. This will still be used to ensure backward
compatibility.
Cc: david.hunt@intel.com
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Ciara Power <ciara.power@intel.com>
---
examples/l3fwd-power/Makefile | 4 +++
examples/l3fwd-power/main.c | 57 ++++++++++++++++++++++++--------
examples/l3fwd-power/meson.build | 4 +++
3 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile
index 729d49639b..531a1d81cb 100644
--- a/examples/l3fwd-power/Makefile
+++ b/examples/l3fwd-power/Makefile
@@ -68,6 +68,10 @@ ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
CFLAGS_main.o += -Wno-return-type
endif
+ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y)
+LDLIBS += -lrte_telemetry
+endif
+
include $(RTE_SDK)/mk/rte.extapp.mk
endif
endif
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index c7fe0ec034..1435458b49 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -46,6 +46,9 @@
#include <rte_spinlock.h>
#include <rte_power_empty_poll.h>
#include <rte_metrics.h>
+#ifdef RTE_LIBRTE_TELEMETRY
+#include <rte_telemetry.h>
+#endif
#include "perf_core.h"
#include "main.h"
@@ -131,7 +134,7 @@
#define EMPTY_POLL_MED_THRESHOLD 350000UL
#define EMPTY_POLL_HGH_THRESHOLD 580000UL
-
+#define NUM_TELSTATS RTE_DIM(telstats_strings)
static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;
static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
@@ -2079,14 +2082,11 @@ init_power_library(void)
return ret;
}
static void
-update_telemetry(__attribute__((unused)) struct rte_timer *tim,
- __attribute__((unused)) void *arg)
+get_current_stat_values(uint64_t *values)
{
unsigned int lcore_id = rte_lcore_id();
struct lcore_conf *qconf;
uint64_t app_eps = 0, app_fps = 0, app_br = 0;
- uint64_t values[3] = {0};
- int ret;
uint64_t count = 0;
RTE_LCORE_FOREACH_SLAVE(lcore_id) {
@@ -2105,17 +2105,43 @@ update_telemetry(__attribute__((unused)) struct rte_timer *tim,
values[0] = app_eps/count;
values[1] = app_fps/count;
values[2] = app_br/count;
- } else {
- values[0] = 0;
- values[1] = 0;
- values[2] = 0;
- }
+ } else
+ memset(values, 0, sizeof(uint64_t) * NUM_TELSTATS);
+
+}
+
+static void
+update_telemetry(__attribute__((unused)) struct rte_timer *tim,
+ __attribute__((unused)) void *arg)
+{
+ int ret;
+ uint64_t values[3] = {0};
+ get_current_stat_values(values);
ret = rte_metrics_update_values(RTE_METRICS_GLOBAL, telstats_index,
values, RTE_DIM(values));
if (ret < 0)
RTE_LOG(WARNING, POWER, "failed to update metrcis\n");
}
+#ifdef RTE_LIBRTE_TELEMETRY
+static int
+handle_app_stats(const char *cmd __rte_unused,
+ const char *params __rte_unused,
+ char *buffer, int buf_len)
+{
+ int used = 0;
+ uint64_t values[3] = {0};
+ uint32_t i;
+
+ used = rte_tel_json_empty_obj(buffer, buf_len, used);
+ get_current_stat_values(values);
+ for (i = 0; i < NUM_TELSTATS; i++)
+ used = rte_tel_json_add_obj_u64(buffer, buf_len, used,
+ telstats_strings[i].name, values[i]);
+
+ return used;
+}
+#endif
static void
telemetry_setup_timer(void)
{
@@ -2203,8 +2229,7 @@ main(int argc, char **argv)
uint32_t dev_rxq_num, dev_txq_num;
uint8_t nb_rx_queue, queue, socketid;
uint16_t portid;
- uint8_t num_telstats = RTE_DIM(telstats_strings);
- const char *ptr_strings[num_telstats];
+ const char *ptr_strings[NUM_TELSTATS];
/* catch SIGINT and restore cpufreq governor to ondemand */
signal(SIGINT, signal_exit_now);
@@ -2503,10 +2528,10 @@ main(int argc, char **argv)
/* Init metrics library */
rte_metrics_init(rte_socket_id());
/** Register stats with metrics library */
- for (i = 0; i < num_telstats; i++)
+ for (i = 0; i < NUM_TELSTATS; i++)
ptr_strings[i] = telstats_strings[i].name;
- ret = rte_metrics_reg_names(ptr_strings, num_telstats);
+ ret = rte_metrics_reg_names(ptr_strings, NUM_TELSTATS);
if (ret >= 0)
telstats_index = ret;
else
@@ -2516,6 +2541,10 @@ main(int argc, char **argv)
rte_spinlock_init(&stats[lcore_id].telemetry_lock);
}
rte_timer_init(&telemetry_timer);
+#ifdef RTE_LIBRTE_TELEMETRY
+ rte_telemetry_register_cmd("/l3fwd-power/stats",
+ handle_app_stats);
+#endif
rte_eal_mp_remote_launch(main_telemetry_loop, NULL,
SKIP_MASTER);
}
diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build
index d5a3d4bb2f..e7c6be6477 100644
--- a/examples/l3fwd-power/meson.build
+++ b/examples/l3fwd-power/meson.build
@@ -16,3 +16,7 @@ deps += ['power', 'timer', 'lpm', 'hash', 'metrics']
sources = files(
'main.c', 'perf_core.c'
)
+
+if dpdk_conf.has('RTE_LIBRTE_TELEMETRY')
+ deps += ['telemetry']
+endif
--
2.17.1