Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'mlx5-100G-fixes' 



Saeed Mahameed says:

====================
Mellanox 100G mlx5 fixes#2 for 4.7-rc

The following series provides one-liners fixes for mlx5 driver plus one
medium patch to reorganize ethtool counters reporting.

Highlights:
	- Added MODIFY_FLOW_TABLE to command strings table
	- Add ConnectX-5 PCIe 4.0 to list of supported devices
	- Rename ASYNC_EVENTS enum
	- Enable BlueFlame only when supported by device
	- Avoid adding same vxlan port twice
	- Report the correct number of PFC counters
	- Reorganize ethtool reported counters and remove duplications
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3ec0a0f1 bfe6d8d1

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

+1 −0
Original line number Diff line number Diff line
@@ -545,6 +545,7 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(ALLOC_FLOW_COUNTER);

	MLX5_COMMAND_STR_CASE(DEALLOC_FLOW_COUNTER);

	MLX5_COMMAND_STR_CASE(QUERY_FLOW_COUNTER);

	MLX5_COMMAND_STR_CASE(MODIFY_FLOW_TABLE);

	default: return "unknown command opcode";

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ enum mlx5e_traffic_types { 
};



enum {

	MLX5E_STATE_ASYNC_EVENTS_ENABLE,

	MLX5E_STATE_ASYNC_EVENTS_ENABLED,

	MLX5E_STATE_OPENED,

	MLX5E_STATE_DESTROYING,

};

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

+17 −17
Original line number Diff line number Diff line
@@ -184,7 +184,9 @@ static unsigned long mlx5e_query_pfc_combined(struct mlx5e_priv *priv) 
#define MLX5E_NUM_SQ_STATS(priv) \

	(NUM_SQ_STATS * priv->params.num_channels * priv->params.num_tc * \

	 test_bit(MLX5E_STATE_OPENED, &priv->state))

#define MLX5E_NUM_PFC_COUNTERS(priv) hweight8(mlx5e_query_pfc_combined(priv))

#define MLX5E_NUM_PFC_COUNTERS(priv) \

	(hweight8(mlx5e_query_pfc_combined(priv)) * \

	 NUM_PPORT_PER_PRIO_PFC_COUNTERS)



static int mlx5e_get_sset_count(struct net_device *dev, int sset)

{
@@ -211,42 +213,41 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data) 


	/* SW counters */

	for (i = 0; i < NUM_SW_COUNTERS; i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN, sw_stats_desc[i].name);

		strcpy(data + (idx++) * ETH_GSTRING_LEN, sw_stats_desc[i].format);



	/* Q counters */

	for (i = 0; i < MLX5E_NUM_Q_CNTRS(priv); i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN, q_stats_desc[i].name);

		strcpy(data + (idx++) * ETH_GSTRING_LEN, q_stats_desc[i].format);



	/* VPORT counters */

	for (i = 0; i < NUM_VPORT_COUNTERS; i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN,

		       vport_stats_desc[i].name);

		       vport_stats_desc[i].format);



	/* PPORT counters */

	for (i = 0; i < NUM_PPORT_802_3_COUNTERS; i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN,

		       pport_802_3_stats_desc[i].name);

		       pport_802_3_stats_desc[i].format);



	for (i = 0; i < NUM_PPORT_2863_COUNTERS; i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN,

		       pport_2863_stats_desc[i].name);

		       pport_2863_stats_desc[i].format);



	for (i = 0; i < NUM_PPORT_2819_COUNTERS; i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN,

		       pport_2819_stats_desc[i].name);

		       pport_2819_stats_desc[i].format);



	for (prio = 0; prio < NUM_PPORT_PRIO; prio++) {

		for (i = 0; i < NUM_PPORT_PER_PRIO_TRAFFIC_COUNTERS; i++)

			sprintf(data + (idx++) * ETH_GSTRING_LEN, "prio%d_%s",

				prio,

				pport_per_prio_traffic_stats_desc[i].name);

			sprintf(data + (idx++) * ETH_GSTRING_LEN,

				pport_per_prio_traffic_stats_desc[i].format, prio);

	}



	pfc_combined = mlx5e_query_pfc_combined(priv);

	for_each_set_bit(prio, &pfc_combined, NUM_PPORT_PRIO) {

		for (i = 0; i < NUM_PPORT_PER_PRIO_PFC_COUNTERS; i++) {

			sprintf(data + (idx++) * ETH_GSTRING_LEN, "prio%d_%s",

				prio, pport_per_prio_pfc_stats_desc[i].name);

			sprintf(data + (idx++) * ETH_GSTRING_LEN,

				pport_per_prio_pfc_stats_desc[i].format, prio);

		}

	}
@@ -256,16 +257,15 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data) 
	/* per channel counters */

	for (i = 0; i < priv->params.num_channels; i++)

		for (j = 0; j < NUM_RQ_STATS; j++)

			sprintf(data + (idx++) * ETH_GSTRING_LEN, "rx%d_%s", i,

				rq_stats_desc[j].name);

			sprintf(data + (idx++) * ETH_GSTRING_LEN,

				rq_stats_desc[j].format, i);



	for (tc = 0; tc < priv->params.num_tc; tc++)

		for (i = 0; i < priv->params.num_channels; i++)

			for (j = 0; j < NUM_SQ_STATS; j++)

				sprintf(data + (idx++) * ETH_GSTRING_LEN,

					"tx%d_%s",

					priv->channeltc_to_txq_map[i][tc],

					sq_stats_desc[j].name);

					sq_stats_desc[j].format,

					priv->channeltc_to_txq_map[i][tc]);

}



static void mlx5e_get_strings(struct net_device *dev,

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

+17 −18
Original line number Diff line number Diff line
@@ -105,11 +105,11 @@ static void mlx5e_update_sw_counters(struct mlx5e_priv *priv) 


		s->rx_packets	+= rq_stats->packets;

		s->rx_bytes	+= rq_stats->bytes;

		s->lro_packets	+= rq_stats->lro_packets;

		s->lro_bytes	+= rq_stats->lro_bytes;

		s->rx_lro_packets += rq_stats->lro_packets;

		s->rx_lro_bytes	+= rq_stats->lro_bytes;

		s->rx_csum_none	+= rq_stats->csum_none;

		s->rx_csum_sw	+= rq_stats->csum_sw;

		s->rx_csum_inner += rq_stats->csum_inner;

		s->rx_csum_complete += rq_stats->csum_complete;

		s->rx_csum_unnecessary_inner += rq_stats->csum_unnecessary_inner;

		s->rx_wqe_err   += rq_stats->wqe_err;

		s->rx_mpwqe_filler += rq_stats->mpwqe_filler;

		s->rx_mpwqe_frag   += rq_stats->mpwqe_frag;
@@ -122,24 +122,23 @@ static void mlx5e_update_sw_counters(struct mlx5e_priv *priv) 


			s->tx_packets		+= sq_stats->packets;

			s->tx_bytes		+= sq_stats->bytes;

			s->tso_packets		+= sq_stats->tso_packets;

			s->tso_bytes		+= sq_stats->tso_bytes;

			s->tso_inner_packets	+= sq_stats->tso_inner_packets;

			s->tso_inner_bytes	+= sq_stats->tso_inner_bytes;

			s->tx_tso_packets	+= sq_stats->tso_packets;

			s->tx_tso_bytes		+= sq_stats->tso_bytes;

			s->tx_tso_inner_packets	+= sq_stats->tso_inner_packets;

			s->tx_tso_inner_bytes	+= sq_stats->tso_inner_bytes;

			s->tx_queue_stopped	+= sq_stats->stopped;

			s->tx_queue_wake	+= sq_stats->wake;

			s->tx_queue_dropped	+= sq_stats->dropped;

			s->tx_csum_inner	+= sq_stats->csum_offload_inner;

			tx_offload_none		+= sq_stats->csum_offload_none;

			s->tx_csum_partial_inner += sq_stats->csum_partial_inner;

			tx_offload_none		+= sq_stats->csum_none;

		}

	}



	/* Update calculated offload counters */

	s->tx_csum_offload = s->tx_packets - tx_offload_none - s->tx_csum_inner;

	s->rx_csum_good    = s->rx_packets - s->rx_csum_none -

			     s->rx_csum_sw;

	s->tx_csum_partial = s->tx_packets - tx_offload_none - s->tx_csum_partial_inner;

	s->rx_csum_unnecessary = s->rx_packets - s->rx_csum_none - s->rx_csum_complete;



	s->link_down_events = MLX5_GET(ppcnt_reg,

	s->link_down_events_phy = MLX5_GET(ppcnt_reg,

				priv->stats.pport.phy_counters,

				counter_set.phys_layer_cntrs.link_down_events);

}
@@ -244,7 +243,7 @@ static void mlx5e_async_event(struct mlx5_core_dev *mdev, void *vpriv, 
{

	struct mlx5e_priv *priv = vpriv;



	if (!test_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLE, &priv->state))

	if (!test_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLED, &priv->state))

		return;



	switch (event) {
@@ -260,12 +259,12 @@ static void mlx5e_async_event(struct mlx5_core_dev *mdev, void *vpriv, 


static void mlx5e_enable_async_events(struct mlx5e_priv *priv)

{

	set_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLE, &priv->state);

	set_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLED, &priv->state);

}



static void mlx5e_disable_async_events(struct mlx5e_priv *priv)

{

	clear_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLE, &priv->state);

	clear_bit(MLX5E_STATE_ASYNC_EVENTS_ENABLED, &priv->state);

	synchronize_irq(mlx5_get_msix_vec(priv->mdev, MLX5_EQ_VEC_ASYNC));

}
@@ -580,7 +579,7 @@ static int mlx5e_create_sq(struct mlx5e_channel *c, 
	void *sqc_wq = MLX5_ADDR_OF(sqc, sqc, wq);

	int err;



	err = mlx5_alloc_map_uar(mdev, &sq->uar, true);

	err = mlx5_alloc_map_uar(mdev, &sq->uar, !!MLX5_CAP_GEN(mdev, bf));

	if (err)

		return err;

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

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static inline void mlx5e_handle_csum(struct net_device *netdev, 
	if (is_first_ethertype_ip(skb)) {

		skb->ip_summed = CHECKSUM_COMPLETE;

		skb->csum = csum_unfold((__force __sum16)cqe->check_sum);

		rq->stats.csum_sw++;

		rq->stats.csum_complete++;

		return;

	}
@@ -699,7 +699,7 @@ static inline void mlx5e_handle_csum(struct net_device *netdev, 
		if (cqe_is_tunneled(cqe)) {

			skb->csum_level = 1;

			skb->encapsulation = 1;

			rq->stats.csum_inner++;

			rq->stats.csum_unnecessary_inner++;

		}

		return;

	}