UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/mlx5e: Switch ipsec counters to use stats group API 

Switch the ipsec counters to use the new stats group API.

Signed-off-by: Kamal Heib <kamalh@mellanox.com>
Reviewed-by: Gal Pressman <galp@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
This commit is contained in:
Kamal Heib 2017-08-23 15:07:20 +03:00 committed by Saeed Mahameed
parent 0e6f01a49d
commit e185d43f59
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
View File

@ -31,7 +31,6 @@
*/ */
#include "en.h" #include "en.h"
#include "en_accel/ipsec.h"
void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv, void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv,
struct ethtool_drvinfo *drvinfo) struct ethtool_drvinfo *drvinfo)
@ -150,8 +149,7 @@ int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset)
num_stats += mlx5e_stats_grps[i].get_num_stats(priv); num_stats += mlx5e_stats_grps[i].get_num_stats(priv);
return num_stats + return num_stats +
MLX5E_NUM_RQ_STATS(priv) + MLX5E_NUM_RQ_STATS(priv) +
MLX5E_NUM_SQ_STATS(priv) + MLX5E_NUM_SQ_STATS(priv);
mlx5e_ipsec_get_count(priv);
case ETH_SS_PRIV_FLAGS: case ETH_SS_PRIV_FLAGS:
return ARRAY_SIZE(mlx5e_priv_flags); return ARRAY_SIZE(mlx5e_priv_flags);
@ -177,9 +175,6 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, u8 *data)
for (i = 0; i < mlx5e_num_stats_grps; i++) for (i = 0; i < mlx5e_num_stats_grps; i++)
idx = mlx5e_stats_grps[i].fill_strings(priv, data, idx); idx = mlx5e_stats_grps[i].fill_strings(priv, data, idx);
/* IPSec counters */
idx += mlx5e_ipsec_get_strings(priv, data + idx * ETH_GSTRING_LEN);
if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
return; return;
@ -244,9 +239,6 @@ void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv,
for (i = 0; i < mlx5e_num_stats_grps; i++) for (i = 0; i < mlx5e_num_stats_grps; i++)
idx = mlx5e_stats_grps[i].fill_stats(priv, data, idx); idx = mlx5e_stats_grps[i].fill_stats(priv, data, idx);
/* IPSec counters */
idx += mlx5e_ipsec_get_stats(priv, data + idx);
if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
return; return;

24
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
View File

@ -31,6 +31,7 @@
*/ */
#include "en.h" #include "en.h"
#include "en_accel/ipsec.h"
static const struct counter_desc sw_stats_desc[] = { static const struct counter_desc sw_stats_desc[] = {
{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_packets) }, { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_packets) },
@ -702,6 +703,24 @@ static int mlx5e_grp_pme_fill_stats(struct mlx5e_priv *priv, u64 *data,
return idx; return idx;
} }
static int mlx5e_grp_ipsec_get_num_stats(struct mlx5e_priv *priv)
{
return mlx5e_ipsec_get_count(priv);
}
static int mlx5e_grp_ipsec_fill_strings(struct mlx5e_priv *priv, u8 *data,
int idx)
{
return idx + mlx5e_ipsec_get_strings(priv,
data + idx * ETH_GSTRING_LEN);
}
static int mlx5e_grp_ipsec_fill_stats(struct mlx5e_priv *priv, u64 *data,
int idx)
{
return idx + mlx5e_ipsec_get_stats(priv, data + idx);
}
const struct mlx5e_stats_grp mlx5e_stats_grps[] = { const struct mlx5e_stats_grp mlx5e_stats_grps[] = {
{ {
.get_num_stats = mlx5e_grp_sw_get_num_stats, .get_num_stats = mlx5e_grp_sw_get_num_stats,
@ -763,6 +782,11 @@ const struct mlx5e_stats_grp mlx5e_stats_grps[] = {
.fill_strings = mlx5e_grp_pme_fill_strings, .fill_strings = mlx5e_grp_pme_fill_strings,
.fill_stats = mlx5e_grp_pme_fill_stats, .fill_stats = mlx5e_grp_pme_fill_stats,
}, },
{
.get_num_stats = mlx5e_grp_ipsec_get_num_stats,
.fill_strings = mlx5e_grp_ipsec_fill_strings,
.fill_stats = mlx5e_grp_ipsec_fill_stats,
},
}; };
const int mlx5e_num_stats_grps = ARRAY_SIZE(mlx5e_stats_grps); const int mlx5e_num_stats_grps = ARRAY_SIZE(mlx5e_stats_grps);