-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'mlx5e-updates-2018-12-11' of git://git.kernel.org/pub/scm/…
…linux/kernel/git/saeed/linux Saeed Mahameed says: ==================== mlx5e-updates-2018-12-11 From Eli Britstein, Patches 1-10 adds remote mirroring support. Patches 1-4 refactor encap related code as pre-steps for using per destination encapsulation properties. Patches 5-7 use extended destination feature for single/multi destination scenarios that have a single encap destination. Patches 8-10 enable multiple encap destinations for a TC flow. From, Daniel Jurgens, Patch 11, Use CQE padding for Ethernet CQs, PPC showed up to a 24% improvement in small packet throughput From Eyal Davidovich, patches 12-14, FW monitor counter support FW monitor counters feature came to solve the delayed reporting of FW stats in the atomic get_stats64 ndo, since we can't access the FW at that stage, this feature will enable immediate FW stats updates in the driver via fw events on specific stats updates. Patch 12, cleanup to avoid querying a FW counter when it is not supported Patch 13, Monitor counters FW commands support Patch 14, Use monitor counters in ethernet netdevice to update FW stats reported in the atomic get_stats64 ndo. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
- Loading branch information
Showing
14 changed files
with
393 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
169 changes: 169 additions & 0 deletions
169
drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| /* SPDX-License-Identifier: GPL-2.0 */ | ||
| /* Copyright (c) 2018 Mellanox Technologies. */ | ||
|
|
||
| #include "en.h" | ||
| #include "monitor_stats.h" | ||
| #include "lib/eq.h" | ||
|
|
||
| /* Driver will set the following watch counters list: | ||
| * Ppcnt.802_3: | ||
| * a_in_range_length_errors Type: 0x0, Counter: 0x0, group_id = N/A | ||
| * a_out_of_range_length_field Type: 0x0, Counter: 0x1, group_id = N/A | ||
| * a_frame_too_long_errors Type: 0x0, Counter: 0x2, group_id = N/A | ||
| * a_frame_check_sequence_errors Type: 0x0, Counter: 0x3, group_id = N/A | ||
| * a_alignment_errors Type: 0x0, Counter: 0x4, group_id = N/A | ||
| * if_out_discards Type: 0x0, Counter: 0x5, group_id = N/A | ||
| * Q_Counters: | ||
| * Q[index].rx_out_of_buffer Type: 0x1, Counter: 0x4, group_id = counter_ix | ||
| */ | ||
|
|
||
| #define NUM_REQ_PPCNT_COUNTER_S1 MLX5_CMD_SET_MONITOR_NUM_PPCNT_COUNTER_SET1 | ||
| #define NUM_REQ_Q_COUNTERS_S1 MLX5_CMD_SET_MONITOR_NUM_Q_COUNTERS_SET1 | ||
|
|
||
| int mlx5e_monitor_counter_supported(struct mlx5e_priv *priv) | ||
| { | ||
| struct mlx5_core_dev *mdev = priv->mdev; | ||
|
|
||
| if (!MLX5_CAP_GEN(mdev, max_num_of_monitor_counters)) | ||
| return false; | ||
| if (MLX5_CAP_PCAM_REG(mdev, ppcnt) && | ||
| MLX5_CAP_GEN(mdev, num_ppcnt_monitor_counters) < | ||
| NUM_REQ_PPCNT_COUNTER_S1) | ||
| return false; | ||
| if (MLX5_CAP_GEN(mdev, num_q_monitor_counters) < | ||
| NUM_REQ_Q_COUNTERS_S1) | ||
| return false; | ||
| return true; | ||
| } | ||
|
|
||
| void mlx5e_monitor_counter_arm(struct mlx5e_priv *priv) | ||
| { | ||
| u32 in[MLX5_ST_SZ_DW(arm_monitor_counter_in)] = {}; | ||
| u32 out[MLX5_ST_SZ_DW(arm_monitor_counter_out)] = {}; | ||
|
|
||
| MLX5_SET(arm_monitor_counter_in, in, opcode, | ||
| MLX5_CMD_OP_ARM_MONITOR_COUNTER); | ||
| mlx5_cmd_exec(priv->mdev, in, sizeof(in), out, sizeof(out)); | ||
| } | ||
|
|
||
| static void mlx5e_monitor_counters_work(struct work_struct *work) | ||
| { | ||
| struct mlx5e_priv *priv = container_of(work, struct mlx5e_priv, | ||
| monitor_counters_work); | ||
|
|
||
| mutex_lock(&priv->state_lock); | ||
| mlx5e_update_ndo_stats(priv); | ||
| mutex_unlock(&priv->state_lock); | ||
| mlx5e_monitor_counter_arm(priv); | ||
| } | ||
|
|
||
| static int mlx5e_monitor_event_handler(struct notifier_block *nb, | ||
| unsigned long event, void *eqe) | ||
| { | ||
| struct mlx5e_priv *priv = mlx5_nb_cof(nb, struct mlx5e_priv, | ||
| monitor_counters_nb); | ||
| queue_work(priv->wq, &priv->monitor_counters_work); | ||
| return NOTIFY_OK; | ||
| } | ||
|
|
||
| void mlx5e_monitor_counter_start(struct mlx5e_priv *priv) | ||
| { | ||
| MLX5_NB_INIT(&priv->monitor_counters_nb, mlx5e_monitor_event_handler, | ||
| MONITOR_COUNTER); | ||
| mlx5_eq_notifier_register(priv->mdev, &priv->monitor_counters_nb); | ||
| } | ||
|
|
||
| static void mlx5e_monitor_counter_stop(struct mlx5e_priv *priv) | ||
| { | ||
| mlx5_eq_notifier_unregister(priv->mdev, &priv->monitor_counters_nb); | ||
| cancel_work_sync(&priv->monitor_counters_work); | ||
| } | ||
|
|
||
| static int fill_monitor_counter_ppcnt_set1(int cnt, u32 *in) | ||
| { | ||
| enum mlx5_monitor_counter_ppcnt ppcnt_cnt; | ||
|
|
||
| for (ppcnt_cnt = 0; | ||
| ppcnt_cnt < NUM_REQ_PPCNT_COUNTER_S1; | ||
| ppcnt_cnt++, cnt++) { | ||
| MLX5_SET(set_monitor_counter_in, in, | ||
| monitor_counter[cnt].type, | ||
| MLX5_QUERY_MONITOR_CNT_TYPE_PPCNT); | ||
| MLX5_SET(set_monitor_counter_in, in, | ||
| monitor_counter[cnt].counter, | ||
| ppcnt_cnt); | ||
| } | ||
| return ppcnt_cnt; | ||
| } | ||
|
|
||
| static int fill_monitor_counter_q_counter_set1(int cnt, int q_counter, u32 *in) | ||
| { | ||
| MLX5_SET(set_monitor_counter_in, in, | ||
| monitor_counter[cnt].type, | ||
| MLX5_QUERY_MONITOR_CNT_TYPE_Q_COUNTER); | ||
| MLX5_SET(set_monitor_counter_in, in, | ||
| monitor_counter[cnt].counter, | ||
| MLX5_QUERY_MONITOR_Q_COUNTER_RX_OUT_OF_BUFFER); | ||
| MLX5_SET(set_monitor_counter_in, in, | ||
| monitor_counter[cnt].counter_group_id, | ||
| q_counter); | ||
| return 1; | ||
| } | ||
|
|
||
| /* check if mlx5e_monitor_counter_supported before calling this function*/ | ||
| static void mlx5e_set_monitor_counter(struct mlx5e_priv *priv) | ||
| { | ||
| struct mlx5_core_dev *mdev = priv->mdev; | ||
| int max_num_of_counters = MLX5_CAP_GEN(mdev, max_num_of_monitor_counters); | ||
| int num_q_counters = MLX5_CAP_GEN(mdev, num_q_monitor_counters); | ||
| int num_ppcnt_counters = !MLX5_CAP_PCAM_REG(mdev, ppcnt) ? 0 : | ||
| MLX5_CAP_GEN(mdev, num_ppcnt_monitor_counters); | ||
| u32 in[MLX5_ST_SZ_DW(set_monitor_counter_in)] = {}; | ||
| u32 out[MLX5_ST_SZ_DW(set_monitor_counter_out)] = {}; | ||
| int q_counter = priv->q_counter; | ||
| int cnt = 0; | ||
|
|
||
| if (num_ppcnt_counters >= NUM_REQ_PPCNT_COUNTER_S1 && | ||
| max_num_of_counters >= (NUM_REQ_PPCNT_COUNTER_S1 + cnt)) | ||
| cnt += fill_monitor_counter_ppcnt_set1(cnt, in); | ||
|
|
||
| if (num_q_counters >= NUM_REQ_Q_COUNTERS_S1 && | ||
| max_num_of_counters >= (NUM_REQ_Q_COUNTERS_S1 + cnt) && | ||
| q_counter) | ||
| cnt += fill_monitor_counter_q_counter_set1(cnt, q_counter, in); | ||
|
|
||
| MLX5_SET(set_monitor_counter_in, in, num_of_counters, cnt); | ||
| MLX5_SET(set_monitor_counter_in, in, opcode, | ||
| MLX5_CMD_OP_SET_MONITOR_COUNTER); | ||
|
|
||
| mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out)); | ||
| } | ||
|
|
||
| /* check if mlx5e_monitor_counter_supported before calling this function*/ | ||
| void mlx5e_monitor_counter_init(struct mlx5e_priv *priv) | ||
| { | ||
| INIT_WORK(&priv->monitor_counters_work, mlx5e_monitor_counters_work); | ||
| mlx5e_monitor_counter_start(priv); | ||
| mlx5e_set_monitor_counter(priv); | ||
| mlx5e_monitor_counter_arm(priv); | ||
| queue_work(priv->wq, &priv->update_stats_work); | ||
| } | ||
|
|
||
| static void mlx5e_monitor_counter_disable(struct mlx5e_priv *priv) | ||
| { | ||
| u32 in[MLX5_ST_SZ_DW(set_monitor_counter_in)] = {}; | ||
| u32 out[MLX5_ST_SZ_DW(set_monitor_counter_out)] = {}; | ||
|
|
||
| MLX5_SET(set_monitor_counter_in, in, num_of_counters, 0); | ||
| MLX5_SET(set_monitor_counter_in, in, opcode, | ||
| MLX5_CMD_OP_SET_MONITOR_COUNTER); | ||
|
|
||
| mlx5_cmd_exec(priv->mdev, in, sizeof(in), out, sizeof(out)); | ||
| } | ||
|
|
||
| /* check if mlx5e_monitor_counter_supported before calling this function*/ | ||
| void mlx5e_monitor_counter_cleanup(struct mlx5e_priv *priv) | ||
| { | ||
| mlx5e_monitor_counter_disable(priv); | ||
| mlx5e_monitor_counter_stop(priv); | ||
| } |
12 changes: 12 additions & 0 deletions
12
drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| /* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */ | ||
| /* Copyright (c) 2018 Mellanox Technologies. */ | ||
|
|
||
| #ifndef __MLX5_MONITOR_H__ | ||
| #define __MLX5_MONITOR_H__ | ||
|
|
||
| int mlx5e_monitor_counter_supported(struct mlx5e_priv *priv); | ||
| void mlx5e_monitor_counter_init(struct mlx5e_priv *priv); | ||
| void mlx5e_monitor_counter_cleanup(struct mlx5e_priv *priv); | ||
| void mlx5e_monitor_counter_arm(struct mlx5e_priv *priv); | ||
|
|
||
| #endif /* __MLX5_MONITOR_H__ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.