Whamcloud - gitweb
LU-6142 socklnd: change UAPI typedefs to proper structure
[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd_cb.c
index 6147d8a..c2f7c57 100644 (file)
@@ -1,13 +1,14 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Copyright (c) 2011, 2014, Intel Corporation.
  *
- * Copyright (C) 2001, 2002 Cluster File Systems, Inc.
  *   Author: Zach Brown <zab@zabbo.net>
  *   Author: Peter J. Braam <braam@clusterfs.com>
  *   Author: Phil Schwan <phil@clusterfs.com>
  *   Author: Eric Barton <eric@bartonsoftware.com>
  *
- *   This file is part of Portals, http://www.sf.net/projects/sandiaportals/
+ *   This file is part of Lustre, https://wiki.hpdd.intel.com/
  *
  *   Portals is free software; you can redistribute it and/or
  *   modify it under the terms of version 2 of the GNU General Public
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "socknal.h"
-
-atomic_t   ksocknal_packets_received;
-atomic_t   ksocknal_packets_launched;
-atomic_t   ksocknal_packets_being_sent;
-
-#if SOCKNAL_ZC
-int        ksocknal_do_zc = 1;
-int        ksocknal_zc_min_frag = 2048;
-#endif
+#include "socklnd.h"
 
-/*
- *  LIB functions follow
- *
- */
-int
-ksocknal_read(nal_cb_t *nal, void *private, void *dst_addr,
-              user_ptr src_addr, size_t len)
+ksock_tx_t *
+ksocknal_alloc_tx(int type, int size)
 {
-        CDEBUG(D_NET, LPX64": reading %ld bytes from %p -> %p\n",
-               nal->ni.nid, (long)len, src_addr, dst_addr);
-
-        memcpy( dst_addr, src_addr, len );
-        return 0;
-}
+       ksock_tx_t *tx = NULL;
 
-int
-ksocknal_write(nal_cb_t *nal, void *private, user_ptr dst_addr,
-               void *src_addr, size_t len)
-{
-        CDEBUG(D_NET, LPX64": writing %ld bytes from %p -> %p\n",
-               nal->ni.nid, (long)len, src_addr, dst_addr);
+       if (type == KSOCK_MSG_NOOP) {
+               LASSERT(size == KSOCK_NOOP_TX_SIZE);
 
-        memcpy( dst_addr, src_addr, len );
-        return 0;
-}
+               /* searching for a noop tx in free list */
+               spin_lock(&ksocknal_data.ksnd_tx_lock);
 
-int
-ksocknal_callback (nal_cb_t * nal, void *private, lib_eq_t *eq,
-                         ptl_event_t *ev)
-{
-        CDEBUG(D_NET, LPX64": callback eq %p ev %p\n",
-               nal->ni.nid, eq, ev);
+               if (!list_empty(&ksocknal_data.ksnd_idle_noop_txs)) {
+                       tx = list_entry(ksocknal_data.ksnd_idle_noop_txs. \
+                                           next, ksock_tx_t, tx_list);
+                       LASSERT(tx->tx_desc_size == size);
+                       list_del(&tx->tx_list);
+               }
 
-        if (eq->event_callback != NULL)
-                eq->event_callback(ev);
+               spin_unlock(&ksocknal_data.ksnd_tx_lock);
+        }
 
-        return 0;
-}
+        if (tx == NULL)
+                LIBCFS_ALLOC(tx, size);
 
-void *
-ksocknal_malloc(nal_cb_t *nal, size_t len)
-{
-        void *buf;
+        if (tx == NULL)
+                return NULL;
 
-        PORTAL_ALLOC(buf, len);
+       atomic_set(&tx->tx_refcount, 1);
+       tx->tx_zc_aborted = 0;
+       tx->tx_zc_capable = 0;
+       tx->tx_zc_checked = 0;
+       tx->tx_desc_size  = size;
 
-        if (buf != NULL)
-                memset(buf, 0, len);
+       atomic_inc(&ksocknal_data.ksnd_nactive_txs);
 
-        return (buf);
+       return tx;
 }
 
-void
-ksocknal_free(nal_cb_t *nal, void *buf, size_t len)
+ksock_tx_t *
+ksocknal_alloc_tx_noop(__u64 cookie, int nonblk)
 {
-        PORTAL_FREE(buf, len);
-}
+        ksock_tx_t *tx;
 
-void
-ksocknal_printf(nal_cb_t *nal, const char *fmt, ...)
-{
-        va_list ap;
-        char msg[256];
+        tx = ksocknal_alloc_tx(KSOCK_MSG_NOOP, KSOCK_NOOP_TX_SIZE);
+        if (tx == NULL) {
+                CERROR("Can't allocate noop tx desc\n");
+                return NULL;
+        }
 
-        va_start (ap, fmt);
-        vsnprintf (msg, sizeof (msg), fmt, ap); /* sprint safely */
-        va_end (ap);
+        tx->tx_conn     = NULL;
+        tx->tx_lnetmsg  = NULL;
+        tx->tx_kiov     = NULL;
+        tx->tx_nkiov    = 0;
+        tx->tx_iov      = tx->tx_frags.virt.iov;
+        tx->tx_niov     = 1;
+        tx->tx_nonblk   = nonblk;
 
-        msg[sizeof (msg) - 1] = 0;              /* ensure terminated */
+       tx->tx_msg.ksm_csum = 0;
+       tx->tx_msg.ksm_type = KSOCK_MSG_NOOP;
+       tx->tx_msg.ksm_zc_cookies[0] = 0;
+        tx->tx_msg.ksm_zc_cookies[1] = cookie;
 
-        CDEBUG (D_NET, "%s", msg);
+        return tx;
 }
 
-void
-ksocknal_cli(nal_cb_t *nal, unsigned long *flags)
-{
-        ksock_nal_data_t *data = nal->nal_data;
-
-        spin_lock(&data->ksnd_nal_cb_lock);
-}
 
 void
-ksocknal_sti(nal_cb_t *nal, unsigned long *flags)
+ksocknal_free_tx (ksock_tx_t *tx)
 {
-        ksock_nal_data_t *data;
-        data = nal->nal_data;
+       atomic_dec(&ksocknal_data.ksnd_nactive_txs);
 
-        spin_unlock(&data->ksnd_nal_cb_lock);
-}
+       if (tx->tx_lnetmsg == NULL && tx->tx_desc_size == KSOCK_NOOP_TX_SIZE) {
+               /* it's a noop tx */
+               spin_lock(&ksocknal_data.ksnd_tx_lock);
 
-int
-ksocknal_dist(nal_cb_t *nal, ptl_nid_t nid, unsigned long *dist)
-{
-        /* I would guess that if ksocknal_get_conn(nid) == NULL,
-           and we're not routing, then 'nid' is very distant :) */
-        if ( nal->ni.nid == nid ) {
-                *dist = 0;
-        } else {
-                *dist = 1;
-        }
+               list_add(&tx->tx_list, &ksocknal_data.ksnd_idle_noop_txs);
 
-        return 0;
+               spin_unlock(&ksocknal_data.ksnd_tx_lock);
+       } else {
+               LIBCFS_FREE(tx, tx->tx_desc_size);
+       }
 }
 
-ksock_ltx_t *
-ksocknal_get_ltx (int may_block)
+static int
+ksocknal_send_iov (ksock_conn_t *conn, ksock_tx_t *tx)
 {
-        long             flags;
-        ksock_ltx_t *ltx = NULL;
+       struct kvec *iov = tx->tx_iov;
+        int    nob;
+        int    rc;
 
-        for (;;) {
-                spin_lock_irqsave (&ksocknal_data.ksnd_idle_ltx_lock, flags);
+        LASSERT (tx->tx_niov > 0);
 
-                if (!list_empty (&ksocknal_data.ksnd_idle_ltx_list)) {
-                        ltx = list_entry(ksocknal_data.ksnd_idle_ltx_list.next,
-                                         ksock_ltx_t, ltx_tx.tx_list);
-                        list_del (&ltx->ltx_tx.tx_list);
-                        break;
-                }
+        /* Never touch tx->tx_iov inside ksocknal_lib_send_iov() */
+        rc = ksocknal_lib_send_iov(conn, tx);
 
-                if (!may_block) {
-                        if (!list_empty(&ksocknal_data.ksnd_idle_nblk_ltx_list)) {
-                                ltx = list_entry(ksocknal_data.ksnd_idle_nblk_ltx_list.next,
-                                                 ksock_ltx_t, ltx_tx.tx_list);
-                                list_del (&ltx->ltx_tx.tx_list);
-                        }
-                        break;
-                }
+        if (rc <= 0)                            /* sent nothing? */
+                return (rc);
 
-                spin_unlock_irqrestore(&ksocknal_data.ksnd_idle_ltx_lock,
-                                       flags);
+        nob = rc;
+        LASSERT (nob <= tx->tx_resid);
+        tx->tx_resid -= nob;
 
-                wait_event (ksocknal_data.ksnd_idle_ltx_waitq,
-                            !list_empty (&ksocknal_data.ksnd_idle_ltx_list));
-        }
+        /* "consume" iov */
+        do {
+                LASSERT (tx->tx_niov > 0);
+
+                if (nob < (int) iov->iov_len) {
+                       iov->iov_base += nob;
+                        iov->iov_len -= nob;
+                        return (rc);
+                }
 
-        spin_unlock_irqrestore (&ksocknal_data.ksnd_idle_ltx_lock, flags);
+                nob -= iov->iov_len;
+                tx->tx_iov = ++iov;
+                tx->tx_niov--;
+        } while (nob != 0);
 
-        return (ltx);
+        return (rc);
 }
 
-#if SOCKNAL_ZC
-struct page *
-ksocknal_kvaddr_to_page (unsigned long vaddr)
+static int
+ksocknal_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
 {
-        struct page *page;
-
-        if (vaddr >= VMALLOC_START &&
-            vaddr < VMALLOC_END)
-                page = vmalloc_to_page ((void *)vaddr);
-#if CONFIG_HIGHMEM
-        else if (vaddr >= PKMAP_BASE &&
-                 vaddr < (PKMAP_BASE + LAST_PKMAP * PAGE_SIZE))
-                page = vmalloc_to_page ((void *)vaddr);
-                /* in 2.4 ^ just walks the page tables */
-#endif
-        else
-                page = virt_to_page (vaddr);
+        lnet_kiov_t    *kiov = tx->tx_kiov;
+        int     nob;
+        int     rc;
 
-        if (page == NULL ||
-            !VALID_PAGE (page))
-                return (NULL);
+        LASSERT (tx->tx_niov == 0);
+        LASSERT (tx->tx_nkiov > 0);
 
-        return (page);
-}
-#endif
+        /* Never touch tx->tx_kiov inside ksocknal_lib_send_kiov() */
+        rc = ksocknal_lib_send_kiov(conn, tx);
 
-int
-ksocknal_send_iov (struct socket *sock, ksock_tx_t *tx, int more)
-{
-        struct iovec  *iov = tx->tx_iov;
-        int            fragsize = iov->iov_len;
-        unsigned long  vaddr = (unsigned long)iov->iov_base;
-#if SOCKNAL_ZC
-        int            offset = vaddr & (PAGE_SIZE - 1);
-        int            zcsize = MIN (fragsize, PAGE_SIZE - offset);
-        struct page   *page;
-#endif
-        int            rc;
+        if (rc <= 0)                            /* sent nothing? */
+                return (rc);
 
-        /* NB we can't trust socket ops to either consume our iovs
-         * or leave them alone, so we only send 1 frag at a time. */
-        LASSERT (fragsize <= tx->tx_nob);
-        LASSERT (tx->tx_niov > 0);
-        more |= (tx->tx_niov > 1);
-        
-#if SOCKNAL_ZC
-        if (ksocknal_do_zc &&
-            (sock->sk->route_caps & NETIF_F_SG) &&
-            (sock->sk->route_caps & (NETIF_F_IP_CSUM | NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)) &&
-            zcsize >= ksocknal_zc_min_frag &&
-            (page = ksocknal_kvaddr_to_page (vaddr)) != NULL) {
-                
-                CDEBUG(D_NET, "vaddr %p, page %p->%p + offset %x for %d\n",
-                       (void *)vaddr, page, page_address(page), offset, zcsize);
-
-                more |= (zcsize < fragsize);
-
-                rc = tcp_sendpage_zccd(sock, page, offset, zcsize, 
-                                       more ? (MSG_DONTWAIT | MSG_MORE) : MSG_DONTWAIT,
-                                       &tx->tx_zccd);
-        } else
-#endif
-        {
-                /* NB don't pass tx's iov; sendmsg may or may not update it */
-                struct iovec fragiov = { .iov_base = (void *)vaddr,
-                                         .iov_len  = fragsize};
-                struct msghdr msg = {
-                        .msg_name       = NULL,
-                        .msg_namelen    = 0,
-                        .msg_iov        = &fragiov,
-                        .msg_iovlen     = 1,
-                        .msg_control    = NULL,
-                        .msg_controllen = 0,
-                        .msg_flags      = more ? (MSG_DONTWAIT | MSG_MORE) : MSG_DONTWAIT
-                };
-                mm_segment_t oldmm = get_fs();
-                
-                set_fs (KERNEL_DS);
-                rc = sock->sk->prot->sendmsg(sock->sk, &msg, fragsize);
-                set_fs (oldmm);
-        } 
+        nob = rc;
+        LASSERT (nob <= tx->tx_resid);
+        tx->tx_resid -= nob;
 
-        if (rc <= 0)
-                return (rc);
+        /* "consume" kiov */
+        do {
+                LASSERT(tx->tx_nkiov > 0);
 
-        tx->tx_nob -= rc;
+                if (nob < (int)kiov->kiov_len) {
+                        kiov->kiov_offset += nob;
+                        kiov->kiov_len -= nob;
+                        return rc;
+                }
 
-        if (rc < fragsize) {
-                /* didn't send whole frag */
-                iov->iov_base = (void *)(vaddr + rc);
-                iov->iov_len  = fragsize - rc;
-                return (-EAGAIN);
-        }
+                nob -= (int)kiov->kiov_len;
+                tx->tx_kiov = ++kiov;
+                tx->tx_nkiov--;
+        } while (nob != 0);
 
-        /* everything went */
-        LASSERT (rc == fragsize);
-        tx->tx_iov++;
-        tx->tx_niov--;
-        return (1);
+        return (rc);
 }
 
-int
-ksocknal_send_kiov (struct socket *sock, ksock_tx_t *tx, int more)
+static int
+ksocknal_transmit(ksock_conn_t *conn, ksock_tx_t *tx)
 {
-        ptl_kiov_t    *kiov = tx->tx_kiov;
-        int            fragsize = kiov->kiov_len;
-        struct page   *page = kiov->kiov_page;
-        int            offset = kiov->kiov_offset;
-        int            rc;
-
-        /* NB we can't trust socket ops to either consume our iovs
-         * or leave them alone, so we only send 1 frag at a time. */
-        LASSERT (fragsize <= tx->tx_nob);
-        LASSERT (offset + fragsize <= PAGE_SIZE);
-        LASSERT (tx->tx_nkiov > 0);
-        more |= (tx->tx_nkiov > 1);
+       int     rc;
+       int     bufnob;
 
-#if SOCKNAL_ZC
-        if (ksocknal_do_zc &&
-            (sock->sk->route_caps & NETIF_F_SG) &&
-            (sock->sk->route_caps & (NETIF_F_IP_CSUM | NETIF_F_NO_CSUM | NETIF_F_HW_CSUM)) &&
-            fragsize >= ksocknal_zc_min_frag) {
+       if (ksocknal_data.ksnd_stall_tx != 0) {
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               schedule_timeout(cfs_time_seconds(ksocknal_data.ksnd_stall_tx));
+       }
 
-                CDEBUG(D_NET, "page %p + offset %x for %d\n",
-                               page, offset, fragsize);
+       LASSERT(tx->tx_resid != 0);
 
-                rc = tcp_sendpage_zccd(sock, page, offset, fragsize,
-                                       more ? (MSG_DONTWAIT | MSG_MORE) : MSG_DONTWAIT,
-                                       &tx->tx_zccd);
-        } else
-#endif
-        {
-                char *addr = ((char *)kmap (page)) + offset;
-                struct iovec fragiov = {.iov_base = addr,
-                                        .iov_len  = fragsize};
-                struct msghdr msg = {
-                        .msg_name       = NULL,
-                        .msg_namelen    = 0,
-                        .msg_iov        = &fragiov,
-                        .msg_iovlen     = 1,
-                        .msg_control    = NULL,
-                        .msg_controllen = 0,
-                        .msg_flags      = more ? (MSG_DONTWAIT | MSG_MORE) : MSG_DONTWAIT
-                };
-                mm_segment_t  oldmm = get_fs();
-                
-                set_fs (KERNEL_DS);
-                rc = sock->sk->prot->sendmsg(sock->sk, &msg, fragsize);
-                set_fs (oldmm);
-                kunmap (page);
+        rc = ksocknal_connsock_addref(conn);
+        if (rc != 0) {
+                LASSERT (conn->ksnc_closing);
+                return (-ESHUTDOWN);
         }
 
-        if (rc <= 0)
-                return (rc);
+        do {
+                if (ksocknal_data.ksnd_enomem_tx > 0) {
+                        /* testing... */
+                        ksocknal_data.ksnd_enomem_tx--;
+                        rc = -EAGAIN;
+                } else if (tx->tx_niov != 0) {
+                        rc = ksocknal_send_iov (conn, tx);
+                } else {
+                        rc = ksocknal_send_kiov (conn, tx);
+                }
 
-        tx->tx_nob -= rc;
+               bufnob = conn->ksnc_sock->sk->sk_wmem_queued;
+                if (rc > 0)                     /* sent something? */
+                        conn->ksnc_tx_bufnob += rc; /* account it */
 
-        if (rc < fragsize) {
-                /* didn't send whole frag */
-                kiov->kiov_offset = offset + rc;
-                kiov->kiov_len    = fragsize - rc;
-                return (-EAGAIN);
-        }
+               if (bufnob < conn->ksnc_tx_bufnob) {
+                       /* allocated send buffer bytes < computed; infer
+                        * something got ACKed */
+                       conn->ksnc_tx_deadline =
+                               cfs_time_shift(*ksocknal_tunables.ksnd_timeout);
+                       conn->ksnc_peer->ksnp_last_alive = cfs_time_current();
+                       conn->ksnc_tx_bufnob = bufnob;
+                       smp_mb();
+               }
 
-        /* everything went */
-        LASSERT (rc == fragsize);
-        tx->tx_kiov++;
-        tx->tx_nkiov--;
-        return (1);
-}
+               if (rc <= 0) { /* Didn't write anything? */
 
-int
-ksocknal_sendmsg (struct socket *sock, ksock_tx_t *tx, int more)
-{
-        int    rc;
-        int    sent_some = 0;
-        ENTRY;
-        
-        LASSERT (!in_interrupt());
+                        if (rc == 0) /* some stacks return 0 instead of -EAGAIN */
+                                rc = -EAGAIN;
 
-        for (;;) {
-                if (tx->tx_niov != 0)
-                        rc = ksocknal_send_iov (sock, tx, more || tx->tx_nkiov != 0);
-                else
-                        rc = ksocknal_send_kiov (sock, tx, more);
+                        /* Check if EAGAIN is due to memory pressure */
+                        if(rc == -EAGAIN && ksocknal_lib_memory_pressure(conn))
+                                rc = -ENOMEM;
 
-                /* Interpret a zero rc the same as -EAGAIN (Adaptech TOE) */
-                if (rc <= 0)                    /* error or partial send */
-                        RETURN ((sent_some || rc == -EAGAIN) ? 0 : rc);
-                
-                if (tx->tx_nob == 0)            /* sent everything */
-                        RETURN (0);
+                        break;
+                }
 
-                sent_some = 1;
-        }
+                /* socket's wmem_queued now includes 'rc' bytes */
+               atomic_sub (rc, &conn->ksnc_tx_nob);
+                rc = 0;
+
+        } while (tx->tx_resid != 0);
+
+        ksocknal_connsock_decref(conn);
+        return (rc);
 }
 
-int
+static int
 ksocknal_recv_iov (ksock_conn_t *conn)
 {
-        struct iovec *iov = conn->ksnc_rx_iov;
-        int           fragsize  = iov->iov_len;
-        unsigned long vaddr = (unsigned long)iov->iov_base;
-        struct iovec  fragiov = { .iov_base = (void *)vaddr,
-                                  .iov_len  = fragsize};
-        struct msghdr msg = {
-                .msg_name       = NULL,
-                .msg_namelen    = 0,
-                .msg_iov        = &fragiov,
-                .msg_iovlen     = 1,
-                .msg_control    = NULL,
-                .msg_controllen = 0,
-                .msg_flags      = 0
-        };
-        mm_segment_t oldmm = get_fs();
-        int          rc;
-
-        /* NB we can't trust socket ops to either consume our iovs
-         * or leave them alone, so we only receive 1 frag at a time. */
+       struct kvec *iov = conn->ksnc_rx_iov;
+        int     nob;
+        int     rc;
+
         LASSERT (conn->ksnc_rx_niov > 0);
-        LASSERT (fragsize <= conn->ksnc_rx_nob_wanted);
-        
-        set_fs (KERNEL_DS);
-        rc = sock_recvmsg (conn->ksnc_sock, &msg, fragsize, MSG_DONTWAIT);
-        /* NB this is just a boolean............................^ */
-        set_fs (oldmm);
+
+       /* Never touch conn->ksnc_rx_iov or change connection
+         * status inside ksocknal_lib_recv_iov */
+        rc = ksocknal_lib_recv_iov(conn);
 
         if (rc <= 0)
                 return (rc);
 
-        conn->ksnc_rx_nob_wanted -= rc;
-        conn->ksnc_rx_nob_left -= rc;
-                
-        if (rc < fragsize) {
-                iov->iov_base = (void *)(vaddr + rc);
-                iov->iov_len = fragsize - rc;
-                return (-EAGAIN);
-        }
+        /* received something... */
+        nob = rc;
+
+       conn->ksnc_peer->ksnp_last_alive = cfs_time_current();
+       conn->ksnc_rx_deadline =
+               cfs_time_shift(*ksocknal_tunables.ksnd_timeout);
+       smp_mb();                       /* order with setting rx_started */
+       conn->ksnc_rx_started = 1;
+
+       conn->ksnc_rx_nob_wanted -= nob;
+       conn->ksnc_rx_nob_left -= nob;
+
+        do {
+                LASSERT (conn->ksnc_rx_niov > 0);
+
+                if (nob < (int)iov->iov_len) {
+                        iov->iov_len -= nob;
+                       iov->iov_base += nob;
+                        return (-EAGAIN);
+                }
+
+                nob -= iov->iov_len;
+                conn->ksnc_rx_iov = ++iov;
+                conn->ksnc_rx_niov--;
+        } while (nob != 0);
 
-        LASSERT (rc == fragsize);
-        conn->ksnc_rx_iov++;
-        conn->ksnc_rx_niov--;
-        return (1);
+        return (rc);
 }
 
-int
+static int
 ksocknal_recv_kiov (ksock_conn_t *conn)
 {
-        ptl_kiov_t   *kiov = conn->ksnc_rx_kiov;
-        struct page  *page = kiov->kiov_page;
-        int           offset = kiov->kiov_offset;
-        int           fragsize = kiov->kiov_len;
-        unsigned long vaddr = ((unsigned long)kmap (page)) + offset;
-        struct iovec  fragiov = { .iov_base = (void *)vaddr,
-                                  .iov_len  = fragsize};
-        struct msghdr msg = {
-                .msg_name       = NULL,
-                .msg_namelen    = 0,
-                .msg_iov        = &fragiov,
-                .msg_iovlen     = 1,
-                .msg_control    = NULL,
-                .msg_controllen = 0,
-                .msg_flags      = 0
-        };
-        mm_segment_t oldmm = get_fs();
-        int          rc;
-
-        /* NB we can't trust socket ops to either consume our iovs
-         * or leave them alone, so we only receive 1 frag at a time. */
-        LASSERT (fragsize <= conn->ksnc_rx_nob_wanted);
+        lnet_kiov_t   *kiov = conn->ksnc_rx_kiov;
+        int     nob;
+        int     rc;
         LASSERT (conn->ksnc_rx_nkiov > 0);
-        LASSERT (offset + fragsize <= PAGE_SIZE);
-        
-        set_fs (KERNEL_DS);
-        rc = sock_recvmsg (conn->ksnc_sock, &msg, fragsize, MSG_DONTWAIT);
-        /* NB this is just a boolean............................^ */
-        set_fs (oldmm);
-        kunmap (page);
-        
+
+       /* Never touch conn->ksnc_rx_kiov or change connection
+         * status inside ksocknal_lib_recv_iov */
+        rc = ksocknal_lib_recv_kiov(conn);
+
         if (rc <= 0)
                 return (rc);
-        
-        conn->ksnc_rx_nob_wanted -= rc;
-        conn->ksnc_rx_nob_left -= rc;
-                
-        if (rc < fragsize) {
-                kiov->kiov_offset = offset + rc;
-                kiov->kiov_len = fragsize - rc;
-                return (-EAGAIN);
-        }
 
-        LASSERT (rc == fragsize);
-        conn->ksnc_rx_kiov++;
-        conn->ksnc_rx_nkiov--;
-        return (1);
+        /* received something... */
+        nob = rc;
+
+       conn->ksnc_peer->ksnp_last_alive = cfs_time_current();
+       conn->ksnc_rx_deadline =
+               cfs_time_shift(*ksocknal_tunables.ksnd_timeout);
+       smp_mb();                       /* order with setting rx_started */
+       conn->ksnc_rx_started = 1;
+
+       conn->ksnc_rx_nob_wanted -= nob;
+       conn->ksnc_rx_nob_left -= nob;
+
+        do {
+                LASSERT (conn->ksnc_rx_nkiov > 0);
+
+                if (nob < (int) kiov->kiov_len) {
+                        kiov->kiov_offset += nob;
+                        kiov->kiov_len -= nob;
+                        return -EAGAIN;
+                }
+
+                nob -= kiov->kiov_len;
+                conn->ksnc_rx_kiov = ++kiov;
+                conn->ksnc_rx_nkiov--;
+        } while (nob != 0);
+
+        return 1;
 }
 
-int
-ksocknal_recvmsg (ksock_conn_t *conn) 
+static int
+ksocknal_receive (ksock_conn_t *conn)
 {
-        int    rc;
-        int    got_some = 0;
+        /* Return 1 on success, 0 on EOF, < 0 on error.
+         * Caller checks ksnc_rx_nob_wanted to determine
+         * progress/completion. */
+        int     rc;
         ENTRY;
-        
-        LASSERT (!in_interrupt ());
+
+       if (ksocknal_data.ksnd_stall_rx != 0) {
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               schedule_timeout(cfs_time_seconds(ksocknal_data.ksnd_stall_rx));
+       }
+
+        rc = ksocknal_connsock_addref(conn);
+        if (rc != 0) {
+                LASSERT (conn->ksnc_closing);
+                return (-ESHUTDOWN);
+        }
 
         for (;;) {
-                LASSERT (conn->ksnc_rx_nob_wanted > 0);
-                
                 if (conn->ksnc_rx_niov != 0)
                         rc = ksocknal_recv_iov (conn);
                 else
                         rc = ksocknal_recv_kiov (conn);
 
-                /* CAVEAT EMPTOR: we return...
-                 * <= 0 for error (0 == EOF) and > 0 for success (unlike sendmsg()) */
+                if (rc <= 0) {
+                        /* error/EOF or partial receive */
+                        if (rc == -EAGAIN) {
+                                rc = 1;
+                        } else if (rc == 0 && conn->ksnc_rx_started) {
+                                /* EOF in the middle of a message */
+                                rc = -EPROTO;
+                        }
+                        break;
+                }
 
-                if (rc <= 0)                    /* error/EOF or partial receive */
-                        RETURN ((got_some || rc == -EAGAIN) ? 1 : rc);
-                
-                if (conn->ksnc_rx_nob_wanted == 0)
-                        RETURN (1);
+                /* Completed a fragment */
 
-                got_some = 0;
+                if (conn->ksnc_rx_nob_wanted == 0) {
+                        rc = 1;
+                        break;
+                }
         }
-}
 
-#if SOCKNAL_ZC
-void
-ksocknal_zc_callback (zccd_t *zcd)
-{
-        ksock_tx_t    *tx = KSOCK_ZCCD_2_TX(zcd);
-        ksock_sched_t *sched = tx->tx_sched;
-        unsigned long  flags;
-        ENTRY;
-
-        /* Schedule tx for cleanup (can't do it now due to lock conflicts) */
-
-        spin_lock_irqsave (&sched->kss_lock, flags);
-
-        list_add_tail (&tx->tx_list, &sched->kss_zctxdone_list);
-        if (waitqueue_active (&sched->kss_waitq))
-                wake_up (&sched->kss_waitq);
-
-        spin_unlock_irqrestore (&sched->kss_lock, flags);
-        EXIT;
+        ksocknal_connsock_decref(conn);
+        RETURN (rc);
 }
-#endif
 
 void
-ksocknal_tx_done (ksock_tx_t *tx)
+ksocknal_tx_done (lnet_ni_t *ni, ksock_tx_t *tx)
 {
-        long           flags;
-        ksock_ltx_t   *ltx;
+        lnet_msg_t  *lnetmsg = tx->tx_lnetmsg;
+        int          rc = (tx->tx_resid == 0 && !tx->tx_zc_aborted) ? 0 : -EIO;
         ENTRY;
 
-        atomic_dec (&ksocknal_packets_being_sent);
-
-        if (tx->tx_isfwd) {             /* was a forwarded packet? */
-                kpr_fwd_done (&ksocknal_data.ksnd_router,
-                              KSOCK_TX_2_KPR_FWD_DESC (tx), 0);
-                EXIT;
-                return;
-        }
-
-        /* local send */
-        ltx = KSOCK_TX_2_KSOCK_LTX (tx);
-
-        lib_finalize (&ksocknal_lib, ltx->ltx_private, ltx->ltx_cookie);
+        LASSERT(ni != NULL || tx->tx_conn != NULL);
 
-        spin_lock_irqsave (&ksocknal_data.ksnd_idle_ltx_lock, flags);
+        if (tx->tx_conn != NULL)
+                ksocknal_conn_decref(tx->tx_conn);
 
-        list_add_tail (&ltx->ltx_tx.tx_list, ltx->ltx_idle);
+        if (ni == NULL && tx->tx_conn != NULL)
+                ni = tx->tx_conn->ksnc_peer->ksnp_ni;
 
-        /* normal tx desc => wakeup anyone blocking for one */
-        if (ltx->ltx_idle == &ksocknal_data.ksnd_idle_ltx_list &&
-            waitqueue_active (&ksocknal_data.ksnd_idle_ltx_waitq))
-                wake_up (&ksocknal_data.ksnd_idle_ltx_waitq);
+        ksocknal_free_tx (tx);
+        if (lnetmsg != NULL) /* KSOCK_MSG_NOOP go without lnetmsg */
+                lnet_finalize (ni, lnetmsg, rc);
 
-        spin_unlock_irqrestore (&ksocknal_data.ksnd_idle_ltx_lock, flags);
         EXIT;
 }
 
 void
-ksocknal_process_transmit (ksock_sched_t *sched, long *irq_flags)
+ksocknal_txlist_done(lnet_ni_t *ni, struct list_head *txlist, int error)
 {
-        ksock_conn_t *conn;
         ksock_tx_t *tx;
-        int         rc;
 
-        LASSERT (!list_empty (&sched->kss_tx_conns));
-        conn = list_entry(sched->kss_tx_conns.next, ksock_conn_t, ksnc_tx_list);
-        list_del (&conn->ksnc_tx_list);
+       while (!list_empty(txlist)) {
+               tx = list_entry(txlist->next, ksock_tx_t, tx_list);
+
+                if (error && tx->tx_lnetmsg != NULL) {
+                        CNETERR("Deleting packet type %d len %d %s->%s\n",
+                                le32_to_cpu (tx->tx_lnetmsg->msg_hdr.type),
+                                le32_to_cpu (tx->tx_lnetmsg->msg_hdr.payload_length),
+                                libcfs_nid2str(le64_to_cpu(tx->tx_lnetmsg->msg_hdr.src_nid)),
+                                libcfs_nid2str(le64_to_cpu(tx->tx_lnetmsg->msg_hdr.dest_nid)));
+                } else if (error) {
+                        CNETERR("Deleting noop packet\n");
+                }
+
+               list_del(&tx->tx_list);
 
-        LASSERT (conn->ksnc_tx_scheduled);
-        LASSERT (conn->ksnc_tx_ready);
-        LASSERT (!list_empty (&conn->ksnc_tx_queue));
-        tx = list_entry (conn->ksnc_tx_queue.next, ksock_tx_t, tx_list);
-        /* assume transmit will complete now, so dequeue while I've got lock */
-        list_del (&tx->tx_list);
+               LASSERT (atomic_read(&tx->tx_refcount) == 1);
+                ksocknal_tx_done (ni, tx);
+        }
+}
 
-        spin_unlock_irqrestore (&sched->kss_lock, *irq_flags);
+static void
+ksocknal_check_zc_req(ksock_tx_t *tx)
+{
+        ksock_conn_t   *conn = tx->tx_conn;
+        ksock_peer_t   *peer = conn->ksnc_peer;
+
+        /* Set tx_msg.ksm_zc_cookies[0] to a unique non-zero cookie and add tx
+         * to ksnp_zc_req_list if some fragment of this message should be sent
+         * zero-copy.  Our peer will send an ACK containing this cookie when
+         * she has received this message to tell us we can signal completion.
+         * tx_msg.ksm_zc_cookies[0] remains non-zero while tx is on
+         * ksnp_zc_req_list. */
+        LASSERT (tx->tx_msg.ksm_type != KSOCK_MSG_NOOP);
+        LASSERT (tx->tx_zc_capable);
+
+        tx->tx_zc_checked = 1;
+
+        if (conn->ksnc_proto == &ksocknal_protocol_v1x ||
+            !conn->ksnc_zc_capable)
+                return;
 
-        LASSERT (tx->tx_nob > 0);
+        /* assign cookie and queue tx to pending list, it will be released when
+         * a matching ack is received. See ksocknal_handle_zcack() */
 
-        conn->ksnc_tx_ready = 0;/* write_space may race with me and set ready */
-        mb();                   /* => clear BEFORE trying to write */
+        ksocknal_tx_addref(tx);
 
-        rc = ksocknal_sendmsg (conn->ksnc_sock, tx, 
-                               !list_empty (&conn->ksnc_tx_queue)); /* more to come? */
+       spin_lock(&peer->ksnp_lock);
 
-        CDEBUG (D_NET, "send(%d) %d\n", tx->tx_nob, rc);
+        /* ZC_REQ is going to be pinned to the peer */
+        tx->tx_deadline =
+                cfs_time_shift(*ksocknal_tunables.ksnd_timeout);
 
-        if (rc != 0) {
-#warning FIXME: handle socket errors properly
-                CERROR("Error socknal send(%d) %p: %d\n", tx->tx_nob, conn, rc);
-                /* kid on for now the whole packet went.
-                 * NB when we handle the error better, we'll still need to
-                 * block for zccd completion.
-                 */
-                tx->tx_nob = 0;
-        }
+        LASSERT (tx->tx_msg.ksm_zc_cookies[0] == 0);
 
-        if (tx->tx_nob == 0)                    /* nothing left to send */
-        {
-                /* everything went; assume more can go, so prevent write_space locking */
-                conn->ksnc_tx_ready = 1;
-
-                ksocknal_put_conn (conn);       /* release packet's ref */
-                atomic_inc (&ksocknal_packets_being_sent);
-#if SOCKNAL_ZC
-                if (atomic_read (&tx->tx_zccd.zccd_count) != 1) {
-                        /* zccd skbufs are still in-flight.  Release my
-                         * initial ref on zccd, so callback can occur */
-                        zccd_put (&tx->tx_zccd);
-                } else
-#endif
-                        ksocknal_tx_done (tx);
+        tx->tx_msg.ksm_zc_cookies[0] = peer->ksnp_zc_next_cookie++;
 
-                spin_lock_irqsave (&sched->kss_lock, *irq_flags);
-        } else {
-                spin_lock_irqsave (&sched->kss_lock, *irq_flags);
+        if (peer->ksnp_zc_next_cookie == 0)
+                peer->ksnp_zc_next_cookie = SOCKNAL_KEEPALIVE_PING + 1;
 
-                /* back onto HEAD of tx_queue */
-                list_add (&tx->tx_list, &conn->ksnc_tx_queue);
-        }
+       list_add_tail(&tx->tx_zc_list, &peer->ksnp_zc_req_list);
 
-        if (!conn->ksnc_tx_ready ||             /* no space to write now */
-            list_empty (&conn->ksnc_tx_queue)) {/* nothing to write */
-                conn->ksnc_tx_scheduled = 0;    /* not being scheduled */
-                ksocknal_put_conn (conn);       /* release scheduler's ref */
-        } else                                 /* let scheduler call me again */
-                list_add_tail (&conn->ksnc_tx_list, &sched->kss_tx_conns);
+       spin_unlock(&peer->ksnp_lock);
 }
 
-void
-ksocknal_launch_packet (ksock_conn_t *conn, ksock_tx_t *tx)
+static void
+ksocknal_uncheck_zc_req(ksock_tx_t *tx)
 {
-        unsigned long  flags;
-        ksock_sched_t *sched = conn->ksnc_scheduler;
-
-        /* Ensure the frags we've been given EXACTLY match the number of
-         * bytes we want to send.  Many TCP/IP stacks disregard any total
-         * size parameters passed to them and just look at the frags. 
-         *
-         * We always expect at least 1 mapped fragment containing the
-         * complete portals header.
-         */
-        LASSERT (lib_iov_nob (tx->tx_niov, tx->tx_iov) +
-                 lib_kiov_nob (tx->tx_nkiov, tx->tx_kiov) == tx->tx_nob);
-        LASSERT (tx->tx_niov >= 1);
-        LASSERT (tx->tx_iov[0].iov_len >= sizeof (ptl_hdr_t));
-        
-        CDEBUG (D_NET, "type %d, nob %d niov %d nkiov %d\n",
-                ((ptl_hdr_t *)tx->tx_iov[0].iov_base)->type, tx->tx_nob, 
-                tx->tx_niov, tx->tx_nkiov);
-
-#if SOCKNAL_ZC
-        zccd_init (&tx->tx_zccd, ksocknal_zc_callback);
-        /* NB this sets 1 ref on zccd, so the callback can only occur
-         * after I've released this ref */
-        tx->tx_sched = sched;
-#endif
-        spin_lock_irqsave (&sched->kss_lock, flags);
+       ksock_peer_t   *peer = tx->tx_conn->ksnc_peer;
 
-        list_add_tail (&tx->tx_list, &conn->ksnc_tx_queue);
+       LASSERT(tx->tx_msg.ksm_type != KSOCK_MSG_NOOP);
+       LASSERT(tx->tx_zc_capable);
 
-        if (conn->ksnc_tx_ready &&              /* able to send */
-            !conn->ksnc_tx_scheduled) {          /* not scheduled to send */
-                list_add_tail (&conn->ksnc_tx_list, &sched->kss_tx_conns);
-                conn->ksnc_tx_scheduled = 1;
-                atomic_inc (&conn->ksnc_refcount); /* extra ref for scheduler */
-                if (waitqueue_active (&sched->kss_waitq))
-                        wake_up (&sched->kss_waitq);
-        }
-
-        spin_unlock_irqrestore (&sched->kss_lock, flags);
+       tx->tx_zc_checked = 0;
 
-        atomic_inc (&ksocknal_packets_launched);
-}
+       spin_lock(&peer->ksnp_lock);
 
-ksock_conn_t *
-ksocknal_send_target (ptl_nid_t nid) 
-{
-        ptl_nid_t     gatewaynid;
-        ksock_conn_t *conn;
-        int           rc;
+       if (tx->tx_msg.ksm_zc_cookies[0] == 0) {
+               /* Not waiting for an ACK */
+               spin_unlock(&peer->ksnp_lock);
+               return;
+       }
 
-        if ((conn = ksocknal_get_conn (nid)) == NULL) {
-                /* It's not a peer; try to find a gateway */
-                rc = kpr_lookup (&ksocknal_data.ksnd_router, nid, &gatewaynid);
-                if (rc != 0) {
-                        CERROR("Can't route to "LPX64": router error %d\n",
-                               nid, rc);
-                        return (NULL);
-                }
+       tx->tx_msg.ksm_zc_cookies[0] = 0;
+       list_del(&tx->tx_zc_list);
 
-                if ((conn = ksocknal_get_conn (gatewaynid)) == NULL) {
-                        CERROR ("Can't route to "LPX64": gateway "LPX64
-                                " is not a peer\n", nid, gatewaynid);
-                        return (NULL);
-                }
-        }
+       spin_unlock(&peer->ksnp_lock);
 
-        return (conn);
+       ksocknal_tx_decref(tx);
 }
 
-ksock_ltx_t *
-ksocknal_setup_hdr (nal_cb_t *nal, void *private, lib_msg_t *cookie, 
-                    ptl_hdr_t *hdr, int type)
+static int
+ksocknal_process_transmit (ksock_conn_t *conn, ksock_tx_t *tx)
 {
-        ksock_ltx_t  *ltx;
-
-        /* I may not block for a transmit descriptor if I might block the
-         * receiver, or an interrupt handler. */
-        ltx = ksocknal_get_ltx (!(type == PTL_MSG_ACK ||
-                                  type == PTL_MSG_REPLY ||
-                                  in_interrupt ()));
-        if (ltx == NULL) {
-                CERROR ("Can't allocate tx desc\n");
-                return (NULL);
-        }
+        int            rc;
 
-        /* Init local send packet (storage for hdr, finalize() args) */
-        ltx->ltx_hdr = *hdr;
-        ltx->ltx_private = private;
-        ltx->ltx_cookie = cookie;
-        
-        /* Init common ltx_tx */
-        ltx->ltx_tx.tx_isfwd = 0;
-        ltx->ltx_tx.tx_nob = sizeof (*hdr);
-
-        /* We always have 1 mapped frag for the header */
-        ltx->ltx_tx.tx_niov = 1;
-        ltx->ltx_tx.tx_iov = &ltx->ltx_iov_space.hdr;
-        ltx->ltx_tx.tx_iov[0].iov_base = &ltx->ltx_hdr;
-        ltx->ltx_tx.tx_iov[0].iov_len = sizeof (ltx->ltx_hdr);
-
-        ltx->ltx_tx.tx_kiov  = NULL;
-        ltx->ltx_tx.tx_nkiov = 0;
-
-        return (ltx);
-}
+        if (tx->tx_zc_capable && !tx->tx_zc_checked)
+                ksocknal_check_zc_req(tx);
 
-int
-ksocknal_send (nal_cb_t *nal, void *private, lib_msg_t *cookie,
-               ptl_hdr_t *hdr, int type, ptl_nid_t nid, ptl_pid_t pid,
-               unsigned int payload_niov, struct iovec *payload_iov,
-               size_t payload_len)
-{
-        ksock_ltx_t  *ltx;
-        ksock_conn_t *conn;
+        rc = ksocknal_transmit (conn, tx);
 
-        /* NB 'private' is different depending on what we're sending.
-         * Just ignore it until we can rely on it
-         *
-         * Also, the return code from this procedure is ignored.
-         * If we can't send, we must still complete with lib_finalize().
-         * We'll have to wait for 3.2 to return an error event.
-         */
+        CDEBUG (D_NET, "send(%d) %d\n", tx->tx_resid, rc);
 
-        CDEBUG(D_NET,
-               "sending "LPSZ" bytes in %d mapped frags to nid: "LPX64
-               " pid %d\n", payload_len, payload_niov, nid, pid);
+        if (tx->tx_resid == 0) {
+                /* Sent everything OK */
+                LASSERT (rc == 0);
 
-        conn = ksocknal_send_target (nid);
-        if (conn == NULL) {
-                lib_finalize (&ksocknal_lib, private, cookie);
-                return (-1);
+                return (0);
         }
 
-        ltx = ksocknal_setup_hdr (nal, private, cookie, hdr, type);
-        if (ltx == NULL) {
-                ksocknal_put_conn (conn);
-                lib_finalize (&ksocknal_lib, private, cookie);
-                return (-1);
+        if (rc == -EAGAIN)
+                return (rc);
+
+        if (rc == -ENOMEM) {
+                static int counter;
+
+                counter++;   /* exponential backoff warnings */
+                if ((counter & (-counter)) == counter)
+                        CWARN("%u ENOMEM tx %p (%u allocated)\n",
+                             counter, conn, atomic_read(&libcfs_kmemory));
+
+                /* Queue on ksnd_enomem_conns for retry after a timeout */
+               spin_lock_bh(&ksocknal_data.ksnd_reaper_lock);
+
+                /* enomem list takes over scheduler's ref... */
+                LASSERT (conn->ksnc_tx_scheduled);
+               list_add_tail(&conn->ksnc_tx_list,
+                                  &ksocknal_data.ksnd_enomem_conns);
+               if (!cfs_time_aftereq(cfs_time_add(cfs_time_current(),
+                                       SOCKNAL_ENOMEM_RETRY),
+                                       ksocknal_data.ksnd_reaper_waketime))
+                       wake_up(&ksocknal_data.ksnd_reaper_waitq);
+
+               spin_unlock_bh(&ksocknal_data.ksnd_reaper_lock);
+               return (rc);
+       }
+
+        /* Actual error */
+        LASSERT (rc < 0);
+
+        if (!conn->ksnc_closing) {
+                switch (rc) {
+                case -ECONNRESET:
+                       LCONSOLE_WARN("Host %pI4h reset our connection "
+                                      "while we were sending data; it may have "
+                                      "rebooted.\n",
+                                     &conn->ksnc_ipaddr);
+                        break;
+                default:
+                        LCONSOLE_WARN("There was an unexpected network error "
+                                     "while writing to %pI4h: %d.\n",
+                                     &conn->ksnc_ipaddr, rc);
+                        break;
+                }
+               CDEBUG(D_NET, "[%p] Error %d on write to %s ip %pI4h:%d\n",
+                      conn, rc, libcfs_id2str(conn->ksnc_peer->ksnp_id),
+                      &conn->ksnc_ipaddr, conn->ksnc_port);
         }
 
-        /* append the payload_iovs to the one pointing at the header */
-        LASSERT (ltx->ltx_tx.tx_niov == 1 && ltx->ltx_tx.tx_nkiov == 0);
-        LASSERT (payload_niov <= PTL_MD_MAX_IOV);
+        if (tx->tx_zc_checked)
+                ksocknal_uncheck_zc_req(tx);
 
-        memcpy (ltx->ltx_tx.tx_iov + 1, payload_iov,
-                payload_niov * sizeof (*payload_iov));
-        ltx->ltx_tx.tx_niov = 1 + payload_niov;
-        ltx->ltx_tx.tx_nob = sizeof (*hdr) + payload_len;
+        /* it's not an error if conn is being closed */
+        ksocknal_close_conn_and_siblings (conn,
+                                          (conn->ksnc_closing) ? 0 : rc);
 
-        ksocknal_launch_packet (conn, &ltx->ltx_tx);
-        return (0);
+        return (rc);
 }
 
-int
-ksocknal_send_pages (nal_cb_t *nal, void *private, lib_msg_t *cookie, 
-                     ptl_hdr_t *hdr, int type, ptl_nid_t nid, ptl_pid_t pid,
-                     unsigned int payload_niov, ptl_kiov_t *payload_iov, size_t payload_len)
+static void
+ksocknal_launch_connection_locked (ksock_route_t *route)
 {
-        ksock_ltx_t *ltx;
-        ksock_conn_t *conn;
-        
-        /* NB 'private' is different depending on what we're sending.
-         * Just ignore it until we can rely on it */
 
-        CDEBUG(D_NET,
-               "sending "LPSZ" bytes in %d mapped frags to nid: "LPX64" pid %d\n",
-               payload_len, payload_niov, nid, pid);
+        /* called holding write lock on ksnd_global_lock */
 
-        conn = ksocknal_send_target (nid);
-        if (conn == NULL)
-                return (-1);
+        LASSERT (!route->ksnr_scheduled);
+        LASSERT (!route->ksnr_connecting);
+        LASSERT ((ksocknal_route_mask() & ~route->ksnr_connected) != 0);
 
-        ltx = ksocknal_setup_hdr (nal, private, cookie, hdr, type);
-        if (ltx == NULL) {
-                ksocknal_put_conn (conn);
-                return (-1);
-        }
+        route->ksnr_scheduled = 1;              /* scheduling conn for connd */
+        ksocknal_route_addref(route);           /* extra ref for connd */
 
-        LASSERT (ltx->ltx_tx.tx_niov == 1 && ltx->ltx_tx.tx_nkiov == 0);
-        LASSERT (payload_niov <= PTL_MD_MAX_IOV);
-        
-        ltx->ltx_tx.tx_kiov = ltx->ltx_iov_space.payload.kiov;
-        memcpy (ltx->ltx_tx.tx_kiov, payload_iov, 
-                payload_niov * sizeof (*payload_iov));
-        ltx->ltx_tx.tx_nkiov = payload_niov;
-        ltx->ltx_tx.tx_nob = sizeof (*hdr) + payload_len;
+       spin_lock_bh(&ksocknal_data.ksnd_connd_lock);
 
-        ksocknal_launch_packet (conn, &ltx->ltx_tx);
-        return (0);
+       list_add_tail(&route->ksnr_connd_list,
+                         &ksocknal_data.ksnd_connd_routes);
+       wake_up(&ksocknal_data.ksnd_connd_waitq);
+
+       spin_unlock_bh(&ksocknal_data.ksnd_connd_lock);
 }
 
 void
-ksocknal_fwd_packet (void *arg, kpr_fwd_desc_t *fwd)
+ksocknal_launch_all_connections_locked (ksock_peer_t *peer)
 {
-        ksock_conn_t *conn;
-        ptl_nid_t     nid = fwd->kprfd_gateway_nid;
-        ksock_tx_t   *tx  = (ksock_tx_t *)&fwd->kprfd_scratch;
+        ksock_route_t *route;
 
-        CDEBUG (D_NET, "Forwarding [%p] -> "LPX64" ("LPX64"))\n", fwd,
-                fwd->kprfd_gateway_nid, fwd->kprfd_target_nid);
-
-        /* I'm the gateway; must be the last hop */
-        if (nid == ksocknal_lib.ni.nid)
-                nid = fwd->kprfd_target_nid;
+        /* called holding write lock on ksnd_global_lock */
+        for (;;) {
+                /* launch any/all connections that need it */
+                route = ksocknal_find_connectable_route_locked(peer);
+                if (route == NULL)
+                        return;
 
-        conn = ksocknal_get_conn (nid);
-        if (conn == NULL) {
-                CERROR ("[%p] fwd to "LPX64" isn't a peer\n", fwd, nid);
-                kpr_fwd_done (&ksocknal_data.ksnd_router, fwd, -EHOSTUNREACH);
-                return;
+                ksocknal_launch_connection_locked(route);
         }
-
-        /* This forward has now got a ref on conn */
-
-        tx->tx_isfwd = 1;                   /* This is a forwarding packet */
-        tx->tx_nob   = fwd->kprfd_nob;
-        tx->tx_niov  = fwd->kprfd_niov;
-        tx->tx_iov   = fwd->kprfd_iov;
-        tx->tx_nkiov = 0;
-        tx->tx_kiov  = NULL;
-        
-        ksocknal_launch_packet (conn, tx);
 }
 
-int
-ksocknal_thread_start (int (*fn)(void *arg), void *arg)
+ksock_conn_t *
+ksocknal_find_conn_locked(ksock_peer_t *peer, ksock_tx_t *tx, int nonblk)
 {
-        long    pid = kernel_thread (fn, arg, 0);
+       struct list_head *tmp;
+        ksock_conn_t     *conn;
+        ksock_conn_t     *typed = NULL;
+        ksock_conn_t     *fallback = NULL;
+        int               tnob     = 0;
+        int               fnob     = 0;
+
+       list_for_each(tmp, &peer->ksnp_conns) {
+               ksock_conn_t *c  = list_entry(tmp, ksock_conn_t, ksnc_list);
+               int           nob = atomic_read(&c->ksnc_tx_nob) +
+                                       c->ksnc_sock->sk->sk_wmem_queued;
+                int           rc;
+
+                LASSERT (!c->ksnc_closing);
+                LASSERT (c->ksnc_proto != NULL &&
+                         c->ksnc_proto->pro_match_tx != NULL);
+
+                rc = c->ksnc_proto->pro_match_tx(c, tx, nonblk);
+
+                switch (rc) {
+                default:
+                        LBUG();
+                case SOCKNAL_MATCH_NO: /* protocol rejected the tx */
+                        continue;
+
+                case SOCKNAL_MATCH_YES: /* typed connection */
+                        if (typed == NULL || tnob > nob ||
+                            (tnob == nob && *ksocknal_tunables.ksnd_round_robin &&
+                             cfs_time_after(typed->ksnc_tx_last_post, c->ksnc_tx_last_post))) {
+                                typed = c;
+                                tnob  = nob;
+                        }
+                        break;
+
+                case SOCKNAL_MATCH_MAY: /* fallback connection */
+                        if (fallback == NULL || fnob > nob ||
+                            (fnob == nob && *ksocknal_tunables.ksnd_round_robin &&
+                             cfs_time_after(fallback->ksnc_tx_last_post, c->ksnc_tx_last_post))) {
+                                fallback = c;
+                                fnob     = nob;
+                        }
+                        break;
+                }
+        }
 
-        if (pid < 0)
-                return ((int)pid);
+        /* prefer the typed selection */
+        conn = (typed != NULL) ? typed : fallback;
 
-        atomic_inc (&ksocknal_data.ksnd_nthreads);
-        return (0);
+        if (conn != NULL)
+                conn->ksnc_tx_last_post = cfs_time_current();
+
+        return conn;
 }
 
 void
-ksocknal_thread_fini (void)
+ksocknal_tx_prep(ksock_conn_t *conn, ksock_tx_t *tx)
 {
-        atomic_dec (&ksocknal_data.ksnd_nthreads);
+        conn->ksnc_proto->pro_pack(tx);
+
+       atomic_add (tx->tx_nob, &conn->ksnc_tx_nob);
+        ksocknal_conn_addref(conn); /* +1 ref for tx */
+        tx->tx_conn = conn;
 }
 
 void
-ksocknal_fmb_callback (void *arg, int error)
+ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t *conn)
 {
-        ksock_fmb_t       *fmb = (ksock_fmb_t *)arg;
-        ksock_fmb_pool_t  *fmp = fmb->fmb_pool;
-        ptl_hdr_t         *hdr = (ptl_hdr_t *) page_address(fmb->fmb_pages[0]);
-        ksock_conn_t      *conn = NULL;
-        ksock_sched_t     *sched;
-        long               flags;
-
-        if (error != 0)
-                CERROR("Failed to route packet from "LPX64" to "LPX64": %d\n",
-                       NTOH__u64(hdr->src_nid), NTOH__u64(hdr->dest_nid),
-                       error);
-        else
-                CDEBUG (D_NET, "routed packet from "LPX64" to "LPX64": OK\n",
-                        NTOH__u64 (hdr->src_nid), NTOH__u64 (hdr->dest_nid));
-
-        spin_lock_irqsave (&fmp->fmp_lock, flags);
-
-        list_add (&fmb->fmb_list, &fmp->fmp_idle_fmbs);
-
-        if (!list_empty (&fmp->fmp_blocked_conns)) {
-                conn = list_entry (fmb->fmb_pool->fmp_blocked_conns.next,
-                                   ksock_conn_t, ksnc_rx_list);
-                list_del (&conn->ksnc_rx_list);
-        }
-
-        spin_unlock_irqrestore (&fmp->fmp_lock, flags);
+        ksock_sched_t *sched = conn->ksnc_scheduler;
+       struct ksock_msg   *msg = &tx->tx_msg;
+        ksock_tx_t    *ztx = NULL;
+        int            bufnob = 0;
 
-        if (conn == NULL)
-                return;
+        /* called holding global lock (read or irq-write) and caller may
+         * not have dropped this lock between finding conn and calling me,
+         * so we don't need the {get,put}connsock dance to deref
+         * ksnc_sock... */
+        LASSERT(!conn->ksnc_closing);
 
-        CDEBUG (D_NET, "Scheduling conn %p\n", conn);
-        LASSERT (conn->ksnc_rx_scheduled);
-        LASSERT (conn->ksnc_rx_state == SOCKNAL_RX_FMB_SLEEP);
+       CDEBUG(D_NET, "Sending to %s ip %pI4h:%d\n",
+              libcfs_id2str(conn->ksnc_peer->ksnp_id),
+              &conn->ksnc_ipaddr, conn->ksnc_port);
 
-        conn->ksnc_rx_state = SOCKNAL_RX_GET_FMB;
+        ksocknal_tx_prep(conn, tx);
 
-        sched = conn->ksnc_scheduler;
+        /* Ensure the frags we've been given EXACTLY match the number of
+         * bytes we want to send.  Many TCP/IP stacks disregard any total
+        * size parameters passed to them and just look at the frags.
+         *
+         * We always expect at least 1 mapped fragment containing the
+         * complete ksocknal message header. */
+        LASSERT (lnet_iov_nob (tx->tx_niov, tx->tx_iov) +
+                 lnet_kiov_nob(tx->tx_nkiov, tx->tx_kiov) ==
+                 (unsigned int)tx->tx_nob);
+        LASSERT (tx->tx_niov >= 1);
+        LASSERT (tx->tx_resid == tx->tx_nob);
+
+        CDEBUG (D_NET, "Packet %p type %d, nob %d niov %d nkiov %d\n",
+                tx, (tx->tx_lnetmsg != NULL) ? tx->tx_lnetmsg->msg_hdr.type:
+                                               KSOCK_MSG_NOOP,
+                tx->tx_nob, tx->tx_niov, tx->tx_nkiov);
+
+       bufnob = conn->ksnc_sock->sk->sk_wmem_queued;
+       spin_lock_bh(&sched->kss_lock);
+
+       if (list_empty(&conn->ksnc_tx_queue) && bufnob == 0) {
+               /* First packet starts the timeout */
+               conn->ksnc_tx_deadline =
+                       cfs_time_shift(*ksocknal_tunables.ksnd_timeout);
+               if (conn->ksnc_tx_bufnob > 0) /* something got ACKed */
+                       conn->ksnc_peer->ksnp_last_alive = cfs_time_current();
+               conn->ksnc_tx_bufnob = 0;
+               smp_mb(); /* order with adding to tx_queue */
+       }
+
+       if (msg->ksm_type == KSOCK_MSG_NOOP) {
+               /* The packet is noop ZC ACK, try to piggyback the ack_cookie
+                * on a normal packet so I don't need to send it */
+                LASSERT (msg->ksm_zc_cookies[1] != 0);
+                LASSERT (conn->ksnc_proto->pro_queue_tx_zcack != NULL);
+
+                if (conn->ksnc_proto->pro_queue_tx_zcack(conn, tx, 0))
+                        ztx = tx; /* ZC ACK piggybacked on ztx release tx later */
 
-        spin_lock_irqsave (&sched->kss_lock, flags);
+        } else {
+                /* It's a normal packet - can it piggback a noop zc-ack that
+                 * has been queued already? */
+                LASSERT (msg->ksm_zc_cookies[1] == 0);
+                LASSERT (conn->ksnc_proto->pro_queue_tx_msg != NULL);
 
-        list_add_tail (&conn->ksnc_rx_list, &sched->kss_rx_conns);
+                ztx = conn->ksnc_proto->pro_queue_tx_msg(conn, tx);
+                /* ztx will be released later */
+        }
 
-        if (waitqueue_active (&sched->kss_waitq))
-                wake_up (&sched->kss_waitq);
+        if (ztx != NULL) {
+               atomic_sub (ztx->tx_nob, &conn->ksnc_tx_nob);
+               list_add_tail(&ztx->tx_list, &sched->kss_zombie_noop_txs);
+        }
 
-        spin_unlock_irqrestore (&sched->kss_lock, flags);
+       if (conn->ksnc_tx_ready &&      /* able to send */
+           !conn->ksnc_tx_scheduled) { /* not scheduled to send */
+               /* +1 ref for scheduler */
+               ksocknal_conn_addref(conn);
+               list_add_tail(&conn->ksnc_tx_list,
+                                  &sched->kss_tx_conns);
+               conn->ksnc_tx_scheduled = 1;
+               wake_up(&sched->kss_waitq);
+       }
+
+       spin_unlock_bh(&sched->kss_lock);
 }
 
-ksock_fmb_t *
-ksocknal_get_idle_fmb (ksock_conn_t *conn)
-{
-        int               payload_nob = conn->ksnc_rx_nob_left;
-        int               packet_nob = sizeof (ptl_hdr_t) + payload_nob;
-        long              flags;
-        ksock_fmb_pool_t *pool;
-        ksock_fmb_t      *fmb;
-
-        LASSERT (conn->ksnc_rx_state == SOCKNAL_RX_GET_FMB);
-        LASSERT (ksocknal_data.ksnd_fmbs != NULL);
 
-        if (packet_nob <= SOCKNAL_SMALL_FWD_PAGES * PAGE_SIZE)
-                pool = &ksocknal_data.ksnd_small_fmp;
-        else
-                pool = &ksocknal_data.ksnd_large_fmp;
+ksock_route_t *
+ksocknal_find_connectable_route_locked (ksock_peer_t *peer)
+{
+        cfs_time_t     now = cfs_time_current();
+       struct list_head    *tmp;
+        ksock_route_t *route;
+
+       list_for_each(tmp, &peer->ksnp_routes) {
+               route = list_entry(tmp, ksock_route_t, ksnr_list);
+
+                LASSERT (!route->ksnr_connecting || route->ksnr_scheduled);
+
+                if (route->ksnr_scheduled)      /* connections being established */
+                        continue;
+
+                /* all route types connected ? */
+                if ((ksocknal_route_mask() & ~route->ksnr_connected) == 0)
+                        continue;
+
+                if (!(route->ksnr_retry_interval == 0 || /* first attempt */
+                      cfs_time_aftereq(now, route->ksnr_timeout))) {
+                        CDEBUG(D_NET,
+                              "Too soon to retry route %pI4h "
+                               "(cnted %d, interval %ld, %ld secs later)\n",
+                              &route->ksnr_ipaddr,
+                               route->ksnr_connected,
+                               route->ksnr_retry_interval,
+                               cfs_duration_sec(route->ksnr_timeout - now));
+                        continue;
+                }
 
-        spin_lock_irqsave (&pool->fmp_lock, flags);
+                return (route);
+        }
 
-        if (!list_empty (&pool->fmp_idle_fmbs)) {
-                fmb = list_entry(pool->fmp_idle_fmbs.next,
-                                 ksock_fmb_t, fmb_list);
-                list_del (&fmb->fmb_list);
-                spin_unlock_irqrestore (&pool->fmp_lock, flags);
+        return (NULL);
+}
 
-                return (fmb);
-        }
+ksock_route_t *
+ksocknal_find_connecting_route_locked (ksock_peer_t *peer)
+{
+       struct list_head        *tmp;
+        ksock_route_t     *route;
 
-        /* deschedule until fmb free */
+       list_for_each(tmp, &peer->ksnp_routes) {
+               route = list_entry(tmp, ksock_route_t, ksnr_list);
 
-        conn->ksnc_rx_state = SOCKNAL_RX_FMB_SLEEP;
+                LASSERT (!route->ksnr_connecting || route->ksnr_scheduled);
 
-        list_add_tail (&conn->ksnc_rx_list,
-                       &pool->fmp_blocked_conns);
+                if (route->ksnr_scheduled)
+                        return (route);
+        }
 
-        spin_unlock_irqrestore (&pool->fmp_lock, flags);
         return (NULL);
 }
 
-
 int
-ksocknal_init_fmb (ksock_conn_t *conn, ksock_fmb_t *fmb)
+ksocknal_launch_packet (lnet_ni_t *ni, ksock_tx_t *tx, lnet_process_id_t id)
 {
-        int payload_nob = conn->ksnc_rx_nob_left;
-        int packet_nob = sizeof (ptl_hdr_t) + payload_nob;
-        ptl_nid_t dest_nid = NTOH__u64 (conn->ksnc_hdr.dest_nid);
-        int niov;                               /* at least the header */
-        int nob;
+        ksock_peer_t     *peer;
+        ksock_conn_t     *conn;
+       rwlock_t     *g_lock;
+        int               retry;
+        int               rc;
+
+        LASSERT (tx->tx_conn == NULL);
+
+        g_lock = &ksocknal_data.ksnd_global_lock;
+
+        for (retry = 0;; retry = 1) {
+               read_lock(g_lock);
+                peer = ksocknal_find_peer_locked(ni, id);
+                if (peer != NULL) {
+                        if (ksocknal_find_connectable_route_locked(peer) == NULL) {
+                                conn = ksocknal_find_conn_locked(peer, tx, tx->tx_nonblk);
+                                if (conn != NULL) {
+                                        /* I've got no routes that need to be
+                                         * connecting and I do have an actual
+                                         * connection... */
+                                        ksocknal_queue_tx_locked (tx, conn);
+                                       read_unlock(g_lock);
+                                        return (0);
+                                }
+                        }
+                }
 
-        LASSERT (conn->ksnc_rx_scheduled);
-        LASSERT (conn->ksnc_rx_state == SOCKNAL_RX_GET_FMB);
-        LASSERT (conn->ksnc_rx_nob_wanted == conn->ksnc_rx_nob_left);
-        LASSERT (payload_nob >= 0);
-        LASSERT (packet_nob <= fmb->fmb_npages * PAGE_SIZE);
-        LASSERT (sizeof (ptl_hdr_t) < PAGE_SIZE);
-
-        /* Got a forwarding buffer; copy the header we just read into the
-         * forwarding buffer.  If there's payload start reading reading it
-         * into the buffer, otherwise the forwarding buffer can be kicked
-         * off immediately.
-         *
-         * NB fmb->fmb_iov spans the WHOLE packet.
-         *    conn->ksnc_rx_iov spans just the payload.
-         */
+                /* I'll need a write lock... */
+               read_unlock(g_lock);
 
-        fmb->fmb_iov[0].iov_base = page_address (fmb->fmb_pages[0]);
+               write_lock_bh(g_lock);
 
-        /* copy header */
-        memcpy (fmb->fmb_iov[0].iov_base, &conn->ksnc_hdr, sizeof (ptl_hdr_t));
+                peer = ksocknal_find_peer_locked(ni, id);
+                if (peer != NULL)
+                        break;
 
-        if (payload_nob == 0) {         /* got complete packet already */
-                atomic_inc (&ksocknal_packets_received);
+               write_unlock_bh(g_lock);
 
-                CDEBUG (D_NET, "%p "LPX64"->"LPX64" %d fwd_start (immediate)\n",
-                        conn, NTOH__u64 (conn->ksnc_hdr.src_nid),
-                        dest_nid, packet_nob);
+                if ((id.pid & LNET_PID_USERFLAG) != 0) {
+                        CERROR("Refusing to create a connection to "
+                               "userspace process %s\n", libcfs_id2str(id));
+                        return -EHOSTUNREACH;
+                }
 
-                fmb->fmb_iov[0].iov_len = sizeof (ptl_hdr_t);
+                if (retry) {
+                        CERROR("Can't find peer %s\n", libcfs_id2str(id));
+                        return -EHOSTUNREACH;
+                }
 
-                kpr_fwd_init (&fmb->fmb_fwd, dest_nid,
-                              packet_nob, 1, fmb->fmb_iov,
-                              ksocknal_fmb_callback, fmb);
+                rc = ksocknal_add_peer(ni, id,
+                                       LNET_NIDADDR(id.nid),
+                                       lnet_acceptor_port());
+                if (rc != 0) {
+                        CERROR("Can't add peer %s: %d\n",
+                               libcfs_id2str(id), rc);
+                        return rc;
+                }
+        }
 
-                /* forward it now */
-                kpr_fwd_start (&ksocknal_data.ksnd_router, &fmb->fmb_fwd);
+        ksocknal_launch_all_connections_locked(peer);
 
-                ksocknal_new_packet (conn, 0);  /* on to next packet */
-                return (1);
+        conn = ksocknal_find_conn_locked(peer, tx, tx->tx_nonblk);
+        if (conn != NULL) {
+                /* Connection exists; queue message on it */
+                ksocknal_queue_tx_locked (tx, conn);
+               write_unlock_bh(g_lock);
+                return (0);
         }
 
-        niov = 1;
-        if (packet_nob <= PAGE_SIZE) {  /* whole packet fits in first page */
-                fmb->fmb_iov[0].iov_len = packet_nob;
-        } else {
-                fmb->fmb_iov[0].iov_len = PAGE_SIZE;
-                nob = packet_nob - PAGE_SIZE;
-
-                do {
-                        LASSERT (niov < fmb->fmb_npages);
-                        fmb->fmb_iov[niov].iov_base =
-                                page_address (fmb->fmb_pages[niov]);
-                        fmb->fmb_iov[niov].iov_len = MIN (PAGE_SIZE, nob);
-                        nob -= PAGE_SIZE;
-                        niov++;
-                } while (nob > 0);
+        if (peer->ksnp_accepting > 0 ||
+            ksocknal_find_connecting_route_locked (peer) != NULL) {
+                /* the message is going to be pinned to the peer */
+                tx->tx_deadline =
+                        cfs_time_shift(*ksocknal_tunables.ksnd_timeout);
+
+                /* Queue the message until a connection is established */
+               list_add_tail(&tx->tx_list, &peer->ksnp_tx_queue);
+               write_unlock_bh(g_lock);
+                return 0;
         }
 
-        kpr_fwd_init (&fmb->fmb_fwd, dest_nid,
-                      packet_nob, niov, fmb->fmb_iov,
-                      ksocknal_fmb_callback, fmb);
+       write_unlock_bh(g_lock);
 
-        /* stash router's descriptor ready for call to kpr_fwd_start */
-        conn->ksnc_cookie = &fmb->fmb_fwd;
+        /* NB Routes may be ignored if connections to them failed recently */
+        CNETERR("No usable routes to %s\n", libcfs_id2str(id));
+        return (-EHOSTUNREACH);
+}
 
-        conn->ksnc_rx_state = SOCKNAL_RX_BODY_FWD; /* read in the payload */
+int
+ksocknal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
+{
+        int               mpflag = 1;
+        int               type = lntmsg->msg_type;
+        lnet_process_id_t target = lntmsg->msg_target;
+        unsigned int      payload_niov = lntmsg->msg_niov;
+       struct kvec *payload_iov = lntmsg->msg_iov;
+        lnet_kiov_t      *payload_kiov = lntmsg->msg_kiov;
+        unsigned int      payload_offset = lntmsg->msg_offset;
+        unsigned int      payload_nob = lntmsg->msg_len;
+        ksock_tx_t       *tx;
+        int               desc_size;
+        int               rc;
 
-        /* payload is desc's iov-ed buffer, but skipping the hdr */
-        LASSERT (niov <= sizeof (conn->ksnc_rx_iov_space) /
-                 sizeof (struct iovec));
+        /* NB 'private' is different depending on what we're sending.
+         * Just ignore it... */
+
+        CDEBUG(D_NET, "sending %u bytes in %d frags to %s\n",
+               payload_nob, payload_niov, libcfs_id2str(target));
+
+       LASSERT (payload_nob == 0 || payload_niov > 0);
+       LASSERT (payload_niov <= LNET_MAX_IOV);
+       /* payload is either all vaddrs or all pages */
+       LASSERT (!(payload_kiov != NULL && payload_iov != NULL));
+       LASSERT (!in_interrupt ());
+
+       if (payload_iov != NULL)
+               desc_size = offsetof(ksock_tx_t,
+                                    tx_frags.virt.iov[1 + payload_niov]);
+       else
+               desc_size = offsetof(ksock_tx_t,
+                                    tx_frags.paged.kiov[payload_niov]);
+
+        if (lntmsg->msg_vmflush)
+                mpflag = cfs_memory_pressure_get_and_set();
+        tx = ksocknal_alloc_tx(KSOCK_MSG_LNET, desc_size);
+        if (tx == NULL) {
+                CERROR("Can't allocate tx desc type %d size %d\n",
+                       type, desc_size);
+                if (lntmsg->msg_vmflush)
+                        cfs_memory_pressure_restore(mpflag);
+                return (-ENOMEM);
+        }
 
-        conn->ksnc_rx_iov = (struct iovec *)&conn->ksnc_rx_iov_space;
-        conn->ksnc_rx_iov[0].iov_base =
-                (void *)(((unsigned long)fmb->fmb_iov[0].iov_base) +
-                         sizeof (ptl_hdr_t));
-        conn->ksnc_rx_iov[0].iov_len =
-                fmb->fmb_iov[0].iov_len - sizeof (ptl_hdr_t);
+        tx->tx_conn = NULL;                     /* set when assigned a conn */
+        tx->tx_lnetmsg = lntmsg;
+
+        if (payload_iov != NULL) {
+                tx->tx_kiov = NULL;
+                tx->tx_nkiov = 0;
+                tx->tx_iov = tx->tx_frags.virt.iov;
+                tx->tx_niov = 1 +
+                              lnet_extract_iov(payload_niov, &tx->tx_iov[1],
+                                               payload_niov, payload_iov,
+                                               payload_offset, payload_nob);
+        } else {
+                tx->tx_niov = 1;
+                tx->tx_iov = &tx->tx_frags.paged.iov;
+                tx->tx_kiov = tx->tx_frags.paged.kiov;
+                tx->tx_nkiov = lnet_extract_kiov(payload_niov, tx->tx_kiov,
+                                                 payload_niov, payload_kiov,
+                                                 payload_offset, payload_nob);
+
+                if (payload_nob >= *ksocknal_tunables.ksnd_zc_min_payload)
+                        tx->tx_zc_capable = 1;
+        }
 
-        if (niov > 1)
-                memcpy(&conn->ksnc_rx_iov[1], &fmb->fmb_iov[1],
-                       (niov - 1) * sizeof (struct iovec));
+       tx->tx_msg.ksm_csum = 0;
+       tx->tx_msg.ksm_type = KSOCK_MSG_LNET;
+       tx->tx_msg.ksm_zc_cookies[0] = 0;
+       tx->tx_msg.ksm_zc_cookies[1] = 0;
 
-        conn->ksnc_rx_niov = niov;
+        /* The first fragment will be set later in pro_pack */
+        rc = ksocknal_launch_packet(ni, tx, target);
+        if (!mpflag)
+                cfs_memory_pressure_restore(mpflag);
 
-        CDEBUG (D_NET, "%p "LPX64"->"LPX64" %d reading body\n", conn,
-                NTOH__u64 (conn->ksnc_hdr.src_nid), dest_nid, payload_nob);
-        return (0);
+        if (rc == 0)
+                return (0);
+
+        ksocknal_free_tx(tx);
+        return (-EIO);
 }
 
-void
-ksocknal_fwd_parse (ksock_conn_t *conn)
+int
+ksocknal_thread_start(int (*fn)(void *arg), void *arg, char *name)
 {
-        ksock_conn_t *conn2;
-        ptl_nid_t     dest_nid = NTOH__u64 (conn->ksnc_hdr.dest_nid);
-        int           body_len = NTOH__u32 (PTL_HDR_LENGTH(&conn->ksnc_hdr));
+       struct task_struct *task = kthread_run(fn, arg, name);
 
-        CDEBUG (D_NET, "%p "LPX64"->"LPX64" %d parsing header\n", conn,
-                NTOH__u64 (conn->ksnc_hdr.src_nid),
-                dest_nid, conn->ksnc_rx_nob_left);
+       if (IS_ERR(task))
+               return PTR_ERR(task);
 
-        LASSERT (conn->ksnc_rx_state == SOCKNAL_RX_HEADER);
-        LASSERT (conn->ksnc_rx_scheduled);
+       write_lock_bh(&ksocknal_data.ksnd_global_lock);
+       ksocknal_data.ksnd_nthreads++;
+       write_unlock_bh(&ksocknal_data.ksnd_global_lock);
+       return 0;
+}
 
-        if (body_len < 0) {                 /* length corrupt (overflow) */
-                CERROR("dropping packet from "LPX64" for "LPX64": packet "
-                       "size %d illegal\n", NTOH__u64 (conn->ksnc_hdr.src_nid),
-                       dest_nid, body_len);
-                ksocknal_new_packet (conn, 0);          /* on to new packet */
-                return;
-        }
+void
+ksocknal_thread_fini (void)
+{
+       write_lock_bh(&ksocknal_data.ksnd_global_lock);
+        ksocknal_data.ksnd_nthreads--;
+       write_unlock_bh(&ksocknal_data.ksnd_global_lock);
+}
 
-        if (ksocknal_data.ksnd_fmbs == NULL) {        /* not forwarding */
-                CERROR("dropping packet from "LPX64" for "LPX64": not "
-                       "forwarding\n", conn->ksnc_hdr.src_nid,
-                       conn->ksnc_hdr.dest_nid);
-                /* on to new packet (skip this one's body) */
-                ksocknal_new_packet (conn, body_len);
-                return;
-        }
+int
+ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
+{
+        static char ksocknal_slop_buffer[4096];
 
-        if (body_len > SOCKNAL_MAX_FWD_PAYLOAD) {      /* too big to forward */
-                CERROR ("dropping packet from "LPX64" for "LPX64
-                        ": packet size %d too big\n", conn->ksnc_hdr.src_nid,
-                        conn->ksnc_hdr.dest_nid, body_len);
-                /* on to new packet (skip this one's body) */
-                ksocknal_new_packet (conn, body_len);
-                return;
-        }
+        int            nob;
+        unsigned int   niov;
+        int            skipped;
 
-        /* should have gone direct */
-        conn2 = ksocknal_get_conn (conn->ksnc_hdr.dest_nid);
-        if (conn2 != NULL) {
-                CERROR ("dropping packet from "LPX64" for "LPX64
-                        ": target is a peer\n", conn->ksnc_hdr.src_nid,
-                        conn->ksnc_hdr.dest_nid);
-                ksocknal_put_conn (conn2);  /* drop ref from get above */
+        LASSERT(conn->ksnc_proto != NULL);
 
-                /* on to next packet (skip this one's body) */
-                ksocknal_new_packet (conn, body_len);
-                return;
+        if ((*ksocknal_tunables.ksnd_eager_ack & conn->ksnc_type) != 0) {
+                /* Remind the socket to ack eagerly... */
+                ksocknal_lib_eager_ack(conn);
         }
 
-        conn->ksnc_rx_state = SOCKNAL_RX_GET_FMB;       /* Getting FMB now */
-        conn->ksnc_rx_nob_left = body_len;              /* stash packet size */
-        conn->ksnc_rx_nob_wanted = body_len;            /* (no slop) */
-}
+       if (nob_to_skip == 0) {         /* right at next packet boundary now */
+               conn->ksnc_rx_started = 0;
+               smp_mb();                       /* racing with timeout thread */
 
-int
-ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
-{
-        static char ksocknal_slop_buffer[4096];
+               switch (conn->ksnc_proto->pro_version) {
+               case  KSOCK_PROTO_V2:
+               case  KSOCK_PROTO_V3:
+                        conn->ksnc_rx_state = SOCKNAL_RX_KSM_HEADER;
+                       conn->ksnc_rx_iov = (struct kvec *)&conn->ksnc_rx_iov_space;
+                        conn->ksnc_rx_iov[0].iov_base = (char *)&conn->ksnc_msg;
+
+                       conn->ksnc_rx_nob_wanted = offsetof(struct ksock_msg, ksm_u);
+                       conn->ksnc_rx_nob_left = offsetof(struct ksock_msg, ksm_u);
+                       conn->ksnc_rx_iov[0].iov_len  = offsetof(struct ksock_msg, ksm_u);
+                        break;
 
-        int   nob;
-        int   niov;
-        int   skipped;
+                case KSOCK_PROTO_V1:
+                        /* Receiving bare lnet_hdr_t */
+                        conn->ksnc_rx_state = SOCKNAL_RX_LNET_HEADER;
+                        conn->ksnc_rx_nob_wanted = sizeof(lnet_hdr_t);
+                        conn->ksnc_rx_nob_left = sizeof(lnet_hdr_t);
 
-        if (nob_to_skip == 0) {         /* right at next packet boundary now */
-                conn->ksnc_rx_state = SOCKNAL_RX_HEADER;
-                conn->ksnc_rx_nob_wanted = sizeof (ptl_hdr_t);
-                conn->ksnc_rx_nob_left = sizeof (ptl_hdr_t);
+                       conn->ksnc_rx_iov = (struct kvec *)&conn->ksnc_rx_iov_space;
+                        conn->ksnc_rx_iov[0].iov_base = (char *)&conn->ksnc_msg.ksm_u.lnetmsg;
+                        conn->ksnc_rx_iov[0].iov_len  = sizeof (lnet_hdr_t);
+                        break;
 
-                conn->ksnc_rx_iov = (struct iovec *)&conn->ksnc_rx_iov_space;
-                conn->ksnc_rx_iov[0].iov_base = (char *)&conn->ksnc_hdr;
-                conn->ksnc_rx_iov[0].iov_len  = sizeof (ptl_hdr_t);
+                default:
+                        LBUG ();
+                }
                 conn->ksnc_rx_niov = 1;
 
                 conn->ksnc_rx_kiov = NULL;
                 conn->ksnc_rx_nkiov = 0;
+                conn->ksnc_rx_csum = ~0;
                 return (1);
         }
 
-        /* Set up to skip as much a possible now.  If there's more left
+        /* Set up to skip as much as possible now.  If there's more left
          * (ran out of iov entries) we'll get called again */
 
         conn->ksnc_rx_state = SOCKNAL_RX_SLOP;
         conn->ksnc_rx_nob_left = nob_to_skip;
-        conn->ksnc_rx_iov = (struct iovec *)&conn->ksnc_rx_iov_space;
+       conn->ksnc_rx_iov = (struct kvec *)&conn->ksnc_rx_iov_space;
         skipped = 0;
         niov = 0;
 
@@ -1165,7 +1102,7 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
                 nob_to_skip -=nob;
 
         } while (nob_to_skip != 0 &&    /* mustn't overflow conn's rx iov */
-                 niov < sizeof(conn->ksnc_rx_iov_space) / sizeof (struct iovec));
+                niov < sizeof(conn->ksnc_rx_iov_space) / sizeof(struct kvec));
 
         conn->ksnc_rx_niov = niov;
         conn->ksnc_rx_kiov = NULL;
@@ -1174,440 +1111,1543 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
         return (0);
 }
 
-void
-ksocknal_process_receive (ksock_sched_t *sched, long *irq_flags)
+static int
+ksocknal_process_receive (ksock_conn_t *conn)
 {
-        ksock_conn_t *conn;
-        ksock_fmb_t  *fmb;
-        int           rc;
+        lnet_hdr_t        *lhdr;
+        lnet_process_id_t *id;
+        int                rc;
 
-        /* NB: sched->ksnc_lock lock held */
+       LASSERT (atomic_read(&conn->ksnc_conn_refcount) > 0);
 
-        LASSERT (!list_empty (&sched->kss_rx_conns));
-        conn = list_entry(sched->kss_rx_conns.next, ksock_conn_t, ksnc_rx_list);
-        list_del (&conn->ksnc_rx_list);
+       /* NB: sched lock NOT held */
+       /* SOCKNAL_RX_LNET_HEADER is here for backward compatibility */
+        LASSERT (conn->ksnc_rx_state == SOCKNAL_RX_KSM_HEADER ||
+                 conn->ksnc_rx_state == SOCKNAL_RX_LNET_PAYLOAD ||
+                 conn->ksnc_rx_state == SOCKNAL_RX_LNET_HEADER ||
+                 conn->ksnc_rx_state == SOCKNAL_RX_SLOP);
+ again:
+        if (conn->ksnc_rx_nob_wanted != 0) {
+                rc = ksocknal_receive(conn);
+
+               if (rc <= 0) {
+                       lnet_process_id_t ksnp_id = conn->ksnc_peer->ksnp_id;
+
+                       LASSERT(rc != -EAGAIN);
+
+                       if (rc == 0)
+                               CDEBUG(D_NET, "[%p] EOF from %s "
+                                      "ip %pI4h:%d\n", conn,
+                                       libcfs_id2str(ksnp_id),
+                                       &conn->ksnc_ipaddr,
+                                        conn->ksnc_port);
+                       else if (!conn->ksnc_closing)
+                               CERROR("[%p] Error %d on read from %s "
+                                      "ip %pI4h:%d\n", conn, rc,
+                                      libcfs_id2str(ksnp_id),
+                                      &conn->ksnc_ipaddr,
+                                      conn->ksnc_port);
+
+                        /* it's not an error if conn is being closed */
+                        ksocknal_close_conn_and_siblings (conn,
+                                                          (conn->ksnc_closing) ? 0 : rc);
+                        return (rc == 0 ? -ESHUTDOWN : rc);
+                }
 
-        spin_unlock_irqrestore (&sched->kss_lock, *irq_flags);
+                if (conn->ksnc_rx_nob_wanted != 0) {
+                        /* short read */
+                        return (-EAGAIN);
+                }
+        }
+        switch (conn->ksnc_rx_state) {
+        case SOCKNAL_RX_KSM_HEADER:
+                if (conn->ksnc_flip) {
+                        __swab32s(&conn->ksnc_msg.ksm_type);
+                        __swab32s(&conn->ksnc_msg.ksm_csum);
+                        __swab64s(&conn->ksnc_msg.ksm_zc_cookies[0]);
+                        __swab64s(&conn->ksnc_msg.ksm_zc_cookies[1]);
+                }
 
-        CDEBUG(D_NET, "sched %p conn %p\n", sched, conn);
-        LASSERT (atomic_read (&conn->ksnc_refcount) > 0);
-        LASSERT (conn->ksnc_rx_scheduled);
-        LASSERT (conn->ksnc_rx_ready);
+                if (conn->ksnc_msg.ksm_type != KSOCK_MSG_NOOP &&
+                    conn->ksnc_msg.ksm_type != KSOCK_MSG_LNET) {
+                        CERROR("%s: Unknown message type: %x\n",
+                               libcfs_id2str(conn->ksnc_peer->ksnp_id),
+                               conn->ksnc_msg.ksm_type);
+                        ksocknal_new_packet(conn, 0);
+                        ksocknal_close_conn_and_siblings(conn, -EPROTO);
+                        return (-EPROTO);
+                }
 
-        /* doesn't need a forwarding buffer */
-        if (conn->ksnc_rx_state != SOCKNAL_RX_GET_FMB)
-                goto try_read;
+                if (conn->ksnc_msg.ksm_type == KSOCK_MSG_NOOP &&
+                    conn->ksnc_msg.ksm_csum != 0 &&     /* has checksum */
+                    conn->ksnc_msg.ksm_csum != conn->ksnc_rx_csum) {
+                        /* NOOP Checksum error */
+                        CERROR("%s: Checksum error, wire:0x%08X data:0x%08X\n",
+                               libcfs_id2str(conn->ksnc_peer->ksnp_id),
+                               conn->ksnc_msg.ksm_csum, conn->ksnc_rx_csum);
+                        ksocknal_new_packet(conn, 0);
+                        ksocknal_close_conn_and_siblings(conn, -EPROTO);
+                        return (-EIO);
+                }
 
- get_fmb:
-        fmb = ksocknal_get_idle_fmb (conn);
-        if (fmb == NULL) {      /* conn descheduled waiting for idle fmb */
-                spin_lock_irqsave (&sched->kss_lock, *irq_flags);
-                return;
-        }
+                if (conn->ksnc_msg.ksm_zc_cookies[1] != 0) {
+                        __u64 cookie = 0;
 
-        if (ksocknal_init_fmb (conn, fmb)) /* packet forwarded ? */
-                goto out;               /* come back later for next packet */
+                        LASSERT (conn->ksnc_proto != &ksocknal_protocol_v1x);
 
- try_read:
-        /* NB: sched lock NOT held */
-        LASSERT (conn->ksnc_rx_state == SOCKNAL_RX_HEADER ||
-                 conn->ksnc_rx_state == SOCKNAL_RX_BODY ||
-                 conn->ksnc_rx_state == SOCKNAL_RX_BODY_FWD ||
-                 conn->ksnc_rx_state == SOCKNAL_RX_SLOP);
+                        if (conn->ksnc_msg.ksm_type == KSOCK_MSG_NOOP)
+                                cookie = conn->ksnc_msg.ksm_zc_cookies[0];
 
-        LASSERT (conn->ksnc_rx_nob_wanted > 0);
+                        rc = conn->ksnc_proto->pro_handle_zcack(conn, cookie,
+                                               conn->ksnc_msg.ksm_zc_cookies[1]);
 
-        conn->ksnc_rx_ready = 0;/* data ready may race with me and set ready */
-        mb();                   /* => clear BEFORE trying to read */
+                        if (rc != 0) {
+                               CERROR("%s: Unknown ZC-ACK cookie: %llu, %llu\n",
+                                       libcfs_id2str(conn->ksnc_peer->ksnp_id),
+                                       cookie, conn->ksnc_msg.ksm_zc_cookies[1]);
+                                ksocknal_new_packet(conn, 0);
+                                ksocknal_close_conn_and_siblings(conn, -EPROTO);
+                                return (rc);
+                        }
+                }
 
-        rc = ksocknal_recvmsg(conn);
+                if (conn->ksnc_msg.ksm_type == KSOCK_MSG_NOOP) {
+                        ksocknal_new_packet (conn, 0);
+                        return 0;       /* NOOP is done and just return */
+                }
 
-        if (rc == 0)
-                goto out;
-        if (rc < 0) {
-#warning FIXME: handle socket errors properly
-                CERROR ("Error socknal read %p: %d\n", conn, rc);
-                goto out;
-        }
+                conn->ksnc_rx_state = SOCKNAL_RX_LNET_HEADER;
+               conn->ksnc_rx_nob_wanted = sizeof(struct ksock_lnet_msg);
+               conn->ksnc_rx_nob_left = sizeof(struct ksock_lnet_msg);
 
-        if (conn->ksnc_rx_nob_wanted != 0)      /* short read */
-                goto out;                       /* try again later */
+               conn->ksnc_rx_iov = (struct kvec *)&conn->ksnc_rx_iov_space;
+                conn->ksnc_rx_iov[0].iov_base = (char *)&conn->ksnc_msg.ksm_u.lnetmsg;
+               conn->ksnc_rx_iov[0].iov_len  = sizeof(struct ksock_lnet_msg);
 
-        /* got all I wanted, assume there's more - prevent data_ready locking */
-        conn->ksnc_rx_ready = 1;
+                conn->ksnc_rx_niov = 1;
+                conn->ksnc_rx_kiov = NULL;
+                conn->ksnc_rx_nkiov = 0;
 
-        switch (conn->ksnc_rx_state) {
-        case SOCKNAL_RX_HEADER:
-                /* It's not for me */
-                if (conn->ksnc_hdr.type != PTL_MSG_HELLO &&
-                    NTOH__u64(conn->ksnc_hdr.dest_nid) != ksocknal_lib.ni.nid) {
-                        ksocknal_fwd_parse (conn);
-                        switch (conn->ksnc_rx_state) {
-                        case SOCKNAL_RX_HEADER: /* skipped (zero payload) */
-                                goto out;       /* => come back later */
-                        case SOCKNAL_RX_SLOP:   /* skipping packet's body */
-                                goto try_read;  /* => go read it */
-                        case SOCKNAL_RX_GET_FMB: /* forwarding */
-                                goto get_fmb;   /* => go get a fwd msg buffer */
-                        default:
-                                LBUG ();
-                        }
-                        /* Not Reached */
-                }
+                goto again;     /* read lnet header now */
+
+        case SOCKNAL_RX_LNET_HEADER:
+                /* unpack message header */
+                conn->ksnc_proto->pro_unpack(&conn->ksnc_msg);
 
-                PROF_START(lib_parse);
-                /* sets wanted_len, iovs etc */
-                lib_parse(&ksocknal_lib, &conn->ksnc_hdr, conn);
-                PROF_FINISH(lib_parse);
+                if ((conn->ksnc_peer->ksnp_id.pid & LNET_PID_USERFLAG) != 0) {
+                        /* Userspace peer */
+                        lhdr = &conn->ksnc_msg.ksm_u.lnetmsg.ksnm_hdr;
+                        id   = &conn->ksnc_peer->ksnp_id;
 
-                if (conn->ksnc_rx_nob_wanted != 0) { /* need to get payload? */
-                        conn->ksnc_rx_state = SOCKNAL_RX_BODY;
-                        goto try_read;          /* go read the payload */
+                        /* Substitute process ID assigned at connection time */
+                        lhdr->src_pid = cpu_to_le32(id->pid);
+                        lhdr->src_nid = cpu_to_le64(id->nid);
                 }
-                /* Fall through (completed packet for me) */
 
-        case SOCKNAL_RX_BODY:
-                atomic_inc (&ksocknal_packets_received);
-                /* packet is done now */
-                lib_finalize(&ksocknal_lib, NULL, conn->ksnc_cookie);
-                /* Fall through */
+                conn->ksnc_rx_state = SOCKNAL_RX_PARSE;
+                ksocknal_conn_addref(conn);     /* ++ref while parsing */
+
+                rc = lnet_parse(conn->ksnc_peer->ksnp_ni,
+                                &conn->ksnc_msg.ksm_u.lnetmsg.ksnm_hdr,
+                                conn->ksnc_peer->ksnp_id.nid, conn, 0);
+                if (rc < 0) {
+                        /* I just received garbage: give up on this conn */
+                        ksocknal_new_packet(conn, 0);
+                        ksocknal_close_conn_and_siblings (conn, rc);
+                        ksocknal_conn_decref(conn);
+                        return (-EPROTO);
+                }
 
-        case SOCKNAL_RX_SLOP:
-                /* starting new packet? */
-                if (ksocknal_new_packet (conn, conn->ksnc_rx_nob_left))
-                        goto out;       /* come back later */
-                goto try_read;          /* try to finish reading slop now */
+                /* I'm racing with ksocknal_recv() */
+                LASSERT (conn->ksnc_rx_state == SOCKNAL_RX_PARSE ||
+                         conn->ksnc_rx_state == SOCKNAL_RX_LNET_PAYLOAD);
+
+                if (conn->ksnc_rx_state != SOCKNAL_RX_LNET_PAYLOAD)
+                        return 0;
+
+                /* ksocknal_recv() got called */
+                goto again;
+
+        case SOCKNAL_RX_LNET_PAYLOAD:
+                /* payload all received */
+                rc = 0;
+
+                if (conn->ksnc_rx_nob_left == 0 &&   /* not truncating */
+                    conn->ksnc_msg.ksm_csum != 0 &&  /* has checksum */
+                    conn->ksnc_msg.ksm_csum != conn->ksnc_rx_csum) {
+                        CERROR("%s: Checksum error, wire:0x%08X data:0x%08X\n",
+                               libcfs_id2str(conn->ksnc_peer->ksnp_id),
+                               conn->ksnc_msg.ksm_csum, conn->ksnc_rx_csum);
+                        rc = -EIO;
+                }
 
-        case SOCKNAL_RX_BODY_FWD:
-                CDEBUG (D_NET, "%p "LPX64"->"LPX64" %d fwd_start (got body)\n",
-                        conn, NTOH__u64 (conn->ksnc_hdr.src_nid),
-                        NTOH__u64 (conn->ksnc_hdr.dest_nid),
-                        conn->ksnc_rx_nob_left);
+                if (rc == 0 && conn->ksnc_msg.ksm_zc_cookies[0] != 0) {
+                        LASSERT(conn->ksnc_proto != &ksocknal_protocol_v1x);
 
-                atomic_inc (&ksocknal_packets_received);
+                        lhdr = &conn->ksnc_msg.ksm_u.lnetmsg.ksnm_hdr;
+                        id   = &conn->ksnc_peer->ksnp_id;
 
-                /* ksocknal_init_fmb() put router desc. in conn->ksnc_cookie */
-                kpr_fwd_start (&ksocknal_data.ksnd_router,
-                               (kpr_fwd_desc_t *)conn->ksnc_cookie);
+                        rc = conn->ksnc_proto->pro_handle_zcreq(conn,
+                                        conn->ksnc_msg.ksm_zc_cookies[0],
+                                        *ksocknal_tunables.ksnd_nonblk_zcack ||
+                                        le64_to_cpu(lhdr->src_nid) != id->nid);
+                }
 
-                /* no slop in forwarded packets */
-                LASSERT (conn->ksnc_rx_nob_left == 0);
+                lnet_finalize(conn->ksnc_peer->ksnp_ni, conn->ksnc_cookie, rc);
 
-                ksocknal_new_packet (conn, 0);  /* on to next packet */
-                goto out;                       /* (later) */
+                if (rc != 0) {
+                        ksocknal_new_packet(conn, 0);
+                        ksocknal_close_conn_and_siblings (conn, rc);
+                        return (-EPROTO);
+                }
+                /* Fall through */
+
+        case SOCKNAL_RX_SLOP:
+                /* starting new packet? */
+                if (ksocknal_new_packet (conn, conn->ksnc_rx_nob_left))
+                        return 0;       /* come back later */
+                goto again;             /* try to finish reading slop now */
 
         default:
+                break;
         }
 
         /* Not Reached */
         LBUG ();
-
- out:
-        spin_lock_irqsave (&sched->kss_lock, *irq_flags);
-
-        /* no data there to read? */
-        if (!conn->ksnc_rx_ready) {
-                /* let socket callback schedule again */
-                conn->ksnc_rx_scheduled = 0;
-                ksocknal_put_conn (conn);       /* release scheduler's ref */
-        } else                              /* let scheduler call me again */
-                list_add_tail (&conn->ksnc_rx_list, &sched->kss_rx_conns);
+        return (-EINVAL);                       /* keep gcc happy */
 }
 
 int
-ksocknal_recv (nal_cb_t *nal, void *private, lib_msg_t *msg,
-               unsigned int niov, struct iovec *iov, size_t mlen, size_t rlen)
+ksocknal_recv (lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed,
+              unsigned int niov, struct kvec *iov, lnet_kiov_t *kiov,
+               unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
-        ksock_conn_t *conn = (ksock_conn_t *)private;
+        ksock_conn_t  *conn = (ksock_conn_t *)private;
+        ksock_sched_t *sched = conn->ksnc_scheduler;
 
         LASSERT (mlen <= rlen);
-        LASSERT (niov <= PTL_MD_MAX_IOV);
-        
+        LASSERT (niov <= LNET_MAX_IOV);
+
         conn->ksnc_cookie = msg;
         conn->ksnc_rx_nob_wanted = mlen;
         conn->ksnc_rx_nob_left   = rlen;
 
-        conn->ksnc_rx_nkiov = 0;
-        conn->ksnc_rx_kiov = NULL;
-        conn->ksnc_rx_niov = niov;
-        conn->ksnc_rx_iov = conn->ksnc_rx_iov_space.iov;
-        memcpy (conn->ksnc_rx_iov, iov, niov * sizeof (*iov));
+        if (mlen == 0 || iov != NULL) {
+                conn->ksnc_rx_nkiov = 0;
+                conn->ksnc_rx_kiov = NULL;
+                conn->ksnc_rx_iov = conn->ksnc_rx_iov_space.iov;
+                conn->ksnc_rx_niov =
+                        lnet_extract_iov(LNET_MAX_IOV, conn->ksnc_rx_iov,
+                                         niov, iov, offset, mlen);
+        } else {
+                conn->ksnc_rx_niov = 0;
+                conn->ksnc_rx_iov  = NULL;
+                conn->ksnc_rx_kiov = conn->ksnc_rx_iov_space.kiov;
+                conn->ksnc_rx_nkiov =
+                        lnet_extract_kiov(LNET_MAX_IOV, conn->ksnc_rx_kiov,
+                                          niov, kiov, offset, mlen);
+        }
+
+        LASSERT (mlen ==
+                 lnet_iov_nob (conn->ksnc_rx_niov, conn->ksnc_rx_iov) +
+                 lnet_kiov_nob (conn->ksnc_rx_nkiov, conn->ksnc_rx_kiov));
+
+        LASSERT (conn->ksnc_rx_scheduled);
+
+       spin_lock_bh(&sched->kss_lock);
+
+       switch (conn->ksnc_rx_state) {
+       case SOCKNAL_RX_PARSE_WAIT:
+               list_add_tail(&conn->ksnc_rx_list, &sched->kss_rx_conns);
+               wake_up(&sched->kss_waitq);
+               LASSERT(conn->ksnc_rx_ready);
+               break;
 
-        LASSERT (mlen == 
-                 lib_iov_nob (conn->ksnc_rx_niov, conn->ksnc_rx_iov) +
-                 lib_kiov_nob (conn->ksnc_rx_nkiov, conn->ksnc_rx_kiov));
+        case SOCKNAL_RX_PARSE:
+                /* scheduler hasn't noticed I'm parsing yet */
+                break;
+        }
+
+        conn->ksnc_rx_state = SOCKNAL_RX_LNET_PAYLOAD;
 
-        return (rlen);
+       spin_unlock_bh(&sched->kss_lock);
+       ksocknal_conn_decref(conn);
+       return 0;
 }
 
-int
-ksocknal_recv_pages (nal_cb_t *nal, void *private, lib_msg_t *msg,
-                     unsigned int niov, ptl_kiov_t *kiov, size_t mlen, size_t rlen)
+static inline int
+ksocknal_sched_cansleep(ksock_sched_t *sched)
 {
-        ksock_conn_t *conn = (ksock_conn_t *)private;
+       int           rc;
 
-        LASSERT (mlen <= rlen);
-        LASSERT (niov <= PTL_MD_MAX_IOV);
-        
-        conn->ksnc_cookie = msg;
-        conn->ksnc_rx_nob_wanted = mlen;
-        conn->ksnc_rx_nob_left   = rlen;
-
-        conn->ksnc_rx_niov = 0;
-        conn->ksnc_rx_iov  = NULL;
-        conn->ksnc_rx_nkiov = niov;
-        conn->ksnc_rx_kiov = conn->ksnc_rx_iov_space.kiov;
-        memcpy (conn->ksnc_rx_kiov, kiov, niov * sizeof (*kiov));
+       spin_lock_bh(&sched->kss_lock);
 
-        LASSERT (mlen == 
-                 lib_iov_nob (conn->ksnc_rx_niov, conn->ksnc_rx_iov) +
-                 lib_kiov_nob (conn->ksnc_rx_nkiov, conn->ksnc_rx_kiov));
+       rc = (!ksocknal_data.ksnd_shuttingdown &&
+             list_empty(&sched->kss_rx_conns) &&
+             list_empty(&sched->kss_tx_conns));
 
-        return (rlen);
+       spin_unlock_bh(&sched->kss_lock);
+       return rc;
 }
 
-int ksocknal_scheduler (void *arg)
+int ksocknal_scheduler(void *arg)
 {
-        ksock_sched_t     *sched = (ksock_sched_t *)arg;
-        unsigned long      flags;
-        int                rc;
-        int                nloops = 0;
-        int                id = sched - ksocknal_data.ksnd_schedulers;
-        char               name[16];
-#if (CONFIG_SMP && CPU_AFFINITY)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        int                cpu = cpu_logical_map(id % num_online_cpus());
-#else
-#warning "Take care of architecure specific logical APIC map"
-        int cpu = 1;    /* Have to change later. */
-#endif /* LINUX_VERSION_CODE */
-        
-        set_cpus_allowed (current, 1 << cpu);
-        id = cpu;
-#endif /* CONFIG_SMP && CPU_AFFINITY */
-
-        snprintf (name, sizeof (name),"ksocknald[%d]", id);
-        kportal_daemonize (name);
-        kportal_blockallsigs ();
-        
-        spin_lock_irqsave (&sched->kss_lock, flags);
+       struct ksock_sched_info *info;
+       ksock_sched_t           *sched;
+       ksock_conn_t            *conn;
+       ksock_tx_t              *tx;
+       int                     rc;
+       int                     nloops = 0;
+       long                    id = (long)arg;
+
+       info = ksocknal_data.ksnd_sched_info[KSOCK_THREAD_CPT(id)];
+       sched = &info->ksi_scheds[KSOCK_THREAD_SID(id)];
+
+       cfs_block_allsigs();
+
+       rc = cfs_cpt_bind(lnet_cpt_table(), info->ksi_cpt);
+       if (rc != 0) {
+               CWARN("Can't set CPU partition affinity to %d: %d\n",
+                       info->ksi_cpt, rc);
+       }
+
+       spin_lock_bh(&sched->kss_lock);
 
         while (!ksocknal_data.ksnd_shuttingdown) {
                 int did_something = 0;
 
                 /* Ensure I progress everything semi-fairly */
 
-                if (!list_empty (&sched->kss_rx_conns)) {
-                        did_something = 1;
-                        /* drops & regains kss_lock */
-                        ksocknal_process_receive (sched, &flags);
-                }
+               if (!list_empty(&sched->kss_rx_conns)) {
+                       conn = list_entry(sched->kss_rx_conns.next,
+                                              ksock_conn_t, ksnc_rx_list);
+                       list_del(&conn->ksnc_rx_list);
+
+                        LASSERT(conn->ksnc_rx_scheduled);
+                        LASSERT(conn->ksnc_rx_ready);
+
+                        /* clear rx_ready in case receive isn't complete.
+                         * Do it BEFORE we call process_recv, since
+                         * data_ready can set it any time after we release
+                         * kss_lock. */
+                        conn->ksnc_rx_ready = 0;
+                       spin_unlock_bh(&sched->kss_lock);
+
+                       rc = ksocknal_process_receive(conn);
+
+                       spin_lock_bh(&sched->kss_lock);
+
+                        /* I'm the only one that can clear this flag */
+                        LASSERT(conn->ksnc_rx_scheduled);
+
+                        /* Did process_receive get everything it wanted? */
+                        if (rc == 0)
+                                conn->ksnc_rx_ready = 1;
+
+                        if (conn->ksnc_rx_state == SOCKNAL_RX_PARSE) {
+                                /* Conn blocked waiting for ksocknal_recv()
+                                 * I change its state (under lock) to signal
+                                 * it can be rescheduled */
+                                conn->ksnc_rx_state = SOCKNAL_RX_PARSE_WAIT;
+                        } else if (conn->ksnc_rx_ready) {
+                                /* reschedule for rx */
+                               list_add_tail(&conn->ksnc_rx_list,
+                                                   &sched->kss_rx_conns);
+                        } else {
+                                conn->ksnc_rx_scheduled = 0;
+                                /* drop my ref */
+                                ksocknal_conn_decref(conn);
+                        }
 
-                if (!list_empty (&sched->kss_tx_conns)) {
                         did_something = 1;
-                        /* drops and regains kss_lock */
-                        ksocknal_process_transmit (sched, &flags);
                 }
-#if SOCKNAL_ZC
-                if (!list_empty (&sched->kss_zctxdone_list)) {
-                        ksock_tx_t *tx =
-                                list_entry(sched->kss_zctxdone_list.next,
-                                           ksock_tx_t, tx_list);
-                        did_something = 1;
 
-                        list_del (&tx->tx_list);
-                        spin_unlock_irqrestore (&sched->kss_lock, flags);
+               if (!list_empty(&sched->kss_tx_conns)) {
+                       struct list_head zlist = LIST_HEAD_INIT(zlist);
 
-                        ksocknal_tx_done (tx);
+                       if (!list_empty(&sched->kss_zombie_noop_txs)) {
+                               list_add(&zlist,
+                                             &sched->kss_zombie_noop_txs);
+                               list_del_init(&sched->kss_zombie_noop_txs);
+                        }
+
+                       conn = list_entry(sched->kss_tx_conns.next,
+                                              ksock_conn_t, ksnc_tx_list);
+                       list_del(&conn->ksnc_tx_list);
+
+                        LASSERT(conn->ksnc_tx_scheduled);
+                        LASSERT(conn->ksnc_tx_ready);
+                       LASSERT(!list_empty(&conn->ksnc_tx_queue));
+
+                       tx = list_entry(conn->ksnc_tx_queue.next,
+                                            ksock_tx_t, tx_list);
+
+                        if (conn->ksnc_tx_carrier == tx)
+                                ksocknal_next_tx_carrier(conn);
+
+                        /* dequeue now so empty list => more to send */
+                       list_del(&tx->tx_list);
+
+                        /* Clear tx_ready in case send isn't complete.  Do
+                         * it BEFORE we call process_transmit, since
+                         * write_space can set it any time after we release
+                         * kss_lock. */
+                        conn->ksnc_tx_ready = 0;
+                       spin_unlock_bh(&sched->kss_lock);
+
+                       if (!list_empty(&zlist)) {
+                               /* free zombie noop txs, it's fast because
+                                 * noop txs are just put in freelist */
+                                ksocknal_txlist_done(NULL, &zlist, 0);
+                        }
+
+                        rc = ksocknal_process_transmit(conn, tx);
+
+                        if (rc == -ENOMEM || rc == -EAGAIN) {
+                                /* Incomplete send: replace tx on HEAD of tx_queue */
+                               spin_lock_bh(&sched->kss_lock);
+                               list_add(&tx->tx_list,
+                                            &conn->ksnc_tx_queue);
+                       } else {
+                               /* Complete send; tx -ref */
+                               ksocknal_tx_decref(tx);
+
+                               spin_lock_bh(&sched->kss_lock);
+                                /* assume space for more */
+                                conn->ksnc_tx_ready = 1;
+                        }
 
-                        spin_lock_irqsave (&sched->kss_lock, flags);
+                        if (rc == -ENOMEM) {
+                                /* Do nothing; after a short timeout, this
+                                 * conn will be reposted on kss_tx_conns. */
+                        } else if (conn->ksnc_tx_ready &&
+                                  !list_empty(&conn->ksnc_tx_queue)) {
+                                /* reschedule for tx */
+                               list_add_tail(&conn->ksnc_tx_list,
+                                                   &sched->kss_tx_conns);
+                        } else {
+                                conn->ksnc_tx_scheduled = 0;
+                                /* drop my ref */
+                                ksocknal_conn_decref(conn);
+                        }
+
+                        did_something = 1;
                 }
-#endif
                 if (!did_something ||           /* nothing to do */
                     ++nloops == SOCKNAL_RESCHED) { /* hogging CPU? */
-                        spin_unlock_irqrestore (&sched->kss_lock, flags);
+                       spin_unlock_bh(&sched->kss_lock);
 
                         nloops = 0;
 
                         if (!did_something) {   /* wait for something to do */
-#if SOCKNAL_ZC
-                                rc = wait_event_interruptible (sched->kss_waitq,
-                                                               ksocknal_data.ksnd_shuttingdown ||
-                                                               !list_empty(&sched->kss_rx_conns) ||
-                                                               !list_empty(&sched->kss_tx_conns) ||
-                                                               !list_empty(&sched->kss_zctxdone_list));
-#else
-                                rc = wait_event_interruptible (sched->kss_waitq,
-                                                               ksocknal_data.ksnd_shuttingdown ||
-                                                               !list_empty(&sched->kss_rx_conns) ||
-                                                               !list_empty(&sched->kss_tx_conns));
+                               rc = wait_event_interruptible_exclusive(
+                                       sched->kss_waitq,
+                                       !ksocknal_sched_cansleep(sched));
+                               LASSERT (rc == 0);
+                       } else {
+                               cond_resched();
+                       }
+
+                       spin_lock_bh(&sched->kss_lock);
+               }
+       }
+
+       spin_unlock_bh(&sched->kss_lock);
+       ksocknal_thread_fini();
+       return 0;
+}
+
+/*
+ * Add connection to kss_rx_conns of scheduler
+ * and wakeup the scheduler.
+ */
+void ksocknal_read_callback (ksock_conn_t *conn)
+{
+       ksock_sched_t *sched;
+       ENTRY;
+
+       sched = conn->ksnc_scheduler;
+
+       spin_lock_bh(&sched->kss_lock);
+
+       conn->ksnc_rx_ready = 1;
+
+       if (!conn->ksnc_rx_scheduled) {  /* not being progressed */
+               list_add_tail(&conn->ksnc_rx_list,
+                                 &sched->kss_rx_conns);
+               conn->ksnc_rx_scheduled = 1;
+               /* extra ref for scheduler */
+               ksocknal_conn_addref(conn);
+
+               wake_up (&sched->kss_waitq);
+       }
+       spin_unlock_bh(&sched->kss_lock);
+
+       EXIT;
+}
+
+/*
+ * Add connection to kss_tx_conns of scheduler
+ * and wakeup the scheduler.
+ */
+void ksocknal_write_callback(ksock_conn_t *conn)
+{
+       ksock_sched_t *sched;
+       ENTRY;
+
+       sched = conn->ksnc_scheduler;
+
+       spin_lock_bh(&sched->kss_lock);
+
+       conn->ksnc_tx_ready = 1;
+
+       if (!conn->ksnc_tx_scheduled && /* not being progressed */
+           !list_empty(&conn->ksnc_tx_queue)) { /* packets to send */
+               list_add_tail(&conn->ksnc_tx_list, &sched->kss_tx_conns);
+               conn->ksnc_tx_scheduled = 1;
+               /* extra ref for scheduler */
+               ksocknal_conn_addref(conn);
+
+               wake_up(&sched->kss_waitq);
+       }
+
+       spin_unlock_bh(&sched->kss_lock);
+
+       EXIT;
+}
+
+static ksock_proto_t *
+ksocknal_parse_proto_version (struct ksock_hello_msg *hello)
+{
+        __u32   version = 0;
+
+        if (hello->kshm_magic == LNET_PROTO_MAGIC)
+                version = hello->kshm_version;
+        else if (hello->kshm_magic == __swab32(LNET_PROTO_MAGIC))
+                version = __swab32(hello->kshm_version);
+
+        if (version != 0) {
+#if SOCKNAL_VERSION_DEBUG
+                if (*ksocknal_tunables.ksnd_protocol == 1)
+                        return NULL;
+
+                if (*ksocknal_tunables.ksnd_protocol == 2 &&
+                    version == KSOCK_PROTO_V3)
+                        return NULL;
 #endif
-                                LASSERT (rc == 0);
-                        } else
-                               our_cond_resched();
+                if (version == KSOCK_PROTO_V2)
+                        return &ksocknal_protocol_v2x;
 
-                        spin_lock_irqsave (&sched->kss_lock, flags);
-                }
+                if (version == KSOCK_PROTO_V3)
+                        return &ksocknal_protocol_v3x;
+
+                return NULL;
         }
 
-        spin_unlock_irqrestore (&sched->kss_lock, flags);
-        ksocknal_thread_fini ();
-        return (0);
+        if (hello->kshm_magic == le32_to_cpu(LNET_PROTO_TCP_MAGIC)) {
+                lnet_magicversion_t *hmv = (lnet_magicversion_t *)hello;
+
+                CLASSERT (sizeof (lnet_magicversion_t) ==
+                         offsetof (struct ksock_hello_msg, kshm_src_nid));
+
+                if (hmv->version_major == cpu_to_le16 (KSOCK_PROTO_V1_MAJOR) &&
+                    hmv->version_minor == cpu_to_le16 (KSOCK_PROTO_V1_MINOR))
+                        return &ksocknal_protocol_v1x;
+        }
+
+        return NULL;
 }
 
-void
-ksocknal_data_ready (struct sock *sk, int n)
+int
+ksocknal_send_hello (lnet_ni_t *ni, ksock_conn_t *conn,
+                    lnet_nid_t peer_nid, struct ksock_hello_msg *hello)
 {
-        unsigned long  flags;
-        ksock_conn_t  *conn;
-        ksock_sched_t *sched;
-        ENTRY;
+        /* CAVEAT EMPTOR: this byte flips 'ipaddrs' */
+        ksock_net_t         *net = (ksock_net_t *)ni->ni_data;
 
-        /* interleave correctly with closing sockets... */
-        read_lock (&ksocknal_data.ksnd_socklist_lock);
+        LASSERT (hello->kshm_nips <= LNET_MAX_INTERFACES);
 
-        conn = sk->user_data;
-        if (conn == NULL) {             /* raced with ksocknal_close_sock */
-                LASSERT (sk->data_ready != &ksocknal_data_ready);
-                sk->data_ready (sk, n);
-        } else if (!conn->ksnc_rx_ready) {        /* new news */
-                /* Set ASAP in case of concurrent calls to me */
-                conn->ksnc_rx_ready = 1;
+        /* rely on caller to hold a ref on socket so it wouldn't disappear */
+        LASSERT (conn->ksnc_proto != NULL);
 
-                sched = conn->ksnc_scheduler;
+        hello->kshm_src_nid         = ni->ni_nid;
+        hello->kshm_dst_nid         = peer_nid;
+        hello->kshm_src_pid         = the_lnet.ln_pid;
+
+        hello->kshm_src_incarnation = net->ksnn_incarnation;
+        hello->kshm_ctype           = conn->ksnc_type;
+
+        return conn->ksnc_proto->pro_send_hello(conn, hello);
+}
+
+static int
+ksocknal_invert_type(int type)
+{
+        switch (type)
+        {
+        case SOCKLND_CONN_ANY:
+        case SOCKLND_CONN_CONTROL:
+                return (type);
+        case SOCKLND_CONN_BULK_IN:
+                return SOCKLND_CONN_BULK_OUT;
+        case SOCKLND_CONN_BULK_OUT:
+                return SOCKLND_CONN_BULK_IN;
+        default:
+                return (SOCKLND_CONN_NONE);
+        }
+}
 
-                spin_lock_irqsave (&sched->kss_lock, flags);
+int
+ksocknal_recv_hello(lnet_ni_t *ni, ksock_conn_t *conn,
+                   struct ksock_hello_msg *hello, lnet_process_id_t *peerid,
+                   __u64 *incarnation)
+{
+        /* Return < 0        fatal error
+         *        0          success
+         *        EALREADY   lost connection race
+         *        EPROTO     protocol version mismatch
+         */
+       struct socket        *sock = conn->ksnc_sock;
+        int                  active = (conn->ksnc_proto != NULL);
+        int                  timeout;
+        int                  proto_match;
+        int                  rc;
+        ksock_proto_t       *proto;
+        lnet_process_id_t    recv_id;
+
+       /* socket type set on active connections - not set on passive */
+       LASSERT(!active == !(conn->ksnc_type != SOCKLND_CONN_NONE));
+
+       timeout = active ? *ksocknal_tunables.ksnd_timeout :
+                           lnet_acceptor_timeout();
+
+       rc = lnet_sock_read(sock, &hello->kshm_magic,
+                           sizeof(hello->kshm_magic), timeout);
+        if (rc != 0) {
+               CERROR("Error %d reading HELLO from %pI4h\n",
+                      rc, &conn->ksnc_ipaddr);
+                LASSERT (rc < 0);
+                return rc;
+        }
 
-                /* Set again (process_receive may have cleared while I blocked for the lock) */
-                conn->ksnc_rx_ready = 1;
+        if (hello->kshm_magic != LNET_PROTO_MAGIC &&
+            hello->kshm_magic != __swab32(LNET_PROTO_MAGIC) &&
+            hello->kshm_magic != le32_to_cpu (LNET_PROTO_TCP_MAGIC)) {
+                /* Unexpected magic! */
+                CERROR ("Bad magic(1) %#08x (%#08x expected) from "
+                       "%pI4h\n", __cpu_to_le32 (hello->kshm_magic),
+                       LNET_PROTO_TCP_MAGIC, &conn->ksnc_ipaddr);
+                return -EPROTO;
+        }
 
-                if (!conn->ksnc_rx_scheduled) {  /* not being progressed */
-                        list_add_tail(&conn->ksnc_rx_list,
-                                      &sched->kss_rx_conns);
-                        conn->ksnc_rx_scheduled = 1;
-                        /* extra ref for scheduler */
-                        atomic_inc (&conn->ksnc_refcount);
+       rc = lnet_sock_read(sock, &hello->kshm_version,
+                           sizeof(hello->kshm_version), timeout);
+        if (rc != 0) {
+               CERROR("Error %d reading HELLO from %pI4h\n",
+                      rc, &conn->ksnc_ipaddr);
+               LASSERT(rc < 0);
+                return rc;
+        }
 
-                        if (waitqueue_active (&sched->kss_waitq))
-                                wake_up (&sched->kss_waitq);
+        proto = ksocknal_parse_proto_version(hello);
+        if (proto == NULL) {
+                if (!active) {
+                        /* unknown protocol from peer, tell peer my protocol */
+                        conn->ksnc_proto = &ksocknal_protocol_v3x;
+#if SOCKNAL_VERSION_DEBUG
+                        if (*ksocknal_tunables.ksnd_protocol == 2)
+                                conn->ksnc_proto = &ksocknal_protocol_v2x;
+                        else if (*ksocknal_tunables.ksnd_protocol == 1)
+                                conn->ksnc_proto = &ksocknal_protocol_v1x;
+#endif
+                        hello->kshm_nips = 0;
+                        ksocknal_send_hello(ni, conn, ni->ni_nid, hello);
                 }
 
-                spin_unlock_irqrestore (&sched->kss_lock, flags);
+               CERROR("Unknown protocol version (%d.x expected) from %pI4h\n",
+                      conn->ksnc_proto->pro_version, &conn->ksnc_ipaddr);
+
+                return -EPROTO;
         }
 
-        read_unlock (&ksocknal_data.ksnd_socklist_lock);
+        proto_match = (conn->ksnc_proto == proto);
+        conn->ksnc_proto = proto;
 
-        EXIT;
+        /* receive the rest of hello message anyway */
+        rc = conn->ksnc_proto->pro_recv_hello(conn, hello, timeout);
+        if (rc != 0) {
+               CERROR("Error %d reading or checking hello from from %pI4h\n",
+                      rc, &conn->ksnc_ipaddr);
+                LASSERT (rc < 0);
+                return rc;
+        }
+
+        *incarnation = hello->kshm_src_incarnation;
+
+        if (hello->kshm_src_nid == LNET_NID_ANY) {
+                CERROR("Expecting a HELLO hdr with a NID, but got LNET_NID_ANY"
+                      "from %pI4h\n", &conn->ksnc_ipaddr);
+                return -EPROTO;
+        }
+
+        if (!active &&
+            conn->ksnc_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) {
+                /* Userspace NAL assigns peer process ID from socket */
+                recv_id.pid = conn->ksnc_port | LNET_PID_USERFLAG;
+                recv_id.nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), conn->ksnc_ipaddr);
+        } else {
+                recv_id.nid = hello->kshm_src_nid;
+                recv_id.pid = hello->kshm_src_pid;
+        }
+
+        if (!active) {
+                *peerid = recv_id;
+
+               /* peer determines type */
+               conn->ksnc_type = ksocknal_invert_type(hello->kshm_ctype);
+               if (conn->ksnc_type == SOCKLND_CONN_NONE) {
+                       CERROR("Unexpected type %d from %s ip %pI4h\n",
+                              hello->kshm_ctype, libcfs_id2str(*peerid),
+                              &conn->ksnc_ipaddr);
+                       return -EPROTO;
+               }
+               return 0;
+       }
+
+        if (peerid->pid != recv_id.pid ||
+            peerid->nid != recv_id.nid) {
+                LCONSOLE_ERROR_MSG(0x130, "Connected successfully to %s on host"
+                                  " %pI4h, but they claimed they were "
+                                   "%s; please check your Lustre "
+                                   "configuration.\n",
+                                   libcfs_id2str(*peerid),
+                                  &conn->ksnc_ipaddr,
+                                   libcfs_id2str(recv_id));
+                return -EPROTO;
+        }
+
+        if (hello->kshm_ctype == SOCKLND_CONN_NONE) {
+                /* Possible protocol mismatch or I lost the connection race */
+                return proto_match ? EALREADY : EPROTO;
+        }
+
+       if (ksocknal_invert_type(hello->kshm_ctype) != conn->ksnc_type) {
+               CERROR("Mismatched types: me %d, %s ip %pI4h %d\n",
+                      conn->ksnc_type, libcfs_id2str(*peerid),
+                      &conn->ksnc_ipaddr,
+                      hello->kshm_ctype);
+               return -EPROTO;
+       }
+       return 0;
 }
 
-void
-ksocknal_write_space (struct sock *sk)
+static int
+ksocknal_connect (ksock_route_t *route)
 {
-        unsigned long  flags;
-        ksock_conn_t  *conn;
-        ksock_sched_t *sched;
-
-        /* interleave correctly with closing sockets... */
-        read_lock (&ksocknal_data.ksnd_socklist_lock);
-
-        conn = sk->user_data;
-
-        CDEBUG(D_NET, "sk %p wspace %d low water %d conn %p%s%s%s\n",
-               sk, tcp_wspace(sk), SOCKNAL_TX_LOW_WATER(sk), conn,
-               (conn == NULL) ? "" : (test_bit (0, &conn->ksnc_tx_ready) ?
-                                      " ready" : " blocked"),
-               (conn == NULL) ? "" : (conn->ksnc_tx_scheduled ?
-                                      " scheduled" : " idle"),
-               (conn == NULL) ? "" : (list_empty (&conn->ksnc_tx_queue) ?
-                                      " empty" : " queued"));
-
-        if (conn == NULL) {             /* raced with ksocknal_close_sock */
-                LASSERT (sk->write_space != &ksocknal_write_space);
-                sk->write_space (sk);
-        } else if (tcp_wspace(sk) >= SOCKNAL_TX_LOW_WATER(sk)) { /* got enough space */
-                clear_bit (SOCK_NOSPACE, &sk->socket->flags);
-
-                if (!conn->ksnc_tx_ready) {      /* new news */
-                        /* Set ASAP in case of concurrent calls to me */
-                        conn->ksnc_tx_ready = 1;
+       struct list_head        zombies = LIST_HEAD_INIT(zombies);
+        ksock_peer_t     *peer = route->ksnr_peer;
+        int               type;
+        int               wanted;
+       struct socket     *sock;
+        cfs_time_t        deadline;
+        int               retry_later = 0;
+        int               rc = 0;
 
-                        sched = conn->ksnc_scheduler;
+        deadline = cfs_time_add(cfs_time_current(),
+                                cfs_time_seconds(*ksocknal_tunables.ksnd_timeout));
 
-                        spin_lock_irqsave (&sched->kss_lock, flags);
+       write_lock_bh(&ksocknal_data.ksnd_global_lock);
 
-                        /* Set again (process_transmit may have
-                           cleared while I blocked for the lock) */
-                        conn->ksnc_tx_ready = 1;
+        LASSERT (route->ksnr_scheduled);
+        LASSERT (!route->ksnr_connecting);
 
-                        if (!conn->ksnc_tx_scheduled && // not being progressed
-                            !list_empty(&conn->ksnc_tx_queue)){//packets to send
-                                list_add_tail (&conn->ksnc_tx_list,
-                                               &sched->kss_tx_conns);
-                                conn->ksnc_tx_scheduled = 1;
-                                /* extra ref for scheduler */
-                                atomic_inc (&conn->ksnc_refcount);
+        route->ksnr_connecting = 1;
 
-                                if (waitqueue_active (&sched->kss_waitq))
-                                        wake_up (&sched->kss_waitq);
-                        }
+        for (;;) {
+                wanted = ksocknal_route_mask() & ~route->ksnr_connected;
+
+                /* stop connecting if peer/route got closed under me, or
+                 * route got connected while queued */
+                if (peer->ksnp_closing || route->ksnr_deleted ||
+                    wanted == 0) {
+                        retry_later = 0;
+                        break;
+                }
 
-                        spin_unlock_irqrestore (&sched->kss_lock, flags);
+                /* reschedule if peer is connecting to me */
+                if (peer->ksnp_accepting > 0) {
+                        CDEBUG(D_NET,
+                               "peer %s(%d) already connecting to me, retry later.\n",
+                               libcfs_nid2str(peer->ksnp_id.nid), peer->ksnp_accepting);
+                        retry_later = 1;
                 }
+
+                if (retry_later) /* needs reschedule */
+                        break;
+
+                if ((wanted & (1 << SOCKLND_CONN_ANY)) != 0) {
+                        type = SOCKLND_CONN_ANY;
+                } else if ((wanted & (1 << SOCKLND_CONN_CONTROL)) != 0) {
+                        type = SOCKLND_CONN_CONTROL;
+                } else if ((wanted & (1 << SOCKLND_CONN_BULK_IN)) != 0) {
+                        type = SOCKLND_CONN_BULK_IN;
+                } else {
+                        LASSERT ((wanted & (1 << SOCKLND_CONN_BULK_OUT)) != 0);
+                        type = SOCKLND_CONN_BULK_OUT;
+                }
+
+               write_unlock_bh(&ksocknal_data.ksnd_global_lock);
+
+                if (cfs_time_aftereq(cfs_time_current(), deadline)) {
+                        rc = -ETIMEDOUT;
+                        lnet_connect_console_error(rc, peer->ksnp_id.nid,
+                                                   route->ksnr_ipaddr,
+                                                   route->ksnr_port);
+                        goto failed;
+                }
+
+                rc = lnet_connect(&sock, peer->ksnp_id.nid,
+                                  route->ksnr_myipaddr,
+                                  route->ksnr_ipaddr, route->ksnr_port);
+                if (rc != 0)
+                        goto failed;
+
+                rc = ksocknal_create_conn(peer->ksnp_ni, route, sock, type);
+                if (rc < 0) {
+                        lnet_connect_console_error(rc, peer->ksnp_id.nid,
+                                                   route->ksnr_ipaddr,
+                                                   route->ksnr_port);
+                        goto failed;
+                }
+
+                /* A +ve RC means I have to retry because I lost the connection
+                 * race or I have to renegotiate protocol version */
+                retry_later = (rc != 0);
+                if (retry_later)
+                        CDEBUG(D_NET, "peer %s: conn race, retry later.\n",
+                               libcfs_nid2str(peer->ksnp_id.nid));
+
+               write_lock_bh(&ksocknal_data.ksnd_global_lock);
         }
 
-        read_unlock (&ksocknal_data.ksnd_socklist_lock);
+        route->ksnr_scheduled = 0;
+        route->ksnr_connecting = 0;
+
+        if (retry_later) {
+                /* re-queue for attention; this frees me up to handle
+                 * the peer's incoming connection request */
+
+                if (rc == EALREADY ||
+                    (rc == 0 && peer->ksnp_accepting > 0)) {
+                        /* We want to introduce a delay before next
+                         * attempt to connect if we lost conn race,
+                         * but the race is resolved quickly usually,
+                         * so min_reconnectms should be good heuristic */
+                        route->ksnr_retry_interval =
+                                cfs_time_seconds(*ksocknal_tunables.ksnd_min_reconnectms)/1000;
+                        route->ksnr_timeout = cfs_time_add(cfs_time_current(),
+                                                           route->ksnr_retry_interval);
+                }
+
+                ksocknal_launch_connection_locked(route);
+        }
+
+       write_unlock_bh(&ksocknal_data.ksnd_global_lock);
+        return retry_later;
+
+ failed:
+       write_lock_bh(&ksocknal_data.ksnd_global_lock);
+
+        route->ksnr_scheduled = 0;
+        route->ksnr_connecting = 0;
+
+        /* This is a retry rather than a new connection */
+        route->ksnr_retry_interval *= 2;
+        route->ksnr_retry_interval =
+                MAX(route->ksnr_retry_interval,
+                    cfs_time_seconds(*ksocknal_tunables.ksnd_min_reconnectms)/1000);
+        route->ksnr_retry_interval =
+                MIN(route->ksnr_retry_interval,
+                    cfs_time_seconds(*ksocknal_tunables.ksnd_max_reconnectms)/1000);
+
+        LASSERT (route->ksnr_retry_interval != 0);
+        route->ksnr_timeout = cfs_time_add(cfs_time_current(),
+                                           route->ksnr_retry_interval);
+
+       if (!list_empty(&peer->ksnp_tx_queue) &&
+            peer->ksnp_accepting == 0 &&
+            ksocknal_find_connecting_route_locked(peer) == NULL) {
+                ksock_conn_t *conn;
+
+                /* ksnp_tx_queue is queued on a conn on successful
+                 * connection for V1.x and V2.x */
+               if (!list_empty(&peer->ksnp_conns)) {
+                       conn = list_entry(peer->ksnp_conns.next,
+                                              ksock_conn_t, ksnc_list);
+                        LASSERT (conn->ksnc_proto == &ksocknal_protocol_v3x);
+                }
+
+                /* take all the blocked packets while I've got the lock and
+                 * complete below... */
+               list_splice_init(&peer->ksnp_tx_queue, &zombies);
+        }
+
+       write_unlock_bh(&ksocknal_data.ksnd_global_lock);
+
+        ksocknal_peer_failed(peer);
+        ksocknal_txlist_done(peer->ksnp_ni, &zombies, 1);
+        return 0;
+}
+
+/*
+ * check whether we need to create more connds.
+ * It will try to create new thread if it's necessary, @timeout can
+ * be updated if failed to create, so caller wouldn't keep try while
+ * running out of resource.
+ */
+static int
+ksocknal_connd_check_start(long sec, long *timeout)
+{
+       char name[16];
+        int rc;
+        int total = ksocknal_data.ksnd_connd_starting +
+                    ksocknal_data.ksnd_connd_running;
+
+        if (unlikely(ksocknal_data.ksnd_init < SOCKNAL_INIT_ALL)) {
+                /* still in initializing */
+                return 0;
+        }
+
+        if (total >= *ksocknal_tunables.ksnd_nconnds_max ||
+            total > ksocknal_data.ksnd_connd_connecting + SOCKNAL_CONND_RESV) {
+                /* can't create more connd, or still have enough
+                 * threads to handle more connecting */
+                return 0;
+        }
+
+        if (list_empty(&ksocknal_data.ksnd_connd_routes)) {
+                /* no pending connecting request */
+                return 0;
+        }
+
+        if (sec - ksocknal_data.ksnd_connd_failed_stamp <= 1) {
+                /* may run out of resource, retry later */
+                *timeout = cfs_time_seconds(1);
+                return 0;
+        }
+
+        if (ksocknal_data.ksnd_connd_starting > 0) {
+                /* serialize starting to avoid flood */
+                return 0;
+        }
+
+        ksocknal_data.ksnd_connd_starting_stamp = sec;
+        ksocknal_data.ksnd_connd_starting++;
+       spin_unlock_bh(&ksocknal_data.ksnd_connd_lock);
+
+       /* NB: total is the next id */
+       snprintf(name, sizeof(name), "socknal_cd%02d", total);
+       rc = ksocknal_thread_start(ksocknal_connd, NULL, name);
+
+       spin_lock_bh(&ksocknal_data.ksnd_connd_lock);
+        if (rc == 0)
+                return 1;
+
+        /* we tried ... */
+        LASSERT(ksocknal_data.ksnd_connd_starting > 0);
+        ksocknal_data.ksnd_connd_starting--;
+        ksocknal_data.ksnd_connd_failed_stamp = cfs_time_current_sec();
+
+        return 1;
+}
+
+/*
+ * check whether current thread can exit, it will return 1 if there are too
+ * many threads and no creating in past 120 seconds.
+ * Also, this function may update @timeout to make caller come back
+ * again to recheck these conditions.
+ */
+static int
+ksocknal_connd_check_stop(long sec, long *timeout)
+{
+        int val;
+
+        if (unlikely(ksocknal_data.ksnd_init < SOCKNAL_INIT_ALL)) {
+                /* still in initializing */
+                return 0;
+        }
+
+        if (ksocknal_data.ksnd_connd_starting > 0) {
+                /* in progress of starting new thread */
+                return 0;
+        }
+
+        if (ksocknal_data.ksnd_connd_running <=
+            *ksocknal_tunables.ksnd_nconnds) { /* can't shrink */
+                return 0;
+        }
+
+        /* created thread in past 120 seconds? */
+        val = (int)(ksocknal_data.ksnd_connd_starting_stamp +
+                    SOCKNAL_CONND_TIMEOUT - sec);
+
+        *timeout = (val > 0) ? cfs_time_seconds(val) :
+                               cfs_time_seconds(SOCKNAL_CONND_TIMEOUT);
+        if (val > 0)
+                return 0;
+
+        /* no creating in past 120 seconds */
+
+        return ksocknal_data.ksnd_connd_running >
+               ksocknal_data.ksnd_connd_connecting + SOCKNAL_CONND_RESV;
+}
+
+/* Go through connd_routes queue looking for a route that we can process
+ * right now, @timeout_p can be updated if we need to come back later */
+static ksock_route_t *
+ksocknal_connd_get_route_locked(signed long *timeout_p)
+{
+       ksock_route_t *route;
+       cfs_time_t     now;
+
+       now = cfs_time_current();
+
+       /* connd_routes can contain both pending and ordinary routes */
+       list_for_each_entry(route, &ksocknal_data.ksnd_connd_routes,
+                                ksnr_connd_list) {
+
+               if (route->ksnr_retry_interval == 0 ||
+                   cfs_time_aftereq(now, route->ksnr_timeout))
+                       return route;
+
+               if (*timeout_p == MAX_SCHEDULE_TIMEOUT ||
+                   (int)*timeout_p > (int)(route->ksnr_timeout - now))
+                       *timeout_p = (int)(route->ksnr_timeout - now);
+       }
+
+       return NULL;
 }
 
 int
-ksocknal_reaper (void *arg)
+ksocknal_connd (void *arg)
+{
+       spinlock_t    *connd_lock = &ksocknal_data.ksnd_connd_lock;
+       ksock_connreq_t   *cr;
+       wait_queue_t     wait;
+       int                nloops = 0;
+       int                cons_retry = 0;
+
+       cfs_block_allsigs();
+
+       init_waitqueue_entry(&wait, current);
+
+       spin_lock_bh(connd_lock);
+
+       LASSERT(ksocknal_data.ksnd_connd_starting > 0);
+       ksocknal_data.ksnd_connd_starting--;
+       ksocknal_data.ksnd_connd_running++;
+
+       while (!ksocknal_data.ksnd_shuttingdown) {
+               ksock_route_t *route = NULL;
+               long sec = cfs_time_current_sec();
+               long timeout = MAX_SCHEDULE_TIMEOUT;
+               int  dropped_lock = 0;
+
+               if (ksocknal_connd_check_stop(sec, &timeout)) {
+                       /* wakeup another one to check stop */
+                       wake_up(&ksocknal_data.ksnd_connd_waitq);
+                       break;
+               }
+
+                if (ksocknal_connd_check_start(sec, &timeout)) {
+                        /* created new thread */
+                        dropped_lock = 1;
+                }
+
+               if (!list_empty(&ksocknal_data.ksnd_connd_connreqs)) {
+                        /* Connection accepted by the listener */
+                       cr = list_entry(ksocknal_data.ksnd_connd_connreqs. \
+                                            next, ksock_connreq_t, ksncr_list);
+
+                       list_del(&cr->ksncr_list);
+                       spin_unlock_bh(connd_lock);
+                       dropped_lock = 1;
+
+                       ksocknal_create_conn(cr->ksncr_ni, NULL,
+                                            cr->ksncr_sock, SOCKLND_CONN_NONE);
+                       lnet_ni_decref(cr->ksncr_ni);
+                       LIBCFS_FREE(cr, sizeof(*cr));
+
+                       spin_lock_bh(connd_lock);
+                }
+
+                /* Only handle an outgoing connection request if there
+                 * is a thread left to handle incoming connections and
+                 * create new connd */
+                if (ksocknal_data.ksnd_connd_connecting + SOCKNAL_CONND_RESV <
+                    ksocknal_data.ksnd_connd_running) {
+                        route = ksocknal_connd_get_route_locked(&timeout);
+                }
+                if (route != NULL) {
+                       list_del(&route->ksnr_connd_list);
+                        ksocknal_data.ksnd_connd_connecting++;
+                       spin_unlock_bh(connd_lock);
+                        dropped_lock = 1;
+
+                        if (ksocknal_connect(route)) {
+                                /* consecutive retry */
+                                if (cons_retry++ > SOCKNAL_INSANITY_RECONN) {
+                                        CWARN("massive consecutive "
+                                             "re-connecting to %pI4h\n",
+                                             &route->ksnr_ipaddr);
+                                        cons_retry = 0;
+                                }
+                        } else {
+                                cons_retry = 0;
+                        }
+
+                        ksocknal_route_decref(route);
+
+                       spin_lock_bh(connd_lock);
+                       ksocknal_data.ksnd_connd_connecting--;
+               }
+
+               if (dropped_lock) {
+                       if (++nloops < SOCKNAL_RESCHED)
+                               continue;
+                       spin_unlock_bh(connd_lock);
+                       nloops = 0;
+                       cond_resched();
+                       spin_lock_bh(connd_lock);
+                       continue;
+               }
+
+               /* Nothing to do for 'timeout'  */
+               set_current_state(TASK_INTERRUPTIBLE);
+               add_wait_queue_exclusive(&ksocknal_data.ksnd_connd_waitq, &wait);
+               spin_unlock_bh(connd_lock);
+
+               nloops = 0;
+               schedule_timeout(timeout);
+
+               set_current_state(TASK_RUNNING);
+               remove_wait_queue(&ksocknal_data.ksnd_connd_waitq, &wait);
+               spin_lock_bh(connd_lock);
+       }
+       ksocknal_data.ksnd_connd_running--;
+       spin_unlock_bh(connd_lock);
+
+       ksocknal_thread_fini();
+       return 0;
+}
+
+static ksock_conn_t *
+ksocknal_find_timed_out_conn (ksock_peer_t *peer)
 {
-        unsigned long      flags;
+        /* We're called with a shared lock on ksnd_global_lock */
         ksock_conn_t      *conn;
-        int                rc;
-        
-        kportal_daemonize ("ksocknal_reaper");
-        kportal_blockallsigs ();
+       struct list_head        *ctmp;
+
+       list_for_each(ctmp, &peer->ksnp_conns) {
+                int     error;
+               conn = list_entry(ctmp, ksock_conn_t, ksnc_list);
+
+                /* Don't need the {get,put}connsock dance to deref ksnc_sock */
+                LASSERT (!conn->ksnc_closing);
+
+               error = conn->ksnc_sock->sk->sk_err;
+                if (error != 0) {
+                        ksocknal_conn_addref(conn);
+
+                        switch (error) {
+                        case ECONNRESET:
+                                CNETERR("A connection with %s "
+                                       "(%pI4h:%d) was reset; "
+                                        "it may have rebooted.\n",
+                                        libcfs_id2str(peer->ksnp_id),
+                                       &conn->ksnc_ipaddr,
+                                        conn->ksnc_port);
+                                break;
+                        case ETIMEDOUT:
+                                CNETERR("A connection with %s "
+                                       "(%pI4h:%d) timed out; the "
+                                        "network or node may be down.\n",
+                                        libcfs_id2str(peer->ksnp_id),
+                                       &conn->ksnc_ipaddr,
+                                        conn->ksnc_port);
+                                break;
+                        default:
+                                CNETERR("An unexpected network error %d "
+                                        "occurred with %s "
+                                       "(%pI4h:%d\n", error,
+                                        libcfs_id2str(peer->ksnp_id),
+                                       &conn->ksnc_ipaddr,
+                                        conn->ksnc_port);
+                                break;
+                        }
 
-        while (!ksocknal_data.ksnd_shuttingdown) {
-                spin_lock_irqsave (&ksocknal_data.ksnd_reaper_lock, flags);
+                        return (conn);
+                }
 
-                if (list_empty (&ksocknal_data.ksnd_reaper_list)) {
-                        conn = NULL;
-                } else {
-                        conn = list_entry (ksocknal_data.ksnd_reaper_list.next,
-                                           ksock_conn_t, ksnc_list);
-                        list_del (&conn->ksnc_list);
+                if (conn->ksnc_rx_started &&
+                    cfs_time_aftereq(cfs_time_current(),
+                                     conn->ksnc_rx_deadline)) {
+                        /* Timed out incomplete incoming message */
+                        ksocknal_conn_addref(conn);
+                       CNETERR("Timeout receiving from %s (%pI4h:%d), "
+                                "state %d wanted %d left %d\n",
+                                libcfs_id2str(peer->ksnp_id),
+                               &conn->ksnc_ipaddr,
+                                conn->ksnc_port,
+                                conn->ksnc_rx_state,
+                                conn->ksnc_rx_nob_wanted,
+                                conn->ksnc_rx_nob_left);
+                        return (conn);
                 }
 
-                spin_unlock_irqrestore (&ksocknal_data.ksnd_reaper_lock, flags);
+               if ((!list_empty(&conn->ksnc_tx_queue) ||
+                    conn->ksnc_sock->sk->sk_wmem_queued != 0) &&
+                    cfs_time_aftereq(cfs_time_current(),
+                                     conn->ksnc_tx_deadline)) {
+                        /* Timed out messages queued for sending or
+                         * buffered in the socket's send buffer */
+                        ksocknal_conn_addref(conn);
+                       CNETERR("Timeout sending data to %s (%pI4h:%d) "
+                                "the network or that node may be down.\n",
+                                libcfs_id2str(peer->ksnp_id),
+                               &conn->ksnc_ipaddr, conn->ksnc_port);
+                        return (conn);
+                }
+        }
+
+        return (NULL);
+}
+
+static inline void
+ksocknal_flush_stale_txs(ksock_peer_t *peer)
+{
+        ksock_tx_t        *tx;
+       struct list_head        stale_txs = LIST_HEAD_INIT(stale_txs);
+
+       write_lock_bh(&ksocknal_data.ksnd_global_lock);
+
+       while (!list_empty(&peer->ksnp_tx_queue)) {
+               tx = list_entry(peer->ksnp_tx_queue.next,
+                                     ksock_tx_t, tx_list);
+
+                if (!cfs_time_aftereq(cfs_time_current(),
+                                      tx->tx_deadline))
+                        break;
+
+               list_del(&tx->tx_list);
+               list_add_tail(&tx->tx_list, &stale_txs);
+        }
+
+       write_unlock_bh(&ksocknal_data.ksnd_global_lock);
+
+        ksocknal_txlist_done(peer->ksnp_ni, &stale_txs, 1);
+}
+
+static int
+ksocknal_send_keepalive_locked(ksock_peer_t *peer)
+__must_hold(&ksocknal_data.ksnd_global_lock)
+{
+        ksock_sched_t  *sched;
+        ksock_conn_t   *conn;
+        ksock_tx_t     *tx;
+
+       /* last_alive will be updated by create_conn */
+       if (list_empty(&peer->ksnp_conns))
+                return 0;
 
-                if (conn != NULL)
-                        ksocknal_close_conn (conn);
-                else {
-                        rc = wait_event_interruptible (ksocknal_data.ksnd_reaper_waitq,
-                                                       ksocknal_data.ksnd_shuttingdown ||
-                                                       !list_empty(&ksocknal_data.ksnd_reaper_list));
-                        LASSERT (rc == 0);
+        if (peer->ksnp_proto != &ksocknal_protocol_v3x)
+                return 0;
+
+        if (*ksocknal_tunables.ksnd_keepalive <= 0 ||
+            cfs_time_before(cfs_time_current(),
+                            cfs_time_add(peer->ksnp_last_alive,
+                                         cfs_time_seconds(*ksocknal_tunables.ksnd_keepalive))))
+                return 0;
+
+        if (cfs_time_before(cfs_time_current(),
+                            peer->ksnp_send_keepalive))
+                return 0;
+
+        /* retry 10 secs later, so we wouldn't put pressure
+         * on this peer if we failed to send keepalive this time */
+        peer->ksnp_send_keepalive = cfs_time_shift(10);
+
+        conn = ksocknal_find_conn_locked(peer, NULL, 1);
+        if (conn != NULL) {
+                sched = conn->ksnc_scheduler;
+
+               spin_lock_bh(&sched->kss_lock);
+               if (!list_empty(&conn->ksnc_tx_queue)) {
+                       spin_unlock_bh(&sched->kss_lock);
+                       /* there is an queued ACK, don't need keepalive */
+                       return 0;
+               }
+
+               spin_unlock_bh(&sched->kss_lock);
+       }
+
+       read_unlock(&ksocknal_data.ksnd_global_lock);
+
+       /* cookie = 1 is reserved for keepalive PING */
+       tx = ksocknal_alloc_tx_noop(1, 1);
+       if (tx == NULL) {
+               read_lock(&ksocknal_data.ksnd_global_lock);
+               return -ENOMEM;
+       }
+
+       if (ksocknal_launch_packet(peer->ksnp_ni, tx, peer->ksnp_id) == 0) {
+               read_lock(&ksocknal_data.ksnd_global_lock);
+               return 1;
+       }
+
+       ksocknal_free_tx(tx);
+       read_lock(&ksocknal_data.ksnd_global_lock);
+
+       return -EIO;
+}
+
+
+static void
+ksocknal_check_peer_timeouts (int idx)
+{
+       struct list_head       *peers = &ksocknal_data.ksnd_peers[idx];
+        ksock_peer_t     *peer;
+        ksock_conn_t     *conn;
+        ksock_tx_t       *tx;
+
+ again:
+        /* NB. We expect to have a look at all the peers and not find any
+         * connections to time out, so we just use a shared lock while we
+         * take a look... */
+       read_lock(&ksocknal_data.ksnd_global_lock);
+
+       list_for_each_entry(peer, peers, ksnp_list) {
+               ksock_tx_t *tx_stale;
+               cfs_time_t  deadline = 0;
+               int         resid = 0;
+               int         n     = 0;
+
+                if (ksocknal_send_keepalive_locked(peer) != 0) {
+                       read_unlock(&ksocknal_data.ksnd_global_lock);
+                        goto again;
+                }
+
+                conn = ksocknal_find_timed_out_conn (peer);
+
+                if (conn != NULL) {
+                       read_unlock(&ksocknal_data.ksnd_global_lock);
+
+                        ksocknal_close_conn_and_siblings (conn, -ETIMEDOUT);
+
+                        /* NB we won't find this one again, but we can't
+                         * just proceed with the next peer, since we dropped
+                         * ksnd_global_lock and it might be dead already! */
+                        ksocknal_conn_decref(conn);
+                        goto again;
                 }
+
+                /* we can't process stale txs right here because we're
+                 * holding only shared lock */
+               if (!list_empty(&peer->ksnp_tx_queue)) {
+                        ksock_tx_t *tx =
+                               list_entry(peer->ksnp_tx_queue.next,
+                                                ksock_tx_t, tx_list);
+
+                        if (cfs_time_aftereq(cfs_time_current(),
+                                             tx->tx_deadline)) {
+
+                                ksocknal_peer_addref(peer);
+                               read_unlock(&ksocknal_data.ksnd_global_lock);
+
+                                ksocknal_flush_stale_txs(peer);
+
+                                ksocknal_peer_decref(peer);
+                                goto again;
+                        }
+                }
+
+               if (list_empty(&peer->ksnp_zc_req_list))
+                        continue;
+
+               tx_stale = NULL;
+               spin_lock(&peer->ksnp_lock);
+               list_for_each_entry(tx, &peer->ksnp_zc_req_list, tx_zc_list) {
+                        if (!cfs_time_aftereq(cfs_time_current(),
+                                              tx->tx_deadline))
+                                break;
+                        /* ignore the TX if connection is being closed */
+                        if (tx->tx_conn->ksnc_closing)
+                                continue;
+                        n++;
+                       if (tx_stale == NULL)
+                               tx_stale = tx;
+                }
+
+               if (tx_stale == NULL) {
+                       spin_unlock(&peer->ksnp_lock);
+                       continue;
+               }
+
+               deadline = tx_stale->tx_deadline;
+               resid    = tx_stale->tx_resid;
+               conn     = tx_stale->tx_conn;
+               ksocknal_conn_addref(conn);
+
+               spin_unlock(&peer->ksnp_lock);
+               read_unlock(&ksocknal_data.ksnd_global_lock);
+
+               CERROR("Total %d stale ZC_REQs for peer %s detected; the "
+                      "oldest(%p) timed out %ld secs ago, "
+                      "resid: %d, wmem: %d\n",
+                      n, libcfs_nid2str(peer->ksnp_id.nid), tx_stale,
+                      cfs_duration_sec(cfs_time_current() - deadline),
+                      resid, conn->ksnc_sock->sk->sk_wmem_queued);
+
+                ksocknal_close_conn_and_siblings (conn, -ETIMEDOUT);
+                ksocknal_conn_decref(conn);
+                goto again;
         }
 
-        ksocknal_thread_fini ();
-        return (0);
+       read_unlock(&ksocknal_data.ksnd_global_lock);
 }
 
-nal_cb_t ksocknal_lib = {
-        nal_data:       &ksocknal_data,                /* NAL private data */
-        cb_send:         ksocknal_send,
-        cb_send_pages:   ksocknal_send_pages,
-        cb_recv:         ksocknal_recv,
-        cb_recv_pages:   ksocknal_recv_pages,
-        cb_read:         ksocknal_read,
-        cb_write:        ksocknal_write,
-        cb_callback:     ksocknal_callback,
-        cb_malloc:       ksocknal_malloc,
-        cb_free:         ksocknal_free,
-        cb_printf:       ksocknal_printf,
-        cb_cli:          ksocknal_cli,
-        cb_sti:          ksocknal_sti,
-        cb_dist:         ksocknal_dist
-};
+int ksocknal_reaper(void *arg)
+{
+       wait_queue_t     wait;
+       ksock_conn_t      *conn;
+       ksock_sched_t     *sched;
+       struct list_head         enomem_conns;
+        int                nenomem_conns;
+        cfs_duration_t     timeout;
+        int                i;
+        int                peer_index = 0;
+        cfs_time_t         deadline = cfs_time_current();
+
+        cfs_block_allsigs ();
+
+       INIT_LIST_HEAD(&enomem_conns);
+       init_waitqueue_entry(&wait, current);
+
+       spin_lock_bh(&ksocknal_data.ksnd_reaper_lock);
+
+        while (!ksocknal_data.ksnd_shuttingdown) {
+
+               if (!list_empty(&ksocknal_data.ksnd_deathrow_conns)) {
+                       conn = list_entry(ksocknal_data. \
+                                               ksnd_deathrow_conns.next,
+                                               ksock_conn_t, ksnc_list);
+                       list_del(&conn->ksnc_list);
+
+                       spin_unlock_bh(&ksocknal_data.ksnd_reaper_lock);
+
+                       ksocknal_terminate_conn(conn);
+                       ksocknal_conn_decref(conn);
+
+                       spin_lock_bh(&ksocknal_data.ksnd_reaper_lock);
+                        continue;
+                }
+
+               if (!list_empty(&ksocknal_data.ksnd_zombie_conns)) {
+                       conn = list_entry(ksocknal_data.ksnd_zombie_conns.\
+                                               next, ksock_conn_t, ksnc_list);
+                       list_del(&conn->ksnc_list);
+
+                       spin_unlock_bh(&ksocknal_data.ksnd_reaper_lock);
+
+                       ksocknal_destroy_conn(conn);
+
+                       spin_lock_bh(&ksocknal_data.ksnd_reaper_lock);
+                        continue;
+                }
+
+               if (!list_empty(&ksocknal_data.ksnd_enomem_conns)) {
+                       list_add(&enomem_conns,
+                                     &ksocknal_data.ksnd_enomem_conns);
+                       list_del_init(&ksocknal_data.ksnd_enomem_conns);
+                }
+
+               spin_unlock_bh(&ksocknal_data.ksnd_reaper_lock);
+
+                /* reschedule all the connections that stalled with ENOMEM... */
+                nenomem_conns = 0;
+               while (!list_empty(&enomem_conns)) {
+                       conn = list_entry(enomem_conns.next,
+                                               ksock_conn_t, ksnc_tx_list);
+                       list_del(&conn->ksnc_tx_list);
+
+                        sched = conn->ksnc_scheduler;
+
+                       spin_lock_bh(&sched->kss_lock);
+
+                       LASSERT(conn->ksnc_tx_scheduled);
+                       conn->ksnc_tx_ready = 1;
+                       list_add_tail(&conn->ksnc_tx_list,
+                                         &sched->kss_tx_conns);
+                       wake_up(&sched->kss_waitq);
+
+                       spin_unlock_bh(&sched->kss_lock);
+                        nenomem_conns++;
+                }
+
+                /* careful with the jiffy wrap... */
+                while ((timeout = cfs_time_sub(deadline,
+                                               cfs_time_current())) <= 0) {
+                        const int n = 4;
+                        const int p = 1;
+                        int       chunk = ksocknal_data.ksnd_peer_hash_size;
+
+                        /* Time to check for timeouts on a few more peers: I do
+                         * checks every 'p' seconds on a proportion of the peer
+                         * table and I need to check every connection 'n' times
+                         * within a timeout interval, to ensure I detect a
+                         * timeout on any connection within (n+1)/n times the
+                         * timeout interval. */
+
+                        if (*ksocknal_tunables.ksnd_timeout > n * p)
+                                chunk = (chunk * n * p) /
+                                        *ksocknal_tunables.ksnd_timeout;
+                        if (chunk == 0)
+                                chunk = 1;
+
+                        for (i = 0; i < chunk; i++) {
+                                ksocknal_check_peer_timeouts (peer_index);
+                                peer_index = (peer_index + 1) %
+                                             ksocknal_data.ksnd_peer_hash_size;
+                        }
+
+                        deadline = cfs_time_add(deadline, cfs_time_seconds(p));
+                }
+
+                if (nenomem_conns != 0) {
+                        /* Reduce my timeout if I rescheduled ENOMEM conns.
+                         * This also prevents me getting woken immediately
+                         * if any go back on my enomem list. */
+                        timeout = SOCKNAL_ENOMEM_RETRY;
+                }
+                ksocknal_data.ksnd_reaper_waketime =
+                        cfs_time_add(cfs_time_current(), timeout);
+
+                       set_current_state(TASK_INTERRUPTIBLE);
+               add_wait_queue(&ksocknal_data.ksnd_reaper_waitq, &wait);
+
+               if (!ksocknal_data.ksnd_shuttingdown &&
+                   list_empty(&ksocknal_data.ksnd_deathrow_conns) &&
+                   list_empty(&ksocknal_data.ksnd_zombie_conns))
+                       schedule_timeout(timeout);
+
+               set_current_state(TASK_RUNNING);
+               remove_wait_queue(&ksocknal_data.ksnd_reaper_waitq, &wait);
+
+               spin_lock_bh(&ksocknal_data.ksnd_reaper_lock);
+       }
+
+       spin_unlock_bh(&ksocknal_data.ksnd_reaper_lock);
+
+       ksocknal_thread_fini();
+       return 0;
+}