Commit 16b2084a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dim-fixes' 



Leon Romanovsky says:

====================
DIM fixes for 5.3

Those two fixes for recently merged DIM patches, both exposed through
RDMa DIM usage.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c8ec4632 f8be17b8

drivers/net/ethernet/broadcom/bcmsysport.c

+1 −1
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ static int bcm_sysport_poll(struct napi_struct *napi, int budget) 
{

	struct bcm_sysport_priv *priv =

		container_of(napi, struct bcm_sysport_priv, napi);

	struct dim_sample dim_sample;

	struct dim_sample dim_sample = {};

	unsigned int work_done = 0;



	work_done = bcm_sysport_desc_rx(priv, budget);

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −1
Original line number Diff line number Diff line
@@ -2136,7 +2136,7 @@ static int bnxt_poll(struct napi_struct *napi, int budget) 
		}

	}

	if (bp->flags & BNXT_FLAG_DIM) {

		struct dim_sample dim_sample;

		struct dim_sample dim_sample = {};



		dim_update_sample(cpr->event_ctr,

				  cpr->rx_packets,

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+1 −1
Original line number Diff line number Diff line
@@ -1895,7 +1895,7 @@ static int bcmgenet_rx_poll(struct napi_struct *napi, int budget) 
{

	struct bcmgenet_rx_ring *ring = container_of(napi,

			struct bcmgenet_rx_ring, napi);

	struct dim_sample dim_sample;

	struct dim_sample dim_sample = {};

	unsigned int work_done;



	work_done = bcmgenet_desc_rx(ring, budget);

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

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 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 = {};



	if (unlikely(!test_bit(MLX5E_SQ_STATE_AM, &sq->state)))

		return;
@@ -61,7 +61,7 @@ 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 = {};



	if (unlikely(!test_bit(MLX5E_RQ_STATE_AM, &rq->state)))

		return;

include/linux/dim.h

+0 −56
Original line number Diff line number Diff line
@@ -272,62 +272,6 @@ dim_update_sample_with_comps(u16 event_ctr, u64 packets, u64 bytes, u64 comps, 


/* Net DIM */



/*

 * Net DIM profiles:

 *        There are different set of profiles for each CQ period mode.

 *        There are different set of profiles for RX/TX CQs.

 *        Each profile size must be of NET_DIM_PARAMS_NUM_PROFILES

 */

#define NET_DIM_PARAMS_NUM_PROFILES 5

#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256

#define NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE 128

#define NET_DIM_DEF_PROFILE_CQE 1

#define NET_DIM_DEF_PROFILE_EQE 1



#define NET_DIM_RX_EQE_PROFILES { \

	{1,   NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \

	{8,   NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \

	{64,  NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \

	{128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \

	{256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \

}



#define NET_DIM_RX_CQE_PROFILES { \

	{2,  256},             \

	{8,  128},             \

	{16, 64},              \

	{32, 64},              \

	{64, 64}               \

}



#define NET_DIM_TX_EQE_PROFILES { \

	{1,   NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE},  \

	{8,   NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE},  \

	{32,  NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE},  \

	{64,  NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE},  \

	{128, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}   \

}



#define NET_DIM_TX_CQE_PROFILES { \

	{5,  128},  \

	{8,  64},  \

	{16, 32},  \

	{32, 32},  \

	{64, 32}   \

}



static const struct dim_cq_moder

rx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {

	NET_DIM_RX_EQE_PROFILES,

	NET_DIM_RX_CQE_PROFILES,

};



static const struct dim_cq_moder

tx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {

	NET_DIM_TX_EQE_PROFILES,

	NET_DIM_TX_CQE_PROFILES,

};



/**

 *	net_dim_get_rx_moderation - provide a CQ moderation object for the given RX profile

 *	@cq_period_mode: CQ period mode