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

Merge tag 'mlx5-fixes-2020-07-28' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5 fixes-2020-07-28

This series introduces some fixes to mlx5 driver.
v1->v2:
 - Drop the "Hold reference on mirred devices" patch, until Or's
   comments are addressed.
 - Imporve "Modify uplink state" patch commit message per Or's request.

Please pull and let me know if there is any problem.

For -Stable:

For -stable v4.9
 ('net/mlx5e: Fix error path of device attach')

For -stable v4.15
 ('net/mlx5: Verify Hardware supports requested ptp function on a given
pin')

For -stable v5.3
 ('net/mlx5e: Modify uplink state on interface up/down')

For -stable v5.4
 ('net/mlx5e: Fix kernel crash when setting vf VLANID on a VF dev')
 ('net/mlx5: E-switch, Destroy TSAR when fail to enable the mode')

For -stable v5.5
 ('net/mlx5: E-switch, Destroy TSAR after reload interface')

For -stable v5.7
 ('net/mlx5: Fix a bug of using ptp channel index as pin index')
====================

Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2ff34c90 350a6324

drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c

+5 −2
Original line number Diff line number Diff line
@@ -183,13 +183,16 @@ void mlx5e_rep_bond_unslave(struct mlx5_eswitch *esw, 


static bool mlx5e_rep_is_lag_netdev(struct net_device *netdev)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5e_rep_priv *rpriv;

	struct mlx5e_priv *priv;



	/* A given netdev is not a representor or not a slave of LAG configuration */

	if (!mlx5e_eswitch_rep(netdev) || !bond_slave_get_rtnl(netdev))

		return false;



	priv = netdev_priv(netdev);

	rpriv = priv->ppriv;



	/* Egress acl forward to vport is supported only non-uplink representor */

	return rpriv->rep->vport != MLX5_VPORT_UPLINK;

}

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

+24 −3
Original line number Diff line number Diff line
@@ -3069,6 +3069,25 @@ void mlx5e_timestamp_init(struct mlx5e_priv *priv) 
	priv->tstamp.rx_filter = HWTSTAMP_FILTER_NONE;

}



static void mlx5e_modify_admin_state(struct mlx5_core_dev *mdev,

				     enum mlx5_port_status state)

{

	struct mlx5_eswitch *esw = mdev->priv.eswitch;

	int vport_admin_state;



	mlx5_set_port_admin_status(mdev, state);



	if (!MLX5_ESWITCH_MANAGER(mdev) ||  mlx5_eswitch_mode(esw) == MLX5_ESWITCH_OFFLOADS)

		return;



	if (state == MLX5_PORT_UP)

		vport_admin_state = MLX5_VPORT_ADMIN_STATE_AUTO;

	else

		vport_admin_state = MLX5_VPORT_ADMIN_STATE_DOWN;



	mlx5_eswitch_set_vport_state(esw, MLX5_VPORT_UPLINK, vport_admin_state);

}



int mlx5e_open_locked(struct net_device *netdev)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);
@@ -3101,7 +3120,7 @@ int mlx5e_open(struct net_device *netdev) 
	mutex_lock(&priv->state_lock);

	err = mlx5e_open_locked(netdev);

	if (!err)

		mlx5_set_port_admin_status(priv->mdev, MLX5_PORT_UP);

		mlx5e_modify_admin_state(priv->mdev, MLX5_PORT_UP);

	mutex_unlock(&priv->state_lock);



	return err;
@@ -3135,7 +3154,7 @@ int mlx5e_close(struct net_device *netdev) 
		return -ENODEV;



	mutex_lock(&priv->state_lock);

	mlx5_set_port_admin_status(priv->mdev, MLX5_PORT_DOWN);

	mlx5e_modify_admin_state(priv->mdev, MLX5_PORT_DOWN);

	err = mlx5e_close_locked(netdev);

	mutex_unlock(&priv->state_lock);
@@ -5182,7 +5201,7 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv) 


	/* Marking the link as currently not needed by the Driver */

	if (!netif_running(netdev))

		mlx5_set_port_admin_status(mdev, MLX5_PORT_DOWN);

		mlx5e_modify_admin_state(mdev, MLX5_PORT_DOWN);



	mlx5e_set_netdev_mtu_boundaries(priv);

	mlx5e_set_dev_port_mtu(priv);
@@ -5390,6 +5409,8 @@ err_cleanup_tx: 
	profile->cleanup_tx(priv);



out:

	set_bit(MLX5E_STATE_DESTROYING, &priv->state);

	cancel_work_sync(&priv->update_stats_work);

	return err;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -936,6 +936,7 @@ err_close_drop_rq: 


static void mlx5e_cleanup_rep_rx(struct mlx5e_priv *priv)

{

	mlx5e_ethtool_cleanup_steering(priv);

	rep_vport_rx_rule_destroy(priv);

	mlx5e_destroy_rep_root_ft(priv);

	mlx5e_destroy_ttc_table(priv, &priv->fs.ttc);
@@ -1080,6 +1081,8 @@ static void mlx5e_uplink_rep_enable(struct mlx5e_priv *priv) 


	mlx5e_rep_tc_enable(priv);



	mlx5_modify_vport_admin_state(mdev, MLX5_VPORT_STATE_OP_MOD_UPLINK,

				      0, 0, MLX5_VPORT_ADMIN_STATE_AUTO);

	mlx5_lag_add(mdev, netdev);

	priv->events_nb.notifier_call = uplink_rep_async_event;

	mlx5_notifier_register(mdev, &priv->events_nb);

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

+16 −11
Original line number Diff line number Diff line
@@ -1608,7 +1608,7 @@ abort: 
		mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);

		mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_ETH);

	}



	esw_destroy_tsar(esw);

	return err;

}
@@ -1653,8 +1653,6 @@ void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw, bool clear_vf) 
	else if (esw->mode == MLX5_ESWITCH_OFFLOADS)

		esw_offloads_disable(esw);



	esw_destroy_tsar(esw);



	old_mode = esw->mode;

	esw->mode = MLX5_ESWITCH_NONE;
@@ -1664,6 +1662,8 @@ void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw, bool clear_vf) 
		mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);

		mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_ETH);

	}

	esw_destroy_tsar(esw);



	if (clear_vf)

		mlx5_eswitch_clear_vf_vports_info(esw);

}
@@ -1826,6 +1826,8 @@ int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw, 
				 u16 vport, int link_state)

{

	struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);

	int opmod = MLX5_VPORT_STATE_OP_MOD_ESW_VPORT;

	int other_vport = 1;

	int err = 0;



	if (!ESW_ALLOWED(esw))
@@ -1833,15 +1835,17 @@ int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw, 
	if (IS_ERR(evport))

		return PTR_ERR(evport);



	if (vport == MLX5_VPORT_UPLINK) {

		opmod = MLX5_VPORT_STATE_OP_MOD_UPLINK;

		other_vport = 0;

		vport = 0;

	}

	mutex_lock(&esw->state_lock);



	err = mlx5_modify_vport_admin_state(esw->dev,

					    MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,

					    vport, 1, link_state);

	err = mlx5_modify_vport_admin_state(esw->dev, opmod, vport, other_vport, link_state);

	if (err) {

		mlx5_core_warn(esw->dev,

			       "Failed to set vport %d link state, err = %d",

			       vport, err);

		mlx5_core_warn(esw->dev, "Failed to set vport %d link state, opmod = %d, err = %d",

			       vport, opmod, err);

		goto unlock;

	}
@@ -1883,8 +1887,6 @@ int __mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw, 
	struct mlx5_vport *evport = mlx5_eswitch_get_vport(esw, vport);

	int err = 0;



	if (!ESW_ALLOWED(esw))

		return -EPERM;

	if (IS_ERR(evport))

		return PTR_ERR(evport);

	if (vlan > 4095 || qos > 7)
@@ -1912,6 +1914,9 @@ int mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw, 
	u8 set_flags = 0;

	int err;



	if (!ESW_ALLOWED(esw))

		return -EPERM;



	if (vlan || qos)

		set_flags = SET_VLAN_STRIP | SET_VLAN_INSERT;

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

+2 −0
Original line number Diff line number Diff line
@@ -680,6 +680,8 @@ static inline int mlx5_eswitch_enable(struct mlx5_eswitch *esw, int num_vfs) { r 
static inline void mlx5_eswitch_disable(struct mlx5_eswitch *esw, bool clear_vf) {}

static inline bool mlx5_esw_lag_prereq(struct mlx5_core_dev *dev0, struct mlx5_core_dev *dev1) { return true; }

static inline bool mlx5_eswitch_is_funcs_handler(struct mlx5_core_dev *dev) { return false; }

static inline

int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw, u16 vport, int link_state) { return 0; }

static inline const u32 *mlx5_esw_query_functions(struct mlx5_core_dev *dev)

{

	return ERR_PTR(-EOPNOTSUPP);

CRA Git | Maintained and supported by SUSTech CRA and CCSE