Whamcloud - gitweb
LU-1517 ptlrpc: throw net error to ptlrpc for bulk
[fs/lustre-release.git] / lustre / ptlrpc / events.c
index 167898a..55cc32e 100644 (file)
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
  *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #define DEBUG_SUBSYSTEM S_RPC
 
-#ifdef __KERNEL__
-#include <linux/module.h>
+#ifndef __KERNEL__
+# include <liblustre.h>
 #else
-#include <liblustre.h>
+# include <libcfs/libcfs.h>
+# ifdef __mips64__
+#  include <linux/kernel.h>
+# endif
 #endif
-#include <linux/obd_class.h>
-#include <linux/lustre_net.h>
 
-struct ptlrpc_ni  ptlrpc_interfaces[NAL_MAX_NR];
-int               ptlrpc_ninterfaces;
+#include <obd_class.h>
+#include <lustre_net.h>
+#include <lustre_sec.h>
+#include "ptlrpc_internal.h"
+
+lnet_handle_eq_t   ptlrpc_eq_h;
 
 /*
- *  Free the packet when it has gone out
+ *  Client's outgoing request callback
  */
-static int request_out_callback(ptl_event_t *ev)
+void request_out_callback(lnet_event_t *ev)
 {
-        struct ptlrpc_request *req = ev->mem_desc.user_ptr;
+        struct ptlrpc_cb_id   *cbid = ev->md.user_ptr;
+        struct ptlrpc_request *req = cbid->cbid_arg;
         ENTRY;
 
-        /* requests always contiguous */
-        LASSERT((ev->mem_desc.options & (PTL_MD_IOV | PTL_MD_KIOV)) == 0);
+        LASSERT (ev->type == LNET_EVENT_SEND ||
+                 ev->type == LNET_EVENT_UNLINK);
+        LASSERT (ev->unlinked);
+
+        DEBUG_REQ(D_NET, req, "type %d, status %d", ev->type, ev->status);
+
+        sptlrpc_request_out_callback(req);
+        req->rq_real_sent = cfs_time_current_sec();
+
+        if (ev->type == LNET_EVENT_UNLINK || ev->status != 0) {
 
-        if (ev->type != PTL_EVENT_SENT) {
-                // XXX make sure we understand all events, including ACK's
-                CERROR("Unknown event %d\n", ev->type);
-                LBUG();
+                /* Failed send: make it seem like the reply timed out, just
+                 * like failing sends in client.c does currently...  */
+
+                cfs_spin_lock(&req->rq_lock);
+                req->rq_net_err = 1;
+                cfs_spin_unlock(&req->rq_lock);
+
+                ptlrpc_client_wake_req(req);
         }
 
-        /* this balances the atomic_inc in ptl_send_rpc() */
         ptlrpc_req_finished(req);
-        RETURN(1);
+
+        EXIT;
 }
 
 /*
- *  Free the packet when it has gone out
+ * Client's incoming reply callback
  */
-static int reply_out_callback(ptl_event_t *ev)
+void reply_in_callback(lnet_event_t *ev)
 {
-        struct ptlrpc_request *req = ev->mem_desc.user_ptr;
-        unsigned long          flags;
+        struct ptlrpc_cb_id   *cbid = ev->md.user_ptr;
+        struct ptlrpc_request *req = cbid->cbid_arg;
         ENTRY;
 
-        /* replies always contiguous */
-        LASSERT((ev->mem_desc.options & (PTL_MD_IOV | PTL_MD_KIOV)) == 0);
-
-        if (ev->type == PTL_EVENT_SENT) {
-                /* NB don't even know if this is the current reply! In fact
-                 * we can't touch any state in the request, since the
-                 * service handler zeros it on each incoming request. */
-                OBD_FREE(ev->mem_desc.start, ev->mem_desc.length);
-        } else if (ev->type == PTL_EVENT_ACK) {
-                LASSERT(req->rq_want_ack);
-                spin_lock_irqsave(&req->rq_lock, flags);
-                req->rq_want_ack = 0;
-                wake_up(&req->rq_wait_for_rep);
-                spin_unlock_irqrestore(&req->rq_lock, flags);
+        DEBUG_REQ(D_NET, req, "type %d, status %d", ev->type, ev->status);
+
+        LASSERT (ev->type == LNET_EVENT_PUT || ev->type == LNET_EVENT_UNLINK);
+        LASSERT (ev->md.start == req->rq_repbuf);
+        LASSERT (ev->offset + ev->mlength <= req->rq_repbuf_len);
+        /* We've set LNET_MD_MANAGE_REMOTE for all outgoing requests
+           for adaptive timeouts' early reply. */
+        LASSERT((ev->md.options & LNET_MD_MANAGE_REMOTE) != 0);
+
+        cfs_spin_lock(&req->rq_lock);
+
+        req->rq_receiving_reply = 0;
+        req->rq_early = 0;
+        if (ev->unlinked)
+                req->rq_must_unlink = 0;
+
+        if (ev->status)
+                goto out_wake;
+
+        if (ev->type == LNET_EVENT_UNLINK) {
+                LASSERT(ev->unlinked);
+                DEBUG_REQ(D_NET, req, "unlink");
+                goto out_wake;
+        }
+
+        if (ev->mlength < ev->rlength ) {
+                CDEBUG(D_RPCTRACE, "truncate req %p rpc %d - %d+%d\n", req,
+                       req->rq_replen, ev->rlength, ev->offset);
+                req->rq_reply_truncate = 1;
+                req->rq_replied = 1;
+                req->rq_status = -EOVERFLOW;
+                req->rq_nob_received = ev->rlength + ev->offset;
+                goto out_wake;
+        }
+
+        if ((ev->offset == 0) &&
+            ((lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_AT_SUPPORT))) {
+                /* Early reply */
+                DEBUG_REQ(D_ADAPTTO, req,
+                          "Early reply received: mlen=%u offset=%d replen=%d "
+                          "replied=%d unlinked=%d", ev->mlength, ev->offset,
+                          req->rq_replen, req->rq_replied, ev->unlinked);
+
+                req->rq_early_count++; /* number received, client side */
+
+                if (req->rq_replied)   /* already got the real reply */
+                        goto out_wake;
+
+                req->rq_early = 1;
+                req->rq_reply_off = ev->offset;
+                req->rq_nob_received = ev->mlength;
+                /* And we're still receiving */
+                req->rq_receiving_reply = 1;
         } else {
-                // XXX make sure we understand all events
-                CERROR("Unknown event %d\n", ev->type);
-                LBUG();
+                /* Real reply */
+                req->rq_rep_swab_mask = 0;
+                req->rq_replied = 1;
+                req->rq_reply_off = ev->offset;
+                req->rq_nob_received = ev->mlength;
+                /* LNetMDUnlink can't be called under the LNET_LOCK,
+                   so we must unlink in ptlrpc_unregister_reply */
+                DEBUG_REQ(D_INFO, req,
+                          "reply in flags=%x mlen=%u offset=%d replen=%d",
+                          lustre_msg_get_flags(req->rq_reqmsg),
+                          ev->mlength, ev->offset, req->rq_replen);
         }
 
-        RETURN(1);
+        req->rq_import->imp_last_reply_time = cfs_time_current_sec();
+
+out_wake:
+        /* NB don't unlock till after wakeup; req can disappear under us
+         * since we don't have our own ref */
+        ptlrpc_client_wake_req(req);
+        cfs_spin_unlock(&req->rq_lock);
+        EXIT;
 }
 
 /*
- * Wake up the thread waiting for the reply once it comes in.
+ * Client's bulk has been written/read
  */
-int reply_in_callback(ptl_event_t *ev)
+void client_bulk_callback (lnet_event_t *ev)
 {
-        struct ptlrpc_request *req = ev->mem_desc.user_ptr;
-        unsigned long flags;
+        struct ptlrpc_cb_id     *cbid = ev->md.user_ptr;
+        struct ptlrpc_bulk_desc *desc = cbid->cbid_arg;
+        struct ptlrpc_request   *req;
         ENTRY;
 
-        /* replies always contiguous */
-        LASSERT((ev->mem_desc.options & (PTL_MD_IOV | PTL_MD_KIOV)) == 0);
+        LASSERT ((desc->bd_type == BULK_PUT_SINK &&
+                  ev->type == LNET_EVENT_PUT) ||
+                 (desc->bd_type == BULK_GET_SOURCE &&
+                  ev->type == LNET_EVENT_GET) ||
+                 ev->type == LNET_EVENT_UNLINK);
+        LASSERT (ev->unlinked);
 
-        if (req->rq_xid == 0x5a5a5a5a5a5a5a5a) {
-                CERROR("Reply received for freed request!  Probably a missing "
-                       "ptlrpc_abort()\n");
-                LBUG();
-        }
+        if (CFS_FAIL_CHECK_ORSET(OBD_FAIL_PTLRPC_CLIENT_BULK_CB, CFS_FAIL_ONCE))
+                ev->status = -EIO;
 
-        if (req->rq_xid != ev->match_bits) {
-                CERROR("Reply packet for wrong request\n");
-                LBUG();
-        }
+        if (CFS_FAIL_CHECK_ORSET(OBD_FAIL_PTLRPC_CLIENT_BULK_CB2,CFS_FAIL_ONCE))
+                ev->status = -EIO;
 
-        if (ev->type == PTL_EVENT_PUT) {
-                /* Bug 1190: should handle non-zero offset as a protocol
-                 * error  */
-                LASSERT (ev->offset == 0);
+        CDEBUG((ev->status == 0) ? D_NET : D_ERROR,
+               "event type %d, status %d, desc %p\n",
+               ev->type, ev->status, desc);
 
-                spin_lock_irqsave (&req->rq_lock, flags);
-                LASSERT (req->rq_receiving_reply);
-                req->rq_receiving_reply = 0;
-                req->rq_replied = 1;
-                if (req->rq_set != NULL)
-                        wake_up(&req->rq_set->set_waitq);
-                else
-                        wake_up(&req->rq_wait_for_rep);
-                spin_unlock_irqrestore (&req->rq_lock, flags);
+        cfs_spin_lock(&desc->bd_lock);
+        req = desc->bd_req;
+        LASSERT(desc->bd_network_rw);
+        desc->bd_network_rw = 0;
+
+        if (ev->type != LNET_EVENT_UNLINK && ev->status == 0) {
+                desc->bd_success = 1;
+                desc->bd_nob_transferred = ev->mlength;
+                desc->bd_sender = ev->sender;
         } else {
-                // XXX make sure we understand all events, including ACKs
-                CERROR("Unknown event %d\n", ev->type);
-                LBUG();
+                /* start reconnect and resend if network error hit */
+                cfs_spin_lock(&req->rq_lock);
+                req->rq_net_err = 1;
+                cfs_spin_unlock(&req->rq_lock);
         }
 
-        RETURN(1);
+        /* release the encrypted pages for write */
+        if (desc->bd_req->rq_bulk_write)
+                sptlrpc_enc_pool_put_pages(desc);
+
+        /* NB don't unlock till after wakeup; desc can disappear under us
+         * otherwise */
+        ptlrpc_client_wake_req(req);
+
+        cfs_spin_unlock(&desc->bd_lock);
+        EXIT;
 }
 
-int request_in_callback(ptl_event_t *ev)
+/*
+ * We will have percpt request history list for ptlrpc service in upcoming
+ * patches because we don't want to be serialized by current per-service
+ * history operations. So we require history ID can (somehow) show arriving
+ * order w/o grabbing global lock, and user can sort them in userspace.
+ *
+ * This is how we generate history ID for ptlrpc_request:
+ * ----------------------------------------------------
+ * |  32 bits  |  16 bits  | (16 - X)bits  |  X bits  |
+ * ----------------------------------------------------
+ * |  seconds  | usec / 16 |   sequence    | CPT id   |
+ * ----------------------------------------------------
+ *
+ * it might not be precise but should be good enough.
+ */
+
+#define REQS_CPT_BITS(svcpt)   ((svcpt)->scp_service->srv_cpt_bits)
+
+#define REQS_SEC_SHIFT         32
+#define REQS_USEC_SHIFT                16
+#define REQS_SEQ_SHIFT(svcpt)  REQS_CPT_BITS(svcpt)
+
+static void ptlrpc_req_add_history(struct ptlrpc_service_part *svcpt,
+                                  struct ptlrpc_request *req)
 {
-        struct ptlrpc_request_buffer_desc *rqbd = ev->mem_desc.user_ptr;
-        struct ptlrpc_srv_ni  *srv_ni = rqbd->rqbd_srv_ni;
-        struct ptlrpc_service *service = srv_ni->sni_service;
-
-        /* requests always contiguous */
-        LASSERT((ev->mem_desc.options & (PTL_MD_IOV | PTL_MD_KIOV)) == 0);
-        /* we only enable puts */
-        LASSERT(ev->type == PTL_EVENT_PUT);
-        LASSERT(atomic_read(&srv_ni->sni_nrqbds_receiving) > 0);
-        LASSERT(atomic_read(&rqbd->rqbd_refcount) > 0);
-
-        if (ev->rlength != ev->mlength)
-                CERROR("Warning: Possibly truncated rpc (%d/%d)\n",
-                       ev->mlength, ev->rlength);
-
-        if (!PtlHandleEqual (ev->unlinked_me, PTL_HANDLE_NONE)) {
-                /* This is the last request to be received into this
-                 * request buffer.  We don't bump the refcount, since the
-                 * thread servicing this event is effectively taking over
-                 * portals' reference.
-                 */
-                /* NB ev->unlinked_me.nal_idx is not set properly in a callback */
-                LASSERT(ev->unlinked_me.cookie==rqbd->rqbd_me_h.cookie);
-
-                /* we're off the air */
-                /* we'll probably start dropping packets in portals soon */
-                if (atomic_dec_and_test(&srv_ni->sni_nrqbds_receiving))
-                        CERROR("All request buffers busy\n");
+       __u64   sec = req->rq_arrival_time.tv_sec;
+       __u32   usec = req->rq_arrival_time.tv_usec >> 4; /* usec / 16 */
+       __u64   new_seq;
+
+       /* set sequence ID for request and add it to history list,
+        * it must be called with hold svcpt::scp_lock */
+
+       new_seq = (sec << REQS_SEC_SHIFT) |
+                 (usec << REQS_USEC_SHIFT) | svcpt->scp_cpt;
+       if (new_seq > svcpt->scp_hist_seq) {
+               /* This handles the initial case of scp_hist_seq == 0 or
+                * we just jumped into a new time window */
+               svcpt->scp_hist_seq = new_seq;
+       } else {
+               LASSERT(REQS_SEQ_SHIFT(svcpt) < REQS_USEC_SHIFT);
+               /* NB: increase sequence number in current usec bucket,
+                * however, it's possible that we used up all bits for
+                * sequence and jumped into the next usec bucket (future time),
+                * then we hope there will be less RPCs per bucket at some
+                * point, and sequence will catch up again */
+               svcpt->scp_hist_seq += (1U << REQS_SEQ_SHIFT(svcpt));
+               new_seq = svcpt->scp_hist_seq;
+       }
+
+       req->rq_history_seq = new_seq;
+
+       cfs_list_add_tail(&req->rq_history_list, &svcpt->scp_hist_reqs);
+}
+
+/*
+ * Server's incoming request callback
+ */
+void request_in_callback(lnet_event_t *ev)
+{
+       struct ptlrpc_cb_id               *cbid = ev->md.user_ptr;
+       struct ptlrpc_request_buffer_desc *rqbd = cbid->cbid_arg;
+       struct ptlrpc_service_part        *svcpt = rqbd->rqbd_svcpt;
+       struct ptlrpc_service             *service = svcpt->scp_service;
+        struct ptlrpc_request             *req;
+        ENTRY;
+
+        LASSERT (ev->type == LNET_EVENT_PUT ||
+                 ev->type == LNET_EVENT_UNLINK);
+        LASSERT ((char *)ev->md.start >= rqbd->rqbd_buffer);
+        LASSERT ((char *)ev->md.start + ev->offset + ev->mlength <=
+                 rqbd->rqbd_buffer + service->srv_buf_size);
+
+        CDEBUG((ev->status == 0) ? D_NET : D_ERROR,
+               "event type %d, status %d, service %s\n",
+               ev->type, ev->status, service->srv_name);
+
+        if (ev->unlinked) {
+                /* If this is the last request message to fit in the
+                 * request buffer we can use the request object embedded in
+                 * rqbd.  Note that if we failed to allocate a request,
+                 * we'd have to re-post the rqbd, which we can't do in this
+                 * context. */
+                req = &rqbd->rqbd_req;
+                memset(req, 0, sizeof (*req));
         } else {
-                /* +1 ref for service thread */
-                atomic_inc(&rqbd->rqbd_refcount);
+                LASSERT (ev->type == LNET_EVENT_PUT);
+                if (ev->status != 0) {
+                        /* We moaned above already... */
+                        return;
+                }
+                OBD_ALLOC_GFP(req, sizeof(*req), CFS_ALLOC_ATOMIC_TRY);
+                if (req == NULL) {
+                        CERROR("Can't allocate incoming request descriptor: "
+                               "Dropping %s RPC from %s\n",
+                               service->srv_name,
+                               libcfs_id2str(ev->initiator));
+                        return;
+                }
         }
 
-        wake_up(&service->srv_waitq);
+        /* NB we ABSOLUTELY RELY on req being zeroed, so pointers are NULL,
+         * flags are reset and scalars are zero.  We only set the message
+         * size to non-zero if this was a successful receive. */
+        req->rq_xid = ev->match_bits;
+        req->rq_reqbuf = ev->md.start + ev->offset;
+        if (ev->type == LNET_EVENT_PUT && ev->status == 0)
+                req->rq_reqdata_len = ev->mlength;
+        cfs_gettimeofday(&req->rq_arrival_time);
+        req->rq_peer = ev->initiator;
+        req->rq_self = ev->target.nid;
+        req->rq_rqbd = rqbd;
+        req->rq_phase = RQ_PHASE_NEW;
+        cfs_spin_lock_init(&req->rq_lock);
+        CFS_INIT_LIST_HEAD(&req->rq_timed_list);
+       CFS_INIT_LIST_HEAD(&req->rq_exp_list);
+        cfs_atomic_set(&req->rq_refcount, 1);
+        if (ev->type == LNET_EVENT_PUT)
+                CDEBUG(D_INFO, "incoming req@%p x"LPU64" msgsize %u\n",
+                       req, req->rq_xid, ev->mlength);
+
+        CDEBUG(D_RPCTRACE, "peer: %s\n", libcfs_id2str(req->rq_peer));
+
+       cfs_spin_lock(&svcpt->scp_lock);
+
+       ptlrpc_req_add_history(svcpt, req);
+
+       if (ev->unlinked) {
+               svcpt->scp_nrqbds_posted--;
+               CDEBUG(D_INFO, "Buffer complete: %d buffers still posted\n",
+                      svcpt->scp_nrqbds_posted);
+
+               /* Normally, don't complain about 0 buffers posted; LNET won't
+                * drop incoming reqs since we set the portal lazy */
+               if (test_req_buffer_pressure &&
+                   ev->type != LNET_EVENT_UNLINK &&
+                   svcpt->scp_nrqbds_posted == 0)
+                        CWARN("All %s request buffers busy\n",
+                              service->srv_name);
+
+                /* req takes over the network's ref on rqbd */
+        } else {
+                /* req takes a ref on rqbd */
+                rqbd->rqbd_refcount++;
+        }
 
-        return 0;
+       cfs_list_add_tail(&req->rq_list, &svcpt->scp_req_incoming);
+       svcpt->scp_nreqs_incoming++;
+
+       /* NB everything can disappear under us once the request
+        * has been queued and we unlock, so do the wake now... */
+       cfs_waitq_signal(&svcpt->scp_waitq);
+
+       cfs_spin_unlock(&svcpt->scp_lock);
+       EXIT;
 }
 
-static int bulk_put_source_callback(ptl_event_t *ev)
+/*
+ *  Server's outgoing reply callback
+ */
+void reply_out_callback(lnet_event_t *ev)
 {
-        unsigned long            flags;
-        struct ptlrpc_bulk_desc *desc = ev->mem_desc.user_ptr;
+       struct ptlrpc_cb_id       *cbid = ev->md.user_ptr;
+       struct ptlrpc_reply_state *rs = cbid->cbid_arg;
+       struct ptlrpc_service_part *svcpt = rs->rs_svcpt;
         ENTRY;
 
-        CDEBUG(D_NET, "got %s event %d\n",
-               (ev->type == PTL_EVENT_SENT) ? "SENT" :
-               (ev->type == PTL_EVENT_ACK)  ? "ACK"  : "UNEXPECTED", ev->type);
+        LASSERT (ev->type == LNET_EVENT_SEND ||
+                 ev->type == LNET_EVENT_ACK ||
+                 ev->type == LNET_EVENT_UNLINK);
+
+        if (!rs->rs_difficult) {
+                /* 'Easy' replies have no further processing so I drop the
+                 * net's ref on 'rs' */
+                LASSERT (ev->unlinked);
+                ptlrpc_rs_decref(rs);
+                EXIT;
+                return;
+        }
+
+        LASSERT (rs->rs_on_net);
+
+        if (ev->unlinked) {
+                /* Last network callback. The net's ref on 'rs' stays put
+                 * until ptlrpc_handle_rs() is done with it */
+               cfs_spin_lock(&svcpt->scp_rep_lock);
+               cfs_spin_lock(&rs->rs_lock);
+
+               rs->rs_on_net = 0;
+               if (!rs->rs_no_ack ||
+                   rs->rs_transno <=
+                   rs->rs_export->exp_obd->obd_last_committed)
+                       ptlrpc_schedule_difficult_reply(rs);
+
+               cfs_spin_unlock(&rs->rs_lock);
+               cfs_spin_unlock(&svcpt->scp_rep_lock);
+       }
+       EXIT;
+}
 
-        LASSERT(ev->type == PTL_EVENT_SENT || ev->type == PTL_EVENT_ACK);
+#ifdef HAVE_SERVER_SUPPORT
+/*
+ * Server's bulk completion callback
+ */
+void server_bulk_callback (lnet_event_t *ev)
+{
+        struct ptlrpc_cb_id     *cbid = ev->md.user_ptr;
+        struct ptlrpc_bulk_desc *desc = cbid->cbid_arg;
+        ENTRY;
 
-        /* 1 fragment for each page always */
-        LASSERT(ev->mem_desc.niov == desc->bd_page_count);
+        LASSERT (ev->type == LNET_EVENT_SEND ||
+                 ev->type == LNET_EVENT_UNLINK ||
+                 (desc->bd_type == BULK_PUT_SOURCE &&
+                  ev->type == LNET_EVENT_ACK) ||
+                 (desc->bd_type == BULK_GET_SINK &&
+                  ev->type == LNET_EVENT_REPLY));
+
+        CDEBUG((ev->status == 0) ? D_NET : D_ERROR,
+               "event type %d, status %d, desc %p\n",
+               ev->type, ev->status, desc);
+
+        cfs_spin_lock(&desc->bd_lock);
+
+        if ((ev->type == LNET_EVENT_ACK ||
+             ev->type == LNET_EVENT_REPLY) &&
+            ev->status == 0) {
+                /* We heard back from the peer, so even if we get this
+                 * before the SENT event (oh yes we can), we know we
+                 * read/wrote the peer buffer and how much... */
+                desc->bd_success = 1;
+                desc->bd_nob_transferred = ev->mlength;
+                desc->bd_sender = ev->sender;
+        }
 
-        spin_lock_irqsave (&desc->bd_lock, flags);
-        
-        LASSERT(desc->bd_callback_count > 0 &&
-                desc->bd_callback_count <= 2);
-        
-        if (--desc->bd_callback_count == 0) {
+        if (ev->unlinked) {
+                /* This is the last callback no matter what... */
                 desc->bd_network_rw = 0;
-                desc->bd_complete = 1;
-                wake_up(&desc->bd_waitq);
+                cfs_waitq_signal(&desc->bd_waitq);
         }
 
-        spin_unlock_irqrestore (&desc->bd_lock, flags);
-        RETURN(0);
+        cfs_spin_unlock(&desc->bd_lock);
+        EXIT;
 }
+#endif
 
-struct ptlrpc_bulk_desc ptlrpc_bad_desc;
-ptl_event_t ptlrpc_bad_event;
+static void ptlrpc_master_callback(lnet_event_t *ev)
+{
+        struct ptlrpc_cb_id *cbid = ev->md.user_ptr;
+        void (*callback)(lnet_event_t *ev) = cbid->cbid_fn;
 
-static int bulk_put_sink_callback(ptl_event_t *ev)
+        /* Honestly, it's best to find out early. */
+        LASSERT (cbid->cbid_arg != LP_POISON);
+        LASSERT (callback == request_out_callback ||
+                 callback == reply_in_callback ||
+                 callback == client_bulk_callback ||
+                 callback == request_in_callback ||
+                 callback == reply_out_callback
+#ifdef HAVE_SERVER_SUPPORT
+                 || callback == server_bulk_callback
+#endif
+                 );
+
+        callback (ev);
+}
+
+int ptlrpc_uuid_to_peer (struct obd_uuid *uuid,
+                         lnet_process_id_t *peer, lnet_nid_t *self)
 {
-        struct ptlrpc_bulk_desc *desc = ev->mem_desc.user_ptr;
-        unsigned long            flags;
-        ENTRY;
+        int               best_dist = 0;
+        __u32             best_order = 0;
+        int               count = 0;
+        int               rc = -ENOENT;
+        int               portals_compatibility;
+        int               dist;
+        __u32             order;
+        lnet_nid_t        dst_nid;
+        lnet_nid_t        src_nid;
+
+        portals_compatibility = LNetCtl(IOC_LIBCFS_PORTALS_COMPATIBILITY, NULL);
+
+        peer->pid = LUSTRE_SRV_LNET_PID;
+
+        /* Choose the matching UUID that's closest */
+        while (lustre_uuid_to_peer(uuid->uuid, &dst_nid, count++) == 0) {
+                dist = LNetDist(dst_nid, &src_nid, &order);
+                if (dist < 0)
+                        continue;
+
+                if (dist == 0) {                /* local! use loopback LND */
+                        peer->nid = *self = LNET_MKNID(LNET_MKNET(LOLND, 0), 0);
+                        rc = 0;
+                        break;
+                }
 
-        LASSERT(ev->type == PTL_EVENT_PUT);
+                if (rc < 0 ||
+                    dist < best_dist ||
+                    (dist == best_dist && order < best_order)) {
+                        best_dist = dist;
+                        best_order = order;
+
+                        if (portals_compatibility > 1) {
+                                /* Strong portals compatibility: Zero the nid's
+                                 * NET, so if I'm reading new config logs, or
+                                 * getting configured by (new) lconf I can
+                                 * still talk to old servers. */
+                                dst_nid = LNET_MKNID(0, LNET_NIDADDR(dst_nid));
+                                src_nid = LNET_MKNID(0, LNET_NIDADDR(src_nid));
+                        }
+                        peer->nid = dst_nid;
+                        *self = src_nid;
+                        rc = 0;
+                }
+        }
 
-        /* used iovs */
-        LASSERT((ev->mem_desc.options & (PTL_MD_IOV | PTL_MD_KIOV)) ==
-                PTL_MD_KIOV);
-        /* Honestly, it's best to find out early. */
-        if (desc->bd_page_count == 0x5a5a5a5a5a ||
-            desc->bd_page_count != ev->mem_desc.niov ||
-            ev->mem_desc.start != &desc->bd_iov) {
-                /* not guaranteed (don't LASSERT) but good for this bug hunt */
-                ptlrpc_bad_event = *ev;
-                ptlrpc_bad_desc = *desc;
-                CERROR ("XXX ev %p type %d portal %d match "LPX64", seq %ld\n",
-                        ev, ev->type, ev->portal, ev->match_bits, ev->sequence);
-                CERROR ("XXX desc %p, export %p import %p gen %d "
-                        " portal %d\n", 
-                        desc, desc->bd_export,
-                        desc->bd_import, desc->bd_import_generation,
-                        desc->bd_portal);
-                RETURN (0);
+        CDEBUG(D_NET,"%s->%s\n", uuid->uuid, libcfs_id2str(*peer));
+        return rc;
+}
+
+void ptlrpc_ni_fini(void)
+{
+        cfs_waitq_t         waitq;
+        struct l_wait_info  lwi;
+        int                 rc;
+        int                 retries;
+
+        /* Wait for the event queue to become idle since there may still be
+         * messages in flight with pending events (i.e. the fire-and-forget
+         * messages == client requests and "non-difficult" server
+         * replies */
+
+        for (retries = 0;; retries++) {
+                rc = LNetEQFree(ptlrpc_eq_h);
+                switch (rc) {
+                default:
+                        LBUG();
+
+                case 0:
+                        LNetNIFini();
+                        return;
+
+                case -EBUSY:
+                        if (retries != 0)
+                                CWARN("Event queue still busy\n");
+
+                        /* Wait for a bit */
+                        cfs_waitq_init(&waitq);
+                        lwi = LWI_TIMEOUT(cfs_time_seconds(2), NULL, NULL);
+                        l_wait_event(waitq, 0, &lwi);
+                        break;
+                }
         }
-        
-        LASSERT(desc->bd_page_count != 0x5a5a5a5a);
-        /* 1 fragment for each page always */
-        LASSERT(ev->mem_desc.niov == desc->bd_page_count);
-        LASSERT(ev->match_bits == desc->bd_req->rq_xid);
-        
-        /* peer must put with zero offset */
-        if (ev->offset != 0) {
-                /* Bug 1190: handle this as a protocol failure */
-                CERROR ("Bad offset %d\n", ev->offset);
-                LBUG ();
+        /* notreached */
+}
+
+lnet_pid_t ptl_get_pid(void)
+{
+        lnet_pid_t        pid;
+
+#ifndef  __KERNEL__
+        pid = getpid();
+#else
+        pid = LUSTRE_SRV_LNET_PID;
+#endif
+        return pid;
+}
+
+int ptlrpc_ni_init(void)
+{
+        int              rc;
+        lnet_pid_t       pid;
+
+        pid = ptl_get_pid();
+        CDEBUG(D_NET, "My pid is: %x\n", pid);
+
+        /* We're not passing any limits yet... */
+        rc = LNetNIInit(pid);
+        if (rc < 0) {
+                CDEBUG (D_NET, "Can't init network interface: %d\n", rc);
+                return (-ENOENT);
         }
 
-        /* No check for total # bytes; this could be a short read */
+        /* CAVEAT EMPTOR: how we process portals events is _radically_
+         * different depending on... */
+#ifdef __KERNEL__
+       /* kernel LNet calls our master callback when there are new event,
+        * because we are guaranteed to get every event via callback,
+        * so we just set EQ size to 0 to avoid overhread of serializing
+        * enqueue/dequeue operations in LNet. */
+       rc = LNetEQAlloc(0, ptlrpc_master_callback, &ptlrpc_eq_h);
+#else
+        /* liblustre calls the master callback when it removes events from the
+         * event queue.  The event queue has to be big enough not to drop
+         * anything */
+        rc = LNetEQAlloc(10240, LNET_EQ_HANDLER_NONE, &ptlrpc_eq_h);
+#endif
+        if (rc == 0)
+                return 0;
 
-        spin_lock_irqsave (&desc->bd_lock, flags);
-        desc->bd_network_rw = 0;
-        desc->bd_complete = 1;
-        if (desc->bd_req->rq_set != NULL)
-                wake_up (&desc->bd_req->rq_set->set_waitq);
-        else
-                wake_up (&desc->bd_req->rq_wait_for_rep);
-        spin_unlock_irqrestore (&desc->bd_lock, flags);
+        CERROR ("Failed to allocate event queue: %d\n", rc);
+        LNetNIFini();
 
-        RETURN(1);
+        return (-ENOMEM);
 }
 
-static int bulk_get_source_callback(ptl_event_t *ev)
+#ifndef __KERNEL__
+CFS_LIST_HEAD(liblustre_wait_callbacks);
+CFS_LIST_HEAD(liblustre_idle_callbacks);
+void *liblustre_services_callback;
+
+void *
+liblustre_register_waitidle_callback (cfs_list_t *callback_list,
+                                      const char *name,
+                                      int (*fn)(void *arg), void *arg)
 {
-        struct ptlrpc_bulk_desc *desc = ev->mem_desc.user_ptr;
-        struct ptlrpc_bulk_page *bulk;
-        struct list_head        *tmp;
-        unsigned long            flags;
-        ptl_size_t               total = 0;
-        ENTRY;
+        struct liblustre_wait_callback *llwc;
 
-        LASSERT(ev->type == PTL_EVENT_GET);
+        OBD_ALLOC(llwc, sizeof(*llwc));
+        LASSERT (llwc != NULL);
 
-        /* used iovs */
-        LASSERT((ev->mem_desc.options & (PTL_MD_IOV | PTL_MD_KIOV)) ==
-                PTL_MD_KIOV);
-        /* 1 fragment for each page always */
-        LASSERT(ev->mem_desc.niov == desc->bd_page_count);
-        LASSERT(ev->match_bits == desc->bd_req->rq_xid);
+        llwc->llwc_name = name;
+        llwc->llwc_fn = fn;
+        llwc->llwc_arg = arg;
+        cfs_list_add_tail(&llwc->llwc_list, callback_list);
 
-        /* peer must get with zero offset */
-        if (ev->offset != 0) {
-                /* Bug 1190: handle this as a protocol failure */
-                CERROR ("Bad offset %d\n", ev->offset);
-                LBUG ();
-        }
-        
-        list_for_each (tmp, &desc->bd_page_list) {
-                bulk = list_entry(tmp, struct ptlrpc_bulk_page, bp_link);
+        return (llwc);
+}
 
-                total += bulk->bp_buflen;
-        }
+void
+liblustre_deregister_waitidle_callback (void *opaque)
+{
+        struct liblustre_wait_callback *llwc = opaque;
 
-        /* peer must get everything */
-        if (ev->mem_desc.length != total) {
-                /* Bug 1190: handle this as a protocol failure */
-                CERROR ("Bad length/total %d/%d\n", ev->mem_desc.length, total);
-                LBUG ();
-        }
+        cfs_list_del(&llwc->llwc_list);
+        OBD_FREE(llwc, sizeof(*llwc));
+}
 
-        spin_lock_irqsave (&desc->bd_lock, flags);
-        desc->bd_network_rw = 0;
-        desc->bd_complete = 1;
-        if (desc->bd_req->rq_set != NULL)
-                wake_up (&desc->bd_req->rq_set->set_waitq);
-        else
-                wake_up (&desc->bd_req->rq_wait_for_rep);
-        spin_unlock_irqrestore (&desc->bd_lock, flags);
+void *
+liblustre_register_wait_callback (const char *name,
+                                  int (*fn)(void *arg), void *arg)
+{
+        return liblustre_register_waitidle_callback(&liblustre_wait_callbacks,
+                                                    name, fn, arg);
+}
 
-        RETURN(1);
+void
+liblustre_deregister_wait_callback (void *opaque)
+{
+        liblustre_deregister_waitidle_callback(opaque);
 }
 
-static int bulk_get_sink_callback(ptl_event_t *ev)
+void *
+liblustre_register_idle_callback (const char *name,
+                                  int (*fn)(void *arg), void *arg)
 {
-        struct ptlrpc_bulk_desc *desc = ev->mem_desc.user_ptr;
-        unsigned long            flags;
-        ENTRY;
+        return liblustre_register_waitidle_callback(&liblustre_idle_callbacks,
+                                                    name, fn, arg);
+}
 
-        CDEBUG(D_NET, "got %s event %d\n",
-               (ev->type == PTL_EVENT_SENT) ? "SENT" :
-               (ev->type == PTL_EVENT_REPLY)  ? "REPLY"  : "UNEXPECTED",
-               ev->type);
+void
+liblustre_deregister_idle_callback (void *opaque)
+{
+        liblustre_deregister_waitidle_callback(opaque);
+}
 
-        LASSERT(ev->type == PTL_EVENT_SENT || ev->type == PTL_EVENT_REPLY);
+int
+liblustre_check_events (int timeout)
+{
+        lnet_event_t ev;
+        int         rc;
+        int         i;
+        ENTRY;
 
-        /* 1 fragment for each page always */
-        LASSERT(ev->mem_desc.niov == desc->bd_page_count);
+        rc = LNetEQPoll(&ptlrpc_eq_h, 1, timeout * 1000, &ev, &i);
+        if (rc == 0)
+                RETURN(0);
 
-        spin_lock_irqsave (&desc->bd_lock, flags);
-        LASSERT(desc->bd_callback_count > 0 &&
-                desc->bd_callback_count <= 2);
+        LASSERT (rc == -EOVERFLOW || rc == 1);
 
-        if (--desc->bd_callback_count == 0) {
-                desc->bd_network_rw = 0;
-                desc->bd_complete = 1;
-                wake_up(&desc->bd_waitq);
+        /* liblustre: no asynch callback so we can't afford to miss any
+         * events... */
+        if (rc == -EOVERFLOW) {
+                CERROR ("Dropped an event!!!\n");
+                abort();
         }
-        spin_unlock_irqrestore (&desc->bd_lock, flags);
 
-        RETURN(0);
+        ptlrpc_master_callback (&ev);
+        RETURN(1);
 }
 
-int ptlrpc_uuid_to_peer (struct obd_uuid *uuid, struct ptlrpc_peer *peer)
+int liblustre_waiting = 0;
+
+int
+liblustre_wait_event (int timeout)
 {
-        struct ptlrpc_ni   *pni;
-        struct lustre_peer  lpeer;
-        int                 i;
-        int                 rc = lustre_uuid_to_peer (uuid->uuid, &lpeer);
-
-        if (rc != 0)
-                RETURN (rc);
-
-        for (i = 0; i < ptlrpc_ninterfaces; i++) {
-                pni = &ptlrpc_interfaces[i];
-
-                if (!memcmp(&lpeer.peer_ni, &pni->pni_ni_h,
-                            sizeof (lpeer.peer_ni))) {
-                        peer->peer_nid = lpeer.peer_nid;
-                        peer->peer_ni = pni;
-                        return (0);
+        cfs_list_t                     *tmp;
+        struct liblustre_wait_callback *llwc;
+        int                             found_something = 0;
+
+        /* single threaded recursion check... */
+        liblustre_waiting = 1;
+
+        for (;;) {
+                /* Deal with all pending events */
+                while (liblustre_check_events(0))
+                        found_something = 1;
+
+                /* Give all registered callbacks a bite at the cherry */
+                cfs_list_for_each(tmp, &liblustre_wait_callbacks) {
+                        llwc = cfs_list_entry(tmp,
+                                              struct liblustre_wait_callback,
+                                              llwc_list);
+
+                        if (llwc->llwc_fn(llwc->llwc_arg))
+                                found_something = 1;
                 }
+
+                if (found_something || timeout == 0)
+                        break;
+
+                /* Nothing so far, but I'm allowed to block... */
+                found_something = liblustre_check_events(timeout);
+                if (!found_something)           /* still nothing */
+                        break;                  /* I timed out */
         }
 
-        CERROR("Can't find ptlrpc interface for "LPX64" ni handle %08lx."LPX64"\n",
-               lpeer.peer_nid, lpeer.peer_ni.nal_idx, lpeer.peer_ni.cookie);
-        return (-ENOENT);
-}
+        liblustre_waiting = 0;
 
-void ptlrpc_ni_fini(struct ptlrpc_ni *pni)
-{
-        PtlEQFree(pni->pni_request_out_eq_h);
-        PtlEQFree(pni->pni_reply_out_eq_h);
-        PtlEQFree(pni->pni_reply_in_eq_h);
-        PtlEQFree(pni->pni_bulk_put_source_eq_h);
-        PtlEQFree(pni->pni_bulk_put_sink_eq_h);
-        PtlEQFree(pni->pni_bulk_get_source_eq_h);
-        PtlEQFree(pni->pni_bulk_get_sink_eq_h);
-
-        kportal_put_ni (pni->pni_number);
+        return found_something;
 }
 
-int ptlrpc_ni_init(int number, char *name, struct ptlrpc_ni *pni)
+void
+liblustre_wait_idle(void)
 {
-        int              rc;
-        ptl_handle_ni_t *nip = kportal_get_ni (number);
+        static int recursed = 0;
 
-        if (nip == NULL) {
-                CDEBUG (D_NET, "Network interface %s not loaded\n", name);
-                return (-ENOENT);
-        }
+        cfs_list_t                     *tmp;
+        struct liblustre_wait_callback *llwc;
+        int                             idle = 0;
+
+        LASSERT(!recursed);
+        recursed = 1;
+
+        do {
+                liblustre_wait_event(0);
+
+                idle = 1;
+
+                cfs_list_for_each(tmp, &liblustre_idle_callbacks) {
+                        llwc = cfs_list_entry(tmp,
+                                              struct liblustre_wait_callback,
+                                              llwc_list);
 
-        CDEBUG (D_NET, "init %d %s: nal_idx %ld\n", number, name, nip->nal_idx);
-
-        pni->pni_name = name;
-        pni->pni_number = number;
-        pni->pni_ni_h = *nip;
-
-        pni->pni_request_out_eq_h = PTL_HANDLE_NONE;
-        pni->pni_reply_out_eq_h = PTL_HANDLE_NONE;
-        pni->pni_reply_in_eq_h = PTL_HANDLE_NONE;
-        pni->pni_bulk_put_source_eq_h = PTL_HANDLE_NONE;
-        pni->pni_bulk_put_sink_eq_h = PTL_HANDLE_NONE;
-        pni->pni_bulk_get_source_eq_h = PTL_HANDLE_NONE;
-        pni->pni_bulk_get_sink_eq_h = PTL_HANDLE_NONE;
-
-        /* NB We never actually PtlEQGet() out of these events queues since
-         * we're only interested in the event callback, so we can just let
-         * them wrap.  Their sizes aren't a big deal, apart from providing
-         * a little history for debugging... */
-
-        rc = PtlEQAlloc(pni->pni_ni_h, 1024, request_out_callback,
-                        &pni->pni_request_out_eq_h);
-        if (rc != PTL_OK)
-                GOTO (fail, rc = -ENOMEM);
-
-        rc = PtlEQAlloc(pni->pni_ni_h, 1024, reply_out_callback,
-                        &pni->pni_reply_out_eq_h);
-        if (rc != PTL_OK)
-                GOTO (fail, rc = -ENOMEM);
-
-        rc = PtlEQAlloc(pni->pni_ni_h, 1024, reply_in_callback,
-                        &pni->pni_reply_in_eq_h);
-        if (rc != PTL_OK)
-                GOTO (fail, rc = -ENOMEM);
-
-        rc = PtlEQAlloc(pni->pni_ni_h, 1024, bulk_put_source_callback,
-                        &pni->pni_bulk_put_source_eq_h);
-        if (rc != PTL_OK)
-                GOTO (fail, rc = -ENOMEM);
-
-        rc = PtlEQAlloc(pni->pni_ni_h, 1024, bulk_put_sink_callback,
-                        &pni->pni_bulk_put_sink_eq_h);
-        if (rc != PTL_OK)
-                GOTO (fail, rc = -ENOMEM);
-
-        rc = PtlEQAlloc(pni->pni_ni_h, 1024, bulk_get_source_callback,
-                        &pni->pni_bulk_get_source_eq_h);
-        if (rc != PTL_OK)
-                GOTO (fail, rc = -ENOMEM);
-
-        rc = PtlEQAlloc(pni->pni_ni_h, 1024, bulk_get_sink_callback,
-                        &pni->pni_bulk_get_sink_eq_h);
-        if (rc != PTL_OK)
-                GOTO (fail, rc = -ENOMEM);
-
-        return (0);
- fail:
-        CERROR ("Failed to initialise network interface %s: %d\n",
-                name, rc);
-
-        /* OK to do complete teardown since we invalidated the handles above */
-        ptlrpc_ni_fini (pni);
-        return (rc);
+                        if (!llwc->llwc_fn(llwc->llwc_arg)) {
+                                idle = 0;
+                                break;
+                        }
+                }
+
+        } while (!idle);
+
+        recursed = 0;
 }
 
+#endif /* __KERNEL__ */
+
 int ptlrpc_init_portals(void)
 {
-        /* Add new portals network interfaces here.
-         * Order is irrelevent! */
-        static struct {
-                int   number;
-                char *name;
-        } ptl_nis[] = {
-                {QSWNAL,  "qswnal"},
-                {SOCKNAL, "socknal"},
-                {GMNAL,   "gmnal"},
-                {TOENAL,  "toenal"},
-                {TCPNAL,  "tcpnal"},
-                {SCIMACNAL, "scimacnal"}};
-        int   rc;
-        int   i;
-
-        LASSERT(ptlrpc_ninterfaces == 0);
-
-        for (i = 0; i < sizeof (ptl_nis) / sizeof (ptl_nis[0]); i++) {
-                LASSERT(ptlrpc_ninterfaces < (sizeof(ptlrpc_interfaces) /
-                                              sizeof(ptlrpc_interfaces[0])));
-
-                rc = ptlrpc_ni_init(ptl_nis[i].number, ptl_nis[i].name,
-                                    &ptlrpc_interfaces[ptlrpc_ninterfaces]);
-                if (rc == 0)
-                        ptlrpc_ninterfaces++;
-        }
+        int   rc = ptlrpc_ni_init();
 
-        if (ptlrpc_ninterfaces == 0) {
-                CERROR("network initialisation failed: is a NAL module "
-                       "loaded?\n");
+        if (rc != 0) {
+                CERROR("network initialisation failed\n");
                 return -EIO;
         }
-        return 0;
+#ifndef __KERNEL__
+        liblustre_services_callback =
+                liblustre_register_wait_callback("liblustre_check_services",
+                                                 &liblustre_check_services,
+                                                 NULL);
+        cfs_init_completion_module(liblustre_wait_event);
+#endif
+        rc = ptlrpcd_addref();
+        if (rc == 0)
+                return 0;
+
+        CERROR("rpcd initialisation failed\n");
+#ifndef __KERNEL__
+        liblustre_deregister_wait_callback(liblustre_services_callback);
+#endif
+        ptlrpc_ni_fini();
+        return rc;
 }
 
 void ptlrpc_exit_portals(void)
 {
-        while (ptlrpc_ninterfaces > 0)
-                ptlrpc_ni_fini (&ptlrpc_interfaces[--ptlrpc_ninterfaces]);
+#ifndef __KERNEL__
+        liblustre_deregister_wait_callback(liblustre_services_callback);
+#endif
+        ptlrpcd_decref();
+        ptlrpc_ni_fini();
 }