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

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

Merge tag 'mlx5-fixes-2019-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2019-04-09

This series provides some fixes to mlx5 driver.

I've cc'ed some of the checksum fixes to Eric Dumazet and i would like to get
his feedback before you pull.

For -stable v4.19
('net/mlx5: FPGA, tls, idr remove on flow delete')
('net/mlx5: FPGA, tls, hold rcu read lock a bit longer')

For -stable v4.20
('net/mlx5e: Rx, Check ip headers sanity')
('Revert "net/mlx5e: Enable reporting checksum unnecessary also for L3 packets"')
('net/mlx5e: Rx, Fixup skb checksum for packets with tail padding')

For -stable v5.0
('net/mlx5e: Switch to Toeplitz RSS hash by default')
('net/mlx5e: Protect against non-uplink representor for encap')
('net/mlx5e: XDP, Avoid checksum complete when XDP prog is loaded')
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 69f23a09 7ee2ace9

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

+1 −0
Original line number Diff line number Diff line
@@ -858,6 +858,7 @@ void mlx5e_close_channels(struct mlx5e_channels *chs); 
 * switching channels

 */

typedef int (*mlx5e_fp_hw_modify)(struct mlx5e_priv *priv);

int mlx5e_safe_reopen_channels(struct mlx5e_priv *priv);

int mlx5e_safe_switch_channels(struct mlx5e_priv *priv,

			       struct mlx5e_channels *new_chs,

			       mlx5e_fp_hw_modify hw_modify);

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c

+8 −3
Original line number Diff line number Diff line
@@ -186,12 +186,17 @@ static int mlx5e_tx_reporter_recover_from_ctx(struct mlx5e_tx_err_ctx *err_ctx) 


static int mlx5e_tx_reporter_recover_all(struct mlx5e_priv *priv)

{

	int err;

	int err = 0;



	rtnl_lock();

	mutex_lock(&priv->state_lock);

	mlx5e_close_locked(priv->netdev);

	err = mlx5e_open_locked(priv->netdev);



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

		goto out;



	err = mlx5e_safe_reopen_channels(priv);



out:

	mutex_unlock(&priv->state_lock);

	rtnl_unlock();

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ static int get_route_and_out_devs(struct mlx5e_priv *priv, 
			return -EOPNOTSUPP;

	}



	if (!(mlx5e_eswitch_rep(*out_dev) &&

	      mlx5e_is_uplink_rep(netdev_priv(*out_dev))))

		return -EOPNOTSUPP;



	return 0;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -1768,7 +1768,8 @@ static int set_pflag_rx_no_csum_complete(struct net_device *netdev, bool enable) 
	struct mlx5e_channel *c;

	int i;



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

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

	    priv->channels.params.xdp_prog)

		return 0;



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

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

+16 −5
Original line number Diff line number Diff line
@@ -951,7 +951,11 @@ static int mlx5e_open_rq(struct mlx5e_channel *c, 
	if (params->rx_dim_enabled)

		__set_bit(MLX5E_RQ_STATE_AM, &c->rq.state);



	if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_NO_CSUM_COMPLETE))

	/* We disable csum_complete when XDP is enabled since

	 * XDP programs might manipulate packets which will render

	 * skb->checksum incorrect.

	 */

	if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_NO_CSUM_COMPLETE) || c->xdp)

		__set_bit(MLX5E_RQ_STATE_NO_CSUM_COMPLETE, &c->rq.state);



	return 0;
@@ -2937,6 +2941,14 @@ int mlx5e_safe_switch_channels(struct mlx5e_priv *priv, 
	return 0;

}



int mlx5e_safe_reopen_channels(struct mlx5e_priv *priv)

{

	struct mlx5e_channels new_channels = {};



	new_channels.params = priv->channels.params;

	return mlx5e_safe_switch_channels(priv, &new_channels, NULL);

}



void mlx5e_timestamp_init(struct mlx5e_priv *priv)

{

	priv->tstamp.tx_type   = HWTSTAMP_TX_OFF;
@@ -4161,11 +4173,10 @@ static void mlx5e_tx_timeout_work(struct work_struct *work) 
	if (!report_failed)

		goto unlock;



	mlx5e_close_locked(priv->netdev);

	err = mlx5e_open_locked(priv->netdev);

	err = mlx5e_safe_reopen_channels(priv);

	if (err)

		netdev_err(priv->netdev,

			   "mlx5e_open_locked failed recovering from a tx_timeout, err(%d).\n",

			   "mlx5e_safe_reopen_channels failed recovering from a tx_timeout, err(%d).\n",

			   err);



unlock:
@@ -4553,7 +4564,7 @@ void mlx5e_build_rss_params(struct mlx5e_rss_params *rss_params, 
{

	enum mlx5e_traffic_types tt;



	rss_params->hfunc = ETH_RSS_HASH_XOR;

	rss_params->hfunc = ETH_RSS_HASH_TOP;

	netdev_rss_key_fill(rss_params->toeplitz_hash_key,

			    sizeof(rss_params->toeplitz_hash_key));

	mlx5e_build_default_indir_rqt(rss_params->indirection_rqt,