IB/rdmavt/hfi1/qib: Use the MGID and MLID for multicast addressing

The Infiniband spec defines "A multicast address is defined by a
MGID and a MLID" (section 10.5).

The current code only uses the MGID for identifying multicast groups.
Update the driver to be compliant with this definition.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c
index 239fa480555f82bd0ac1e8940a80be145eae2fad..202572a618a2a3401cebfe3456604aec6e31fd7b 100644 (file)
--- a/drivers/infiniband/hw/hfi1/verbs.c
+++ b/drivers/infiniband/hw/hfi1/verbs.c
@@ -604,7 +604,7 @@ void hfi1_ib_rcv(struct hfi1_packet *packet)
 
                if (lnh != HFI1_LRH_GRH)
                        goto drop;
-               mcast = rvt_mcast_find(&ibp->rvp, &hdr->u.l.grh.dgid);
+               mcast = rvt_mcast_find(&ibp->rvp, &hdr->u.l.grh.dgid, lid);
                if (!mcast)
                        goto drop;
                list_for_each_entry_rcu(p, &mcast->qp_list, list) {

diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index e120efefb8d7712f3157f31674f4798be9377faf..68d449cdb7942425dde01a204a8dfce0315628e2 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -356,7 +356,7 @@ void qib_ib_rcv(struct qib_ctxtdata *rcd, void *rhdr, void *data, u32 tlen)
 
                if (lnh != QIB_LRH_GRH)
                        goto drop;
-               mcast = rvt_mcast_find(&ibp->rvp, &hdr->u.l.grh.dgid);
+               mcast = rvt_mcast_find(&ibp->rvp, &hdr->u.l.grh.dgid, lid);
                if (mcast == NULL)
                        goto drop;
                this_cpu_inc(ibp->pmastats->n_multicast_rcv);

diff --git a/drivers/infiniband/sw/rdmavt/mcast.c b/drivers/infiniband/sw/rdmavt/mcast.c
index 05c8c2afb0e33a70fca3014e3bdf3a77bfe5b1a6..1f12b69a0d075c5e20ed78b49b1f50f5948f9fa2 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/mcast.c
+++ b/drivers/infiniband/sw/rdmavt/mcast.c
@@ -100,10 +100,11 @@ static void rvt_mcast_qp_free(struct rvt_mcast_qp *mqp)
 /**
  * mcast_alloc - allocate the multicast GID structure
  * @mgid: the multicast GID
+ * @lid: the muilticast LID (host order)
  *
  * A list of QPs will be attached to this structure.
  */
-static struct rvt_mcast *rvt_mcast_alloc(union ib_gid *mgid)
+static struct rvt_mcast *rvt_mcast_alloc(union ib_gid *mgid, u16 lid)
 {
        struct rvt_mcast *mcast;
 
@@ -111,7 +112,9 @@ static struct rvt_mcast *rvt_mcast_alloc(union ib_gid *mgid)
        if (!mcast)
                goto bail;
 
-       mcast->mgid = *mgid;
+       mcast->mcast_addr.mgid = *mgid;
+       mcast->mcast_addr.lid = lid;
+
        INIT_LIST_HEAD(&mcast->qp_list);
        init_waitqueue_head(&mcast->wait);
        atomic_set(&mcast->refcount, 0);
@@ -131,15 +134,19 @@ static void rvt_mcast_free(struct rvt_mcast *mcast)
 }
 
 /**
- * rvt_mcast_find - search the global table for the given multicast GID
+ * rvt_mcast_find - search the global table for the given multicast GID/LID
+ * NOTE: It is valid to have 1 MLID with multiple MGIDs.  It is not valid
+ * to have 1 MGID with multiple MLIDs.
  * @ibp: the IB port structure
  * @mgid: the multicast GID to search for
+ * @lid: the multicast LID portion of the multicast address (host order)
  *
  * The caller is responsible for decrementing the reference count if found.
  *
  * Return: NULL if not found.
  */
-struct rvt_mcast *rvt_mcast_find(struct rvt_ibport *ibp, union ib_gid *mgid)
+struct rvt_mcast *rvt_mcast_find(struct rvt_ibport *ibp, union ib_gid *mgid,
+                                u16 lid)
 {
        struct rb_node *n;
        unsigned long flags;
@@ -153,15 +160,18 @@ struct rvt_mcast *rvt_mcast_find(struct rvt_ibport *ibp, union ib_gid *mgid)
 
                mcast = rb_entry(n, struct rvt_mcast, rb_node);
 
-               ret = memcmp(mgid->raw, mcast->mgid.raw,
-                            sizeof(union ib_gid));
+               ret = memcmp(mgid->raw, mcast->mcast_addr.mgid.raw,
+                            sizeof(*mgid));
                if (ret < 0) {
                        n = n->rb_left;
                } else if (ret > 0) {
                        n = n->rb_right;
                } else {
-                       atomic_inc(&mcast->refcount);
-                       found = mcast;
+                       /* MGID/MLID must match */
+                       if (mcast->mcast_addr.lid == lid) {
+                               atomic_inc(&mcast->refcount);
+                               found = mcast;
+                       }
                        break;
                }
        }
@@ -177,7 +187,8 @@ EXPORT_SYMBOL(rvt_mcast_find);
  *
  * Return: zero if both were added.  Return EEXIST if the GID was already in
  * the table but the QP was added.  Return ESRCH if the QP was already
- * attached and neither structure was added.
+ * attached and neither structure was added. Return EINVAL if the MGID was
+ * found, but the MLID did NOT match.
  */
 static int rvt_mcast_add(struct rvt_dev_info *rdi, struct rvt_ibport *ibp,
                         struct rvt_mcast *mcast, struct rvt_mcast_qp *mqp)
@@ -195,8 +206,9 @@ static int rvt_mcast_add(struct rvt_dev_info *rdi, struct rvt_ibport *ibp,
                pn = *n;
                tmcast = rb_entry(pn, struct rvt_mcast, rb_node);
 
-               ret = memcmp(mcast->mgid.raw, tmcast->mgid.raw,
-                            sizeof(union ib_gid));
+               ret = memcmp(mcast->mcast_addr.mgid.raw,
+                            tmcast->mcast_addr.mgid.raw,
+                            sizeof(mcast->mcast_addr.mgid));
                if (ret < 0) {
                        n = &pn->rb_left;
                        continue;
@@ -206,6 +218,11 @@ static int rvt_mcast_add(struct rvt_dev_info *rdi, struct rvt_ibport *ibp,
                        continue;
                }
 
+               if (tmcast->mcast_addr.lid != mcast->mcast_addr.lid) {
+                       ret = EINVAL;
+                       goto bail;
+               }
+
                /* Search the QP list to see if this is already there. */
                list_for_each_entry_rcu(p, &tmcast->qp_list, list) {
                        if (p->qp == mqp->qp) {
@@ -276,7 +293,7 @@ int rvt_attach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         * Allocate data structures since its better to do this outside of
         * spin locks and it will most likely be needed.
         */
-       mcast = rvt_mcast_alloc(gid);
+       mcast = rvt_mcast_alloc(gid, lid);
        if (!mcast)
                return -ENOMEM;
 
@@ -296,6 +313,10 @@ int rvt_attach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                /* Exceeded the maximum number of mcast groups. */
                ret = -ENOMEM;
                goto bail_mqp;
+       case EINVAL:
+               /* Invalid MGID/MLID pair */
+               ret = -EINVAL;
+               goto bail_mqp;
        default:
                break;
        }
@@ -344,14 +365,20 @@ int rvt_detach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                }
 
                mcast = rb_entry(n, struct rvt_mcast, rb_node);
-               ret = memcmp(gid->raw, mcast->mgid.raw,
-                            sizeof(union ib_gid));
-               if (ret < 0)
+               ret = memcmp(gid->raw, mcast->mcast_addr.mgid.raw,
+                            sizeof(*gid));
+               if (ret < 0) {
                        n = n->rb_left;
-               else if (ret > 0)
+               } else if (ret > 0) {
                        n = n->rb_right;
-               else
+               } else {
+                       /* MGID/MLID must match */
+                       if (mcast->mcast_addr.lid != lid) {
+                               spin_unlock_irq(&ibp->lock);
+                               return -EINVAL;
+                       }
                        break;
+               }
        }
 
        /* Search the QP list. */

diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index 8fc1ca7b6f2329fd38f27577de827949a9697df7..7f895689352693061cb2306f45a464ed29159af8 100644 (file)
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
@@ -516,6 +516,7 @@ int rvt_rkey_ok(struct rvt_qp *qp, struct rvt_sge *sge,
                u32 len, u64 vaddr, u32 rkey, int acc);
 int rvt_lkey_ok(struct rvt_lkey_table *rkt, struct rvt_pd *pd,
                struct rvt_sge *isge, struct ib_sge *sge, int acc);
-struct rvt_mcast *rvt_mcast_find(struct rvt_ibport *ibp, union ib_gid *mgid);
+struct rvt_mcast *rvt_mcast_find(struct rvt_ibport *ibp, union ib_gid *mgid,
+                                u16 lid);
 
 #endif          /* DEF_RDMA_VT_H */

diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h
index e3bb312a2ffa695794f4b63171003c82c30f8093..75a077c59742073fea5418a131011bf09bcb18d2 100644 (file)
--- a/include/rdma/rdmavt_qp.h
+++ b/include/rdma/rdmavt_qp.h
@@ -435,9 +435,14 @@ struct rvt_mcast_qp {
        struct rvt_qp *qp;
 };
 
+struct rvt_mcast_addr {
+       union ib_gid mgid;
+       u16 lid;
+};
+
 struct rvt_mcast {
        struct rb_node rb_node;
-       union ib_gid mgid;
+       struct rvt_mcast_addr mcast_addr;
        struct list_head qp_list;
        wait_queue_head_t wait;
        atomic_t refcount;