net/mlx5e: Uninstantiate esw manager vport netdev on switchdev mode

Now, when we have a dedicated uplink representor, the netdev instance
set over the esw manager vport (PF) is of no-use. As such, remove it
once we're on switchdev mode and get it back to life when off switchdev.

This is done by reloading the Ethernet interface as well (we already
do that for the IB interface) from the eswitch code while going in/out
of switchdev mode.

The Eth add/remove entries are modified to act differently when called in
switchdev mode. In this case we only deal with registration of the eth
vport representors. The rep netdevices are created from the eswitch call
to load the registered eth representors.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 9ee50de4de33cfd05f8505143bf28a68df96fbe4..0fd5752fb181db302f574b725f7f857b0b9777d2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -4894,9 +4894,6 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)
        if (mlx5e_monitor_counter_supported(priv))
                mlx5e_monitor_counter_init(priv);
 
-       if (MLX5_ESWITCH_MANAGER(priv->mdev))
-               mlx5e_rep_register_vport_reps(priv);
-
        if (netdev->reg_state != NETREG_REGISTERED)
                return;
 #ifdef CONFIG_MLX5_CORE_EN_DCB
@@ -4929,9 +4926,6 @@ static void mlx5e_nic_disable(struct mlx5e_priv *priv)
 
        queue_work(priv->wq, &priv->set_rx_mode_work);
 
-       if (MLX5_ESWITCH_MANAGER(priv->mdev))
-               mlx5e_rep_unregister_vport_reps(priv);
-
        if (mlx5e_monitor_counter_supported(priv))
                mlx5e_monitor_counter_cleanup(priv);
 
@@ -5138,6 +5132,14 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev)
        if (err)
                return NULL;
 
+#ifdef CONFIG_MLX5_ESWITCH
+       if (MLX5_ESWITCH_MANAGER(mdev) &&
+           mlx5_eswitch_mode(mdev->priv.eswitch) == SRIOV_OFFLOADS) {
+               mlx5e_rep_register_vport_reps(mdev);
+               return mdev;
+       }
+#endif
+
        nch = mlx5e_get_max_num_channels(mdev);
        netdev = mlx5e_create_netdev(mdev, &mlx5e_nic_profile, nch, NULL);
        if (!netdev) {
@@ -5173,9 +5175,15 @@ err_destroy_netdev:
 
 static void mlx5e_remove(struct mlx5_core_dev *mdev, void *vpriv)
 {
-       struct mlx5e_priv *priv = vpriv;
-       void *ppriv = priv->ppriv;
+       struct mlx5e_priv *priv;
 
+#ifdef CONFIG_MLX5_ESWITCH
+       if (MLX5_ESWITCH_MANAGER(mdev) && vpriv == mdev) {
+               mlx5e_rep_unregister_vport_reps(mdev);
+               return;
+       }
+#endif
+       priv = vpriv;
 #ifdef CONFIG_MLX5_CORE_EN_DCB
        mlx5e_dcbnl_delete_app(priv);
 #endif

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 73c6f24771bdac659830aa3635bc9bf73468d202..e4f8f639dea0aede308cefed55e6ad0a2a3c66c7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -1562,11 +1562,17 @@ mlx5e_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)
        rep->rep_if[REP_ETH].priv = rpriv;
        INIT_LIST_HEAD(&rpriv->vport_sqs_list);
 
+       if (rep->vport == FDB_UPLINK_VPORT) {
+               err = mlx5e_create_mdev_resources(dev);
+               if (err)
+                       goto err_destroy_netdev;
+       }
+
        err = mlx5e_attach_netdev(netdev_priv(netdev));
        if (err) {
                pr_warn("Failed to attach representor netdev for vport %d\n",
                        rep->vport);
-               goto err_destroy_netdev;
+               goto err_destroy_mdev_resources;
        }
 
        err = mlx5e_rep_neigh_init(rpriv);
@@ -1591,6 +1597,10 @@ err_neigh_cleanup:
 err_detach_netdev:
        mlx5e_detach_netdev(netdev_priv(netdev));
 
+err_destroy_mdev_resources:
+       if (rep->vport == FDB_UPLINK_VPORT)
+               mlx5e_destroy_mdev_resources(dev);
+
 err_destroy_netdev:
        mlx5e_destroy_netdev(netdev_priv(netdev));
        kfree(rpriv);
@@ -1608,6 +1618,8 @@ mlx5e_vport_rep_unload(struct mlx5_eswitch_rep *rep)
        unregister_netdev(netdev);
        mlx5e_rep_neigh_cleanup(rpriv);
        mlx5e_detach_netdev(priv);
+       if (rep->vport == FDB_UPLINK_VPORT)
+               mlx5e_destroy_mdev_resources(priv->mdev);
        mlx5e_destroy_netdev(priv);
        kfree(ppriv); /* mlx5e_rep_priv */
 }
@@ -1621,10 +1633,9 @@ static void *mlx5e_vport_rep_get_proto_dev(struct mlx5_eswitch_rep *rep)
        return rpriv->netdev;
 }
 
-void mlx5e_rep_register_vport_reps(struct mlx5e_priv *priv)
+void mlx5e_rep_register_vport_reps(struct mlx5_core_dev *mdev)
 {
-       struct mlx5_core_dev *mdev = priv->mdev;
-       struct mlx5_eswitch *esw   = mdev->priv.eswitch;
+       struct mlx5_eswitch *esw = mdev->priv.eswitch;
        int total_vfs = MLX5_TOTAL_VPORTS(mdev);
        int vport;
 
@@ -1638,9 +1649,8 @@ void mlx5e_rep_register_vport_reps(struct mlx5e_priv *priv)
        }
 }
 
-void mlx5e_rep_unregister_vport_reps(struct mlx5e_priv *priv)
+void mlx5e_rep_unregister_vport_reps(struct mlx5_core_dev *mdev)
 {
-       struct mlx5_core_dev *mdev = priv->mdev;
        struct mlx5_eswitch *esw = mdev->priv.eswitch;
        int total_vfs = MLX5_TOTAL_VPORTS(mdev);
        int vport;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
index bb2d2484eb64bafd4742d303e71beb2575077a37..5645d3cef1bb8c48b2c506662b8de7135c7012b5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
@@ -162,8 +162,8 @@ struct mlx5e_rep_sq {
 };
 
 void *mlx5e_alloc_nic_rep_priv(struct mlx5_core_dev *mdev);
-void mlx5e_rep_register_vport_reps(struct mlx5e_priv *priv);
-void mlx5e_rep_unregister_vport_reps(struct mlx5e_priv *priv);
+void mlx5e_rep_register_vport_reps(struct mlx5_core_dev *mdev);
+void mlx5e_rep_unregister_vport_reps(struct mlx5_core_dev *mdev);
 bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv);
 int mlx5e_add_sqs_fwd_rules(struct mlx5e_priv *priv);
 void mlx5e_remove_sqs_fwd_rules(struct mlx5e_priv *priv);
@@ -177,8 +177,6 @@ void mlx5e_rep_encap_entry_detach(struct mlx5e_priv *priv,
 
 void mlx5e_rep_queue_neigh_stats_work(struct mlx5e_priv *priv);
 #else /* CONFIG_MLX5_ESWITCH */
-static inline void mlx5e_rep_register_vport_reps(struct mlx5e_priv *priv) {}
-static inline void mlx5e_rep_unregister_vport_reps(struct mlx5e_priv *priv) {}
 static inline bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv) { return false; }
 static inline int mlx5e_add_sqs_fwd_rules(struct mlx5e_priv *priv) { return 0; }
 static inline void mlx5e_remove_sqs_fwd_rules(struct mlx5e_priv *priv) {}

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index ef2bec50423d32eab07dd0c5422e241a7fd39989..a44ea7b8561494c14f3207aef7604810ca4edb5f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1630,6 +1630,7 @@ int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode)
                esw_warn(esw->dev, "E-Switch engress ACL is not supported by FW\n");
 
        esw_info(esw->dev, "E-Switch enable SRIOV: nvfs(%d) mode (%d)\n", nvfs, mode);
+
        esw->mode = mode;
 
        mlx5_lag_update(esw->dev);
@@ -1637,8 +1638,8 @@ int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode)
        if (mode == SRIOV_LEGACY) {
                err = esw_create_legacy_fdb_table(esw);
        } else {
+               mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_ETH);
                mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);
-
                err = esw_offloads_init(esw, nvfs + 1);
        }
 
@@ -1669,8 +1670,10 @@ int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode)
 abort:
        esw->mode = SRIOV_NONE;
 
-       if (mode == SRIOV_OFFLOADS)
+       if (mode == SRIOV_OFFLOADS) {
                mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);
+               mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_ETH);
+       }
 
        return err;
 }
@@ -1712,8 +1715,10 @@ void mlx5_eswitch_disable_sriov(struct mlx5_eswitch *esw)
 
        mlx5_lag_update(esw->dev);
 
-       if (old_mode == SRIOV_OFFLOADS)
+       if (old_mode == SRIOV_OFFLOADS) {
                mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_IB);
+               mlx5_reload_interface(esw->dev, MLX5_INTERFACE_PROTOCOL_ETH);
+       }
 }
 
 int mlx5_eswitch_init(struct mlx5_core_dev *dev)