X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Frouter.c;h=86d24ad921ff5d5b47aec73ab18592ef3eb0716d;hb=698d3088622b4610a84bd508f2b707a7a2dd1e3e;hp=e10c97ac831b48710c3bd4a007dd30230bb47d59;hpb=d016a086b68ca4af2dcbfefc3917b9291efd8d62;p=fs%2Flustre-release.git diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c index e10c97a..86d24ad 100644 --- a/lnet/lnet/router.c +++ b/lnet/lnet/router.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * * Copyright (c) 2011, Whamcloud, Inc. @@ -124,27 +122,24 @@ lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive, cfs_time_t when) lp->lp_alive = !(!alive); /* 1 bit! */ lp->lp_notify = 1; lp->lp_notifylnd |= notifylnd; + if (lp->lp_alive) + lp->lp_ping_version = LNET_PROTO_PING_UNKNOWN; /* reset */ CDEBUG(D_NET, "set %s %d\n", libcfs_nid2str(lp->lp_nid), alive); } void -lnet_do_notify (lnet_peer_t *lp) +lnet_ni_notify_locked(lnet_ni_t *ni, 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 */ - if (lp->lp_notifying) { - LNET_UNLOCK(); + if (lp->lp_notifying) return; - } lp->lp_notifying = 1; @@ -168,8 +163,6 @@ lnet_do_notify (lnet_peer_t *lp) } lp->lp_notifying = 0; - - LNET_UNLOCK(); } @@ -207,9 +200,11 @@ lnet_rtr_decref_locked(lnet_peer_t *lp) lp->lp_rtr_refcount--; if (lp->lp_rtr_refcount == 0) { + LASSERT(cfs_list_empty(&lp->lp_routes)); + if (lp->lp_rcd != NULL) { cfs_list_add(&lp->lp_rcd->rcd_list, - &the_lnet.ln_zombie_rcd); + &the_lnet.ln_rcd_deathrow); lp->lp_rcd = NULL; } @@ -288,6 +283,7 @@ lnet_add_route_to_rnet (lnet_remotenet_t *rnet, lnet_route_t *route) offset--; } cfs_list_add(&route->lr_list, e); + cfs_list_add(&route->lr_gwlist, &route->lr_gateway->lp_routes); the_lnet.ln_remote_nets_version++; lnet_rtr_addref_locked(route->lr_gateway); @@ -334,6 +330,7 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway) CFS_INIT_LIST_HEAD(&rnet->lrn_routes); rnet->lrn_net = net; route->lr_hops = hops; + route->lr_net = net; LNET_LOCK(); @@ -344,11 +341,13 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway) LIBCFS_FREE(route, sizeof(*route)); LIBCFS_FREE(rnet, sizeof(*rnet)); - if (rc == -EHOSTUNREACH) /* gateway is not on a local net */ + if (rc == -EHOSTUNREACH) { /* gateway is not on a local net */ return 0; /* ignore the route entry */ - - CERROR("Error %d creating route %s %d %s\n", rc, - libcfs_net2str(net), hops, libcfs_nid2str(gateway)); + } else { + CERROR("Error %d creating route %s %d %s\n", rc, + libcfs_net2str(net), hops, + libcfs_nid2str(gateway)); + } return rc; } @@ -376,22 +375,25 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway) } if (add_route) { - ni = route->lr_gateway->lp_ni; - lnet_ni_addref_locked(ni); + lnet_peer_addref_locked(route->lr_gateway); /* +1 for notify */ + lnet_add_route_to_rnet(rnet2, route); - lnet_add_route_to_rnet(rnet2, route); - LNET_UNLOCK(); + ni = route->lr_gateway->lp_ni; + LNET_UNLOCK(); - /* XXX Assume alive */ - if (ni->ni_lnd->lnd_notify != NULL) - (ni->ni_lnd->lnd_notify)(ni, gateway, 1); + /* XXX Assume alive */ + if (ni->ni_lnd->lnd_notify != NULL) + (ni->ni_lnd->lnd_notify)(ni, gateway, 1); - lnet_ni_decref(ni); - } else { - lnet_peer_decref_locked(route->lr_gateway); - LNET_UNLOCK(); - LIBCFS_FREE(route, sizeof(*route)); - } + LNET_LOCK(); + } + + /* -1 for notify or !add_route */ + lnet_peer_decref_locked(route->lr_gateway); + LNET_UNLOCK(); + + if (!add_route) + LIBCFS_FREE(route, sizeof(*route)); if (rnet != rnet2) LIBCFS_FREE(rnet, sizeof(*rnet)); @@ -415,20 +417,31 @@ lnet_check_routes (void) route2 = NULL; cfs_list_for_each (e2, &rnet->lrn_routes) { + lnet_nid_t nid1; + lnet_nid_t nid2; + int net; + route = cfs_list_entry(e2, lnet_route_t, lr_list); - if (route2 == NULL) - route2 = route; - else if (route->lr_gateway->lp_ni != - route2->lr_gateway->lp_ni) { - LNET_UNLOCK(); + if (route2 == NULL) { + route2 = route; + continue; + } - CERROR("Routes to %s via %s and %s not supported\n", - libcfs_net2str(rnet->lrn_net), - libcfs_nid2str(route->lr_gateway->lp_nid), - libcfs_nid2str(route2->lr_gateway->lp_nid)); - return -EINVAL; - } + if (route->lr_gateway->lp_ni == + route2->lr_gateway->lp_ni) + continue; + + nid1 = route->lr_gateway->lp_nid; + nid2 = route2->lr_gateway->lp_nid; + net = rnet->lrn_net; + + LNET_UNLOCK(); + + CERROR("Routes to %s via %s and %s not supported\n", + libcfs_net2str(net), libcfs_nid2str(nid1), + libcfs_nid2str(nid2)); + return -EINVAL; } } @@ -439,6 +452,7 @@ lnet_check_routes (void) int lnet_del_route (__u32 net, lnet_nid_t gw_nid) { + struct lnet_peer *gateway; lnet_remotenet_t *rnet; lnet_route_t *route; cfs_list_t *e1; @@ -464,11 +478,13 @@ lnet_del_route (__u32 net, lnet_nid_t gw_nid) cfs_list_for_each (e2, &rnet->lrn_routes) { route = cfs_list_entry(e2, lnet_route_t, lr_list); - if (!(gw_nid == LNET_NID_ANY || - gw_nid == route->lr_gateway->lp_nid)) - continue; + gateway = route->lr_gateway; + if (!(gw_nid == LNET_NID_ANY || + gw_nid == gateway->lp_nid)) + continue; - cfs_list_del(&route->lr_list); + cfs_list_del(&route->lr_list); + cfs_list_del(&route->lr_gwlist); the_lnet.ln_remote_nets_version++; if (cfs_list_empty(&rnet->lrn_routes)) @@ -476,8 +492,8 @@ lnet_del_route (__u32 net, lnet_nid_t gw_nid) else rnet = NULL; - lnet_rtr_decref_locked(route->lr_gateway); - lnet_peer_decref_locked(route->lr_gateway); + lnet_rtr_decref_locked(gateway); + lnet_peer_decref_locked(gateway); LNET_UNLOCK(); LIBCFS_FREE(route, sizeof (*route)); @@ -538,6 +554,7 @@ lnet_swap_pinginfo(lnet_ping_info_t *info) int i; lnet_ni_status_t *stat; + __swab32s(&info->pi_magic); __swab32s(&info->pi_version); __swab32s(&info->pi_pid); __swab32s(&info->pi_nnis); @@ -549,84 +566,139 @@ lnet_swap_pinginfo(lnet_ping_info_t *info) return; } -/* Returns # of down NIs, or negative error codes; ignore downed NIs - * if a NI in 'net' is up */ -int -lnet_router_down_ni(lnet_peer_t *rtr, __u32 net) +/** + * parse router-checker pinginfo, record number of down NIs for remote + * networks on that router. + */ +static void +lnet_parse_rc_info(lnet_rc_data_t *rcd) { - int i; - int down = 0; - int ptl_up = 0; - int ptl_down = 0; - lnet_ping_info_t *info; - - if (!avoid_asym_router_failure) - return -ENOENT; - - if (rtr->lp_rcd == NULL) - return -EINVAL; + lnet_ping_info_t *info = rcd->rcd_pinginfo; + struct lnet_peer *gw = rcd->rcd_gateway; + lnet_route_t *rtr; + + if (!gw->lp_alive) + return; + + if (info->pi_magic == __swab32(LNET_PROTO_PING_MAGIC)) + lnet_swap_pinginfo(info); + + /* NB always racing with network! */ + if (info->pi_magic != LNET_PROTO_PING_MAGIC) { + CDEBUG(D_NET, "%s: Unexpected magic %08x\n", + libcfs_nid2str(gw->lp_nid), info->pi_magic); + gw->lp_ping_version = LNET_PROTO_PING_UNKNOWN; + return; + } + + gw->lp_ping_version = info->pi_version; + if (gw->lp_ping_version == LNET_PROTO_PING_VERSION_1) + return; /* v1 doesn't carry NI status info */ + + if (gw->lp_ping_version != LNET_PROTO_PING_VERSION) { + CDEBUG(D_NET, "%s: Unexpected version 0x%x\n", + libcfs_nid2str(gw->lp_nid), gw->lp_ping_version); + gw->lp_ping_version = LNET_PROTO_PING_UNKNOWN; + return; + } + + cfs_list_for_each_entry(rtr, &gw->lp_routes, lr_gwlist) { + int ptl_status = LNET_NI_STATUS_INVALID; + int down = 0; + int up = 0; + int i; + + for (i = 0; i < info->pi_nnis && i < LNET_MAX_RTR_NIS; i++) { + lnet_ni_status_t *stat = &info->pi_ni[i]; + lnet_nid_t nid = stat->ns_nid; + + if (nid == LNET_NID_ANY) { + CDEBUG(D_NET, "%s: unexpected LNET_NID_ANY\n", + libcfs_nid2str(gw->lp_nid)); + gw->lp_ping_version = LNET_PROTO_PING_UNKNOWN; + return; + } + + if (LNET_NETTYP(LNET_NIDNET(nid)) == LOLND) + continue; + + if (stat->ns_status == LNET_NI_STATUS_DOWN) { + if (LNET_NETTYP(LNET_NIDNET(nid)) != PTLLND) + down++; + else if (ptl_status != LNET_NI_STATUS_UP) + ptl_status = LNET_NI_STATUS_DOWN; + continue; + } + + if (stat->ns_status == LNET_NI_STATUS_UP) { + if (LNET_NIDNET(nid) == rtr->lr_net) { + up = 1; + break; + } + /* ptl NIs are considered down only when + * they're all down */ + if (LNET_NETTYP(LNET_NIDNET(nid)) == PTLLND) + ptl_status = LNET_NI_STATUS_UP; + continue; + } + + CDEBUG(D_NET, "%s: Unexpected status 0x%x\n", + libcfs_nid2str(gw->lp_nid), stat->ns_status); + gw->lp_ping_version = LNET_PROTO_PING_UNKNOWN; + return; + } + + if (up) { /* ignore downed NIs if NI for dest network is up */ + rtr->lr_downis = 0; + continue; + } + rtr->lr_downis = down + (ptl_status == LNET_NI_STATUS_DOWN); + } +} - if (!rtr->lp_alive) - return -EINVAL; /* stale lp_rcd */ +static void +lnet_router_checker_event(lnet_event_t *event) +{ + /* CAVEAT EMPTOR: I'm called with lnet_res_locked */ + lnet_rc_data_t *rcd = event->md.user_ptr; + struct lnet_peer *lp; - info = rtr->lp_rcd->rcd_pinginfo; - LASSERT (info != NULL); + LASSERT(rcd != NULL); - /* NB always racing with network! */ - if (info->pi_magic == __swab32(LNET_PROTO_PING_MAGIC)) { - lnet_swap_pinginfo(info); - } else if (info->pi_magic != LNET_PROTO_PING_MAGIC) { - CNETERR("%s: Unexpected magic %08x\n", - libcfs_nid2str(rtr->lp_nid), info->pi_magic); - return -EPROTO; + if (event->unlinked) { + LNetInvalidateHandle(&rcd->rcd_mdh); + return; } - if (info->pi_version == LNET_PROTO_PING_VERSION1) - return -ENOENT; /* v1 doesn't carry NI status info */ + LASSERT(event->type == LNET_EVENT_SEND || + event->type == LNET_EVENT_REPLY); - if (info->pi_version != LNET_PROTO_PING_VERSION) { - CNETERR("%s: Unexpected version 0x%x\n", - libcfs_nid2str(rtr->lp_nid), info->pi_version); - return -EPROTO; - } + lp = rcd->rcd_gateway; + LASSERT(lp != NULL); - for (i = 0; i < info->pi_nnis && i < LNET_MAX_RTR_NIS; i++) { - lnet_ni_status_t *stat = &info->pi_ni[i]; - lnet_nid_t nid = stat->ns_nid; + if (!lnet_isrouter(lp)) /* ignore if no longer a router */ + return; - if (nid == LNET_NID_ANY) { - CNETERR("%s: unexpected LNET_NID_ANY\n", - libcfs_nid2str(rtr->lp_nid)); - return -EPROTO; - } + if (event->type == LNET_EVENT_SEND) { + lp->lp_ping_notsent = 0; /* NB: re-enable another ping */ + if (event->status == 0) + return; + } - if (LNET_NETTYP(LNET_NIDNET(nid)) == LOLND) - continue; + /* 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 + * apps get burned). */ - if (stat->ns_status == LNET_NI_STATUS_DOWN) { - if (LNET_NETTYP(LNET_NIDNET(nid)) == PTLLND) - ptl_down = 1; - else - down++; - continue; - } + lnet_notify_locked(lp, 1, (event->status == 0), cfs_time_current()); + /* The router checker will wake up very shortly and do the + * actual notification. + * XXX If 'lp' stops being a router before then, it will still + * have the notification pending!!! */ - if (stat->ns_status != LNET_NI_STATUS_UP) { - CNETERR("%s: Unexpected status 0x%x\n", - libcfs_nid2str(rtr->lp_nid), stat->ns_status); - return -EPROTO; - } - - /* ignore downed NIs if there's a NI up for dest network */ - if (LNET_NIDNET(nid) == net) - return 0; - - if (LNET_NETTYP(LNET_NIDNET(nid)) == PTLLND) - ptl_up = 1; - } - - /* ptl NIs are considered down only when they're all down */ - return down + (ptl_up ? 0 : ptl_down); + if (avoid_asym_router_failure && event->status == 0) + lnet_parse_rc_info(rcd); } void @@ -663,140 +735,77 @@ lnet_wait_known_routerstate(void) } } -static void -lnet_router_checker_event (lnet_event_t *event) +void +lnet_update_ni_status_locked(void) { - /* CAVEAT EMPTOR: I'm called with LNET_LOCKed and I'm not allowed to - * drop it (that's how come I see _every_ event, even ones that would - * overflow my EQ) */ - lnet_rc_data_t *rcd = event->md.user_ptr; - lnet_peer_t *lp; - lnet_nid_t nid; - - if (event->unlinked) { - if (rcd != NULL) { - LNetInvalidateHandle(&rcd->rcd_mdh); - return; - } + lnet_ni_t *ni; + long now; + int timeout; - /* The router checker thread has unlinked the default rc_md - * and exited. */ - LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_UNLINKING); - the_lnet.ln_rc_state = LNET_RC_STATE_UNLINKED; -#ifdef __KERNEL__ - cfs_up(&the_lnet.ln_rc_signal); -#endif - return; - } - - LASSERT (event->type == LNET_EVENT_SEND || - event->type == LNET_EVENT_REPLY); + LASSERT(the_lnet.ln_routing); - nid = (event->type == LNET_EVENT_SEND) ? - event->target.nid : event->initiator.nid; - - lp = lnet_find_peer_locked(nid); - if (lp == NULL) { - /* router may have been removed */ - CDEBUG(D_NET, "Router %s not found\n", libcfs_nid2str(nid)); - return; - } + timeout = router_ping_timeout + + MAX(live_router_check_interval, dead_router_check_interval); - if (event->type == LNET_EVENT_SEND) /* re-enable another ping */ - lp->lp_ping_notsent = 0; + now = cfs_time_current_sec(); + cfs_list_for_each_entry(ni, &the_lnet.ln_nis, ni_list) { + if (ni->ni_lnd->lnd_type == LOLND) + continue; - if (lnet_isrouter(lp) && /* ignore if no longer a router */ - (event->status != 0 || - event->type == LNET_EVENT_REPLY)) { + if (now < ni->ni_last_alive + timeout) + continue; - /* 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 - * apps get burned). */ + LASSERT(ni->ni_status != NULL); - lnet_notify_locked(lp, 1, (event->status == 0), - cfs_time_current()); - - /* The router checker will wake up very shortly and do the - * actual notification. - * XXX If 'lp' stops being a router before then, it will still - * have the notification pending!!! */ - } - - /* This decref will NOT drop LNET_LOCK (it had to have 1 ref when it - * was in the peer table and I've not dropped the lock, so no-one else - * can have reduced the refcount) */ - LASSERT(lp->lp_refcount > 1); - - lnet_peer_decref_locked(lp); + if (ni->ni_status->ns_status != LNET_NI_STATUS_DOWN) { + CDEBUG(D_NET, "NI(%s:%d) status changed to down\n", + libcfs_nid2str(ni->ni_nid), timeout); + /* NB: so far, this is the only place to set + * NI status to "down" */ + ni->ni_status->ns_status = LNET_NI_STATUS_DOWN; + } + } } void -lnet_update_ni_status(void) +lnet_destroy_rc_data (lnet_rc_data_t *rcd) { - cfs_time_t now = cfs_time_current(); - lnet_ni_t *ni; - int status; - int timeout; - - LASSERT (the_lnet.ln_routing); + LASSERT(cfs_list_empty(&rcd->rcd_list)); + /* detached from network */ + LASSERT(LNetHandleIsInvalid(rcd->rcd_mdh)); - timeout = router_ping_timeout + - MAX(live_router_check_interval, dead_router_check_interval); - - LNET_LOCK(); + if (rcd->rcd_gateway != NULL) { + LNET_LOCK(); + lnet_peer_decref_locked(rcd->rcd_gateway); + LNET_UNLOCK(); + } - cfs_list_for_each_entry (ni, &the_lnet.ln_nis, ni_list) { - lnet_ni_status_t *ns = ni->ni_status; + if (rcd->rcd_pinginfo != NULL) + LIBCFS_FREE(rcd->rcd_pinginfo, LNET_PINGINFO_SIZE); - LASSERT (ns != NULL); - - status = LNET_NI_STATUS_UP; - if (ni->ni_lnd->lnd_type != LOLND && /* @lo forever alive */ - cfs_time_after(now, cfs_time_add(ni->ni_last_alive, - cfs_time_seconds(timeout)))) - status = LNET_NI_STATUS_DOWN; - - if (ns->ns_status != status) { - ns->ns_status = status; - CDEBUG(D_NET, "NI(%s:%d) status changed to %s\n", - libcfs_nid2str(ni->ni_nid), timeout, - status == LNET_NI_STATUS_UP ? "up" : "down"); - } - } - - LNET_UNLOCK(); + LIBCFS_FREE(rcd, sizeof(*rcd)); } -void -lnet_destroy_rc_data (lnet_rc_data_t *rcd) +lnet_rc_data_t * +lnet_create_rc_data_locked(lnet_peer_t *gateway) { - LASSERT (cfs_list_empty(&rcd->rcd_list)); - /* detached from network */ - LASSERT (LNetHandleIsInvalid(rcd->rcd_mdh)); + lnet_rc_data_t *rcd = NULL; + lnet_ping_info_t *pi; + int rc; + int i; - LIBCFS_FREE(rcd->rcd_pinginfo, LNET_PINGINFO_SIZE); - LIBCFS_FREE(rcd, sizeof(*rcd)); - return; -} + LNET_UNLOCK(); -lnet_rc_data_t * -lnet_create_rc_data (void) -{ - int i; - int rc; - lnet_ping_info_t *pi; - lnet_rc_data_t *rcd; + LIBCFS_ALLOC(rcd, sizeof(*rcd)); + if (rcd == NULL) + goto out; - LIBCFS_ALLOC(rcd, sizeof(*rcd)); - if (rcd == NULL) - return NULL; + LNetInvalidateHandle(&rcd->rcd_mdh); + CFS_INIT_LIST_HEAD(&rcd->rcd_list); - LIBCFS_ALLOC(pi, LNET_PINGINFO_SIZE); - if (pi == NULL) { - LIBCFS_FREE(rcd, sizeof(*rcd)); - return NULL; - } + LIBCFS_ALLOC(pi, LNET_PINGINFO_SIZE); + if (pi == NULL) + goto out; memset(pi, 0, LNET_PINGINFO_SIZE); for (i = 0; i < LNET_MAX_RTR_NIS; i++) { @@ -804,8 +813,6 @@ lnet_create_rc_data (void) pi->pi_ni[i].ns_status = LNET_NI_STATUS_INVALID; } rcd->rcd_pinginfo = pi; - LNetInvalidateHandle(&rcd->rcd_mdh); - CFS_INIT_LIST_HEAD(&rcd->rcd_list); LASSERT (!LNetHandleIsInvalid(the_lnet.ln_rc_eqh)); rc = LNetMDBind((lnet_md_t){.start = pi, @@ -818,11 +825,33 @@ lnet_create_rc_data (void) &rcd->rcd_mdh); if (rc < 0) { CERROR("Can't bind MD: %d\n", rc); - lnet_destroy_rc_data(rcd); - return NULL; - } - LASSERT (rc == 0); - return rcd; + goto out; + } + LASSERT(rc == 0); + + LNET_LOCK(); + /* router table changed or someone has created rcd for this gateway */ + if (!lnet_isrouter(gateway) || gateway->lp_rcd != NULL) { + LNET_UNLOCK(); + goto out; + } + + lnet_peer_addref_locked(gateway); + rcd->rcd_gateway = gateway; + gateway->lp_rcd = rcd; + return rcd; + + out: + if (rcd != NULL) { + if (!LNetHandleIsInvalid(rcd->rcd_mdh)) { + rc = LNetMDUnlink(rcd->rcd_mdh); + LASSERT(rc == 0); + } + lnet_destroy_rc_data(rcd); + } + + LNET_LOCK(); + return gateway->lp_rcd; } static int @@ -841,7 +870,6 @@ lnet_router_check_interval (lnet_peer_t *rtr) static void lnet_ping_router_locked (lnet_peer_t *rtr) { - int newrcd = 0; lnet_rc_data_t *rcd = NULL; cfs_time_t now = cfs_time_current(); int secs; @@ -852,30 +880,21 @@ lnet_ping_router_locked (lnet_peer_t *rtr) cfs_time_after(now, rtr->lp_ping_deadline)) lnet_notify_locked(rtr, 1, 0, now); - if (avoid_asym_router_failure && rtr->lp_rcd == NULL) - newrcd = 1; - - LNET_UNLOCK(); - - /* Run any outstanding notifications */ - lnet_do_notify(rtr); + /* Run any outstanding notifications */ + lnet_ni_notify_locked(rtr->lp_ni, rtr); - if (newrcd) - rcd = lnet_create_rc_data(); + if (!lnet_isrouter(rtr) || + the_lnet.ln_rc_state != LNET_RC_STATE_RUNNING) { + /* router table changed or router checker is shutting down */ + lnet_peer_decref_locked(rtr); + return; + } - LNET_LOCK(); + rcd = rtr->lp_rcd != NULL ? + rtr->lp_rcd : lnet_create_rc_data_locked(rtr); - if (!lnet_isrouter(rtr)) { - lnet_peer_decref_locked(rtr); - if (rcd != NULL) - cfs_list_add(&rcd->rcd_list, &the_lnet.ln_zombie_rcd); - return; /* router table changed! */ - } - - if (rcd != NULL) { - LASSERT (rtr->lp_rcd == NULL); - rtr->lp_rcd = rcd; - } + if (rcd == NULL) + return; secs = lnet_router_check_interval(rtr); @@ -899,11 +918,13 @@ lnet_ping_router_locked (lnet_peer_t *rtr) rtr->lp_ping_notsent = 1; rtr->lp_ping_timestamp = now; - mdh = (rtr->lp_rcd == NULL) ? the_lnet.ln_rc_mdh : - rtr->lp_rcd->rcd_mdh; - if (rtr->lp_ping_deadline == 0) - rtr->lp_ping_deadline = cfs_time_shift(router_ping_timeout); + mdh = rcd->rcd_mdh; + + if (rtr->lp_ping_deadline == 0) { + rtr->lp_ping_deadline = \ + cfs_time_shift(router_ping_timeout); + } LNET_UNLOCK(); @@ -922,9 +943,6 @@ lnet_ping_router_locked (lnet_peer_t *rtr) int lnet_router_checker_start(void) { - static lnet_ping_info_t pinginfo; - - lnet_md_t md; int rc; int eqsz; #ifndef __KERNEL__ @@ -1003,7 +1021,7 @@ lnet_router_checker_start(void) cfs_sema_init(&the_lnet.ln_rc_signal, 0); /* EQ size doesn't matter; the callback is guaranteed to get every * event */ - eqsz = 1; + eqsz = 0; rc = LNetEQAlloc(eqsz, lnet_router_checker_event, &the_lnet.ln_rc_eqh); #else @@ -1015,30 +1033,11 @@ lnet_router_checker_start(void) return -ENOMEM; } - memset(&md, 0, sizeof(md)); - md.user_ptr = NULL; - 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); - the_lnet.ln_rc_state = LNET_RC_STATE_RUNNING; #ifdef __KERNEL__ rc = cfs_create_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 */ cfs_down(&the_lnet.ln_rc_signal); rc = LNetEQFree(the_lnet.ln_rc_eqh); @@ -1067,94 +1066,105 @@ lnet_router_checker_stop (void) return; LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING); - the_lnet.ln_rc_state = LNET_RC_STATE_STOPTHREAD; + the_lnet.ln_rc_state = LNET_RC_STATE_STOPPING; #ifdef __KERNEL__ - /* block until event callback signals exit */ - cfs_down(&the_lnet.ln_rc_signal); + /* block until event callback signals exit */ + cfs_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)); - } + lnet_router_checker(); #endif - LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_UNLINKED); + LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_SHUTDOWN); rc = LNetEQFree(the_lnet.ln_rc_eqh); LASSERT (rc == 0); - the_lnet.ln_rc_state = LNET_RC_STATE_SHUTDOWN; return; } -#if defined(__KERNEL__) && defined(LNET_ROUTER) - static void -lnet_prune_zombie_rcd (int wait_unlink) +lnet_prune_rc_data(int wait_unlink) { - lnet_rc_data_t *rcd; - lnet_rc_data_t *tmp; - cfs_list_t free_rcd; - int i; - __u64 version; + lnet_rc_data_t *rcd; + lnet_rc_data_t *tmp; + lnet_peer_t *lp; + cfs_list_t head; + int i = 2; - CFS_INIT_LIST_HEAD(&free_rcd); + if (likely(the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING && + cfs_list_empty(&the_lnet.ln_rcd_deathrow) && + cfs_list_empty(&the_lnet.ln_rcd_zombie))) + return; - LNET_LOCK(); -rescan: - version = the_lnet.ln_routers_version; - cfs_list_for_each_entry_safe (rcd, tmp, &the_lnet.ln_zombie_rcd, - rcd_list) { - if (LNetHandleIsInvalid(rcd->rcd_mdh)) { - cfs_list_del(&rcd->rcd_list); - cfs_list_add(&rcd->rcd_list, &free_rcd); - continue; - } + CFS_INIT_LIST_HEAD(&head); - LNET_UNLOCK(); + LNET_LOCK(); - LNetMDUnlink(rcd->rcd_mdh); + if (the_lnet.ln_rc_state != LNET_RC_STATE_RUNNING) { + /* router checker is stopping, prune all */ + cfs_list_for_each_entry(lp, &the_lnet.ln_routers, + lp_rtr_list) { + if (lp->lp_rcd == NULL) + continue; - LNET_LOCK(); - if (version != the_lnet.ln_routers_version) - goto rescan; + LASSERT(cfs_list_empty(&lp->lp_rcd->rcd_list)); + cfs_list_add(&lp->lp_rcd->rcd_list, + &the_lnet.ln_rcd_deathrow); + lp->lp_rcd = NULL; + } + } + + /* unlink all RCDs on deathrow list */ + cfs_list_splice_init(&the_lnet.ln_rcd_deathrow, &head); + + if (!cfs_list_empty(&head)) { + LNET_UNLOCK(); + + cfs_list_for_each_entry(rcd, &head, rcd_list) + LNetMDUnlink(rcd->rcd_mdh); + + LNET_LOCK(); } - i = 2; - while (wait_unlink && !cfs_list_empty(&the_lnet.ln_zombie_rcd)) { - rcd = cfs_list_entry(the_lnet.ln_zombie_rcd.next, - lnet_rc_data_t, rcd_list); - if (LNetHandleIsInvalid(rcd->rcd_mdh)) { - cfs_list_del(&rcd->rcd_list); - cfs_list_add(&rcd->rcd_list, &free_rcd); - continue; + cfs_list_splice_init(&head, &the_lnet.ln_rcd_zombie); + + /* release all zombie RCDs */ + while (!cfs_list_empty(&the_lnet.ln_rcd_zombie)) { + cfs_list_for_each_entry_safe(rcd, tmp, &the_lnet.ln_rcd_zombie, + rcd_list) { + if (!LNetHandleIsInvalid(rcd->rcd_mdh)) + cfs_list_move(&rcd->rcd_list, &head); } - LNET_UNLOCK(); + wait_unlink = wait_unlink && + !cfs_list_empty(&the_lnet.ln_rcd_zombie); - LNetMDUnlink(rcd->rcd_mdh); + LNET_UNLOCK(); - i++; - CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET, - "Waiting for rc buffers to unlink\n"); - cfs_pause(cfs_time_seconds(1)); + while (!cfs_list_empty(&head)) { + rcd = cfs_list_entry(head.next, + lnet_rc_data_t, rcd_list); + cfs_list_del_init(&rcd->rcd_list); + lnet_destroy_rc_data(rcd); + } - LNET_LOCK(); - } + if (!wait_unlink) + break; - LNET_UNLOCK(); + i++; + CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET, + "Waiting for rc buffers to unlink\n"); + cfs_pause(cfs_time_seconds(1) / 4); - while (!cfs_list_empty(&free_rcd)) { - rcd = cfs_list_entry(free_rcd.next, lnet_rc_data_t, rcd_list); - cfs_list_del_init(&rcd->rcd_list); - lnet_destroy_rc_data(rcd); - } - return; + LNET_LOCK(); + } } + +#if defined(__KERNEL__) && defined(LNET_ROUTER) + static int lnet_router_checker(void *arg) { - int rc; lnet_peer_t *rtr; cfs_list_t *entry; @@ -1181,12 +1191,12 @@ rescan: } } - LNET_UNLOCK(); + if (the_lnet.ln_routing) + lnet_update_ni_status_locked(); - if (the_lnet.ln_routing) - lnet_update_ni_status(); + LNET_UNLOCK(); - lnet_prune_zombie_rcd(0); /* don't wait for UNLINK */ + lnet_prune_rc_data(0); /* don't wait for UNLINK */ /* Call cfs_pause() here always adds 1 to load average * because kernel counts # active tasks as nr_running @@ -1195,29 +1205,12 @@ rescan: cfs_time_seconds(1)); } - LNET_LOCK(); - - cfs_list_for_each (entry, &the_lnet.ln_routers) { - rtr = cfs_list_entry(entry, lnet_peer_t, lp_rtr_list); - - if (rtr->lp_rcd == NULL) - continue; - - LASSERT (cfs_list_empty(&rtr->lp_rcd->rcd_list)); - cfs_list_add(&rtr->lp_rcd->rcd_list, &the_lnet.ln_zombie_rcd); - rtr->lp_rcd = NULL; - } - - LNET_UNLOCK(); + LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_STOPPING); - lnet_prune_zombie_rcd(1); /* wait for UNLINK */ - - 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); + lnet_prune_rc_data(1); /* wait for UNLINK */ + the_lnet.ln_rc_state = LNET_RC_STATE_SHUTDOWN; + cfs_up(&the_lnet.ln_rc_signal); /* The unlink event callback will signal final completion */ return 0; } @@ -1480,11 +1473,7 @@ lnet_notify (lnet_ni_t *ni, lnet_nid_t nid, int alive, cfs_time_t when) lnet_notify_locked(lp, ni == NULL, alive, when); - LNET_UNLOCK(); - - lnet_do_notify(lp); - - LNET_LOCK(); + lnet_ni_notify_locked(ni, lp); lnet_peer_decref_locked(lp); @@ -1538,11 +1527,8 @@ lnet_router_checker (void) 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); - } + if (the_lnet.ln_rc_state == LNET_RC_STATE_STOPPING) + lnet_prune_rc_data(0); /* unlink all rcd and nowait */ /* consume all pending events */ while (1) { @@ -1568,8 +1554,9 @@ lnet_router_checker (void) LNET_UNLOCK(); } - if (the_lnet.ln_rc_state == LNET_RC_STATE_UNLINKED || - the_lnet.ln_rc_state == LNET_RC_STATE_UNLINKING) { + if (the_lnet.ln_rc_state == LNET_RC_STATE_STOPPING) { + lnet_prune_rc_data(1); /* release rcd */ + the_lnet.ln_rc_state = LNET_RC_STATE_SHUTDOWN; running = 0; return; }