Commit 4c4dbb4a authored by Andy Gospodarek's avatar Andy Gospodarek Committed by David S. Miller
Browse files

net/mlx5e: Move dynamic interrupt coalescing code to include/linux 



This move allows drivers to add private structure elements to track the
number of packets, bytes, and interrupts events per ring.  A driver
also defines a workqueue handler to act on this collected data once per
poll and modify the coalescing parameters per ring.

Signed-off-by: default avatarAndy Gospodarek <gospo@broadcom.com>
Acked-by: default avatarTal Gilboa <talgi@mellanox.com>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a317425

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \ 


mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \

		en_tx.o en_rx.o en_dim.o en_txrx.o en_stats.o vxlan.o \

		en_arfs.o en_fs_ethtool.o en_selftest.o net_dim.o

		en_arfs.o en_fs_ethtool.o en_selftest.o



mlx5_core-$(CONFIG_MLX5_MPFS) += lib/mpfs.o

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ 
#include <linux/rhashtable.h>

#include <net/switchdev.h>

#include <net/xdp.h>

#include <linux/net_dim.h>

#include "wq.h"

#include "mlx5_core.h"

#include "en_stats.h"

#include "net_dim.h"



#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)

drivers/net/ethernet/mellanox/mlx5/core/en_dim.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
 * SOFTWARE.

 */



#include <linux/net_dim.h>

#include "en.h"



void mlx5e_rx_dim_work(struct work_struct *work)

drivers/net/ethernet/mellanox/mlx5/core/net_dim.h

deleted100644 → 0
+0 −108
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2015, Mellanox Technologies, Ltd.  All rights reserved.

 * Copyright (c) 2017-2018, Broadcom Limited.  All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#ifndef NET_DIM_H

#define NET_DIM_H



struct net_dim_cq_moder {

	u16 usec;

	u16 pkts;

	u8 cq_period_mode;

};



struct net_dim_sample {

	ktime_t time;

	u32     pkt_ctr;

	u32     byte_ctr;

	u16     event_ctr;

};



struct net_dim_stats {

	int ppms; /* packets per msec */

	int bpms; /* bytes per msec */

	int epms; /* events per msec */

};



struct net_dim { /* Adaptive Moderation */

	u8                                      state;

	struct net_dim_stats                    prev_stats;

	struct net_dim_sample                   start_sample;

	struct work_struct                      work;

	u8                                      profile_ix;

	u8                                      mode;

	u8                                      tune_state;

	u8                                      steps_right;

	u8                                      steps_left;

	u8                                      tired;

};



enum {

	NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,

	NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,

	NET_DIM_CQ_PERIOD_NUM_MODES

};



/* Adaptive moderation logic */

enum {

	NET_DIM_START_MEASURE,

	NET_DIM_MEASURE_IN_PROGRESS,

	NET_DIM_APPLY_NEW_PROFILE,

};



enum {

	NET_DIM_PARKING_ON_TOP,

	NET_DIM_PARKING_TIRED,

	NET_DIM_GOING_RIGHT,

	NET_DIM_GOING_LEFT,

};



enum {

	NET_DIM_STATS_WORSE,

	NET_DIM_STATS_SAME,

	NET_DIM_STATS_BETTER,

};



enum {

	NET_DIM_STEPPED,

	NET_DIM_TOO_TIRED,

	NET_DIM_ON_EDGE,

};



void net_dim(struct net_dim *dim,

	     u16 event_ctr,

	     u64 packets,

	     u64 bytes);

struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode);

struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix);



#endif /* NET_DIM_H */

drivers/net/ethernet/mellanox/mlx5/core/net_dim.c→include/linux/net_dim.h

+94 −24
Original line number Diff line number Diff line
@@ -31,7 +31,74 @@ 
 * SOFTWARE.

 */



#include "en.h"

#ifndef NET_DIM_H

#define NET_DIM_H



#include <linux/module.h>



struct net_dim_cq_moder {

	u16 usec;

	u16 pkts;

	u8 cq_period_mode;

};



struct net_dim_sample {

	ktime_t time;

	u32     pkt_ctr;

	u32     byte_ctr;

	u16     event_ctr;

};



struct net_dim_stats {

	int ppms; /* packets per msec */

	int bpms; /* bytes per msec */

	int epms; /* events per msec */

};



struct net_dim { /* Adaptive Moderation */

	u8                                      state;

	struct net_dim_stats                    prev_stats;

	struct net_dim_sample                   start_sample;

	struct work_struct                      work;

	u8                                      profile_ix;

	u8                                      mode;

	u8                                      tune_state;

	u8                                      steps_right;

	u8                                      steps_left;

	u8                                      tired;

};



enum {

	NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE = 0x0,

	NET_DIM_CQ_PERIOD_MODE_START_FROM_CQE = 0x1,

	NET_DIM_CQ_PERIOD_NUM_MODES

};



/* Adaptive moderation logic */

enum {

	NET_DIM_START_MEASURE,

	NET_DIM_MEASURE_IN_PROGRESS,

	NET_DIM_APPLY_NEW_PROFILE,

};



enum {

	NET_DIM_PARKING_ON_TOP,

	NET_DIM_PARKING_TIRED,

	NET_DIM_GOING_RIGHT,

	NET_DIM_GOING_LEFT,

};



enum {

	NET_DIM_STATS_WORSE,

	NET_DIM_STATS_SAME,

	NET_DIM_STATS_BETTER,

};



enum {

	NET_DIM_STEPPED,

	NET_DIM_TOO_TIRED,

	NET_DIM_ON_EDGE,

};



#define NET_DIM_PARAMS_NUM_PROFILES 5

/* Adaptive moderation profiles */
@@ -62,7 +129,8 @@ profile[NET_DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = { 
	NET_DIM_CQE_PROFILES,

};



struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix)

static inline struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode,

							  int ix)

{

	struct net_dim_cq_moder cq_moder;
@@ -71,7 +139,7 @@ struct net_dim_cq_moder net_dim_get_profile(u8 cq_period_mode, int ix) 
	return cq_moder;

}



struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)

static inline struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode)

{

	int default_profile_ix;
@@ -83,7 +151,7 @@ struct net_dim_cq_moder net_dim_get_def_profile(u8 rx_cq_period_mode) 
	return net_dim_get_profile(rx_cq_period_mode, default_profile_ix);

}



static bool net_dim_on_top(struct net_dim *dim)

static inline bool net_dim_on_top(struct net_dim *dim)

{

	switch (dim->tune_state) {

	case NET_DIM_PARKING_ON_TOP:
@@ -96,7 +164,7 @@ static bool net_dim_on_top(struct net_dim *dim) 
	}

}



static void net_dim_turn(struct net_dim *dim)

static inline void net_dim_turn(struct net_dim *dim)

{

	switch (dim->tune_state) {

	case NET_DIM_PARKING_ON_TOP:
@@ -113,7 +181,7 @@ static void net_dim_turn(struct net_dim *dim) 
	}

}



static int net_dim_step(struct net_dim *dim)

static inline int net_dim_step(struct net_dim *dim)

{

	if (dim->tired == (NET_DIM_PARAMS_NUM_PROFILES * 2))

		return NET_DIM_TOO_TIRED;
@@ -140,7 +208,7 @@ static int net_dim_step(struct net_dim *dim) 
	return NET_DIM_STEPPED;

}



static void net_dim_park_on_top(struct net_dim *dim)

static inline void net_dim_park_on_top(struct net_dim *dim)

{

	dim->steps_right  = 0;

	dim->steps_left   = 0;
@@ -148,14 +216,14 @@ static void net_dim_park_on_top(struct net_dim *dim) 
	dim->tune_state   = NET_DIM_PARKING_ON_TOP;

}



static void net_dim_park_tired(struct net_dim *dim)

static inline void net_dim_park_tired(struct net_dim *dim)

{

	dim->steps_right  = 0;

	dim->steps_left   = 0;

	dim->tune_state   = NET_DIM_PARKING_TIRED;

}



static void net_dim_exit_parking(struct net_dim *dim)

static inline void net_dim_exit_parking(struct net_dim *dim)

{

	dim->tune_state = dim->profile_ix ? NET_DIM_GOING_LEFT :

					  NET_DIM_GOING_RIGHT;
@@ -165,7 +233,7 @@ static void net_dim_exit_parking(struct net_dim *dim) 
#define IS_SIGNIFICANT_DIFF(val, ref) \

	(((100 * abs((val) - (ref))) / (ref)) > 10) /* more than 10% difference */



static int net_dim_stats_compare(struct net_dim_stats *curr,

static inline int net_dim_stats_compare(struct net_dim_stats *curr,

					struct net_dim_stats *prev)

{

	if (!prev->bpms)
@@ -187,7 +255,7 @@ static int net_dim_stats_compare(struct net_dim_stats *curr, 
	return NET_DIM_STATS_SAME;

}



static bool net_dim_decision(struct net_dim_stats *curr_stats,

static inline bool net_dim_decision(struct net_dim_stats *curr_stats,

				    struct net_dim *dim)

{

	int prev_state = dim->tune_state;
@@ -239,7 +307,7 @@ static bool net_dim_decision(struct net_dim_stats *curr_stats, 
	return dim->profile_ix != prev_ix;

}



static void net_dim_sample(u16 event_ctr,

static inline void net_dim_sample(u16 event_ctr,

				  u64 packets,

				  u64 bytes,

				  struct net_dim_sample *s)
@@ -254,7 +322,7 @@ static void net_dim_sample(u16 event_ctr, 
#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)

#define BIT_GAP(bits, end, start) ((((end) - (start)) + BIT_ULL(bits)) & (BIT_ULL(bits) - 1))



static void net_dim_calc_stats(struct net_dim_sample *start,

static inline void net_dim_calc_stats(struct net_dim_sample *start,

				      struct net_dim_sample *end,

				      struct net_dim_stats *curr_stats)

{
@@ -273,7 +341,7 @@ static void net_dim_calc_stats(struct net_dim_sample *start, 
					delta_us);

}



void net_dim(struct net_dim *dim,

static inline void net_dim(struct net_dim *dim,

			   u16 event_ctr,

			   u64 packets,

			   u64 bytes)
@@ -305,3 +373,5 @@ void net_dim(struct net_dim *dim, 
		break;

	}

}



#endif /* NET_DIM_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE