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

Commit 779d986d authored by Feras Daoud's avatar Feras Daoud Committed by Saeed Mahameed
Browse files

net/mlx5e: Do not ignore netdevice TX/RX queues number 



The current design of mlx5e driver ignores the netdevice TX/RX queues
number for netdevices that RDMA IPoIB ULP creates. Instead, the queue
number is initialized to the maximum number that mlx5 thinks best for
performance. As a result, ULP drivers that choose to create a netdevice
with queue number that is less than the maximum channels mlx5 creates,
will get a memory corruption.

This fix changes the mlx5e netdev logic to respect ULP netdevices TX/RX
queue number and use it when creating resources instead of the maximum
channel number.

Fixes: cd565b4b ("IB/IPoIB: Support acceleration options callbacks")
Signed-off-by: default avatarFeras Daoud <ferasda@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent cdeef2b1

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

+9 −2
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ static inline u16 mlx5_min_rx_wqes(int wq_type, u32 wq_size) 
	}

}



/* Use this function to get max num channels (rxqs/txqs) only to create netdev */

static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev)

{

	return is_kdump_kernel() ?
@@ -181,6 +182,13 @@ static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev) 
		      MLX5E_MAX_NUM_CHANNELS);

}



/* Use this function to get max num channels after netdev was created */

static inline int mlx5e_get_netdev_max_channels(struct net_device *netdev)

{

	return min_t(unsigned int, netdev->num_rx_queues,

		     netdev->num_tx_queues);

}



struct mlx5e_tx_wqe {

	struct mlx5_wqe_ctrl_seg ctrl;

	struct mlx5_wqe_eth_seg  eth;
@@ -710,7 +718,6 @@ struct mlx5e_profile { 
	void	(*disable)(struct mlx5e_priv *priv);

	void	(*update_stats)(struct mlx5e_priv *priv);

	void	(*update_carrier)(struct mlx5e_priv *priv);

	int	(*max_nch)(struct mlx5_core_dev *mdev);

	struct {

		mlx5e_fp_handle_rx_cqe handle_rx_cqe;

		mlx5e_fp_handle_rx_cqe handle_rx_cqe_mpwqe;
@@ -970,7 +977,7 @@ int mlx5e_netdev_init(struct net_device *netdev, 
void mlx5e_netdev_cleanup(struct net_device *netdev, struct mlx5e_priv *priv);

struct net_device*

mlx5e_create_netdev(struct mlx5_core_dev *mdev, const struct mlx5e_profile *profile,

		    void *ppriv);

		    int nch, void *ppriv);

int mlx5e_attach_netdev(struct mlx5e_priv *priv);

void mlx5e_detach_netdev(struct mlx5e_priv *priv);

void mlx5e_destroy_netdev(struct mlx5e_priv *priv);

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

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int mlx5e_set_ringparam(struct net_device *dev, 
void mlx5e_ethtool_get_channels(struct mlx5e_priv *priv,

				struct ethtool_channels *ch)

{

	ch->max_combined   = priv->profile->max_nch(priv->mdev);

	ch->max_combined   = mlx5e_get_netdev_max_channels(priv->netdev);

	ch->combined_count = priv->channels.params.num_channels;

}

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

+13 −12
Original line number Diff line number Diff line
@@ -1799,7 +1799,7 @@ static int mlx5e_open_sqs(struct mlx5e_channel *c, 
			  struct mlx5e_channel_param *cparam)

{

	struct mlx5e_priv *priv = c->priv;

	int err, tc, max_nch = priv->profile->max_nch(priv->mdev);

	int err, tc, max_nch = mlx5e_get_netdev_max_channels(priv->netdev);



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

		int txq_ix = c->ix + tc * max_nch;
@@ -2439,7 +2439,7 @@ int mlx5e_create_direct_rqts(struct mlx5e_priv *priv) 
	int err;

	int ix;



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

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

		rqt = &priv->direct_tir[ix].rqt;

		err = mlx5e_create_rqt(priv, 1 /*size */, rqt);

		if (err)
@@ -2460,7 +2460,7 @@ void mlx5e_destroy_direct_rqts(struct mlx5e_priv *priv) 
{

	int i;



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

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

		mlx5e_destroy_rqt(priv, &priv->direct_tir[i].rqt);

}
@@ -2554,7 +2554,7 @@ static void mlx5e_redirect_rqts(struct mlx5e_priv *priv, 
		mlx5e_redirect_rqt(priv, rqtn, MLX5E_INDIR_RQT_SIZE, rrp);

	}



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

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

		struct mlx5e_redirect_rqt_param direct_rrp = {

			.is_rss = false,

			{
@@ -2755,7 +2755,7 @@ static int mlx5e_modify_tirs_lro(struct mlx5e_priv *priv) 
			goto free_in;

	}



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

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

		err = mlx5_core_modify_tir(mdev, priv->direct_tir[ix].tirn,

					   in, inlen);

		if (err)
@@ -2855,7 +2855,7 @@ static void mlx5e_netdev_set_tcs(struct net_device *netdev) 


static void mlx5e_build_tc2txq_maps(struct mlx5e_priv *priv)

{

	int max_nch = priv->profile->max_nch(priv->mdev);

	int max_nch = mlx5e_get_netdev_max_channels(priv->netdev);

	int i, tc;



	for (i = 0; i < max_nch; i++)
@@ -3247,7 +3247,7 @@ int mlx5e_create_indirect_tirs(struct mlx5e_priv *priv, bool inner_ttc) 


int mlx5e_create_direct_tirs(struct mlx5e_priv *priv)

{

	int nch = priv->profile->max_nch(priv->mdev);

	int nch = mlx5e_get_netdev_max_channels(priv->netdev);

	struct mlx5e_tir *tir;

	void *tirc;

	int inlen;
@@ -3300,7 +3300,7 @@ void mlx5e_destroy_indirect_tirs(struct mlx5e_priv *priv, bool inner_ttc) 


void mlx5e_destroy_direct_tirs(struct mlx5e_priv *priv)

{

	int nch = priv->profile->max_nch(priv->mdev);

	int nch = mlx5e_get_netdev_max_channels(priv->netdev);

	int i;



	for (i = 0; i < nch; i++)
@@ -4743,7 +4743,7 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev, 
		return err;



	mlx5e_build_nic_params(mdev, &priv->channels.params,

			       profile->max_nch(mdev), netdev->mtu);

			       mlx5e_get_netdev_max_channels(netdev), netdev->mtu);



	mlx5e_timestamp_init(priv);
@@ -4926,7 +4926,6 @@ static const struct mlx5e_profile mlx5e_nic_profile = { 
	.enable		   = mlx5e_nic_enable,

	.disable	   = mlx5e_nic_disable,

	.update_stats	   = mlx5e_update_ndo_stats,

	.max_nch	   = mlx5e_get_max_num_channels,

	.update_carrier	   = mlx5e_update_carrier,

	.rx_handlers.handle_rx_cqe       = mlx5e_handle_rx_cqe,

	.rx_handlers.handle_rx_cqe_mpwqe = mlx5e_handle_rx_cqe_mpwrq,
@@ -4977,9 +4976,9 @@ void mlx5e_netdev_cleanup(struct net_device *netdev, struct mlx5e_priv *priv) 


struct net_device *mlx5e_create_netdev(struct mlx5_core_dev *mdev,

				       const struct mlx5e_profile *profile,

				       int nch,

				       void *ppriv)

{

	int nch = profile->max_nch(mdev);

	struct net_device *netdev;

	int err;
@@ -5101,6 +5100,7 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev) 
	void *rpriv = NULL;

	void *priv;

	int err;

	int nch;



	err = mlx5e_check_required_hca_cap(mdev);

	if (err)
@@ -5116,7 +5116,8 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev) 
	}

#endif



	netdev = mlx5e_create_netdev(mdev, &mlx5e_nic_profile, rpriv);

	nch = mlx5e_get_max_num_channels(mdev);

	netdev = mlx5e_create_netdev(mdev, &mlx5e_nic_profile, nch, rpriv);

	if (!netdev) {

		mlx5_core_err(mdev, "mlx5e_create_netdev failed\n");

		goto err_free_rpriv;

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

+5 −4
Original line number Diff line number Diff line
@@ -1090,7 +1090,8 @@ static int mlx5e_init_rep(struct mlx5_core_dev *mdev, 
		return err;





	priv->channels.params.num_channels = profile->max_nch(mdev);

	priv->channels.params.num_channels =

				mlx5e_get_netdev_max_channels(netdev);



	mlx5e_build_rep_params(mdev, &priv->channels.params, netdev->mtu);

	mlx5e_build_rep_netdev(netdev);
@@ -1233,7 +1234,6 @@ static const struct mlx5e_profile mlx5e_rep_profile = { 
	.init_tx		= mlx5e_init_rep_tx,

	.cleanup_tx		= mlx5e_cleanup_nic_tx,

	.update_stats           = mlx5e_rep_update_hw_counters,

	.max_nch		= mlx5e_get_max_num_channels,

	.update_carrier		= NULL,

	.rx_handlers.handle_rx_cqe       = mlx5e_handle_rx_cqe_rep,

	.rx_handlers.handle_rx_cqe_mpwqe = mlx5e_handle_rx_cqe_mpwrq,
@@ -1296,13 +1296,14 @@ mlx5e_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
	struct mlx5e_rep_priv *rpriv;

	struct net_device *netdev;

	struct mlx5e_priv *upriv;

	int err;

	int nch, err;



	rpriv = kzalloc(sizeof(*rpriv), GFP_KERNEL);

	if (!rpriv)

		return -ENOMEM;



	netdev = mlx5e_create_netdev(dev, &mlx5e_rep_profile, rpriv);

	nch = mlx5e_get_max_num_channels(dev);

	netdev = mlx5e_create_netdev(dev, &mlx5e_rep_profile, nch, rpriv);

	if (!netdev) {

		pr_warn("Failed to create representor netdev for vport %d\n",

			rep->vport);

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

+4 −4
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ void mlx5e_grp_sw_update_stats(struct mlx5e_priv *priv) 


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



	for (i = 0; i < priv->profile->max_nch(priv->mdev); 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_xdpsq_stats *xdpsq_red_stats = &channel_stats->xdpsq;
@@ -1217,7 +1217,7 @@ static const struct counter_desc ch_stats_desc[] = { 


static int mlx5e_grp_channels_get_num_stats(struct mlx5e_priv *priv)

{

	int max_nch = priv->profile->max_nch(priv->mdev);

	int max_nch = mlx5e_get_netdev_max_channels(priv->netdev);



	return (NUM_RQ_STATS * max_nch) +

	       (NUM_CH_STATS * max_nch) +
@@ -1229,7 +1229,7 @@ static int mlx5e_grp_channels_get_num_stats(struct mlx5e_priv *priv) 
static int mlx5e_grp_channels_fill_strings(struct mlx5e_priv *priv, u8 *data,

					   int idx)

{

	int max_nch = priv->profile->max_nch(priv->mdev);

	int max_nch = mlx5e_get_netdev_max_channels(priv->netdev);

	int i, j, tc;



	for (i = 0; i < max_nch; i++)
@@ -1264,7 +1264,7 @@ static int mlx5e_grp_channels_fill_strings(struct mlx5e_priv *priv, u8 *data, 
static int mlx5e_grp_channels_fill_stats(struct mlx5e_priv *priv, u64 *data,

					 int idx)

{

	int max_nch = priv->profile->max_nch(priv->mdev);

	int max_nch = mlx5e_get_netdev_max_channels(priv->netdev);

	int i, j, tc;



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