Whamcloud - gitweb
i=liang,b=13065:
[fs/lustre-release.git] / lnet / lnet / router.c
index df1bfc8..9714c21 100644 (file)
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Copyright (C) 2002 Cluster File Systems, Inc.
+ * Copyright  2008 Sun Microsystems, Inc. All rights reserved
  *
  *   This file is part of Portals
  *   http://sourceforge.net/projects/sandiaportals/
@@ -39,11 +39,40 @@ CFS_MODULE_PARM(small_router_buffers, "i", int, 0444,
 static int large_router_buffers = 512;
 CFS_MODULE_PARM(large_router_buffers, "i", int, 0444,
                 "# of large messages to buffer in the router");
+static int peer_buffer_credits = 0;
+CFS_MODULE_PARM(peer_buffer_credits, "i", int, 0444,
+                "# router buffer credits per peer");
 
 static int auto_down = 1;
 CFS_MODULE_PARM(auto_down, "i", int, 0444,
                 "Automatically mark peers down on comms error");
 
+int
+lnet_peer_buffer_credits(lnet_ni_t *ni)
+{
+        /* NI option overrides LNet default */
+        if (ni->ni_peerrtrcredits > 0)
+                return ni->ni_peerrtrcredits;
+        if (peer_buffer_credits > 0)
+                return peer_buffer_credits;
+
+        /* As an approximation, allow this peer the same number of router
+         * buffers as it is allowed outstanding sends */
+        return ni->ni_peertxcredits;
+}
+
+/* forward ref's */
+static int lnet_router_checker(void *);
+#else
+
+int
+lnet_peer_buffer_credits(lnet_ni_t *ni)
+{
+        return 0;
+}
+
+#endif
+
 static int check_routers_before_use = 0;
 CFS_MODULE_PARM(check_routers_before_use, "i", int, 0444,
                 "Assume routers are down and ping them before use");
@@ -94,14 +123,14 @@ lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive, time_t when)
 }
 
 void
-lnet_do_notify (lnet_peer_t *lp) 
+lnet_do_notify (lnet_peer_t *lp)
 {
         lnet_ni_t *ni = lp->lp_ni;
         int        alive;
         int        notifylnd;
-        
+
         LNET_LOCK();
-                
+
         /* Notify only in 1 thread at any time to ensure ordered notification.
          * NB individual events can be missed; the only guarantee is that you
          * always get the most recent news */
@@ -112,7 +141,7 @@ lnet_do_notify (lnet_peer_t *lp)
         }
 
         lp->lp_notifying = 1;
-        
+
         while (lp->lp_notify) {
                 alive     = lp->lp_alive;
                 notifylnd = lp->lp_notifylnd;
@@ -137,77 +166,6 @@ lnet_do_notify (lnet_peer_t *lp)
         LNET_UNLOCK();
 }
 
-int
-lnet_notify (lnet_ni_t *ni, lnet_nid_t nid, int alive, time_t when)
-{
-        lnet_peer_t         *lp = NULL;
-        time_t               now = cfs_time_current_sec();
-
-        LASSERT (!in_interrupt ());
-
-        CDEBUG (D_NET, "%s notifying %s: %s\n",
-                (ni == NULL) ? "userspace" : libcfs_nid2str(ni->ni_nid),
-                libcfs_nid2str(nid),
-                alive ? "up" : "down");
-
-        if (ni != NULL &&
-            LNET_NIDNET(ni->ni_nid) != LNET_NIDNET(nid)) {
-                CWARN ("Ignoring notification of %s %s by %s (different net)\n",
-                        libcfs_nid2str(nid), alive ? "birth" : "death",
-                        libcfs_nid2str(ni->ni_nid));
-                return -EINVAL;
-        }
-
-        /* can't do predictions... */
-        if (when > now) {
-                CWARN ("Ignoring prediction from %s of %s %s "
-                       "%ld seconds in the future\n",
-                       (ni == NULL) ? "userspace" : libcfs_nid2str(ni->ni_nid),
-                       libcfs_nid2str(nid), alive ? "up" : "down",
-                       when - now);
-                return -EINVAL;
-        }
-
-        if (ni != NULL && !alive &&             /* LND telling me she's down */
-            !auto_down) {                       /* auto-down disabled */
-                CDEBUG(D_NET, "Auto-down disabled\n");
-                return 0;
-        }
-        
-        LNET_LOCK();
-
-        lp = lnet_find_peer_locked(nid);
-        if (lp == NULL) {
-                /* nid not found */
-                LNET_UNLOCK();
-                CDEBUG(D_NET, "%s not found\n", libcfs_nid2str(nid));
-                return 0;
-        }
-
-        lnet_notify_locked(lp, ni == NULL, alive, when);
-
-        LNET_UNLOCK();
-        
-        lnet_do_notify(lp);
-        
-        LNET_LOCK();
-
-        lnet_peer_decref_locked(lp);
-
-        LNET_UNLOCK();
-        return 0;
-}
-EXPORT_SYMBOL(lnet_notify);
-
-#else
-
-int
-lnet_notify (lnet_ni_t *ni, lnet_nid_t nid, int alive, time_t when)
-{
-        return -EOPNOTSUPP;
-}
-
-#endif
 
 static void
 lnet_rtr_addref_locked(lnet_peer_t *lp)
@@ -271,11 +229,11 @@ int
 lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway)
 {
         struct list_head     zombies;
-       struct list_head    *e;
-       lnet_remotenet_t    *rnet;
-       lnet_remotenet_t    *rnet2;
-       lnet_route_t        *route;
-       lnet_route_t        *route2;
+        struct list_head    *e;
+        lnet_remotenet_t    *rnet;
+        lnet_remotenet_t    *rnet2;
+        lnet_route_t        *route;
+        lnet_route_t        *route2;
         lnet_ni_t           *ni;
         int                  add_route;
         int                  rc;
@@ -307,7 +265,7 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway)
                 return -ENOMEM;
         }
 
-        INIT_LIST_HEAD(&rnet->lrn_routes);
+        CFS_INIT_LIST_HEAD(&rnet->lrn_routes);
         rnet->lrn_net = net;
         rnet->lrn_hops = hops;
 
@@ -363,11 +321,11 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway)
                         LASSERT (route2->lr_gateway->lp_nid != gateway);
                 }
         }
-        
+
         if (add_route) {
                 ni = route->lr_gateway->lp_ni;
                 lnet_ni_addref_locked(ni);
-                
+
                 LASSERT (rc == 0);
                 list_add_tail(&route->lr_list, &rnet2->lrn_routes);
                 the_lnet.ln_remote_nets_version++;
@@ -393,8 +351,9 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway)
         while (!list_empty(&zombies)) {
                 route = list_entry(zombies.next, lnet_route_t, lr_list);
                 list_del(&route->lr_list);
-                
+
                 LNET_LOCK();
+                lnet_rtr_decref_locked(route->lr_gateway);
                 lnet_peer_decref_locked(route->lr_gateway);
                 LNET_UNLOCK();
                 LIBCFS_FREE(route, sizeof(*route));
@@ -426,7 +385,7 @@ lnet_check_routes (void)
                         else if (route->lr_gateway->lp_ni !=
                                  route2->lr_gateway->lp_ni) {
                                 LNET_UNLOCK();
-                                
+
                                 CERROR("Routes to %s via %s and %s not supported\n",
                                        libcfs_net2str(rnet->lrn_net),
                                        libcfs_nid2str(route->lr_gateway->lp_nid),
@@ -435,7 +394,7 @@ lnet_check_routes (void)
                         }
                 }
         }
-        
+
         LNET_UNLOCK();
         return 0;
 }
@@ -508,8 +467,8 @@ int
 lnet_get_route (int idx, __u32 *net, __u32 *hops,
                lnet_nid_t *gateway, __u32 *alive)
 {
-       struct list_head    *e1;
-       struct list_head    *e2;
+        struct list_head    *e1;
+        struct list_head    *e2;
         lnet_remotenet_t    *rnet;
         lnet_route_t        *route;
 
@@ -536,7 +495,40 @@ lnet_get_route (int idx, __u32 *net, __u32 *hops,
         return -ENOENT;
 }
 
-#if defined(__KERNEL__) && defined(LNET_ROUTER)
+void
+lnet_wait_known_routerstate(void)
+{
+        lnet_peer_t         *rtr;
+        struct list_head    *entry;
+        int                  all_known;
+
+        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING);
+
+        for (;;) {
+                LNET_LOCK();
+
+                all_known = 1;
+                list_for_each (entry, &the_lnet.ln_routers) {
+                        rtr = list_entry(entry, lnet_peer_t, lp_rtr_list);
+
+                        if (rtr->lp_alive_count == 0) {
+                                all_known = 0;
+                                break;
+                        }
+                }
+
+                LNET_UNLOCK();
+
+                if (all_known)
+                        return;
+
+#ifndef __KERNEL__
+                lnet_router_checker();
+#endif
+                cfs_pause(cfs_time_seconds(1));
+        }
+}
+
 static void
 lnet_router_checker_event (lnet_event_t *event)
 {
@@ -550,14 +542,16 @@ lnet_router_checker_event (lnet_event_t *event)
                 /* The router checker thread has unlinked the rc_md
                  * and exited. */
                 LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_UNLINKING);
-                the_lnet.ln_rc_state = LNET_RC_STATE_UNLINKED; 
-                mutex_up(&the_lnet.ln_rc_signal); 
+                the_lnet.ln_rc_state = LNET_RC_STATE_UNLINKED;
+#ifdef __KERNEL__
+                mutex_up(&the_lnet.ln_rc_signal);
+#endif
                 return;
         }
 
-        LASSERT (event->type == LNET_EVENT_SEND || 
+        LASSERT (event->type == LNET_EVENT_SEND ||
                  event->type == LNET_EVENT_REPLY);
-        
+
         nid = (event->type == LNET_EVENT_SEND) ?
               event->target.nid : event->initiator.nid;
 
@@ -574,7 +568,7 @@ lnet_router_checker_event (lnet_event_t *event)
         if (lnet_isrouter(lp) &&                /* ignore if no longer a router */
             (event->status != 0 ||
              event->type == LNET_EVENT_REPLY)) {
-                
+
                 /* A successful REPLY means the router is up.  If _any_ comms
                  * to the router fail I assume it's down (this will happen if
                  * we ping alive routers to try to detect router death before
@@ -598,185 +592,135 @@ lnet_router_checker_event (lnet_event_t *event)
 }
 
 static int
-lnet_router_checker(void *arg)
+lnet_router_check_interval (lnet_peer_t *rtr)
 {
-        static lnet_ping_info_t   pinginfo;
-
-        int                  rc;
-        lnet_handle_md_t     mdh;
-        lnet_peer_t         *rtr;
-        struct list_head    *entry;
-        time_t               now;
-        lnet_process_id_t    rtr_id;
-        int                  secs;
-
-       cfs_daemonize("router_checker");
-       cfs_block_allsigs();
+        int secs;
 
-        rtr_id.pid = LUSTRE_SRV_LNET_PID;
+        secs = rtr->lp_alive ? live_router_check_interval :
+                               dead_router_check_interval;
+        if (secs < 0)
+                secs = 0;
 
-        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN);
-
-        rc = LNetMDBind((lnet_md_t){.start     = &pinginfo,
-                                    .length    = sizeof(pinginfo),
-                                    .threshold = LNET_MD_THRESH_INF,
-                                    .options   = LNET_MD_TRUNCATE,
-                                    .eq_handle = the_lnet.ln_rc_eqh},
-                        LNET_UNLINK,
-                        &mdh);
-
-        if (rc < 0) {
-                CERROR("Can't bind MD: %d\n", rc);
-                the_lnet.ln_rc_state = rc;
-                mutex_up(&the_lnet.ln_rc_signal);
-                return rc;
-        }
+        return secs;
+}
 
-        LASSERT (rc == 0);
+static void
+lnet_ping_router_locked (lnet_peer_t *rtr)
+{
+        lnet_process_id_t id;
+        int               secs;
+        time_t            now = cfs_time_current_sec();
 
-        the_lnet.ln_rc_state = LNET_RC_STATE_RUNNING;
-        mutex_up(&the_lnet.ln_rc_signal);       /* let my parent go */
+        lnet_peer_addref_locked(rtr);
 
-       while (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING) {
-                __u64 version;
+        if (rtr->lp_ping_deadline != 0 && /* ping timed out? */
+            now > rtr->lp_ping_deadline)
+                lnet_notify_locked(rtr, 1, 0, now);
 
-                LNET_LOCK();
-rescan:
-                version = the_lnet.ln_routers_version;
+        LNET_UNLOCK();
 
-                list_for_each (entry, &the_lnet.ln_routers) {
-                        rtr = list_entry(entry, lnet_peer_t, lp_rtr_list);
+        /* Run any outstanding notifications */
+        lnet_do_notify(rtr);
 
-                        lnet_peer_addref_locked(rtr);
+        LNET_LOCK();
 
-                        now = cfs_time_current_sec();
+        secs = lnet_router_check_interval(rtr);
 
-                        if (rtr->lp_ping_deadline != 0 && /* ping timed out? */
-                            now > rtr->lp_ping_deadline)
-                                lnet_notify_locked(rtr, 1, 0, now);
+        CDEBUG(D_NET,
+               "rtr %s %d: deadline %lu ping_notsent %d alive %d "
+               "alive_count %d lp_ping_timestamp %lu\n",
+               libcfs_nid2str(rtr->lp_nid), secs,
+               rtr->lp_ping_deadline, rtr->lp_ping_notsent,
+               rtr->lp_alive, rtr->lp_alive_count, rtr->lp_ping_timestamp);
 
-                        LNET_UNLOCK();
+        if (secs != 0 && !rtr->lp_ping_notsent &&
+            now > rtr->lp_ping_timestamp + secs) {
+                id.nid = rtr->lp_nid;
+                id.pid = LUSTRE_SRV_LNET_PID;
+                CDEBUG(D_NET, "Check: %s\n", libcfs_id2str(id));
 
-                        /* Run any outstanding notificiations */
-                        lnet_do_notify(rtr);
+                rtr->lp_ping_notsent   = 1;
+                rtr->lp_ping_timestamp = now;
 
-                        if (rtr->lp_alive) {
-                                secs = live_router_check_interval;
-                        } else {
-                                secs = dead_router_check_interval;
-                        }
-                        if (secs <= 0)
-                                secs = 0;
-                        
-                        if (secs != 0 &&
-                            !rtr->lp_ping_notsent &&
-                            now > rtr->lp_ping_timestamp + secs) {
-                                CDEBUG(D_NET, "Check: %s\n",
-                                       libcfs_nid2str(rtr->lp_nid));
-
-                                LNET_LOCK();
-                                rtr_id.nid = rtr->lp_nid;
-                                rtr->lp_ping_notsent = 1;
-                                rtr->lp_ping_timestamp = now;
-
-                                if (rtr->lp_ping_deadline == 0)
-                                        rtr->lp_ping_deadline = 
-                                                now + router_ping_timeout;
+                if (rtr->lp_ping_deadline == 0)
+                        rtr->lp_ping_deadline = now + router_ping_timeout;
 
-                                LNET_UNLOCK();
+                LNET_UNLOCK();
 
-                                LNetGet(LNET_NID_ANY, mdh, rtr_id,
-                                        LNET_RESERVED_PORTAL,
-                                        LNET_PROTO_PING_MATCHBITS, 0);
-                        }
-                        
-                        LNET_LOCK();
-                        lnet_peer_decref_locked(rtr);
+                LNetGet(LNET_NID_ANY, the_lnet.ln_rc_mdh, id,
+                        LNET_RESERVED_PORTAL, LNET_PROTO_PING_MATCHBITS, 0);
 
-                        if (version != the_lnet.ln_routers_version) {
-                                /* the routers list has changed */
-                                goto rescan;
-                        }
-                }
+                LNET_LOCK();
+        }
 
-                LNET_UNLOCK();
+        lnet_peer_decref_locked(rtr);
+        return;
+}
 
-                /* Call cfs_pause() here always adds 1 to load average 
-                 * because kernel counts # active tasks as nr_running 
-                 * + nr_uninterruptible. */
-                set_current_state(CFS_TASK_INTERRUPTIBLE);
-                cfs_schedule_timeout(CFS_TASK_INTERRUPTIBLE,
-                                     cfs_time_seconds(1));
-       }
+int
+lnet_router_checker_start(void)
+{
+        static lnet_ping_info_t pinginfo;
 
-        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_STOPTHREAD);
-        the_lnet.ln_rc_state = LNET_RC_STATE_UNLINKING;
-        
-        rc = LNetMDUnlink(mdh);
-        LASSERT (rc == 0);
+        lnet_md_t    md;
+        int          rc;
+        int          eqsz;
+#ifndef __KERNEL__
+        lnet_peer_t *rtr;
+        __u64        version;
+        int          nrtr = 0;
+        int          router_checker_max_eqsize = 10240;
 
-        /* The unlink event callback will signal final completion */
+        LASSERT (check_routers_before_use);
+        LASSERT (dead_router_check_interval > 0);
 
-       return 0;
-}
+        LNET_LOCK();
 
+        /* As an approximation, allow each router the same number of
+         * outstanding events as it is allowed outstanding sends */
+        eqsz = 0;
+        version = the_lnet.ln_routers_version;
+        list_for_each_entry(rtr, &the_lnet.ln_routers, lp_rtr_list) {
+                lnet_ni_t         *ni = rtr->lp_ni;
+                lnet_process_id_t  id;
 
-void
-lnet_wait_known_routerstate(void)
-{
-        lnet_peer_t         *rtr;
-        struct list_head    *entry;
-        int                  all_known;
+                nrtr++;
+                eqsz += ni->ni_peertxcredits;
 
-        for (;;) {
-                LNET_LOCK();
-                
-                all_known = 1;
-                list_for_each (entry, &the_lnet.ln_routers) {
-                        rtr = list_entry(entry, lnet_peer_t, lp_rtr_list);
-                
-                        if (rtr->lp_alive_count == 0) {
-                                all_known = 0;
-                                break;
-                        }
-                }
+                /* one async ping reply per router */
+                id.nid = rtr->lp_nid;
+                id.pid = LUSTRE_SRV_LNET_PID;
 
                 LNET_UNLOCK();
 
-                if (all_known)
-                        return;
+                rc = LNetSetAsync(id, 1);
+                if (rc != 0) {
+                        CWARN("LNetSetAsync %s failed: %d\n",
+                              libcfs_id2str(id), rc);
+                        return rc;
+                }
 
-                cfs_pause(cfs_time_seconds(1));
+                LNET_LOCK();
+                /* NB router list doesn't change in userspace */
+                LASSERT (version == the_lnet.ln_routers_version);
         }
-}
-
-void
-lnet_router_checker_stop(void)
-{
-        int       rc;
 
-        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING ||
-                 the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN);
-
-        if (the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN)
-                return;
-
-        the_lnet.ln_rc_state = LNET_RC_STATE_STOPTHREAD;
-       /* block until event callback signals exit */
-       mutex_down(&the_lnet.ln_rc_signal);
+        LNET_UNLOCK();
 
-        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_UNLINKED);
+        if (nrtr == 0) {
+                CDEBUG(D_NET,
+                       "No router found, not starting router checker\n");
+                return 0;
+        }
 
-        rc = LNetEQFree(the_lnet.ln_rc_eqh);
-        LASSERT (rc == 0);
-        
-        the_lnet.ln_rc_state = LNET_RC_STATE_SHUTDOWN;
-}
+        /* at least allow a SENT and a REPLY per router */
+        if (router_checker_max_eqsize < 2 * nrtr)
+                router_checker_max_eqsize = 2 * nrtr;
 
-int
-lnet_router_checker_start(void)
-{
-        int  rc;
+        LASSERT (eqsz > 0);
+        if (eqsz > router_checker_max_eqsize)
+                eqsz = router_checker_max_eqsize;
+#endif
 
         LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN);
 
@@ -787,37 +731,58 @@ lnet_router_checker_start(void)
                                    "\n");
                 return -EINVAL;
         }
-        
+
         if (live_router_check_interval <= 0 &&
             dead_router_check_interval <= 0)
                 return 0;
 
-       init_mutex_locked(&the_lnet.ln_rc_signal);
-
+#ifdef __KERNEL__
+        init_mutex_locked(&the_lnet.ln_rc_signal);
         /* EQ size doesn't matter; the callback is guaranteed to get every
          * event */
-        rc = LNetEQAlloc(1, lnet_router_checker_event,
+        eqsz = 1;
+        rc = LNetEQAlloc(eqsz, lnet_router_checker_event,
+                         &the_lnet.ln_rc_eqh);
+#else
+        rc = LNetEQAlloc(eqsz, LNET_EQ_HANDLER_NONE,
                          &the_lnet.ln_rc_eqh);
+#endif
         if (rc != 0) {
-                CERROR("Can't allocate EQ: %d\n", rc);
+                CERROR("Can't allocate EQ(%d): %d\n", eqsz, rc);
                 return -ENOMEM;
         }
 
-       rc = (int)cfs_kernel_thread(lnet_router_checker, NULL, 0);
-       if (rc < 0) {
-               CERROR("Can't start router checker thread: %d\n", rc);
-                goto failed;
-       }
-
-       mutex_down(&the_lnet.ln_rc_signal);     /* wait for checker to startup */
+        memset(&md, 0, sizeof(md));
+        md.start     = &pinginfo;
+        md.length    = sizeof(pinginfo);
+        md.options   = LNET_MD_TRUNCATE;
+        md.threshold = LNET_MD_THRESH_INF;
+        md.eq_handle = the_lnet.ln_rc_eqh;
+        rc = LNetMDBind(md, LNET_UNLINK, &the_lnet.ln_rc_mdh);
+        if (rc < 0) {
+                CERROR("Can't bind MD: %d\n", rc);
+                rc = LNetEQFree(the_lnet.ln_rc_eqh);
+                LASSERT (rc == 0);
+                return -ENOMEM;
+        }
+        LASSERT (rc == 0);
 
-        rc = the_lnet.ln_rc_state;
+        the_lnet.ln_rc_state = LNET_RC_STATE_RUNNING;
+#ifdef __KERNEL__
+        rc = (int)cfs_kernel_thread(lnet_router_checker, NULL, 0);
         if (rc < 0) {
+                CERROR("Can't start router checker thread: %d\n", rc);
+                the_lnet.ln_rc_state = LNET_RC_STATE_UNLINKING;
+                rc = LNetMDUnlink(the_lnet.ln_rc_mdh);
+                LASSERT (rc == 0);
+                /* block until event callback signals exit */
+                mutex_down(&the_lnet.ln_rc_signal);
+                rc = LNetEQFree(the_lnet.ln_rc_eqh);
+                LASSERT (rc == 0);
                 the_lnet.ln_rc_state = LNET_RC_STATE_SHUTDOWN;
-                goto failed;
+                return -ENOMEM;
         }
-        
-        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING);
+#endif
 
         if (check_routers_before_use) {
                 /* Note that a helpful side-effect of pinging all known routers
@@ -825,13 +790,90 @@ lnet_router_checker_start(void)
                  * may have to a previous instance of me. */
                 lnet_wait_known_routerstate();
         }
-        
+
         return 0;
-        
- failed:
+}
+
+void
+lnet_router_checker_stop (void)
+{
+        int rc;
+
+        if (the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN)
+                return;
+
+        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING);
+        the_lnet.ln_rc_state = LNET_RC_STATE_STOPTHREAD;
+
+#ifdef __KERNEL__
+        /* block until event callback signals exit */
+        mutex_down(&the_lnet.ln_rc_signal);
+#else
+        while (the_lnet.ln_rc_state != LNET_RC_STATE_UNLINKED) {
+                lnet_router_checker();
+                cfs_pause(cfs_time_seconds(1));
+        }
+#endif
+        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_UNLINKED);
+
         rc = LNetEQFree(the_lnet.ln_rc_eqh);
         LASSERT (rc == 0);
-        return rc;
+        the_lnet.ln_rc_state = LNET_RC_STATE_SHUTDOWN;
+        return;
+}
+
+#if defined(__KERNEL__) && defined(LNET_ROUTER)
+
+static int
+lnet_router_checker(void *arg)
+{
+        int                rc;
+        lnet_peer_t       *rtr;
+        struct list_head  *entry;
+        lnet_process_id_t  rtr_id;
+
+        cfs_daemonize("router_checker");
+        cfs_block_allsigs();
+
+        rtr_id.pid = LUSTRE_SRV_LNET_PID;
+
+        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING);
+
+        while (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING) {
+                __u64 version;
+
+                LNET_LOCK();
+rescan:
+                version = the_lnet.ln_routers_version;
+
+                list_for_each (entry, &the_lnet.ln_routers) {
+                        rtr = list_entry(entry, lnet_peer_t, lp_rtr_list);
+                        lnet_ping_router_locked(rtr);
+
+                        /* NB dropped lock */
+                        if (version != the_lnet.ln_routers_version) {
+                                /* the routers list has changed */
+                                goto rescan;
+                        }
+                }
+
+                LNET_UNLOCK();
+
+                /* Call cfs_pause() here always adds 1 to load average 
+                 * because kernel counts # active tasks as nr_running 
+                 * + nr_uninterruptible. */
+                cfs_schedule_timeout(CFS_TASK_INTERRUPTIBLE,
+                                     cfs_time_seconds(1));
+        }
+
+        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_STOPTHREAD);
+        the_lnet.ln_rc_state = LNET_RC_STATE_UNLINKING;
+
+        rc = LNetMDUnlink(the_lnet.ln_rc_mdh);
+        LASSERT (rc == 0);
+
+        /* The unlink event callback will signal final completion */
+        return 0;
 }
 
 void
@@ -914,7 +956,7 @@ lnet_rtrpool_alloc_bufs(lnet_rtrbufpool_t *rbp, int nbufs)
                 LASSERT (rbp->rbp_nbuffers == nbufs);
                 return 0;
         }
-        
+
         for (i = 0; i < nbufs; i++) {
                 rb = lnet_new_rtrbuf(rbp);
 
@@ -973,7 +1015,7 @@ int
 lnet_alloc_rtrpools(int im_a_router)
 {
         int       rc;
-        
+
         if (!strcmp(forwarding, "")) {
                 /* not set either way */
                 if (!im_a_router)
@@ -988,7 +1030,7 @@ lnet_alloc_rtrpools(int im_a_router)
                                    "'enabled' or 'disabled'\n");
                 return -EINVAL;
         }
-        
+
         if (tiny_router_buffers <= 0) {
                 LCONSOLE_ERROR_MSG(0x10c, "tiny_router_buffers=%d invalid when "
                                    "routing enabled\n", tiny_router_buffers);
@@ -1028,7 +1070,7 @@ lnet_alloc_rtrpools(int im_a_router)
         LNET_LOCK();
         the_lnet.ln_routing = 1;
         LNET_UNLOCK();
-        
+
         return 0;
 
  failed:
@@ -1036,24 +1078,192 @@ lnet_alloc_rtrpools(int im_a_router)
         return rc;
 }
 
-#else
-
 int
-lnet_peers_start_down(void)
+lnet_notify (lnet_ni_t *ni, lnet_nid_t nid, int alive, time_t when)
 {
+        lnet_peer_t         *lp = NULL;
+        time_t               now = cfs_time_current_sec();
+
+        LASSERT (!in_interrupt ());
+
+        CDEBUG (D_NET, "%s notifying %s: %s\n",
+                (ni == NULL) ? "userspace" : libcfs_nid2str(ni->ni_nid),
+                libcfs_nid2str(nid),
+                alive ? "up" : "down");
+
+        if (ni != NULL &&
+            LNET_NIDNET(ni->ni_nid) != LNET_NIDNET(nid)) {
+                CWARN ("Ignoring notification of %s %s by %s (different net)\n",
+                        libcfs_nid2str(nid), alive ? "birth" : "death",
+                        libcfs_nid2str(ni->ni_nid));
+                return -EINVAL;
+        }
+
+        /* can't do predictions... */
+        if (when > now) {
+                CWARN ("Ignoring prediction from %s of %s %s "
+                       "%ld seconds in the future\n",
+                       (ni == NULL) ? "userspace" : libcfs_nid2str(ni->ni_nid),
+                       libcfs_nid2str(nid), alive ? "up" : "down",
+                       when - now);
+                return -EINVAL;
+        }
+
+        if (ni != NULL && !alive &&             /* LND telling me she's down */
+            !auto_down) {                       /* auto-down disabled */
+                CDEBUG(D_NET, "Auto-down disabled\n");
+                return 0;
+        }
+
+        LNET_LOCK();
+
+        lp = lnet_find_peer_locked(nid);
+        if (lp == NULL) {
+                /* nid not found */
+                LNET_UNLOCK();
+                CDEBUG(D_NET, "%s not found\n", libcfs_nid2str(nid));
+                return 0;
+        }
+
+        /* We can't fully trust LND on reporting exact peer last_alive
+         * if he notifies us about dead peer. For example ksocklnd can
+         * call us with when == _time_when_the_node_was_booted_ if
+         * no connections were successfully established */
+        if (ni != NULL && !alive && when < lp->lp_last_alive)
+                when = lp->lp_last_alive;
+
+        lnet_notify_locked(lp, ni == NULL, alive, when);
+
+        LNET_UNLOCK();
+
+        lnet_do_notify(lp);
+
+        LNET_LOCK();
+
+        lnet_peer_decref_locked(lp);
+
+        LNET_UNLOCK();
         return 0;
 }
+EXPORT_SYMBOL(lnet_notify);
 
 void
-lnet_router_checker_stop(void)
+lnet_get_tunables (void)
 {
         return;
 }
 
+#else
+
 int
-lnet_router_checker_start(void)
+lnet_notify (lnet_ni_t *ni, lnet_nid_t nid, int alive, time_t when)
 {
-        return 0;
+        return -EOPNOTSUPP;
+}
+
+void
+lnet_router_checker (void)
+{
+        static time_t last = 0;
+        static int    running = 0;
+
+        time_t            now = cfs_time_current_sec();
+        int               interval = now - last;
+        int               rc;
+        __u64             version;
+        lnet_peer_t      *rtr;
+
+        /* It's no use to call me again within a sec - all intervals and
+         * timeouts are measured in seconds */
+        if (last != 0 && interval < 2)
+                return;
+
+        if (last != 0 &&
+            interval > MAX(live_router_check_interval,
+                           dead_router_check_interval))
+                CDEBUG(D_NETERROR, "Checker(%d/%d) not called for %d seconds\n",
+                       live_router_check_interval, dead_router_check_interval,
+                       interval);
+
+        LNET_LOCK();
+        LASSERT (!running); /* recursion check */
+        running = 1;
+        LNET_UNLOCK();
+
+        last = now;
+
+        if (the_lnet.ln_rc_state == LNET_RC_STATE_STOPTHREAD) {
+                the_lnet.ln_rc_state = LNET_RC_STATE_UNLINKING;
+                rc = LNetMDUnlink(the_lnet.ln_rc_mdh);
+                LASSERT (rc == 0);
+        }
+
+        /* consume all pending events */
+        while (1) {
+                int          i;
+                lnet_event_t ev;
+
+                /* NB ln_rc_eqh must be the 1st in 'eventqs' otherwise the
+                 * recursion breaker in LNetEQPoll would fail */
+                rc = LNetEQPoll(&the_lnet.ln_rc_eqh, 1, 0, &ev, &i);
+                if (rc == 0)   /* no event pending */
+                        break;
+
+                /* NB a lost SENT prevents me from pinging a router again */
+                if (rc == -EOVERFLOW) {
+                        CERROR("Dropped an event!!!\n");
+                        abort();
+                }
+
+                LASSERT (rc == 1);
+
+                LNET_LOCK();
+                lnet_router_checker_event(&ev);
+                LNET_UNLOCK();
+        }
+
+        if (the_lnet.ln_rc_state == LNET_RC_STATE_UNLINKED ||
+            the_lnet.ln_rc_state == LNET_RC_STATE_UNLINKING) {
+                running = 0;
+                return;
+        }
+
+        LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING);
+
+        LNET_LOCK();
+
+        version = the_lnet.ln_routers_version;
+        list_for_each_entry (rtr, &the_lnet.ln_routers, lp_rtr_list) {
+                lnet_ping_router_locked(rtr);
+                LASSERT (version == the_lnet.ln_routers_version);
+        }
+
+        LNET_UNLOCK();
+
+        running = 0; /* lock only needed for the recursion check */
+        return;
+}
+
+/* NB lnet_peers_start_down depends on me,
+ * so must be called before any peer creation */
+void
+lnet_get_tunables (void)
+{
+        char *s;
+
+        s = getenv("LNET_ROUTER_PING_TIMEOUT");
+        if (s != NULL) router_ping_timeout = atoi(s);
+
+        s = getenv("LNET_LIVE_ROUTER_CHECK_INTERVAL");
+        if (s != NULL) live_router_check_interval = atoi(s);
+
+        s = getenv("LNET_DEAD_ROUTER_CHECK_INTERVAL");
+        if (s != NULL) dead_router_check_interval = atoi(s);
+
+        /* This replaces old lnd_notify mechanism */
+        check_routers_before_use = 1;
+        if (dead_router_check_interval <= 0)
+                dead_router_check_interval = 30;
 }
 
 void