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")
Cc: stable@dpdk.org
Signed-off-by: Ciara Power <ciara.power@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index d7668114ca45f594653a2e939f50b2df966c806a..f1e44594c663eb0a96a8eee56406d1e0df2761f0 100644 (file)
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -5324,11 +5324,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;
 
@@ -5370,11 +5374,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 36f3acf2b7024f7d6c368b60bde9e3198b7d3d14..f29164dd1588173986e18a1c526c01e90e723b19 100644 (file)
--- a/lib/librte_rawdev/rte_rawdev.c
+++ b/lib/librte_rawdev/rte_rawdev.c
@@ -578,11 +578,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 51e7ceeb1b2c29db515242eef5c41cb14e924879..78754050a5fe8651f86bf2ec6b3cbc8b52d1d086 100644 (file)
--- a/lib/librte_telemetry/telemetry.c
+++ b/lib/librte_telemetry/telemetry.c
@@ -258,7 +258,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;