net/mlx5e: IPoIB, Add PKEY child interface ndos
Child interface ndos will be called to support child interface specific behaviour. ndo_init flow: -Acquire shared QPN to net-device HT from parent -Continue with the same flow as parent interface ndo_open flow: -Initialize child underlay QP and connect to shared FT -Create child send TIS -Open child send channels Signed-off-by: Alex Vesker <valex@mellanox.com> Reviewed-by: Erez Shitrit <erezsh@mellanox.com>
This commit is contained in:
parent
4c6c615e3f
commit
af98cebcb3
|
@ -40,8 +40,6 @@
|
|||
|
||||
static int mlx5i_open(struct net_device *netdev);
|
||||
static int mlx5i_close(struct net_device *netdev);
|
||||
static int mlx5i_dev_init(struct net_device *dev);
|
||||
static void mlx5i_dev_cleanup(struct net_device *dev);
|
||||
static int mlx5i_change_mtu(struct net_device *netdev, int new_mtu);
|
||||
static int mlx5i_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
|
||||
|
||||
|
@ -108,7 +106,7 @@ static void mlx5i_cleanup(struct mlx5e_priv *priv)
|
|||
/* Do nothing .. */
|
||||
}
|
||||
|
||||
static int mlx5i_init_underlay_qp(struct mlx5e_priv *priv)
|
||||
int mlx5i_init_underlay_qp(struct mlx5e_priv *priv)
|
||||
{
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
struct mlx5i_priv *ipriv = priv->ppriv;
|
||||
|
@ -154,7 +152,7 @@ err_qp_modify_to_err:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static void mlx5i_uninit_underlay_qp(struct mlx5e_priv *priv)
|
||||
void mlx5i_uninit_underlay_qp(struct mlx5e_priv *priv)
|
||||
{
|
||||
struct mlx5i_priv *ipriv = priv->ppriv;
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
|
@ -372,7 +370,7 @@ out:
|
|||
return err;
|
||||
}
|
||||
|
||||
static int mlx5i_dev_init(struct net_device *dev)
|
||||
int mlx5i_dev_init(struct net_device *dev)
|
||||
{
|
||||
struct mlx5e_priv *priv = mlx5i_epriv(dev);
|
||||
struct mlx5i_priv *ipriv = priv->ppriv;
|
||||
|
@ -402,7 +400,7 @@ static int mlx5i_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
|||
}
|
||||
}
|
||||
|
||||
static void mlx5i_dev_cleanup(struct net_device *dev)
|
||||
void mlx5i_dev_cleanup(struct net_device *dev)
|
||||
{
|
||||
struct mlx5e_priv *priv = mlx5i_epriv(dev);
|
||||
struct mlx5i_priv *ipriv = priv->ppriv;
|
||||
|
|
|
@ -59,6 +59,10 @@ struct mlx5i_priv {
|
|||
int mlx5i_create_underlay_qp(struct mlx5_core_dev *mdev, struct mlx5_core_qp *qp);
|
||||
void mlx5i_destroy_underlay_qp(struct mlx5_core_dev *mdev, struct mlx5_core_qp *qp);
|
||||
|
||||
/* Underlay QP state modification init/uninit functions */
|
||||
int mlx5i_init_underlay_qp(struct mlx5e_priv *priv);
|
||||
void mlx5i_uninit_underlay_qp(struct mlx5e_priv *priv);
|
||||
|
||||
/* Allocate/Free underlay QPN to net-device hash table */
|
||||
int mlx5i_pkey_qpn_ht_init(struct net_device *netdev);
|
||||
void mlx5i_pkey_qpn_ht_cleanup(struct net_device *netdev);
|
||||
|
@ -70,6 +74,10 @@ int mlx5i_pkey_del_qpn(struct net_device *netdev, u32 qpn);
|
|||
/* Get the net-device corresponding to the given underlay QPN */
|
||||
struct net_device *mlx5i_pkey_get_netdev(struct net_device *netdev, u32 qpn);
|
||||
|
||||
/* Shared ndo functionts */
|
||||
int mlx5i_dev_init(struct net_device *dev);
|
||||
void mlx5i_dev_cleanup(struct net_device *dev);
|
||||
|
||||
/* Parent profile functions */
|
||||
void mlx5i_init(struct mlx5_core_dev *mdev,
|
||||
struct net_device *netdev,
|
||||
|
|
|
@ -135,6 +135,137 @@ struct net_device *mlx5i_pkey_get_netdev(struct net_device *netdev, u32 qpn)
|
|||
return node->netdev;
|
||||
}
|
||||
|
||||
static int mlx5i_pkey_open(struct net_device *netdev);
|
||||
static int mlx5i_pkey_close(struct net_device *netdev);
|
||||
static int mlx5i_pkey_dev_init(struct net_device *dev);
|
||||
static void mlx5i_pkey_dev_cleanup(struct net_device *netdev);
|
||||
static int mlx5i_pkey_change_mtu(struct net_device *netdev, int new_mtu);
|
||||
|
||||
static const struct net_device_ops mlx5i_pkey_netdev_ops = {
|
||||
.ndo_open = mlx5i_pkey_open,
|
||||
.ndo_stop = mlx5i_pkey_close,
|
||||
.ndo_init = mlx5i_pkey_dev_init,
|
||||
.ndo_uninit = mlx5i_pkey_dev_cleanup,
|
||||
.ndo_change_mtu = mlx5i_pkey_change_mtu,
|
||||
};
|
||||
|
||||
/* Child NDOs */
|
||||
static int mlx5i_pkey_dev_init(struct net_device *dev)
|
||||
{
|
||||
struct mlx5e_priv *priv = mlx5i_epriv(dev);
|
||||
struct mlx5i_priv *ipriv, *parent_ipriv;
|
||||
struct net_device *parent_dev;
|
||||
int parent_ifindex;
|
||||
|
||||
ipriv = priv->ppriv;
|
||||
|
||||
/* Get QPN to netdevice hash table from parent */
|
||||
parent_ifindex = dev->netdev_ops->ndo_get_iflink(dev);
|
||||
parent_dev = dev_get_by_index(dev_net(dev), parent_ifindex);
|
||||
if (!parent_dev) {
|
||||
mlx5_core_warn(priv->mdev, "failed to get parent device\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
parent_ipriv = netdev_priv(parent_dev);
|
||||
ipriv->qpn_htbl = parent_ipriv->qpn_htbl;
|
||||
dev_put(parent_dev);
|
||||
|
||||
return mlx5i_dev_init(dev);
|
||||
}
|
||||
|
||||
static void mlx5i_pkey_dev_cleanup(struct net_device *netdev)
|
||||
{
|
||||
return mlx5i_dev_cleanup(netdev);
|
||||
}
|
||||
|
||||
static int mlx5i_pkey_open(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *epriv = mlx5i_epriv(netdev);
|
||||
struct mlx5i_priv *ipriv = epriv->ppriv;
|
||||
struct mlx5_core_dev *mdev = epriv->mdev;
|
||||
int err;
|
||||
|
||||
mutex_lock(&epriv->state_lock);
|
||||
|
||||
set_bit(MLX5E_STATE_OPENED, &epriv->state);
|
||||
|
||||
err = mlx5i_init_underlay_qp(epriv);
|
||||
if (err) {
|
||||
mlx5_core_warn(mdev, "prepare child underlay qp state failed, %d\n", err);
|
||||
goto err_release_lock;
|
||||
}
|
||||
|
||||
err = mlx5_fs_add_rx_underlay_qpn(mdev, ipriv->qp.qpn);
|
||||
if (err) {
|
||||
mlx5_core_warn(mdev, "attach child underlay qp to ft failed, %d\n", err);
|
||||
goto err_unint_underlay_qp;
|
||||
}
|
||||
|
||||
err = mlx5e_create_tis(mdev, 0 /* tc */, ipriv->qp.qpn, &epriv->tisn[0]);
|
||||
if (err) {
|
||||
mlx5_core_warn(mdev, "create child tis failed, %d\n", err);
|
||||
goto err_remove_rx_uderlay_qp;
|
||||
}
|
||||
|
||||
err = mlx5e_open_channels(epriv, &epriv->channels);
|
||||
if (err) {
|
||||
mlx5_core_warn(mdev, "opening child channels failed, %d\n", err);
|
||||
goto err_clear_state_opened_flag;
|
||||
}
|
||||
mlx5e_refresh_tirs(epriv, false);
|
||||
mlx5e_activate_priv_channels(epriv);
|
||||
mutex_unlock(&epriv->state_lock);
|
||||
|
||||
return 0;
|
||||
|
||||
err_clear_state_opened_flag:
|
||||
mlx5e_destroy_tis(mdev, epriv->tisn[0]);
|
||||
err_remove_rx_uderlay_qp:
|
||||
mlx5_fs_remove_rx_underlay_qpn(mdev, ipriv->qp.qpn);
|
||||
err_unint_underlay_qp:
|
||||
mlx5i_uninit_underlay_qp(epriv);
|
||||
err_release_lock:
|
||||
clear_bit(MLX5E_STATE_OPENED, &epriv->state);
|
||||
mutex_unlock(&epriv->state_lock);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mlx5i_pkey_close(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = mlx5i_epriv(netdev);
|
||||
struct mlx5i_priv *ipriv = priv->ppriv;
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
|
||||
mutex_lock(&priv->state_lock);
|
||||
|
||||
if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
|
||||
goto unlock;
|
||||
|
||||
clear_bit(MLX5E_STATE_OPENED, &priv->state);
|
||||
|
||||
netif_carrier_off(priv->netdev);
|
||||
mlx5_fs_remove_rx_underlay_qpn(mdev, ipriv->qp.qpn);
|
||||
mlx5i_uninit_underlay_qp(priv);
|
||||
mlx5e_deactivate_priv_channels(priv);
|
||||
mlx5e_close_channels(&priv->channels);
|
||||
mlx5e_destroy_tis(mdev, priv->tisn[0]);
|
||||
unlock:
|
||||
mutex_unlock(&priv->state_lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mlx5i_pkey_change_mtu(struct net_device *netdev, int new_mtu)
|
||||
{
|
||||
struct mlx5e_priv *priv = mlx5i_epriv(netdev);
|
||||
|
||||
mutex_lock(&priv->state_lock);
|
||||
netdev->mtu = new_mtu;
|
||||
mutex_unlock(&priv->state_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Called directly after IPoIB netdevice was created to initialize SW structs */
|
||||
static void mlx5i_pkey_init(struct mlx5_core_dev *mdev,
|
||||
struct net_device *netdev,
|
||||
|
@ -146,7 +277,7 @@ static void mlx5i_pkey_init(struct mlx5_core_dev *mdev,
|
|||
mlx5i_init(mdev, netdev, profile, ppriv);
|
||||
|
||||
/* Override parent ndo */
|
||||
netdev->netdev_ops = NULL;
|
||||
netdev->netdev_ops = &mlx5i_pkey_netdev_ops;
|
||||
|
||||
/* Currently no ethtool support */
|
||||
netdev->ethtool_ops = NULL;
|
||||
|
|
Loading…
Reference in New Issue