IB/mlx5: Listen to netdev register/unresiter events in switchdev mode

Currently we listen to netdev register/unregister event based on PCI
device. When in switchdev mode PF and representors share the same PCI
device, so in order to pair ib device and netdev in switchdev mode
compare the netdev that triggered the event to that of the representor.

Expose a function that lets you receive the netdev associated what
a given representor.

Signed-off-by: Mark Bloch <markb@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/infiniband/hw/mlx5/ib_rep.h b/drivers/infiniband/hw/mlx5/ib_rep.h
index 64ab54b82820d031cdf2fd0b7d48c99517ba3bb2..923ad4cba941c699628bd5a45d24880ea1a28500 100644 (file)
--- a/drivers/infiniband/hw/mlx5/ib_rep.h
+++ b/drivers/infiniband/hw/mlx5/ib_rep.h
@@ -17,6 +17,8 @@ struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,
                                           int vport_index);
 void mlx5_ib_register_vport_reps(struct mlx5_ib_dev *dev);
 void mlx5_ib_unregister_vport_reps(struct mlx5_ib_dev *dev);
+struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,
+                                         int vport_index);
 #else /* CONFIG_MLX5_ESWITCH */
 static inline u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw)
 {
@@ -39,6 +41,12 @@ struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,
 
 static inline void mlx5_ib_register_vport_reps(struct mlx5_ib_dev *dev) {}
 static inline void mlx5_ib_unregister_vport_reps(struct mlx5_ib_dev *dev) {}
+static inline
+struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,
+                                         int vport_index)
+{
+       return NULL;
+}
 #endif
 
 static inline

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 5624c5eba2ede7edaf53e90f9c72038270e0171b..bc97c73704c475d0f8266b41431b7aa9d157f378 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -155,10 +155,19 @@ static int mlx5_netdev_event(struct notifier_block *this,
        case NETDEV_REGISTER:
        case NETDEV_UNREGISTER:
                write_lock(&roce->netdev_lock);
-
-               if (ndev->dev.parent == &mdev->pdev->dev)
-                       roce->netdev = (event == NETDEV_UNREGISTER) ?
+               if (ibdev->rep) {
+                       struct mlx5_eswitch *esw = ibdev->mdev->priv.eswitch;
+                       struct net_device *rep_ndev;
+
+                       rep_ndev = mlx5_ib_get_rep_netdev(esw,
+                                                         ibdev->rep->vport);
+                       if (rep_ndev == ndev)
+                               roce->netdev = (event == NETDEV_UNREGISTER) ?
                                        NULL : ndev;
+               } else if (ndev->dev.parent == &ibdev->mdev->pdev->dev) {
+                       roce->netdev = (event == NETDEV_UNREGISTER) ?
+                               NULL : ndev;
+               }
                write_unlock(&roce->netdev_lock);
                break;