RDMA/cma: Add IPv6 support for iWARP

Modify the type of local_addr and remote_addr fields in struct
iw_cm_id from struct sockaddr_in to struct sockaddr_storage to hold
IPv6 and IPv4 addresses uniformly.

Change the references of local_addr and remote_addr in cxgb4, cxgb3,
nes and amso drivers to match this.  However to be able to actully run
traffic over IPv6, low-level drivers have to add code to support this.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Reviewed-by: Sean Hefty <sean.hefty@intel.com>

[ Fix unused variable warnings when INFINIBAND_NES_DEBUG not set.
  - Roland ]

Signed-off-by: Roland Dreier <roland@purestorage.com>

1 files changed, 32 insertions, 14 deletions

diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 3e094cd6a0e3..095bb046e2c8 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -721,8 +721,10 @@ static void connect_reply_upcall(struct iwch_ep *ep, int status)
         memset(&event, 0, sizeof(event));
         event.event = IW_CM_EVENT_CONNECT_REPLY;
         event.status = status;
-        event.local_addr = ep->com.local_addr;
-        event.remote_addr = ep->com.remote_addr;
+        memcpy(&event.local_addr, &ep->com.local_addr,
+               sizeof(ep->com.local_addr));
+        memcpy(&event.remote_addr, &ep->com.remote_addr,
+               sizeof(ep->com.remote_addr));
 
         if ((status == 0) || (status == -ECONNREFUSED)) {
                 event.private_data_len = ep->plen;
@@ -747,8 +749,10 @@ static void connect_request_upcall(struct iwch_ep *ep)
         PDBG("%s ep %p tid %d\n", __func__, ep, ep->hwtid);
         memset(&event, 0, sizeof(event));
         event.event = IW_CM_EVENT_CONNECT_REQUEST;
-        event.local_addr = ep->com.local_addr;
-        event.remote_addr = ep->com.remote_addr;
+        memcpy(&event.local_addr, &ep->com.local_addr,
+               sizeof(ep->com.local_addr));
+        memcpy(&event.remote_addr, &ep->com.remote_addr,
+               sizeof(ep->com.local_addr));
         event.private_data_len = ep->plen;
         event.private_data = ep->mpa_pkt + sizeof(struct mpa_message);
         event.provider_data = ep;
@@ -1872,8 +1876,9 @@ err:
 static int is_loopback_dst(struct iw_cm_id *cm_id)
 {
         struct net_device *dev;
+        struct sockaddr_in *raddr = (struct sockaddr_in *)&cm_id->remote_addr;
 
-        dev = ip_dev_find(&init_net, cm_id->remote_addr.sin_addr.s_addr);
+        dev = ip_dev_find(&init_net, raddr->sin_addr.s_addr);
         if (!dev)
                 return 0;
         dev_put(dev);
@@ -1886,6 +1891,13 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
         struct iwch_ep *ep;
         struct rtable *rt;
         int err = 0;
+        struct sockaddr_in *laddr = (struct sockaddr_in *)&cm_id->local_addr;
+        struct sockaddr_in *raddr = (struct sockaddr_in *)&cm_id->remote_addr;
+
+        if (cm_id->remote_addr.ss_family != PF_INET) {
+                err = -ENOSYS;
+                goto out;
+        }
 
         if (is_loopback_dst(cm_id)) {
                 err = -ENOSYS;
@@ -1929,11 +1941,9 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
         }
 
         /* find a route */
-        rt = find_route(h->rdev.t3cdev_p,
-                        cm_id->local_addr.sin_addr.s_addr,
-                        cm_id->remote_addr.sin_addr.s_addr,
-                        cm_id->local_addr.sin_port,
-                        cm_id->remote_addr.sin_port, IPTOS_LOWDELAY);
+        rt = find_route(h->rdev.t3cdev_p, laddr->sin_addr.s_addr,
+                        raddr->sin_addr.s_addr, laddr->sin_port,
+                        raddr->sin_port, IPTOS_LOWDELAY);
         if (!rt) {
                 printk(KERN_ERR MOD "%s - cannot find route.\n", __func__);
                 err = -EHOSTUNREACH;
@@ -1941,7 +1951,7 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
         }
         ep->dst = &rt->dst;
         ep->l2t = t3_l2t_get(ep->com.tdev, ep->dst, NULL,
-                             &cm_id->remote_addr.sin_addr.s_addr);
+                             &raddr->sin_addr.s_addr);
         if (!ep->l2t) {
                 printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__);
                 err = -ENOMEM;
@@ -1950,8 +1960,10 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
 
         state_set(&ep->com, CONNECTING);
         ep->tos = IPTOS_LOWDELAY;
-        ep->com.local_addr = cm_id->local_addr;
-        ep->com.remote_addr = cm_id->remote_addr;
+        memcpy(&ep->com.local_addr, &cm_id->local_addr,
+               sizeof(ep->com.local_addr));
+        memcpy(&ep->com.remote_addr, &cm_id->remote_addr,
+               sizeof(ep->com.remote_addr));
 
         /* send connect request to rnic */
         err = send_connect(ep);
@@ -1979,6 +1991,11 @@ int iwch_create_listen(struct iw_cm_id *cm_id, int backlog)
 
         might_sleep();
 
+        if (cm_id->local_addr.ss_family != PF_INET) {
+                err = -ENOSYS;
+                goto fail1;
+        }
+
         ep = alloc_ep(sizeof(*ep), GFP_KERNEL);
         if (!ep) {
                 printk(KERN_ERR MOD "%s - cannot alloc ep.\n", __func__);
@@ -1990,7 +2007,8 @@ int iwch_create_listen(struct iw_cm_id *cm_id, int backlog)
         cm_id->add_ref(cm_id);
         ep->com.cm_id = cm_id;
         ep->backlog = backlog;
-        ep->com.local_addr = cm_id->local_addr;
+        memcpy(&ep->com.local_addr, &cm_id->local_addr,
+               sizeof(ep->com.local_addr));
 
         /*
          * Allocate a server TID.