IB/core: Don't resolve passive side RoCE L2 address in CMA REQ handler

The code that resolves the passive side source MAC within the rdma_cm
connection request handler was both redundant and buggy, so remove it.

It was redundant since later, when an RC QP is modified to RTR state,
the resolution will take place in the ib_core module.  It was buggy
because this callback also deals with UD SIDR exchange, for which we
incorrectly looked at the REQ member of the CM event and dereferenced
a random value.

Fixes: dd5f03beb4f7 ("IB/core: Ethernet L2 attributes in verbs/cm structures")
Signed-off-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 0601b9daf8407ae31c4ccc6c99ee64372a5a896f..c3239170d8b789e98233b3cb0e4ead65673de125 100644 (file)
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -349,23 +349,6 @@ static void cm_init_av_for_response(struct cm_port *port, struct ib_wc *wc,
                           grh, &av->ah_attr);
 }
 
-int ib_update_cm_av(struct ib_cm_id *id, const u8 *smac, const u8 *alt_smac)
-{
-       struct cm_id_private *cm_id_priv;
-
-       cm_id_priv = container_of(id, struct cm_id_private, id);
-
-       if (smac != NULL)
-               memcpy(cm_id_priv->av.smac, smac, sizeof(cm_id_priv->av.smac));
-
-       if (alt_smac != NULL)
-               memcpy(cm_id_priv->alt_av.smac, alt_smac,
-                      sizeof(cm_id_priv->alt_av.smac));
-
-       return 0;
-}
-EXPORT_SYMBOL(ib_update_cm_av);
-
 static int cm_init_av_by_path(struct ib_sa_path_rec *path, struct cm_av *av)
 {
        struct cm_device *cm_dev;

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 199958d9ddc8088d7576904ab96c838fb193990c..42c3058e6e9cdbaa406cf682c4c6bb2b064591bd 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1284,15 +1284,6 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
        struct rdma_id_private *listen_id, *conn_id;
        struct rdma_cm_event event;
        int offset, ret;
-       u8 smac[ETH_ALEN];
-       u8 alt_smac[ETH_ALEN];
-       u8 *psmac = smac;
-       u8 *palt_smac = alt_smac;
-       int is_iboe = ((rdma_node_get_transport(cm_id->device->node_type) ==
-                       RDMA_TRANSPORT_IB) &&
-                      (rdma_port_get_link_layer(cm_id->device,
-                       ib_event->param.req_rcvd.port) ==
-                       IB_LINK_LAYER_ETHERNET));
 
        listen_id = cm_id->context;
        if (!cma_check_req_qp_type(&listen_id->id, ib_event))
@@ -1336,28 +1327,11 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
        ret = conn_id->id.event_handler(&conn_id->id, &event);
        if (ret)
                goto err3;
-
-       if (is_iboe) {
-               if (ib_event->param.req_rcvd.primary_path != NULL)
-                       rdma_addr_find_smac_by_sgid(
-                               &ib_event->param.req_rcvd.primary_path->sgid,
-                               psmac, NULL);
-               else
-                       psmac = NULL;
-               if (ib_event->param.req_rcvd.alternate_path != NULL)
-                       rdma_addr_find_smac_by_sgid(
-                               &ib_event->param.req_rcvd.alternate_path->sgid,
-                               palt_smac, NULL);
-               else
-                       palt_smac = NULL;
-       }
        /*
         * Acquire mutex to prevent user executing rdma_destroy_id()
         * while we're accessing the cm_id.
         */
        mutex_lock(&lock);
-       if (is_iboe)
-               ib_update_cm_av(cm_id, psmac, palt_smac);
        if (cma_comp(conn_id, RDMA_CM_CONNECT) &&
            (conn_id->id.qp_type != IB_QPT_UD))
                ib_send_cm_mra(cm_id, CMA_CM_MRA_SETTING, NULL, 0);

diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index f29e3a27c2cccc6a22bbbe0037417e4fe234a04b..0e3ff30647d518483853cb9c52104991df966221 100644 (file)
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -601,5 +601,4 @@ struct ib_cm_sidr_rep_param {
 int ib_send_cm_sidr_rep(struct ib_cm_id *cm_id,
                        struct ib_cm_sidr_rep_param *param);
 
-int ib_update_cm_av(struct ib_cm_id *id, const u8 *smac, const u8 *alt_smac);
 #endif /* IB_CM_H */