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

Merge branch 'mlx5e-IPoIB-stats' 



Tariq Toukan says:

====================
mlx5e IPoIB stats

This patchset by Feras contains statistics enhancements and NDO
implementation for the mlx5e IPoIB driver.

Series generated against net-next commit:
2d5c2885 net: bgmac: remove set but not used variable 'err'
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1fcc3fd7 19052a3b

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

+2 −1
Original line number Diff line number Diff line
@@ -1230,8 +1230,8 @@ static inline void mlx5i_complete_rx_cqe(struct mlx5e_rq *rq, 
					 u32 cqe_bcnt,

					 struct sk_buff *skb)

{

	struct mlx5e_rq_stats *stats = rq->stats;

	struct hwtstamp_config *tstamp;

	struct mlx5e_rq_stats *stats;

	struct net_device *netdev;

	struct mlx5e_priv *priv;

	char *pseudo_header;
@@ -1254,6 +1254,7 @@ static inline void mlx5i_complete_rx_cqe(struct mlx5e_rq *rq, 


	priv = mlx5i_epriv(netdev);

	tstamp = &priv->tstamp;

	stats = &priv->channel_stats[rq->ix].rq;



	g = (be32_to_cpu(cqe->flags_rqpn) >> 28) & 3;

	dgid = skb->data + MLX5_IB_GRH_DGID_OFFSET;

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

+43 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ static int mlx5i_change_mtu(struct net_device *netdev, int new_mtu); 
static const struct net_device_ops mlx5i_netdev_ops = {

	.ndo_open                = mlx5i_open,

	.ndo_stop                = mlx5i_close,

	.ndo_get_stats64         = mlx5i_get_stats,

	.ndo_init                = mlx5i_dev_init,

	.ndo_uninit              = mlx5i_dev_cleanup,

	.ndo_change_mtu          = mlx5i_change_mtu,
@@ -83,6 +84,7 @@ void mlx5i_init(struct mlx5_core_dev *mdev, 
	priv->netdev      = netdev;

	priv->profile     = profile;

	priv->ppriv       = ppriv;

	priv->max_opened_tc = 1;

	mutex_init(&priv->state_lock);



	mlx5_query_port_max_mtu(mdev, &max_mtu, 1);
@@ -114,6 +116,47 @@ static void mlx5i_cleanup(struct mlx5e_priv *priv) 
	/* Do nothing .. */

}



void mlx5i_grp_sw_update_stats(struct mlx5e_priv *priv)

{

	struct mlx5e_sw_stats s = { 0 };

	int i, j;



	for (i = 0; i < priv->profile->max_nch(priv->mdev); i++) {

		struct mlx5e_channel_stats *channel_stats;

		struct mlx5e_rq_stats *rq_stats;



		channel_stats = &priv->channel_stats[i];

		rq_stats = &channel_stats->rq;



		s.rx_packets += rq_stats->packets;

		s.rx_bytes   += rq_stats->bytes;



		for (j = 0; j < priv->max_opened_tc; j++) {

			struct mlx5e_sq_stats *sq_stats = &channel_stats->sq[j];



			s.tx_packets           += sq_stats->packets;

			s.tx_bytes             += sq_stats->bytes;

			s.tx_queue_dropped     += sq_stats->dropped;

		}

	}



	memcpy(&priv->stats.sw, &s, sizeof(s));

}



void mlx5i_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)

{

	struct mlx5e_priv     *priv   = mlx5i_epriv(dev);

	struct mlx5e_sw_stats *sstats = &priv->stats.sw;



	mlx5i_grp_sw_update_stats(priv);



	stats->rx_packets = sstats->rx_packets;

	stats->rx_bytes   = sstats->rx_bytes;

	stats->tx_packets = sstats->tx_packets;

	stats->tx_bytes   = sstats->tx_bytes;

	stats->tx_dropped = sstats->tx_queue_dropped;

}



int mlx5i_init_underlay_qp(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

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

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ static inline void mlx5i_sq_fetch_wqe(struct mlx5e_txqsq *sq, 
netdev_tx_t mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb,

			  struct mlx5_av *av, u32 dqpn, u32 dqkey);

void mlx5i_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);

void mlx5i_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats);



#endif /* CONFIG_MLX5_CORE_IPOIB */

#endif /* __MLX5E_IPOB_H__ */

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static const struct net_device_ops mlx5i_pkey_netdev_ops = { 
	.ndo_open                = mlx5i_pkey_open,

	.ndo_stop                = mlx5i_pkey_close,

	.ndo_init                = mlx5i_pkey_dev_init,

	.ndo_get_stats64         = mlx5i_get_stats,

	.ndo_uninit              = mlx5i_pkey_dev_cleanup,

	.ndo_change_mtu          = mlx5i_pkey_change_mtu,

	.ndo_do_ioctl            = mlx5i_pkey_ioctl,

CRA Git | Maintained and supported by SUSTech CRA and CCSE