From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id E704BA04B4
for <public@inbox.dpdk.org>; Thu, 27 Aug 2020 10:39:34 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id CC51E1C0CF;
Thu, 27 Aug 2020 10:39:34 +0200 (CEST)
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
by dpdk.org (Postfix) with ESMTP id E2C4B1C0B9;
Thu, 27 Aug 2020 10:39:30 +0200 (CEST)
IronPort-SDR: COoJ++rpWb6/O6AlWsNVKQHRWVqmmH5bmXHaZH/guqXOzRxIJgCVixoev2Bv31HO2LgSR3kRYc
QDwKwHKe1Z2Q==
X-IronPort-AV: E=McAfee;i="6000,8403,9725"; a="174494556"
X-IronPort-AV: E=Sophos;i="5.76,359,1592895600"; d="scan'208";a="174494556"
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga003.jf.intel.com ([10.7.209.27])
by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
27 Aug 2020 01:39:28 -0700
IronPort-SDR: jterBgduC8WId6Z1vR4abM9BwRBUGo2o8COEG9lNofGs+ne50fi6zdPM09JPv+vAVXvwH5FVfT
iSNew0wKakEA==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.76,359,1592895600"; d="scan'208";a="295653568"
Received: from silpixa00399953.ir.intel.com (HELO
silpixa00399953.ger.corp.intel.com) ([10.237.222.53])
by orsmga003.jf.intel.com with ESMTP; 27 Aug 2020 01:39:25 -0700
From: Ciara Power <ciara.power@intel.com>
To: dev@dpdk.org
Cc: mike.ximing.chen@intel.com, gage.eads@intel.com,
sundar.vedantham@intel.com, Ciara Power <ciara.power@intel.com>,
bruce.richardson@intel.com, stable@dpdk.org,
Thomas Monjalon <thomas@monjalon.net>,
Ferruh Yigit <ferruh.yigit@intel.com>,
Andrew Rybchenko <arybchenko@solarflare.com>,
Nipun Gupta <nipun.gupta@nxp.com>, Hemant Agrawal <hemant.agrawal@nxp.com>,
Kevin Laatz <kevin.laatz@intel.com>, Keith Wiles <keith.wiles@intel.com>
Date: Thu, 27 Aug 2020 09:39:22 +0100
Message-Id: <20200827083922.64442-1-ciara.power@intel.com>
X-Mailer: git-send-email 2.17.1
Subject: [dpdk-stable] [PATCH v2] lib/telemetry: fix passing full params
string to command
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Telemetry only passed the first param to the command handler if multiple
were entered by the user, separated by commas. Telemetry is required to
pass the full params string to the command, by splitting by a comma
delimiter only once to remove the command part of the string. This will
enable future commands to take multiple param values.
Fixes: b1ad0e124536 ("rawdev: add telemetry callbacks")
Fixes: c190daedb9b1 ("ethdev: add telemetry callbacks")
Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality")
Cc: bruce.richardson@intel.com
Cc: stable@dpdk.org
Signed-off-by: Ciara Power <ciara.power@intel.com>
---
v2: modified log string
---
lib/librte_ethdev/rte_ethdev.c | 12 ++++++++++--
lib/librte_rawdev/rte_rawdev.c | 6 +++++-
lib/librte_telemetry/telemetry.c | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 7858ad5f11..a00a9e4d36 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -5284,11 +5284,15 @@ handle_port_xstats(const char *cmd __rte_unused,
struct rte_eth_xstat_name *xstat_names;
int port_id, num_xstats;
int i, ret;
+ char *end_param;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
return -1;
- port_id = atoi(params);
+ port_id = strtoul(params, &end_param, 0);
+ if (*end_param != '\0')
+ RTE_ETHDEV_LOG(NOTICE,
+ "Extra parameters passed to ethdev telemetry command, ignoring");
if (!rte_eth_dev_is_valid_port(port_id))
return -1;
@@ -5330,11 +5334,15 @@ handle_port_link_status(const char *cmd __rte_unused,
static const char *status_str = "status";
int ret, port_id;
struct rte_eth_link link;
+ char *end_param;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
return -1;
- port_id = atoi(params);
+ port_id = strtoul(params, &end_param, 0);
+ if (*end_param != '\0')
+ RTE_ETHDEV_LOG(NOTICE,
+ "Extra parameters passed to ethdev telemetry command, ignoring");
if (!rte_eth_dev_is_valid_port(port_id))
return -1;
diff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/librte_rawdev/rte_rawdev.c
index 8f84d0b228..5e5f8f0cca 100644
--- a/lib/librte_rawdev/rte_rawdev.c
+++ b/lib/librte_rawdev/rte_rawdev.c
@@ -565,11 +565,15 @@ handle_dev_xstats(const char *cmd __rte_unused,
struct rte_rawdev_xstats_name *xstat_names;
int dev_id, num_xstats, i, ret;
unsigned int *ids;
+ char *end_param;
if (params == NULL || strlen(params) == 0 || !isdigit(*params))
return -1;
- dev_id = atoi(params);
+ dev_id = strtoul(params, &end_param, 0);
+ if (*end_param != '\0')
+ RTE_RDEV_LOG(NOTICE,
+ "Extra parameters passed to rawdev telemetry command, ignoring");
if (!rte_rawdev_pmd_is_valid_dev(dev_id))
return -1;
diff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c
index 0252282735..c6c2948709 100644
--- a/lib/librte_telemetry/telemetry.c
+++ b/lib/librte_telemetry/telemetry.c
@@ -248,7 +248,7 @@ client_handler(void *sock_id)
while (bytes > 0) {
buffer[bytes] = 0;
const char *cmd = strtok(buffer, ",");
- const char *param = strtok(NULL, ",");
+ const char *param = strtok(NULL, "\0");
telemetry_cb fn = unknown_command;
int i;
--
2.17.1