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

Commit 58569ef8 authored by Alex Vesker's avatar Alex Vesker Committed by Saeed Mahameed
Browse files

net/mlx5e: IPoIB, Modify add/remove underlay QPN flows 



On interface remove, the clean-up was done incorrectly causing
an error in the log:
"SET_FLOW_TABLE_ROOT(0x92f) op_mod(0x0) failed...syndrome (0x7e9f14)"

This was caused by the following flow:
-ndo_uninit:
 Move QP state to RST (this disconnects the QP from FT),
 the QP cannot be attached to any FT unless it is in RTS.

-mlx5_rdma_netdev_free:
 cleanup_rx: Destroy FT
 cleanup_tx: Destroy QP and remove QPN from FT

This caused a problem when destroying current FT we tried to
re-attach the QP to the next FT which is not needed.

The correct flow is:
-mlx5_rdma_netdev_free:
	cleanup_rx: remove QPN from FT & Destroy FT
	cleanup_tx: Destroy QP

Fixes: 50854114 ("net/mlx5: Use underlay QPN from the root name space")
Signed-off-by: default avatarAlex Vesker <valex@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 219c81f7

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

+11 −5
Original line number Diff line number Diff line
@@ -178,8 +178,6 @@ static int mlx5i_create_underlay_qp(struct mlx5_core_dev *mdev, struct mlx5_core 


static void mlx5i_destroy_underlay_qp(struct mlx5_core_dev *mdev, struct mlx5_core_qp *qp)

{

	mlx5_fs_remove_rx_underlay_qpn(mdev, qp->qpn);



	mlx5_core_destroy_qp(mdev, qp);

}
@@ -194,8 +192,6 @@ static int mlx5i_init_tx(struct mlx5e_priv *priv) 
		return err;

	}



	mlx5_fs_add_rx_underlay_qpn(priv->mdev, ipriv->qp.qpn);



	err = mlx5e_create_tis(priv->mdev, 0 /* tc */, ipriv->qp.qpn, &priv->tisn[0]);

	if (err) {

		mlx5_core_warn(priv->mdev, "create tis failed, %d\n", err);
@@ -253,6 +249,7 @@ static void mlx5i_destroy_flow_steering(struct mlx5e_priv *priv) 


static int mlx5i_init_rx(struct mlx5e_priv *priv)

{

	struct mlx5i_priv *ipriv  = priv->ppriv;

	int err;



	err = mlx5e_create_indirect_rqt(priv);
@@ -271,12 +268,18 @@ static int mlx5i_init_rx(struct mlx5e_priv *priv) 
	if (err)

		goto err_destroy_indirect_tirs;



	err = mlx5i_create_flow_steering(priv);

	err = mlx5_fs_add_rx_underlay_qpn(priv->mdev, ipriv->qp.qpn);

	if (err)

		goto err_destroy_direct_tirs;



	err = mlx5i_create_flow_steering(priv);

	if (err)

		goto err_remove_rx_underlay_qpn;



	return 0;



err_remove_rx_underlay_qpn:

	mlx5_fs_remove_rx_underlay_qpn(priv->mdev, ipriv->qp.qpn);

err_destroy_direct_tirs:

	mlx5e_destroy_direct_tirs(priv);

err_destroy_indirect_tirs:
@@ -290,6 +293,9 @@ static int mlx5i_init_rx(struct mlx5e_priv *priv) 


static void mlx5i_cleanup_rx(struct mlx5e_priv *priv)

{

	struct mlx5i_priv *ipriv  = priv->ppriv;



	mlx5_fs_remove_rx_underlay_qpn(priv->mdev, ipriv->qp.qpn);

	mlx5i_destroy_flow_steering(priv);

	mlx5e_destroy_direct_tirs(priv);

	mlx5e_destroy_indirect_tirs(priv);