Skip to contentSkip to conversation

lib/telemetry: fix passing full params string to command

PATCH Applied Ciara Power 3 participants 3 messages Aug 27, 2020 – Oct 6, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 lib/telemetry: fix passing full params string to command

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")

---
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(-)
lib/librte_ethdev/rte_ethdev.c +10 -2
index 7858ad5f11..a00a9e4d36 100644
@@ -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;
 
lib/librte_rawdev/rte_rawdev.c +5 -1
index 8f84d0b228..5e5f8f0cca 100644
@@ -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;
 
lib/librte_telemetry/telemetry.c +1 -1
index 0252282735..c6c2948709 100644
@@ -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;
 
Signature · 1 line
2.17.1
Acked-by on v2 1/1
#1 lore raw
Quoted 6 lines · Ciara Power

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.

Quoted 8 lines
Fixes b1ad0e124536 ("rawdev: add telemetry callbacks")
Fixes c190daedb9b1 ("ethdev: add telemetry callbacks")
Fixes 6dd571fd07c3 ("telemetry: introduce new functionality")

Missed threading with V1, but otherwise LGTM.

#2 lore raw

27/08/2020 11:14, Bruce Richardson:

Quoted 13 lines · Ciara Power
Quoted 12 lines

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")
Quoted 5 lines
Quoted 2 lines

Missed threading with V1, but otherwise LGTM.

Applied, thanks