* [dpdk-dev] [PATCH] telemetry: fix incorrect stat name to id mapping
@ 2019-03-28 15:30 Bruce Richardson
2019-03-28 15:30 ` Bruce Richardson
2019-04-01 17:17 ` Laatz, Kevin
0 siblings, 2 replies; 6+ messages in thread
From: Bruce Richardson @ 2019-03-28 15:30 UTC (permalink / raw)
To: Kevin Laatz; +Cc: dev, Bruce Richardson, stable
If we have two NIC ports which have a different set of NIC stats we can
end up having two different stats registered with xstats with the same
name. [Since the stats are updated in bulk as a contiguous set, the
second driver re-using the registration of the first is not possible.]
This causes issues with the invalid stat for one driver being found due to
a lookup by name which is unnecessary. Instead of getting stat names
involved do the lookup by ID instead.
CC: stable@dpdk.org
Fixes: 1b756087db93 ("telemetry: add parser for client socket messages")
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/librte_telemetry/rte_telemetry_parser.c | 22 +++++++++------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/lib/librte_telemetry/rte_telemetry_parser.c b/lib/librte_telemetry/rte_telemetry_parser.c
index 03a58a2fd..9bc16eef4 100644
--- a/lib/librte_telemetry/rte_telemetry_parser.c
+++ b/lib/librte_telemetry/rte_telemetry_parser.c
@@ -256,7 +256,7 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
int action, json_t *data)
{
int ret, num_metrics, i, p;
- struct rte_metric_name *names;
+ struct rte_metric_value *values;
uint64_t num_port_ids = 0;
uint32_t port_ids[RTE_MAX_ETHPORTS];
@@ -281,7 +281,7 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
return -1;
}
- num_metrics = rte_metrics_get_names(NULL, 0);
+ num_metrics = rte_metrics_get_values(0, NULL, 0);
if (num_metrics < 0) {
TELEMETRY_LOG_ERR("Cannot get metrics count");
@@ -300,8 +300,8 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
return -1;
}
- names = malloc(sizeof(struct rte_metric_name) * num_metrics);
- if (names == NULL) {
+ values = malloc(sizeof(struct rte_metric_value) * num_metrics);
+ if (values == NULL) {
TELEMETRY_LOG_ERR("Cannot allocate memory");
ret = rte_telemetry_send_error_response(telemetry,
-ENOMEM);
@@ -310,7 +310,6 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
return -1;
}
- const char *stat_names[num_metrics];
uint32_t stat_ids[num_metrics];
RTE_ETH_FOREACH_DEV(p) {
@@ -328,16 +327,13 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
goto fail;
}
- ret = rte_metrics_get_names(names, num_metrics);
- for (i = 0; i < num_metrics; i++)
- stat_names[i] = names[i].name;
-
- ret = rte_telemetry_stat_names_to_ids(telemetry, stat_names, stat_ids,
- num_metrics);
+ ret = rte_metrics_get_values(port_ids[0], values, num_metrics);
if (ret < 0) {
- TELEMETRY_LOG_ERR("Could not convert stat names to IDs");
+ TELEMETRY_LOG_ERR("Could not get stat values");
goto fail;
}
+ for (i = 0; i < num_metrics; i++)
+ stat_ids[i] = values[i].key;
ret = rte_telemetry_send_ports_stats_values(stat_ids, num_metrics,
port_ids, num_port_ids, telemetry);
@@ -349,7 +345,7 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
return 0;
fail:
- free(names);
+ free(values);
return -1;
}
--
2.20.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [dpdk-dev] [PATCH] telemetry: fix incorrect stat name to id mapping
2019-03-28 15:30 [dpdk-dev] [PATCH] telemetry: fix incorrect stat name to id mapping Bruce Richardson
@ 2019-03-28 15:30 ` Bruce Richardson
2019-04-01 17:17 ` Laatz, Kevin
1 sibling, 0 replies; 6+ messages in thread
From: Bruce Richardson @ 2019-03-28 15:30 UTC (permalink / raw)
To: Kevin Laatz; +Cc: dev, Bruce Richardson, stable
If we have two NIC ports which have a different set of NIC stats we can
end up having two different stats registered with xstats with the same
name. [Since the stats are updated in bulk as a contiguous set, the
second driver re-using the registration of the first is not possible.]
This causes issues with the invalid stat for one driver being found due to
a lookup by name which is unnecessary. Instead of getting stat names
involved do the lookup by ID instead.
CC: stable@dpdk.org
Fixes: 1b756087db93 ("telemetry: add parser for client socket messages")
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/librte_telemetry/rte_telemetry_parser.c | 22 +++++++++------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/lib/librte_telemetry/rte_telemetry_parser.c b/lib/librte_telemetry/rte_telemetry_parser.c
index 03a58a2fd..9bc16eef4 100644
--- a/lib/librte_telemetry/rte_telemetry_parser.c
+++ b/lib/librte_telemetry/rte_telemetry_parser.c
@@ -256,7 +256,7 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
int action, json_t *data)
{
int ret, num_metrics, i, p;
- struct rte_metric_name *names;
+ struct rte_metric_value *values;
uint64_t num_port_ids = 0;
uint32_t port_ids[RTE_MAX_ETHPORTS];
@@ -281,7 +281,7 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
return -1;
}
- num_metrics = rte_metrics_get_names(NULL, 0);
+ num_metrics = rte_metrics_get_values(0, NULL, 0);
if (num_metrics < 0) {
TELEMETRY_LOG_ERR("Cannot get metrics count");
@@ -300,8 +300,8 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
return -1;
}
- names = malloc(sizeof(struct rte_metric_name) * num_metrics);
- if (names == NULL) {
+ values = malloc(sizeof(struct rte_metric_value) * num_metrics);
+ if (values == NULL) {
TELEMETRY_LOG_ERR("Cannot allocate memory");
ret = rte_telemetry_send_error_response(telemetry,
-ENOMEM);
@@ -310,7 +310,6 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
return -1;
}
- const char *stat_names[num_metrics];
uint32_t stat_ids[num_metrics];
RTE_ETH_FOREACH_DEV(p) {
@@ -328,16 +327,13 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
goto fail;
}
- ret = rte_metrics_get_names(names, num_metrics);
- for (i = 0; i < num_metrics; i++)
- stat_names[i] = names[i].name;
-
- ret = rte_telemetry_stat_names_to_ids(telemetry, stat_names, stat_ids,
- num_metrics);
+ ret = rte_metrics_get_values(port_ids[0], values, num_metrics);
if (ret < 0) {
- TELEMETRY_LOG_ERR("Could not convert stat names to IDs");
+ TELEMETRY_LOG_ERR("Could not get stat values");
goto fail;
}
+ for (i = 0; i < num_metrics; i++)
+ stat_ids[i] = values[i].key;
ret = rte_telemetry_send_ports_stats_values(stat_ids, num_metrics,
port_ids, num_port_ids, telemetry);
@@ -349,7 +345,7 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,
return 0;
fail:
- free(names);
+ free(values);
return -1;
}
--
2.20.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] telemetry: fix incorrect stat name to id mapping
2019-03-28 15:30 [dpdk-dev] [PATCH] telemetry: fix incorrect stat name to id mapping Bruce Richardson
2019-03-28 15:30 ` Bruce Richardson
@ 2019-04-01 17:17 ` Laatz, Kevin
2019-04-01 17:17 ` Laatz, Kevin
2019-04-02 0:34 ` Thomas Monjalon
1 sibling, 2 replies; 6+ messages in thread
From: Laatz, Kevin @ 2019-04-01 17:17 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev, stable
On 28/03/2019 15:30, Bruce Richardson wrote:
> If we have two NIC ports which have a different set of NIC stats we can
> end up having two different stats registered with xstats with the same
> name. [Since the stats are updated in bulk as a contiguous set, the
> second driver re-using the registration of the first is not possible.]
>
> This causes issues with the invalid stat for one driver being found due to
> a lookup by name which is unnecessary. Instead of getting stat names
> involved do the lookup by ID instead.
>
> CC: stable@dpdk.org
> Fixes: 1b756087db93 ("telemetry: add parser for client socket messages")
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
Looks good to me! Thanks.
Acked-by: Kevin Laatz <kevin.laatz@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] telemetry: fix incorrect stat name to id mapping
2019-04-01 17:17 ` Laatz, Kevin
@ 2019-04-01 17:17 ` Laatz, Kevin
2019-04-02 0:34 ` Thomas Monjalon
1 sibling, 0 replies; 6+ messages in thread
From: Laatz, Kevin @ 2019-04-01 17:17 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev, stable
On 28/03/2019 15:30, Bruce Richardson wrote:
> If we have two NIC ports which have a different set of NIC stats we can
> end up having two different stats registered with xstats with the same
> name. [Since the stats are updated in bulk as a contiguous set, the
> second driver re-using the registration of the first is not possible.]
>
> This causes issues with the invalid stat for one driver being found due to
> a lookup by name which is unnecessary. Instead of getting stat names
> involved do the lookup by ID instead.
>
> CC: stable@dpdk.org
> Fixes: 1b756087db93 ("telemetry: add parser for client socket messages")
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
Looks good to me! Thanks.
Acked-by: Kevin Laatz <kevin.laatz@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] telemetry: fix incorrect stat name to id mapping
2019-04-01 17:17 ` Laatz, Kevin
2019-04-01 17:17 ` Laatz, Kevin
@ 2019-04-02 0:34 ` Thomas Monjalon
2019-04-02 0:34 ` Thomas Monjalon
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Monjalon @ 2019-04-02 0:34 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev, Laatz, Kevin, stable
01/04/2019 19:17, Laatz, Kevin:
> On 28/03/2019 15:30, Bruce Richardson wrote:
> > If we have two NIC ports which have a different set of NIC stats we can
> > end up having two different stats registered with xstats with the same
> > name. [Since the stats are updated in bulk as a contiguous set, the
> > second driver re-using the registration of the first is not possible.]
> >
> > This causes issues with the invalid stat for one driver being found due to
> > a lookup by name which is unnecessary. Instead of getting stat names
> > involved do the lookup by ID instead.
> >
> > CC: stable@dpdk.org
> > Fixes: 1b756087db93 ("telemetry: add parser for client socket messages")
> >
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
>
> Looks good to me! Thanks.
>
> Acked-by: Kevin Laatz <kevin.laatz@intel.com>
Applied, thanks
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] telemetry: fix incorrect stat name to id mapping
2019-04-02 0:34 ` Thomas Monjalon
@ 2019-04-02 0:34 ` Thomas Monjalon
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Monjalon @ 2019-04-02 0:34 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev, Laatz, Kevin, stable
01/04/2019 19:17, Laatz, Kevin:
> On 28/03/2019 15:30, Bruce Richardson wrote:
> > If we have two NIC ports which have a different set of NIC stats we can
> > end up having two different stats registered with xstats with the same
> > name. [Since the stats are updated in bulk as a contiguous set, the
> > second driver re-using the registration of the first is not possible.]
> >
> > This causes issues with the invalid stat for one driver being found due to
> > a lookup by name which is unnecessary. Instead of getting stat names
> > involved do the lookup by ID instead.
> >
> > CC: stable@dpdk.org
> > Fixes: 1b756087db93 ("telemetry: add parser for client socket messages")
> >
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
>
> Looks good to me! Thanks.
>
> Acked-by: Kevin Laatz <kevin.laatz@intel.com>
Applied, thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-04-02 0:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-28 15:30 [dpdk-dev] [PATCH] telemetry: fix incorrect stat name to id mapping Bruce Richardson
2019-03-28 15:30 ` Bruce Richardson
2019-04-01 17:17 ` Laatz, Kevin
2019-04-01 17:17 ` Laatz, Kevin
2019-04-02 0:34 ` Thomas Monjalon
2019-04-02 0:34 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).