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

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

Merge tag 'mlx5-updates-2019-01-25' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2019-01-25

This series provides some updates to mlx5 driver,

From Tariq,
1) Make sure RX packet header does not cross page boundary
   To avoid page boundary crossing, use stride size that fits
   the maximum possible header. Stride is increased form 64B to 256B.

2) CQ struct cleanup: Take CQ decompress fields into a separate structure

From Moshe,
3) Expand XPS cpumask to cover all online cpus

From Jason Gunthorpe and Tariq:
4) Compilation warning cleanup

From Or,
5) Add trace points for flow tables create/destroy

From Saeed,
6) Software stats update/folding improvements
   this also solves a compilation warning on 32bit systems that was reported
   last release cycle by Arnd and Andrew.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 30e5c2c6 b832d4fd

drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c

+2 −0
Original line number Diff line number Diff line
@@ -258,6 +258,8 @@ const char *parse_fs_dst(struct trace_seq *p, 
	return ret;

}



EXPORT_TRACEPOINT_SYMBOL(mlx5_fs_add_ft);

EXPORT_TRACEPOINT_SYMBOL(mlx5_fs_del_ft);

EXPORT_TRACEPOINT_SYMBOL(mlx5_fs_add_fg);

EXPORT_TRACEPOINT_SYMBOL(mlx5_fs_del_fg);

EXPORT_TRACEPOINT_SYMBOL(mlx5_fs_set_fte);

drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h

+35 −0
Original line number Diff line number Diff line
@@ -61,6 +61,41 @@ const char *parse_fs_dst(struct trace_seq *p, 
			 const struct mlx5_flow_destination *dst,

			 u32 counter_id);



TRACE_EVENT(mlx5_fs_add_ft,

	    TP_PROTO(const struct mlx5_flow_table *ft),

	    TP_ARGS(ft),

	    TP_STRUCT__entry(

		__field(const struct mlx5_flow_table *, ft)

		__field(u32, id)

		__field(u32, level)

		__field(u32, type)

	    ),

	    TP_fast_assign(

			   __entry->ft = ft;

			   __entry->id = ft->id;

			   __entry->level = ft->level;

			   __entry->type = ft->type;

	    ),

	    TP_printk("ft=%p id=%u level=%u type=%u \n",

		      __entry->ft, __entry->id, __entry->level, __entry->type)

	    );



TRACE_EVENT(mlx5_fs_del_ft,

	    TP_PROTO(const struct mlx5_flow_table *ft),

	    TP_ARGS(ft),

	    TP_STRUCT__entry(

		__field(const struct mlx5_flow_table *, ft)

		__field(u32, id)

	    ),

	    TP_fast_assign(

			   __entry->ft = ft;

			   __entry->id = ft->id;



	    ),

	    TP_printk("ft=%p id=%u\n",

		      __entry->ft, __entry->id)

	    );



TRACE_EVENT(mlx5_fs_add_fg,

	    TP_PROTO(const struct mlx5_flow_group *fg),

	    TP_ARGS(fg),

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

+15 −13
Original line number Diff line number Diff line
@@ -76,15 +76,14 @@ struct page_pool; 
#define MLX5_SKB_FRAG_SZ(len)	(SKB_DATA_ALIGN(len) +	\

				 SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))



#define MLX5E_RX_MAX_HEAD (256)



#define MLX5_MPWRQ_MIN_LOG_STRIDE_SZ(mdev) \

	(6 + MLX5_CAP_GEN(mdev, cache_line_128byte)) /* HW restriction */

#define MLX5_MPWRQ_LOG_STRIDE_SZ(mdev, req) \

	max_t(u32, MLX5_MPWRQ_MIN_LOG_STRIDE_SZ(mdev), req)

#define MLX5_MPWRQ_DEF_LOG_STRIDE_SZ(mdev)       MLX5_MPWRQ_LOG_STRIDE_SZ(mdev, 6)

#define MLX5_MPWRQ_CQE_CMPRS_LOG_STRIDE_SZ(mdev) MLX5_MPWRQ_LOG_STRIDE_SZ(mdev, 8)

#define MLX5E_MPWQE_STRIDE_SZ(mdev, cqe_cmprs) \

	(cqe_cmprs ? MLX5_MPWRQ_CQE_CMPRS_LOG_STRIDE_SZ(mdev) : \

	MLX5_MPWRQ_DEF_LOG_STRIDE_SZ(mdev))

#define MLX5_MPWRQ_DEF_LOG_STRIDE_SZ(mdev) \

	MLX5_MPWRQ_LOG_STRIDE_SZ(mdev, order_base_2(MLX5E_RX_MAX_HEAD))



#define MLX5_MPWRQ_LOG_WQE_SZ			18

#define MLX5_MPWRQ_WQE_PAGE_ORDER  (MLX5_MPWRQ_LOG_WQE_SZ - PAGE_SHIFT > 0 ? \
@@ -119,8 +118,6 @@ struct page_pool; 


#define MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE_MPW            0x2



#define MLX5E_RX_MAX_HEAD (256)



#define MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ                 (64 * 1024)

#define MLX5E_DEFAULT_LRO_TIMEOUT                       32

#define MLX5E_LRO_TIMEOUT_ARR_SIZE                      4
@@ -309,16 +306,18 @@ struct mlx5e_cq { 
	struct mlx5_core_cq        mcq;

	struct mlx5e_channel      *channel;



	/* control */

	struct mlx5_core_dev      *mdev;

	struct mlx5_wq_ctrl        wq_ctrl;

} ____cacheline_aligned_in_smp;



struct mlx5e_cq_decomp {

	/* cqe decompression */

	struct mlx5_cqe64          title;

	struct mlx5_mini_cqe8      mini_arr[MLX5_MINI_CQE_ARRAY_SIZE];

	u8                         mini_arr_idx;

	u16                        decmprs_left;

	u16                        decmprs_wqe_counter;



	/* control */

	struct mlx5_core_dev      *mdev;

	struct mlx5_wq_ctrl        wq_ctrl;

	u16                        left;

	u16                        wqe_counter;

} ____cacheline_aligned_in_smp;



struct mlx5e_tx_wqe_info {
@@ -581,6 +580,7 @@ struct mlx5e_rq { 
	struct net_device     *netdev;

	struct mlx5e_rq_stats *stats;

	struct mlx5e_cq        cq;

	struct mlx5e_cq_decomp cqd;

	struct mlx5e_page_cache page_cache;

	struct hwtstamp_config *tstamp;

	struct mlx5_clock      *clock;
@@ -638,6 +638,7 @@ struct mlx5e_channel { 
	struct hwtstamp_config    *tstamp;

	int                        ix;

	int                        cpu;

	cpumask_var_t              xps_cpumask;

};



struct mlx5e_channels {
@@ -803,6 +804,7 @@ mlx5e_skb_from_cqe_nonlinear(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe, 


void mlx5e_update_stats(struct mlx5e_priv *priv);

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

void mlx5e_fold_sw_stats64(struct mlx5e_priv *priv, struct rtnl_link_stats64 *s);



void mlx5e_init_l2_addr(struct mlx5e_priv *priv);

int mlx5e_self_test_num(struct mlx5e_priv *priv);

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

+56 −11
Original line number Diff line number Diff line
@@ -171,8 +171,7 @@ static u8 mlx5e_mpwqe_get_log_stride_size(struct mlx5_core_dev *mdev, 
	if (mlx5e_rx_mpwqe_is_linear_skb(mdev, params))

		return order_base_2(mlx5e_rx_get_linear_frag_sz(params));



	return MLX5E_MPWQE_STRIDE_SZ(mdev,

		MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS));

	return MLX5_MPWRQ_DEF_LOG_STRIDE_SZ(mdev);

}



static u8 mlx5e_mpwqe_get_log_num_strides(struct mlx5_core_dev *mdev,
@@ -1950,6 +1949,29 @@ static int mlx5e_set_tx_maxrate(struct net_device *dev, int index, u32 rate) 
	return err;

}



static int mlx5e_alloc_xps_cpumask(struct mlx5e_channel *c,

				   struct mlx5e_params *params)

{

	int num_comp_vectors = mlx5_comp_vectors_count(c->mdev);

	int irq;



	if (!zalloc_cpumask_var(&c->xps_cpumask, GFP_KERNEL))

		return -ENOMEM;



	for (irq = c->ix; irq < num_comp_vectors; irq += params->num_channels) {

		int cpu = cpumask_first(mlx5_comp_irq_get_affinity_mask(c->mdev, irq));



		cpumask_set_cpu(cpu, c->xps_cpumask);

	}



	return 0;

}



static void mlx5e_free_xps_cpumask(struct mlx5e_channel *c)

{

	free_cpumask_var(c->xps_cpumask);

}



static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix,

			      struct mlx5e_params *params,

			      struct mlx5e_channel_param *cparam,
@@ -1982,9 +2004,12 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 
	c->num_tc   = params->num_tc;

	c->xdp      = !!params->xdp_prog;

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



	c->irq_desc = irq_to_desc(irq);



	err = mlx5e_alloc_xps_cpumask(c, params);

	if (err)

		goto err_free_channel;



	netif_napi_add(netdev, &c->napi, mlx5e_napi_poll, 64);



	err = mlx5e_open_cq(c, icocq_moder, &cparam->icosq_cq, &c->icosq.cq);
@@ -2067,6 +2092,9 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 


err_napi_del:

	netif_napi_del(&c->napi);

	mlx5e_free_xps_cpumask(c);



err_free_channel:

	kvfree(c);



	return err;
@@ -2079,7 +2107,7 @@ static void mlx5e_activate_channel(struct mlx5e_channel *c) 
	for (tc = 0; tc < c->num_tc; tc++)

		mlx5e_activate_txqsq(&c->sq[tc]);

	mlx5e_activate_rq(&c->rq);

	netif_set_xps_queue(c->netdev, get_cpu_mask(c->cpu), c->ix);

	netif_set_xps_queue(c->netdev, c->xps_cpumask, c->ix);

}



static void mlx5e_deactivate_channel(struct mlx5e_channel *c)
@@ -2107,6 +2135,7 @@ static void mlx5e_close_channel(struct mlx5e_channel *c) 
	mlx5e_close_tx_cqs(c);

	mlx5e_close_cq(&c->icosq.cq);

	netif_napi_del(&c->napi);

	mlx5e_free_xps_cpumask(c);



	kvfree(c);

}
@@ -3492,11 +3521,32 @@ static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type, 
	}

}



void mlx5e_fold_sw_stats64(struct mlx5e_priv *priv, struct rtnl_link_stats64 *s)

{

	int i;



	for (i = 0; i < mlx5e_get_netdev_max_channels(priv->netdev); i++) {

		struct mlx5e_channel_stats *channel_stats = &priv->channel_stats[i];

		struct mlx5e_rq_stats *rq_stats = &channel_stats->rq;

		int j;



		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_dropped    += sq_stats->dropped;

		}

	}

}



void

mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

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

	struct mlx5e_vport_stats *vstats = &priv->stats.vport;

	struct mlx5e_pport_stats *pstats = &priv->stats.pport;
@@ -3511,12 +3561,7 @@ mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats) 
		stats->tx_packets = PPORT_802_3_GET(pstats, a_frames_transmitted_ok);

		stats->tx_bytes   = PPORT_802_3_GET(pstats, a_octets_transmitted_ok);

	} else {

		mlx5e_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;

		mlx5e_fold_sw_stats64(priv, stats);

	}



	stats->rx_dropped = priv->stats.qcnt.rx_out_of_buffer;

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

+9 −30
Original line number Diff line number Diff line
@@ -162,27 +162,16 @@ static void mlx5e_rep_update_hw_counters(struct mlx5e_priv *priv) 
static void mlx5e_rep_update_sw_counters(struct mlx5e_priv *priv)

{

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

	struct mlx5e_rq_stats *rq_stats;

	struct mlx5e_sq_stats *sq_stats;

	int i, j;

	struct rtnl_link_stats64 stats64 = {};



	memset(s, 0, sizeof(*s));

	for (i = 0; i < priv->channels.num; i++) {

		struct mlx5e_channel *c = priv->channels.c[i];



		rq_stats = c->rq.stats;



		s->rx_packets	+= rq_stats->packets;

		s->rx_bytes	+= rq_stats->bytes;

	mlx5e_fold_sw_stats64(priv, &stats64);



		for (j = 0; j < priv->channels.params.num_tc; j++) {

			sq_stats = c->sq[j].stats;



			s->tx_packets		+= sq_stats->packets;

			s->tx_bytes		+= sq_stats->bytes;

			s->tx_queue_dropped	+= sq_stats->dropped;

		}

	}

	s->rx_packets = stats64.rx_packets;

	s->rx_bytes   = stats64.rx_bytes;

	s->tx_packets = stats64.tx_packets;

	s->tx_bytes   = stats64.tx_bytes;

	s->tx_queue_dropped = stats64.tx_dropped;

}



static void mlx5e_rep_get_ethtool_stats(struct net_device *dev,
@@ -195,7 +184,6 @@ static void mlx5e_rep_get_ethtool_stats(struct net_device *dev, 
		return;



	mutex_lock(&priv->state_lock);

	if (test_bit(MLX5E_STATE_OPENED, &priv->state))

	mlx5e_rep_update_sw_counters(priv);

	mlx5e_rep_update_hw_counters(priv);

	mutex_unlock(&priv->state_lock);
@@ -1229,17 +1217,8 @@ mlx5e_get_sw_stats64(const struct net_device *dev, 
		     struct rtnl_link_stats64 *stats)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

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



	mlx5e_rep_update_sw_counters(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;



	mlx5e_fold_sw_stats64(priv, stats);

	return 0;

}