git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/mlx5: add abstraction for multiple flow drivers
[dpdk.git]
/
drivers
/
net
/
mlx5
/
mlx5_stats.c
diff --git
a/drivers/net/mlx5/mlx5_stats.c
b/drivers/net/mlx5/mlx5_stats.c
index
066d347
..
91f3d47
100644
(file)
--- a/
drivers/net/mlx5/mlx5_stats.c
+++ b/
drivers/net/mlx5/mlx5_stats.c
@@
-1,6
+1,6
@@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2015 6WIND S.A.
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2015 6WIND S.A.
- * Copyright 2015 Mellanox
.
+ * Copyright 2015 Mellanox
Technologies, Ltd
*/
#include <inttypes.h>
*/
#include <inttypes.h>
@@
-146,10
+146,11
@@
mlx5_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)
et_stats->cmd = ETHTOOL_GSTATS;
et_stats->n_stats = xstats_ctrl->stats_n;
ifr.ifr_data = (caddr_t)et_stats;
et_stats->cmd = ETHTOOL_GSTATS;
et_stats->n_stats = xstats_ctrl->stats_n;
ifr.ifr_data = (caddr_t)et_stats;
- ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
+ ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr
, 1
);
if (ret) {
if (ret) {
- WARN("port %u unable to read statistic values from device",
- dev->data->port_id);
+ DRV_LOG(WARNING,
+ "port %u unable to read statistic values from device",
+ dev->data->port_id);
return ret;
}
for (i = 0; i != xstats_n; ++i) {
return ret;
}
for (i = 0; i != xstats_n; ++i) {
@@
-193,10
+194,10
@@
mlx5_ethtool_get_stats_n(struct rte_eth_dev *dev) {
drvinfo.cmd = ETHTOOL_GDRVINFO;
ifr.ifr_data = (caddr_t)&drvinfo;
drvinfo.cmd = ETHTOOL_GDRVINFO;
ifr.ifr_data = (caddr_t)&drvinfo;
- ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
+ ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr
, 1
);
if (ret) {
if (ret) {
-
WARN(
"port %u unable to query number of statistics",
- dev->data->port_id);
+
DRV_LOG(WARNING,
"port %u unable to query number of statistics",
+
dev->data->port_id);
return ret;
}
return drvinfo.n_stats;
return ret;
}
return drvinfo.n_stats;
@@
-223,8
+224,8
@@
mlx5_xstats_init(struct rte_eth_dev *dev)
ret = mlx5_ethtool_get_stats_n(dev);
if (ret < 0) {
ret = mlx5_ethtool_get_stats_n(dev);
if (ret < 0) {
-
WARN(
"port %u no extended statistics available",
- dev->data->port_id);
+
DRV_LOG(WARNING,
"port %u no extended statistics available",
+
dev->data->port_id);
return;
}
dev_stats_n = ret;
return;
}
dev_stats_n = ret;
@@
-235,7
+236,7
@@
mlx5_xstats_init(struct rte_eth_dev *dev)
rte_malloc("xstats_strings",
str_sz + sizeof(struct ethtool_gstrings), 0);
if (!strings) {
rte_malloc("xstats_strings",
str_sz + sizeof(struct ethtool_gstrings), 0);
if (!strings) {
-
WARN(
"port %u unable to allocate memory for xstats",
+
DRV_LOG(WARNING,
"port %u unable to allocate memory for xstats",
dev->data->port_id);
return;
}
dev->data->port_id);
return;
}
@@
-243,10
+244,10
@@
mlx5_xstats_init(struct rte_eth_dev *dev)
strings->string_set = ETH_SS_STATS;
strings->len = dev_stats_n;
ifr.ifr_data = (caddr_t)strings;
strings->string_set = ETH_SS_STATS;
strings->len = dev_stats_n;
ifr.ifr_data = (caddr_t)strings;
- ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
+ ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr
, 1
);
if (ret) {
if (ret) {
-
WARN(
"port %u unable to get statistic names",
- dev->data->port_id);
+
DRV_LOG(WARNING,
"port %u unable to get statistic names",
+
dev->data->port_id);
goto free;
}
for (j = 0; j != xstats_n; ++j)
goto free;
}
for (j = 0; j != xstats_n; ++j)
@@
-267,9
+268,10
@@
mlx5_xstats_init(struct rte_eth_dev *dev)
if (mlx5_counters_init[j].ib)
continue;
if (xstats_ctrl->dev_table_idx[j] >= dev_stats_n) {
if (mlx5_counters_init[j].ib)
continue;
if (xstats_ctrl->dev_table_idx[j] >= dev_stats_n) {
- WARN("port %u counter \"%s\" is not recognized",
- dev->data->port_id,
- mlx5_counters_init[j].dpdk_name);
+ DRV_LOG(WARNING,
+ "port %u counter \"%s\" is not recognized",
+ dev->data->port_id,
+ mlx5_counters_init[j].dpdk_name);
goto free;
}
}
goto free;
}
}
@@
-277,8
+279,8
@@
mlx5_xstats_init(struct rte_eth_dev *dev)
assert(xstats_n <= MLX5_MAX_XSTATS);
ret = mlx5_read_dev_counters(dev, xstats_ctrl->base);
if (ret)
assert(xstats_n <= MLX5_MAX_XSTATS);
ret = mlx5_read_dev_counters(dev, xstats_ctrl->base);
if (ret)
-
ERROR(
"port %u cannot read device counters: %s",
- dev->data->port_id, strerror(rte_errno));
+
DRV_LOG(ERR,
"port %u cannot read device counters: %s",
+
dev->data->port_id, strerror(rte_errno));
free:
rte_free(strings);
}
free:
rte_free(strings);
}
@@
-323,7
+325,7
@@
mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
stats[i].value = (counters[i] - xstats_ctrl->base[i]);
}
}
stats[i].value = (counters[i] - xstats_ctrl->base[i]);
}
}
- return n;
+ return
xstats_
n;
}
/**
}
/**
@@
-445,16
+447,16
@@
mlx5_xstats_reset(struct rte_eth_dev *dev)
stats_n = mlx5_ethtool_get_stats_n(dev);
if (stats_n < 0) {
stats_n = mlx5_ethtool_get_stats_n(dev);
if (stats_n < 0) {
-
ERROR(
"port %u cannot get stats: %s", dev->data->port_id,
- strerror(-stats_n));
+
DRV_LOG(ERR,
"port %u cannot get stats: %s", dev->data->port_id,
+
strerror(-stats_n));
return;
}
if (xstats_ctrl->stats_n != stats_n)
mlx5_xstats_init(dev);
ret = mlx5_read_dev_counters(dev, counters);
if (ret) {
return;
}
if (xstats_ctrl->stats_n != stats_n)
mlx5_xstats_init(dev);
ret = mlx5_read_dev_counters(dev, counters);
if (ret) {
-
ERROR(
"port %u cannot read device counters: %s",
- dev->data->port_id, strerror(rte_errno));
+
DRV_LOG(ERR,
"port %u cannot read device counters: %s",
+
dev->data->port_id, strerror(rte_errno));
return;
}
for (i = 0; i != n; ++i)
return;
}
for (i = 0; i != n; ++i)