4 files changed, 497 insertions, 55 deletions

diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 4878704b6d7..036ddd28152 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -38,10 +38,12 @@
 #include <linux/inetdevice.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
+#include <linux/if_vlan.h>
 
 #include <net/neighbour.h>
 #include <net/netevent.h>
 #include <net/route.h>
+#include <net/tcp.h>
 
 #include "iw_cxgb4.h"
 
@@ -1569,13 +1571,14 @@ static int pass_open_rpl(struct c4iw_dev *dev, struct sk_buff *skb)
         struct c4iw_listen_ep *ep = lookup_stid(t, stid);
 
         if (!ep) {
-                printk(KERN_ERR MOD "stid %d lookup failure!\n", stid);
-                return 0;
+                PDBG("%s stid %d lookup failure!\n", __func__, stid);
+                goto out;
         }
         PDBG("%s ep %p status %d error %d\n", __func__, ep,
              rpl->status, status2errno(rpl->status));
         c4iw_wake_up(&ep->com.wr_wait, status2errno(rpl->status));
 
+out:
         return 0;
 }
 
@@ -1779,15 +1782,23 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
         unsigned int hwtid = GET_TID(req);
         struct dst_entry *dst;
         struct rtable *rt;
-        __be32 local_ip, peer_ip;
+        __be32 local_ip, peer_ip = 0;
         __be16 local_port, peer_port;
         int err;
+        u16 peer_mss = ntohs(req->tcpopt.mss);
 
         parent_ep = lookup_stid(t, stid);
-        PDBG("%s parent ep %p tid %u\n", __func__, parent_ep, hwtid);
-
+        if (!parent_ep) {
+                PDBG("%s connect request on invalid stid %d\n", __func__, stid);
+                goto reject;
+        }
         get_4tuple(req, &local_ip, &peer_ip, &local_port, &peer_port);
 
+        PDBG("%s parent ep %p hwtid %u laddr 0x%x raddr 0x%x lport %d " \
+             "rport %d peer_mss %d\n", __func__, parent_ep, hwtid,
+             ntohl(local_ip), ntohl(peer_ip), ntohs(local_port),
+             ntohs(peer_port), peer_mss);
+
         if (state_read(&parent_ep->com) != LISTEN) {
                 printk(KERN_ERR "%s - listening ep not in LISTEN\n",
                        __func__);
@@ -1821,6 +1832,9 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
                 goto reject;
         }
 
+        if (peer_mss && child_ep->mtu > (peer_mss + 40))
+                child_ep->mtu = peer_mss + 40;
+
         state_set(&child_ep->com, CONNECTING);
         child_ep->com.dev = dev;
         child_ep->com.cm_id = NULL;
@@ -1861,6 +1875,9 @@ static int pass_establish(struct c4iw_dev *dev, struct sk_buff *skb)
         ep->snd_seq = be32_to_cpu(req->snd_isn);
         ep->rcv_seq = be32_to_cpu(req->rcv_isn);
 
+        PDBG("%s ep %p hwtid %u tcp_opt 0x%02x\n", __func__, ep, tid,
+             ntohs(req->tcp_opt));
+
         set_emss(ep, ntohs(req->tcp_opt));
 
         dst_confirm(ep->dst);
@@ -2478,7 +2495,6 @@ int c4iw_create_listen(struct iw_cm_id *cm_id, int backlog)
         struct c4iw_dev *dev = to_c4iw_dev(cm_id->device);
         struct c4iw_listen_ep *ep;
 
-
         might_sleep();
 
         ep = alloc_ep(sizeof(*ep), GFP_KERNEL);
@@ -2497,30 +2513,49 @@ int c4iw_create_listen(struct iw_cm_id *cm_id, int backlog)
         /*
          * Allocate a server TID.
          */
-        ep->stid = cxgb4_alloc_stid(dev->rdev.lldi.tids, PF_INET, ep);
+        if (dev->rdev.lldi.enable_fw_ofld_conn)
+                ep->stid = cxgb4_alloc_sftid(dev->rdev.lldi.tids, PF_INET, ep);
+        else
+                ep->stid = cxgb4_alloc_stid(dev->rdev.lldi.tids, PF_INET, ep);
+
         if (ep->stid == -1) {
                 printk(KERN_ERR MOD "%s - cannot alloc stid.\n", __func__);
                 err = -ENOMEM;
                 goto fail2;
         }
-
         state_set(&ep->com, LISTEN);
-        c4iw_init_wr_wait(&ep->com.wr_wait);
-        err = cxgb4_create_server(ep->com.dev->rdev.lldi.ports[0], ep->stid,
-                                  ep->com.local_addr.sin_addr.s_addr,
-                                  ep->com.local_addr.sin_port,
-                                  ep->com.dev->rdev.lldi.rxq_ids[0]);
-        if (err)
-                goto fail3;
-
-        /* wait for pass_open_rpl */
-        err = c4iw_wait_for_reply(&ep->com.dev->rdev, &ep->com.wr_wait, 0, 0,
-                                  __func__);
+        if (dev->rdev.lldi.enable_fw_ofld_conn) {
+                do {
+                        err = cxgb4_create_server_filter(
+                                ep->com.dev->rdev.lldi.ports[0], ep->stid,
+                                ep->com.local_addr.sin_addr.s_addr,
+                                ep->com.local_addr.sin_port,
+                                ep->com.dev->rdev.lldi.rxq_ids[0]);
+                        if (err == -EBUSY) {
+                                set_current_state(TASK_UNINTERRUPTIBLE);
+                                schedule_timeout(usecs_to_jiffies(100));
+                        }
+                } while (err == -EBUSY);
+        } else {
+                c4iw_init_wr_wait(&ep->com.wr_wait);
+                err = cxgb4_create_server(ep->com.dev->rdev.lldi.ports[0],
+                                ep->stid, ep->com.local_addr.sin_addr.s_addr,
+                                ep->com.local_addr.sin_port,
+                                ep->com.dev->rdev.lldi.rxq_ids[0]);
+                if (!err)
+                        err = c4iw_wait_for_reply(&ep->com.dev->rdev,
+                                                  &ep->com.wr_wait,
+                                                  0, 0, __func__);
+        }
         if (!err) {
                 cm_id->provider_data = ep;
                 goto out;
         }
-fail3:
+        pr_err("%s cxgb4_create_server/filter failed err %d " \
+               "stid %d laddr %08x lport %d\n", \
+               __func__, err, ep->stid,
+               ntohl(ep->com.local_addr.sin_addr.s_addr),
+               ntohs(ep->com.local_addr.sin_port));
         cxgb4_free_stid(ep->com.dev->rdev.lldi.tids, ep->stid, PF_INET);
 fail2:
         cm_id->rem_ref(cm_id);
@@ -2539,12 +2574,18 @@ int c4iw_destroy_listen(struct iw_cm_id *cm_id)
 
         might_sleep();
         state_set(&ep->com, DEAD);
-        c4iw_init_wr_wait(&ep->com.wr_wait);
-        err = listen_stop(ep);
-        if (err)
-                goto done;
-        err = c4iw_wait_for_reply(&ep->com.dev->rdev, &ep->com.wr_wait, 0, 0,
-                                  __func__);
+        if (ep->com.dev->rdev.lldi.enable_fw_ofld_conn) {
+                err = cxgb4_remove_server_filter(
+                        ep->com.dev->rdev.lldi.ports[0], ep->stid,
+                        ep->com.dev->rdev.lldi.rxq_ids[0], 0);
+        } else {
+                c4iw_init_wr_wait(&ep->com.wr_wait);
+                err = listen_stop(ep);
+                if (err)
+                        goto done;
+                err = c4iw_wait_for_reply(&ep->com.dev->rdev, &ep->com.wr_wait,
+                                          0, 0, __func__);
+        }
         cxgb4_free_stid(ep->com.dev->rdev.lldi.tids, ep->stid, PF_INET);
 done: