@@ -49,11 +49,19 @@ static inline bool mlx5e_channel_no_affinity_change(struct mlx5e_channel *c)
static void mlx5e_handle_tx_dim(struct mlx5e_txqsq *sq)
{
struct mlx5e_sq_stats *stats = sq->stats;
- struct dim_sample dim_sample = {};
+ struct dim_sample dim_sample;
+ u16 nevents;
if (unlikely(!test_bit(MLX5E_SQ_STATE_DIM, &sq->state)))
return;
+ if (sq->dim->state == DIM_MEASURE_IN_PROGRESS) {
+ nevents = BIT_GAP(BITS_PER_TYPE(u16), sq->cq.event_ctr,
+ sq->dim->start_sample.event_ctr);
+ if (nevents < DIM_NEVENTS)
+ return;
+ }
+
dim_update_sample(sq->cq.event_ctr, stats->packets, stats->bytes, &dim_sample);
net_dim(sq->dim, &dim_sample);
}
@@ -61,11 +69,19 @@ static void mlx5e_handle_tx_dim(struct mlx5e_txqsq *sq)
static void mlx5e_handle_rx_dim(struct mlx5e_rq *rq)
{
struct mlx5e_rq_stats *stats = rq->stats;
- struct dim_sample dim_sample = {};
+ struct dim_sample dim_sample;
+ u16 nevents;
if (unlikely(!test_bit(MLX5E_RQ_STATE_DIM, &rq->state)))
return;
+ if (rq->dim->state == DIM_MEASURE_IN_PROGRESS) {
+ nevents = BIT_GAP(BITS_PER_TYPE(u16), rq->cq.event_ctr,
+ rq->dim->start_sample.event_ctr);
+ if (nevents < DIM_NEVENTS)
+ return;
+ }
+
dim_update_sample(rq->cq.event_ctr, stats->packets, stats->bytes, &dim_sample);
net_dim(rq->dim, &dim_sample);
}
High cpu usage for net_dim is seen still after commit 61bf0009a765 ("dim: pass dim_sample to net_dim() by reference"), the calling net_dim can be avoid under network low throughput or pingpong mode by checking the event counter, even under high throughput, it maybe only rx or tx direction And don't initialize dim_sample variable, since it will gets overwritten by dim_update_sample Signed-off-by: Li RongQing <lirongqing@baidu.com> Signed-off-by: Shuo Li <lishuo02@baidu.com> --- drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)