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

Merge tag 'mlx5-fixes-2022-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5 fixes 2022-02-01

This series provides bug fixes to mlx5 driver.
Please pull and let me know if there is any problem.

Sorry about the long series, but I had to move the top two patches from
net-next to net to help avoiding a build break when kspp branch is merged
into linus-next on next merge window.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3aa430d3 ad518573

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

+3 −3
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev) 
struct mlx5e_tx_wqe {

	struct mlx5_wqe_ctrl_seg ctrl;

	struct mlx5_wqe_eth_seg  eth;

	struct mlx5_wqe_data_seg data[0];

	struct mlx5_wqe_data_seg data[];

};



struct mlx5e_rx_wqe_ll {
@@ -241,8 +241,8 @@ struct mlx5e_umr_wqe { 
	struct mlx5_wqe_umr_ctrl_seg   uctrl;

	struct mlx5_mkey_seg           mkc;

	union {

		struct mlx5_mtt inline_mtts[0];

		struct mlx5_klm inline_klms[0];

		DECLARE_FLEX_ARRAY(struct mlx5_mtt, inline_mtts);

		DECLARE_FLEX_ARRAY(struct mlx5_klm, inline_klms);

	};

};

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

+2 −1
Original line number Diff line number Diff line
@@ -570,7 +570,8 @@ static int mlx5e_htb_convert_rate(struct mlx5e_priv *priv, u64 rate, 


static void mlx5e_htb_convert_ceil(struct mlx5e_priv *priv, u64 ceil, u32 *max_average_bw)

{

	*max_average_bw = div_u64(ceil, BYTES_IN_MBIT);

	/* Hardware treats 0 as "unlimited", set at least 1. */

	*max_average_bw = max_t(u32, div_u64(ceil, BYTES_IN_MBIT), 1);



	qos_dbg(priv->mdev, "Convert: ceil %llu -> max_average_bw %u\n",

		ceil, *max_average_bw);

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

+14 −18
Original line number Diff line number Diff line
@@ -183,18 +183,7 @@ void mlx5e_rep_bond_unslave(struct mlx5_eswitch *esw, 


static bool mlx5e_rep_is_lag_netdev(struct net_device *netdev)

{

	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) || !netif_is_lag_port(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;

	return netif_is_lag_port(netdev) && mlx5e_eswitch_vf_rep(netdev);

}



static void mlx5e_rep_changelowerstate_event(struct net_device *netdev, void *ptr)
@@ -210,9 +199,6 @@ static void mlx5e_rep_changelowerstate_event(struct net_device *netdev, void *pt 
	u16 fwd_vport_num;

	int err;



	if (!mlx5e_rep_is_lag_netdev(netdev))

		return;



	info = ptr;

	lag_info = info->lower_state_info;

	/* This is not an event of a representor becoming active slave */
@@ -266,9 +252,6 @@ static void mlx5e_rep_changeupper_event(struct net_device *netdev, void *ptr) 
	struct net_device *lag_dev;

	struct mlx5e_priv *priv;



	if (!mlx5e_rep_is_lag_netdev(netdev))

		return;



	priv = netdev_priv(netdev);

	rpriv = priv->ppriv;

	lag_dev = info->upper_dev;
@@ -293,6 +276,19 @@ static int mlx5e_rep_esw_bond_netevent(struct notifier_block *nb, 
				       unsigned long event, void *ptr)

{

	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);

	struct mlx5e_rep_priv *rpriv;

	struct mlx5e_rep_bond *bond;

	struct mlx5e_priv *priv;



	if (!mlx5e_rep_is_lag_netdev(netdev))

		return NOTIFY_DONE;



	bond = container_of(nb, struct mlx5e_rep_bond, nb);

	priv = netdev_priv(netdev);

	rpriv = mlx5_eswitch_get_uplink_priv(priv->mdev->priv.eswitch, REP_ETH);

	/* Verify VF representor is on the same device of the bond handling the netevent. */

	if (rpriv->uplink_priv.bond != bond)

		return NOTIFY_DONE;



	switch (event) {

	case NETDEV_CHANGELOWERSTATE:

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

+4 −2
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ void mlx5e_rep_bridge_init(struct mlx5e_priv *priv) 
	}



	br_offloads->netdev_nb.notifier_call = mlx5_esw_bridge_switchdev_port_event;

	err = register_netdevice_notifier(&br_offloads->netdev_nb);

	err = register_netdevice_notifier_net(&init_net, &br_offloads->netdev_nb);

	if (err) {

		esw_warn(mdev, "Failed to register bridge offloads netdevice notifier (err=%d)\n",

			 err);
@@ -509,7 +509,9 @@ void mlx5e_rep_bridge_init(struct mlx5e_priv *priv) 
err_register_swdev:

	destroy_workqueue(br_offloads->wq);

err_alloc_wq:

	rtnl_lock();

	mlx5_esw_bridge_cleanup(esw);

	rtnl_unlock();

}



void mlx5e_rep_bridge_cleanup(struct mlx5e_priv *priv)
@@ -524,7 +526,7 @@ void mlx5e_rep_bridge_cleanup(struct mlx5e_priv *priv) 
		return;



	cancel_delayed_work_sync(&br_offloads->update_work);

	unregister_netdevice_notifier(&br_offloads->netdev_nb);

	unregister_netdevice_notifier_net(&init_net, &br_offloads->netdev_nb);

	unregister_switchdev_blocking_notifier(&br_offloads->nb_blk);

	unregister_switchdev_notifier(&br_offloads->nb);

	destroy_workqueue(br_offloads->wq);

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

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ static inline u16 mlx5e_txqsq_get_next_pi(struct mlx5e_txqsq *sq, u16 size) 
	return pi;

}



static inline u16 mlx5e_shampo_get_cqe_header_index(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)

{

	return be16_to_cpu(cqe->shampo.header_entry_index) & (rq->mpwqe.shampo->hd_per_wq - 1);

}



struct mlx5e_shampo_umr {

	u16 len;

};