Merge branch 'ip-roce' into for-next

Conflicts:
	drivers/infiniband/hw/mlx4/main.c

1 files changed, 61 insertions, 13 deletions

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 4173a2ad6d08..9b079a7ea29c 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -340,7 +340,7 @@ static int cma_translate_addr(struct sockaddr *addr, struct rdma_dev_addr *dev_a
         int ret;
 
         if (addr->sa_family != AF_IB) {
-                ret = rdma_translate_ip(addr, dev_addr);
+                ret = rdma_translate_ip(addr, dev_addr, NULL);
         } else {
                 cma_translate_ib((struct sockaddr_ib *) addr, dev_addr);
                 ret = 0;
@@ -365,7 +365,9 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv,
                 return -EINVAL;
 
         mutex_lock(&lock);
-        iboe_addr_get_sgid(dev_addr, &iboe_gid);
+        rdma_ip2gid((struct sockaddr *)&id_priv->id.route.addr.src_addr,
+                    &iboe_gid);
+
         memcpy(&gid, dev_addr->src_dev_addr +
                rdma_addr_gid_offset(dev_addr), sizeof gid);
         if (listen_id_priv &&
@@ -603,6 +605,7 @@ static int cma_modify_qp_rtr(struct rdma_id_private *id_priv,
 {
         struct ib_qp_attr qp_attr;
         int qp_attr_mask, ret;
+        union ib_gid sgid;
 
         mutex_lock(&id_priv->qp_mutex);
         if (!id_priv->id.qp) {
@@ -625,6 +628,20 @@ static int cma_modify_qp_rtr(struct rdma_id_private *id_priv,
         if (ret)
                 goto out;
 
+        ret = ib_query_gid(id_priv->id.device, id_priv->id.port_num,
+                           qp_attr.ah_attr.grh.sgid_index, &sgid);
+        if (ret)
+                goto out;
+
+        if (rdma_node_get_transport(id_priv->cma_dev->device->node_type)
+            == RDMA_TRANSPORT_IB &&
+            rdma_port_get_link_layer(id_priv->id.device, id_priv->id.port_num)
+            == IB_LINK_LAYER_ETHERNET) {
+                ret = rdma_addr_find_smac_by_sgid(&sgid, qp_attr.smac, NULL);
+
+                if (ret)
+                        goto out;
+        }
         if (conn_param)
                 qp_attr.max_dest_rd_atomic = conn_param->responder_resources;
         ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
@@ -725,6 +742,7 @@ int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr,
                 else
                         ret = ib_cm_init_qp_attr(id_priv->cm_id.ib, qp_attr,
                                                  qp_attr_mask);
+
                 if (qp_attr->qp_state == IB_QPS_RTR)
                         qp_attr->rq_psn = id_priv->seq_num;
                 break;
@@ -1266,6 +1284,15 @@ 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))
@@ -1310,12 +1337,29 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_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 (cma_comp(conn_id, RDMA_CM_CONNECT) && (conn_id->id.qp_type != IB_QPT_UD))
+        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);
         mutex_unlock(&lock);
         mutex_unlock(&conn_id->handler_mutex);
@@ -1474,7 +1518,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
         mutex_lock_nested(&conn_id->handler_mutex, SINGLE_DEPTH_NESTING);
         conn_id->state = RDMA_CM_CONNECT;
 
-        ret = rdma_translate_ip(laddr, &conn_id->id.route.addr.dev_addr);
+        ret = rdma_translate_ip(laddr, &conn_id->id.route.addr.dev_addr, NULL);
         if (ret) {
                 mutex_unlock(&conn_id->handler_mutex);
                 rdma_destroy_id(new_cm_id);
@@ -1873,7 +1917,7 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
         struct cma_work *work;
         int ret;
         struct net_device *ndev = NULL;
-        u16 vid;
+
 
         work = kzalloc(sizeof *work, GFP_KERNEL);
         if (!work)
@@ -1897,10 +1941,14 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)
                 goto err2;
         }
 
-        vid = rdma_vlan_dev_vlan_id(ndev);
+        route->path_rec->vlan_id = rdma_vlan_dev_vlan_id(ndev);
+        memcpy(route->path_rec->dmac, addr->dev_addr.dst_dev_addr, ETH_ALEN);
+        memcpy(route->path_rec->smac, ndev->dev_addr, ndev->addr_len);
 
-        iboe_mac_vlan_to_ll(&route->path_rec->sgid, addr->dev_addr.src_dev_addr, vid);
-        iboe_mac_vlan_to_ll(&route->path_rec->dgid, addr->dev_addr.dst_dev_addr, vid);
+        rdma_ip2gid((struct sockaddr *)&id_priv->id.route.addr.src_addr,
+                    &route->path_rec->sgid);
+        rdma_ip2gid((struct sockaddr *)&id_priv->id.route.addr.dst_addr,
+                    &route->path_rec->dgid);
 
         route->path_rec->hop_limit = 1;
         route->path_rec->reversible = 1;
@@ -2063,6 +2111,7 @@ static void addr_handler(int status, struct sockaddr *src_addr,
                            RDMA_CM_ADDR_RESOLVED))
                 goto out;
 
+        memcpy(cma_src_addr(id_priv), src_addr, rdma_addr_size(src_addr));
         if (!status && !id_priv->cma_dev)
                 status = cma_acquire_dev(id_priv, NULL);
 
@@ -2072,10 +2121,8 @@ static void addr_handler(int status, struct sockaddr *src_addr,
                         goto out;
                 event.event = RDMA_CM_EVENT_ADDR_ERROR;
                 event.status = status;
-        } else {
-                memcpy(cma_src_addr(id_priv), src_addr, rdma_addr_size(src_addr));
+        } else
                 event.event = RDMA_CM_EVENT_ADDR_RESOLVED;
-        }
 
         if (id_priv->id.event_handler(&id_priv->id, &event)) {
                 cma_exch(id_priv, RDMA_CM_DESTROYING);
@@ -2559,6 +2606,7 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)
         if (ret)
                 goto err1;
 
+        memcpy(cma_src_addr(id_priv), addr, rdma_addr_size(addr));
         if (!cma_any_addr(addr)) {
                 ret = cma_translate_addr(addr, &id->route.addr.dev_addr);
                 if (ret)
@@ -2569,7 +2617,6 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)
                         goto err1;
         }
 
-        memcpy(cma_src_addr(id_priv), addr, rdma_addr_size(addr));
         if (!(id_priv->options & (1 << CMA_OPTION_AFONLY))) {
                 if (addr->sa_family == AF_INET)
                         id_priv->afonly = 1;
@@ -3298,7 +3345,8 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,
                 err = -EINVAL;
                 goto out2;
         }
-        iboe_addr_get_sgid(dev_addr, &mc->multicast.ib->rec.port_gid);
+        rdma_ip2gid((struct sockaddr *)&id_priv->id.route.addr.src_addr,
+                    &mc->multicast.ib->rec.port_gid);
         work->id = id_priv;
         work->mc = mc;
         INIT_WORK(&work->work, iboe_mcast_work_handler);