RDMA/cma: Consider net namespace while leaving multicast group

When sending multicast leave request, consider the net ns in which this
cm_id is created.

Code was duplicated in cma_leave_mc_groups() and rdma_leave_multicast(),
which is now done using a helper function cma_leave_roce_mc_group().

Fixes: bee3c3c91865 ("IB/cma: Join and leave multicast groups with IGMP")
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index c2f478761ae929daf7be52ae3695f38084d8d794..fca2854749e59a9fb12b61807f7d037f1c6ba938 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1629,6 +1629,28 @@ static void cma_release_port(struct rdma_id_private *id_priv)
        mutex_unlock(&lock);
 }
 
+static void cma_leave_roce_mc_group(struct rdma_id_private *id_priv,
+                                   struct cma_multicast *mc)
+{
+       if (mc->igmp_joined) {
+               struct rdma_dev_addr *dev_addr =
+                       &id_priv->id.route.addr.dev_addr;
+               struct net_device *ndev = NULL;
+
+               if (dev_addr->bound_dev_if)
+                       ndev = dev_get_by_index(dev_addr->net,
+                                               dev_addr->bound_dev_if);
+               if (ndev) {
+                       cma_igmp_send(ndev,
+                                     &mc->multicast.ib->rec.mgid,
+                                     false);
+                       dev_put(ndev);
+               }
+               mc->igmp_joined = false;
+       }
+       kref_put(&mc->mcref, release_mc);
+}
+
 static void cma_leave_mc_groups(struct rdma_id_private *id_priv)
 {
        struct cma_multicast *mc;
@@ -1642,22 +1664,7 @@ static void cma_leave_mc_groups(struct rdma_id_private *id_priv)
                        ib_sa_free_multicast(mc->multicast.ib);
                        kfree(mc);
                } else {
-                       if (mc->igmp_joined) {
-                               struct rdma_dev_addr *dev_addr =
-                                       &id_priv->id.route.addr.dev_addr;
-                               struct net_device *ndev = NULL;
-
-                               if (dev_addr->bound_dev_if)
-                                       ndev = dev_get_by_index(&init_net,
-                                                               dev_addr->bound_dev_if);
-                               if (ndev) {
-                                       cma_igmp_send(ndev,
-                                                     &mc->multicast.ib->rec.mgid,
-                                                     false);
-                                       dev_put(ndev);
-                               }
-                       }
-                       kref_put(&mc->mcref, release_mc);
+                       cma_leave_roce_mc_group(id_priv, mc);
                }
        }
 }
@@ -4268,23 +4275,7 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr)
                                ib_sa_free_multicast(mc->multicast.ib);
                                kfree(mc);
                        } else if (rdma_protocol_roce(id->device, id->port_num)) {
-                               if (mc->igmp_joined) {
-                                       struct rdma_dev_addr *dev_addr =
-                                               &id->route.addr.dev_addr;
-                                       struct net_device *ndev = NULL;
-
-                                       if (dev_addr->bound_dev_if)
-                                               ndev = dev_get_by_index(dev_addr->net,
-                                                                       dev_addr->bound_dev_if);
-                                       if (ndev) {
-                                               cma_igmp_send(ndev,
-                                                             &mc->multicast.ib->rec.mgid,
-                                                             false);
-                                               dev_put(ndev);
-                                       }
-                                       mc->igmp_joined = false;
-                               }
-                               kref_put(&mc->mcref, release_mc);
+                               cma_leave_roce_mc_group(id_priv, mc);
                        }
                        return;
                }