X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Frouter.c;h=091cfd967d608ef7339ebedd6f5b72185d6d4967;hp=86d24ad921ff5d5b47aec73ab18592ef3eb0716d;hb=fb259fe85813e0f28ac7f7410689e3856ef26316;hpb=2118a8b92cec2df85d1bdbe2e58b389d83fe06b2 diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c index 86d24ad..091cfd9 100644 --- a/lnet/lnet/router.c +++ b/lnet/lnet/router.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2013, Intel Corporation. * * This file is part of Portals * http://sourceforge.net/projects/sandiaportals/ @@ -26,19 +26,29 @@ #if defined(__KERNEL__) && defined(LNET_ROUTER) +#define LNET_NRB_TINY_MIN 512 /* min value for each CPT */ +#define LNET_NRB_TINY (LNET_NRB_TINY_MIN * 4) +#define LNET_NRB_SMALL_MIN 4096 /* min value for each CPT */ +#define LNET_NRB_SMALL (LNET_NRB_SMALL_MIN * 4) +#define LNET_NRB_SMALL_PAGES 1 +#define LNET_NRB_LARGE_MIN 256 /* min value for each CPT */ +#define LNET_NRB_LARGE (LNET_NRB_LARGE_MIN * 4) +#define LNET_NRB_LARGE_PAGES ((LNET_MTU + PAGE_CACHE_SIZE - 1) >> \ + PAGE_CACHE_SHIFT) + static char *forwarding = ""; CFS_MODULE_PARM(forwarding, "s", charp, 0444, "Explicitly enable/disable forwarding between networks"); -static int tiny_router_buffers = 1024; +static int tiny_router_buffers; CFS_MODULE_PARM(tiny_router_buffers, "i", int, 0444, - "# of 0 payload messages to buffer in the router"); -static int small_router_buffers = 8192; + "# of 0 payload messages to buffer in the router"); +static int small_router_buffers; CFS_MODULE_PARM(small_router_buffers, "i", int, 0444, - "# of small (1 page) messages to buffer in the router"); -static int large_router_buffers = 512; + "# of small (1 page) messages to buffer in the router"); +static int large_router_buffers; CFS_MODULE_PARM(large_router_buffers, "i", int, 0444, - "# of large messages to buffer in the router"); + "# 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"); @@ -75,23 +85,23 @@ lnet_peer_buffer_credits(lnet_ni_t *ni) 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"); + "Assume routers are down and ping them before use"); -static int avoid_asym_router_failure = 0; -CFS_MODULE_PARM(avoid_asym_router_failure, "i", int, 0444, - "Avoid asymmetrical failures: reserved, use at your own risk"); +int avoid_asym_router_failure = 1; +CFS_MODULE_PARM(avoid_asym_router_failure, "i", int, 0644, + "Avoid asymmetrical router failures (0 to disable)"); -static int dead_router_check_interval = 0; -CFS_MODULE_PARM(dead_router_check_interval, "i", int, 0444, - "Seconds between dead router health checks (<= 0 to disable)"); +static int dead_router_check_interval = 60; +CFS_MODULE_PARM(dead_router_check_interval, "i", int, 0644, + "Seconds between dead router health checks (<= 0 to disable)"); -static int live_router_check_interval = 0; -CFS_MODULE_PARM(live_router_check_interval, "i", int, 0444, - "Seconds between live router health checks (<= 0 to disable)"); +static int live_router_check_interval = 60; +CFS_MODULE_PARM(live_router_check_interval, "i", int, 0644, + "Seconds between live router health checks (<= 0 to disable)"); static int router_ping_timeout = 50; -CFS_MODULE_PARM(router_ping_timeout, "i", int, 0444, - "Seconds to wait for the reply to a router health query"); +CFS_MODULE_PARM(router_ping_timeout, "i", int, 0644, + "Seconds to wait for the reply to a router health query"); int lnet_peers_start_down(void) @@ -123,9 +133,9 @@ lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive, cfs_time_t when) lp->lp_notify = 1; lp->lp_notifylnd |= notifylnd; if (lp->lp_alive) - lp->lp_ping_version = LNET_PROTO_PING_UNKNOWN; /* reset */ + lp->lp_ping_feats = LNET_PING_FEAT_INVAL; /* reset */ - CDEBUG(D_NET, "set %s %d\n", libcfs_nid2str(lp->lp_nid), alive); + CDEBUG(D_NET, "set %s %d\n", libcfs_nid2str(lp->lp_nid), alive); } void @@ -151,85 +161,89 @@ lnet_ni_notify_locked(lnet_ni_t *ni, lnet_peer_t *lp) lp->lp_notify = 0; if (notifylnd && ni->ni_lnd->lnd_notify != NULL) { - LNET_UNLOCK(); + lnet_net_unlock(lp->lp_cpt); - /* A new notification could happen now; I'll handle it - * when control returns to me */ + /* A new notification could happen now; I'll handle it + * when control returns to me */ - (ni->ni_lnd->lnd_notify)(ni, lp->lp_nid, alive); + (ni->ni_lnd->lnd_notify)(ni, lp->lp_nid, alive); - LNET_LOCK(); - } - } + lnet_net_lock(lp->lp_cpt); + } + } - lp->lp_notifying = 0; + lp->lp_notifying = 0; } static void lnet_rtr_addref_locked(lnet_peer_t *lp) { - LASSERT (lp->lp_refcount > 0); - LASSERT (lp->lp_rtr_refcount >= 0); + LASSERT(lp->lp_refcount > 0); + LASSERT(lp->lp_rtr_refcount >= 0); - lp->lp_rtr_refcount++; - if (lp->lp_rtr_refcount == 1) { - cfs_list_t *pos; + /* lnet_net_lock must be exclusively locked */ + lp->lp_rtr_refcount++; + if (lp->lp_rtr_refcount == 1) { + struct list_head *pos; - /* a simple insertion sort */ - cfs_list_for_each_prev(pos, &the_lnet.ln_routers) { - lnet_peer_t *rtr = cfs_list_entry(pos, lnet_peer_t, - lp_rtr_list); + /* a simple insertion sort */ + list_for_each_prev(pos, &the_lnet.ln_routers) { + lnet_peer_t *rtr = list_entry(pos, lnet_peer_t, + lp_rtr_list); - if (rtr->lp_nid < lp->lp_nid) - break; - } + if (rtr->lp_nid < lp->lp_nid) + break; + } - cfs_list_add(&lp->lp_rtr_list, pos); - /* addref for the_lnet.ln_routers */ - lnet_peer_addref_locked(lp); - the_lnet.ln_routers_version++; - } + list_add(&lp->lp_rtr_list, pos); + /* addref for the_lnet.ln_routers */ + lnet_peer_addref_locked(lp); + the_lnet.ln_routers_version++; + } } static void lnet_rtr_decref_locked(lnet_peer_t *lp) { - LASSERT (lp->lp_refcount > 0); - LASSERT (lp->lp_rtr_refcount > 0); + LASSERT(lp->lp_refcount > 0); + LASSERT(lp->lp_rtr_refcount > 0); - lp->lp_rtr_refcount--; - if (lp->lp_rtr_refcount == 0) { - LASSERT(cfs_list_empty(&lp->lp_routes)); + /* lnet_net_lock must be exclusively locked */ + lp->lp_rtr_refcount--; + if (lp->lp_rtr_refcount == 0) { + LASSERT(list_empty(&lp->lp_routes)); - if (lp->lp_rcd != NULL) { - cfs_list_add(&lp->lp_rcd->rcd_list, - &the_lnet.ln_rcd_deathrow); - lp->lp_rcd = NULL; - } + if (lp->lp_rcd != NULL) { + list_add(&lp->lp_rcd->rcd_list, + &the_lnet.ln_rcd_deathrow); + lp->lp_rcd = NULL; + } - cfs_list_del(&lp->lp_rtr_list); - /* decref for the_lnet.ln_routers */ - lnet_peer_decref_locked(lp); - the_lnet.ln_routers_version++; - } + list_del(&lp->lp_rtr_list); + /* decref for the_lnet.ln_routers */ + lnet_peer_decref_locked(lp); + the_lnet.ln_routers_version++; + } } lnet_remotenet_t * lnet_find_net_locked (__u32 net) { - lnet_remotenet_t *rnet; - cfs_list_t *tmp; + lnet_remotenet_t *rnet; + struct list_head *tmp; + struct list_head *rn_list; - LASSERT (!the_lnet.ln_shutdown); + LASSERT(!the_lnet.ln_shutdown); - cfs_list_for_each (tmp, &the_lnet.ln_remote_nets) { - rnet = cfs_list_entry(tmp, lnet_remotenet_t, lrn_list); + rn_list = lnet_net2rnethash(net); + list_for_each(tmp, rn_list) { + rnet = list_entry(tmp, lnet_remotenet_t, lrn_list); - if (rnet->lrn_net == net) - return rnet; - } - return NULL; + if (rnet->lrn_net == net) + return rnet; + } + return NULL; } static void lnet_shuffle_seed(void) @@ -238,276 +252,299 @@ static void lnet_shuffle_seed(void) int lnd_type, seed[2]; struct timeval tv; lnet_ni_t *ni; - cfs_list_t *tmp; + struct list_head *tmp; if (seeded) return; cfs_get_random_bytes(seed, sizeof(seed)); - /* Nodes with small feet have little entropy - * the NID for this node gives the most entropy in the low bits */ - cfs_list_for_each(tmp, &the_lnet.ln_nis) { - ni = cfs_list_entry(tmp, lnet_ni_t, ni_list); - lnd_type = LNET_NETTYP(LNET_NIDNET(ni->ni_nid)); + /* Nodes with small feet have little entropy + * the NID for this node gives the most entropy in the low bits */ + list_for_each(tmp, &the_lnet.ln_nis) { + ni = list_entry(tmp, lnet_ni_t, ni_list); + lnd_type = LNET_NETTYP(LNET_NIDNET(ni->ni_nid)); - if (lnd_type != LOLND) - seed[0] ^= (LNET_NIDADDR(ni->ni_nid) | lnd_type); - } + if (lnd_type != LOLND) + seed[0] ^= (LNET_NIDADDR(ni->ni_nid) | lnd_type); + } - cfs_gettimeofday(&tv); - cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]); - seeded = 1; - return; + do_gettimeofday(&tv); + cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]); + seeded = 1; + return; } /* NB expects LNET_LOCK held */ void lnet_add_route_to_rnet (lnet_remotenet_t *rnet, lnet_route_t *route) { - unsigned int len = 0; - unsigned int offset = 0; - cfs_list_t *e; + unsigned int len = 0; + unsigned int offset = 0; + struct list_head *e; - lnet_shuffle_seed(); + lnet_shuffle_seed(); - cfs_list_for_each (e, &rnet->lrn_routes) { - len++; - } + list_for_each(e, &rnet->lrn_routes) { + len++; + } - /* len+1 positions to add a new entry, also prevents division by 0 */ - offset = cfs_rand() % (len + 1); - cfs_list_for_each (e, &rnet->lrn_routes) { - if (offset == 0) - break; - offset--; - } - cfs_list_add(&route->lr_list, e); - cfs_list_add(&route->lr_gwlist, &route->lr_gateway->lp_routes); + /* len+1 positions to add a new entry, also prevents division by 0 */ + offset = cfs_rand() % (len + 1); + list_for_each(e, &rnet->lrn_routes) { + if (offset == 0) + break; + offset--; + } + list_add(&route->lr_list, e); + list_add(&route->lr_gwlist, &route->lr_gateway->lp_routes); - the_lnet.ln_remote_nets_version++; - lnet_rtr_addref_locked(route->lr_gateway); + the_lnet.ln_remote_nets_version++; + lnet_rtr_addref_locked(route->lr_gateway); } int -lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway) +lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway, + unsigned int priority) { - cfs_list_t *e; - lnet_remotenet_t *rnet; - lnet_remotenet_t *rnet2; - lnet_route_t *route; - lnet_ni_t *ni; - int add_route; - int rc; - - CDEBUG(D_NET, "Add route: net %s hops %u gw %s\n", - libcfs_net2str(net), hops, libcfs_nid2str(gateway)); - - if (gateway == LNET_NID_ANY || - LNET_NETTYP(LNET_NIDNET(gateway)) == LOLND || - net == LNET_NIDNET(LNET_NID_ANY) || - LNET_NETTYP(net) == LOLND || - LNET_NIDNET(gateway) == net || - hops < 1 || hops > 255) - return (-EINVAL); - - if (lnet_islocalnet(net)) /* it's a local network */ - return 0; /* ignore the route entry */ - - /* Assume net, route, all new */ - LIBCFS_ALLOC(route, sizeof(*route)); - LIBCFS_ALLOC(rnet, sizeof(*rnet)); - if (route == NULL || rnet == NULL) { - CERROR("Out of memory creating route %s %d %s\n", - libcfs_net2str(net), hops, libcfs_nid2str(gateway)); - if (route != NULL) - LIBCFS_FREE(route, sizeof(*route)); - if (rnet != NULL) - LIBCFS_FREE(rnet, sizeof(*rnet)); - return -ENOMEM; - } + struct list_head *e; + lnet_remotenet_t *rnet; + lnet_remotenet_t *rnet2; + lnet_route_t *route; + lnet_ni_t *ni; + int add_route; + int rc; - CFS_INIT_LIST_HEAD(&rnet->lrn_routes); - rnet->lrn_net = net; - route->lr_hops = hops; + CDEBUG(D_NET, "Add route: net %s hops %u priority %u gw %s\n", + libcfs_net2str(net), hops, priority, libcfs_nid2str(gateway)); + + if (gateway == LNET_NID_ANY || + LNET_NETTYP(LNET_NIDNET(gateway)) == LOLND || + net == LNET_NIDNET(LNET_NID_ANY) || + LNET_NETTYP(net) == LOLND || + LNET_NIDNET(gateway) == net || + hops < 1 || hops > 255) + return -EINVAL; + + if (lnet_islocalnet(net)) /* it's a local network */ + return 0; /* ignore the route entry */ + + /* Assume net, route, all new */ + LIBCFS_ALLOC(route, sizeof(*route)); + LIBCFS_ALLOC(rnet, sizeof(*rnet)); + if (route == NULL || rnet == NULL) { + CERROR("Out of memory creating route %s %d %s\n", + libcfs_net2str(net), hops, libcfs_nid2str(gateway)); + if (route != NULL) + LIBCFS_FREE(route, sizeof(*route)); + if (rnet != NULL) + LIBCFS_FREE(rnet, sizeof(*rnet)); + return -ENOMEM; + } + + INIT_LIST_HEAD(&rnet->lrn_routes); + rnet->lrn_net = net; + route->lr_hops = hops; route->lr_net = net; + route->lr_priority = priority; - LNET_LOCK(); + lnet_net_lock(LNET_LOCK_EX); - rc = lnet_nid2peer_locked(&route->lr_gateway, gateway); - if (rc != 0) { - LNET_UNLOCK(); + rc = lnet_nid2peer_locked(&route->lr_gateway, gateway, LNET_LOCK_EX); + if (rc != 0) { + lnet_net_unlock(LNET_LOCK_EX); - LIBCFS_FREE(route, sizeof(*route)); - LIBCFS_FREE(rnet, sizeof(*rnet)); - - if (rc == -EHOSTUNREACH) { /* gateway is not on a local net */ - return 0; /* ignore the route entry */ - } else { - CERROR("Error %d creating route %s %d %s\n", rc, - libcfs_net2str(net), hops, - libcfs_nid2str(gateway)); - } - return rc; - } + LIBCFS_FREE(route, sizeof(*route)); + LIBCFS_FREE(rnet, sizeof(*rnet)); + + 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)); + return rc; + } - LASSERT (!the_lnet.ln_shutdown); + LASSERT(!the_lnet.ln_shutdown); - rnet2 = lnet_find_net_locked(net); - if (rnet2 == NULL) { - /* new network */ - cfs_list_add_tail(&rnet->lrn_list, &the_lnet.ln_remote_nets); - rnet2 = rnet; - } + rnet2 = lnet_find_net_locked(net); + if (rnet2 == NULL) { + /* new network */ + list_add_tail(&rnet->lrn_list, lnet_net2rnethash(net)); + rnet2 = rnet; + } - /* Search for a duplicate route (it's a NOOP if it is) */ - add_route = 1; - cfs_list_for_each (e, &rnet2->lrn_routes) { - lnet_route_t *route2 = cfs_list_entry(e, lnet_route_t, lr_list); + /* Search for a duplicate route (it's a NOOP if it is) */ + add_route = 1; + list_for_each(e, &rnet2->lrn_routes) { + lnet_route_t *route2 = list_entry(e, lnet_route_t, lr_list); - if (route2->lr_gateway == route->lr_gateway) { - add_route = 0; - break; - } + if (route2->lr_gateway == route->lr_gateway) { + add_route = 0; + break; + } - /* our lookups must be true */ - LASSERT (route2->lr_gateway->lp_nid != gateway); - } + /* our lookups must be true */ + LASSERT(route2->lr_gateway->lp_nid != gateway); + } - if (add_route) { + if (add_route) { lnet_peer_addref_locked(route->lr_gateway); /* +1 for notify */ lnet_add_route_to_rnet(rnet2, route); ni = route->lr_gateway->lp_ni; - LNET_UNLOCK(); + lnet_net_unlock(LNET_LOCK_EX); /* XXX Assume alive */ if (ni->ni_lnd->lnd_notify != NULL) (ni->ni_lnd->lnd_notify)(ni, gateway, 1); - LNET_LOCK(); + lnet_net_lock(LNET_LOCK_EX); } /* -1 for notify or !add_route */ lnet_peer_decref_locked(route->lr_gateway); - LNET_UNLOCK(); + lnet_net_unlock(LNET_LOCK_EX); if (!add_route) LIBCFS_FREE(route, sizeof(*route)); - if (rnet != rnet2) - LIBCFS_FREE(rnet, sizeof(*rnet)); + if (rnet != rnet2) + LIBCFS_FREE(rnet, sizeof(*rnet)); - return 0; + return 0; } int -lnet_check_routes (void) +lnet_check_routes(void) { - lnet_remotenet_t *rnet; - lnet_route_t *route; - lnet_route_t *route2; - cfs_list_t *e1; - cfs_list_t *e2; - - LNET_LOCK(); + lnet_remotenet_t *rnet; + lnet_route_t *route; + lnet_route_t *route2; + struct list_head *e1; + struct list_head *e2; + int cpt; + struct list_head *rn_list; + int i; + + cpt = lnet_net_lock_current(); + + for (i = 0; i < LNET_REMOTE_NETS_HASH_SIZE; i++) { + rn_list = &the_lnet.ln_remote_nets_hash[i]; + list_for_each(e1, rn_list) { + rnet = list_entry(e1, lnet_remotenet_t, lrn_list); + + route2 = NULL; + list_for_each(e2, &rnet->lrn_routes) { + lnet_nid_t nid1; + lnet_nid_t nid2; + int net; + + route = list_entry(e2, lnet_route_t, + lr_list); + + if (route2 == NULL) { + route2 = route; + continue; + } - cfs_list_for_each (e1, &the_lnet.ln_remote_nets) { - rnet = cfs_list_entry(e1, lnet_remotenet_t, lrn_list); + if (route->lr_gateway->lp_ni == + route2->lr_gateway->lp_ni) + continue; - route2 = NULL; - cfs_list_for_each (e2, &rnet->lrn_routes) { - lnet_nid_t nid1; - lnet_nid_t nid2; - int net; + nid1 = route->lr_gateway->lp_nid; + nid2 = route2->lr_gateway->lp_nid; + net = rnet->lrn_net; - route = cfs_list_entry(e2, lnet_route_t, lr_list); + lnet_net_unlock(cpt); - if (route2 == NULL) { - route2 = route; - continue; + CERROR("Routes to %s via %s and %s not " + "supported\n", + libcfs_net2str(net), + libcfs_nid2str(nid1), + libcfs_nid2str(nid2)); + 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; - } - } - - LNET_UNLOCK(); - return 0; + lnet_net_unlock(cpt); + return 0; } int -lnet_del_route (__u32 net, lnet_nid_t gw_nid) +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; - cfs_list_t *e2; - int rc = -ENOENT; - - CDEBUG(D_NET, "Del route: net %s : gw %s\n", - libcfs_net2str(net), libcfs_nid2str(gw_nid)); - - /* NB Caller may specify either all routes via the given gateway - * or a specific route entry actual NIDs) */ - - again: - LNET_LOCK(); - - cfs_list_for_each (e1, &the_lnet.ln_remote_nets) { - rnet = cfs_list_entry(e1, lnet_remotenet_t, lrn_list); - - if (!(net == LNET_NIDNET(LNET_NID_ANY) || - net == rnet->lrn_net)) - continue; + lnet_remotenet_t *rnet; + lnet_route_t *route; + struct list_head *e1; + struct list_head *e2; + int rc = -ENOENT; + struct list_head *rn_list; + int idx = 0; + + CDEBUG(D_NET, "Del route: net %s : gw %s\n", + libcfs_net2str(net), libcfs_nid2str(gw_nid)); + + /* NB Caller may specify either all routes via the given gateway + * or a specific route entry actual NIDs) */ + + lnet_net_lock(LNET_LOCK_EX); + if (net == LNET_NIDNET(LNET_NID_ANY)) + rn_list = &the_lnet.ln_remote_nets_hash[0]; + else + rn_list = lnet_net2rnethash(net); + +again: + list_for_each(e1, rn_list) { + rnet = list_entry(e1, lnet_remotenet_t, lrn_list); + + if (!(net == LNET_NIDNET(LNET_NID_ANY) || + net == rnet->lrn_net)) + continue; - cfs_list_for_each (e2, &rnet->lrn_routes) { - route = cfs_list_entry(e2, lnet_route_t, lr_list); + list_for_each(e2, &rnet->lrn_routes) { + route = list_entry(e2, lnet_route_t, lr_list); 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_gwlist); - the_lnet.ln_remote_nets_version++; + list_del(&route->lr_list); + list_del(&route->lr_gwlist); + the_lnet.ln_remote_nets_version++; - if (cfs_list_empty(&rnet->lrn_routes)) - cfs_list_del(&rnet->lrn_list); - else - rnet = NULL; + if (list_empty(&rnet->lrn_routes)) + list_del(&rnet->lrn_list); + else + rnet = NULL; lnet_rtr_decref_locked(gateway); lnet_peer_decref_locked(gateway); - LNET_UNLOCK(); - LIBCFS_FREE(route, sizeof (*route)); + lnet_net_unlock(LNET_LOCK_EX); - if (rnet != NULL) - LIBCFS_FREE(rnet, sizeof(*rnet)); + LIBCFS_FREE(route, sizeof(*route)); - rc = 0; - goto again; - } - } + if (rnet != NULL) + LIBCFS_FREE(rnet, sizeof(*rnet)); + + rc = 0; + lnet_net_lock(LNET_LOCK_EX); + goto again; + } + } - LNET_UNLOCK(); - return rc; + if (net == LNET_NIDNET(LNET_NID_ANY) && + ++idx < LNET_REMOTE_NETS_HASH_SIZE) { + rn_list = &the_lnet.ln_remote_nets_hash[idx]; + goto again; + } + lnet_net_unlock(LNET_LOCK_EX); + + return rc; } void @@ -516,54 +553,100 @@ lnet_destroy_routes (void) lnet_del_route(LNET_NIDNET(LNET_NID_ANY), LNET_NID_ANY); } +int lnet_get_rtr_pool_cfg(int idx, struct lnet_ioctl_pool_cfg *pool_cfg) +{ + int i, rc = -ENOENT, lidx, j; + + if (the_lnet.ln_rtrpools == NULL) + return rc; + + for (i = 0; i < LNET_NRBPOOLS; i++) { + lnet_rtrbufpool_t *rbp; + + lnet_net_lock(LNET_LOCK_EX); + lidx = idx; + cfs_percpt_for_each(rbp, j, the_lnet.ln_rtrpools) { + if (lidx-- == 0) { + rc = 0; + pool_cfg->pl_pools[i].pl_npages = + rbp[i].rbp_npages; + pool_cfg->pl_pools[i].pl_nbuffers = + rbp[i].rbp_nbuffers; + pool_cfg->pl_pools[i].pl_credits = + rbp[i].rbp_credits; + pool_cfg->pl_pools[i].pl_mincredits = + rbp[i].rbp_mincredits; + break; + } + } + lnet_net_unlock(LNET_LOCK_EX); + } + + lnet_net_lock(LNET_LOCK_EX); + pool_cfg->pl_routing = the_lnet.ln_routing; + lnet_net_unlock(LNET_LOCK_EX); + + return rc; +} + int -lnet_get_route (int idx, __u32 *net, __u32 *hops, - lnet_nid_t *gateway, __u32 *alive) +lnet_get_route(int idx, __u32 *net, __u32 *hops, + lnet_nid_t *gateway, __u32 *alive, __u32 *priority) { - cfs_list_t *e1; - cfs_list_t *e2; - lnet_remotenet_t *rnet; - lnet_route_t *route; - - LNET_LOCK(); - - cfs_list_for_each (e1, &the_lnet.ln_remote_nets) { - rnet = cfs_list_entry(e1, lnet_remotenet_t, lrn_list); - - cfs_list_for_each (e2, &rnet->lrn_routes) { - route = cfs_list_entry(e2, lnet_route_t, lr_list); - - if (idx-- == 0) { - *net = rnet->lrn_net; - *hops = route->lr_hops; - *gateway = route->lr_gateway->lp_nid; - *alive = route->lr_gateway->lp_alive; - LNET_UNLOCK(); - return 0; - } - } - } + struct list_head *e1; + struct list_head *e2; + lnet_remotenet_t *rnet; + lnet_route_t *route; + int cpt; + int i; + struct list_head *rn_list; + + cpt = lnet_net_lock_current(); + + for (i = 0; i < LNET_REMOTE_NETS_HASH_SIZE; i++) { + rn_list = &the_lnet.ln_remote_nets_hash[i]; + list_for_each(e1, rn_list) { + rnet = list_entry(e1, lnet_remotenet_t, lrn_list); + + list_for_each(e2, &rnet->lrn_routes) { + route = list_entry(e2, lnet_route_t, + lr_list); + + if (idx-- == 0) { + *net = rnet->lrn_net; + *hops = route->lr_hops; + *priority = route->lr_priority; + *gateway = route->lr_gateway->lp_nid; + *alive = + route->lr_gateway->lp_alive && + !route->lr_downis; + lnet_net_unlock(cpt); + return 0; + } + } + } + } - LNET_UNLOCK(); - return -ENOENT; + lnet_net_unlock(cpt); + return -ENOENT; } void lnet_swap_pinginfo(lnet_ping_info_t *info) { - int i; - lnet_ni_status_t *stat; + int i; + lnet_ni_status_t *stat; __swab32s(&info->pi_magic); - __swab32s(&info->pi_version); - __swab32s(&info->pi_pid); - __swab32s(&info->pi_nnis); - for (i = 0; i < info->pi_nnis && i < LNET_MAX_RTR_NIS; i++) { - stat = &info->pi_ni[i]; - __swab64s(&stat->ns_nid); - __swab32s(&stat->ns_status); - } - return; + __swab32s(&info->pi_features); + __swab32s(&info->pi_pid); + __swab32s(&info->pi_nnis); + for (i = 0; i < info->pi_nnis && i < LNET_MAX_RTR_NIS; i++) { + stat = &info->pi_ni[i]; + __swab64s(&stat->ns_nid); + __swab32s(&stat->ns_status); + } + return; } /** @@ -575,7 +658,7 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd) { lnet_ping_info_t *info = rcd->rcd_pinginfo; struct lnet_peer *gw = rcd->rcd_gateway; - lnet_route_t *rtr; + lnet_route_t *rte; if (!gw->lp_alive) return; @@ -587,27 +670,30 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd) 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; + gw->lp_ping_feats = LNET_PING_FEAT_INVAL; 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; + gw->lp_ping_feats = info->pi_features; + if ((gw->lp_ping_feats & LNET_PING_FEAT_MASK) == 0) { + CDEBUG(D_NET, "%s: Unexpected features 0x%x\n", + libcfs_nid2str(gw->lp_nid), gw->lp_ping_feats); + return; /* nothing I can understand */ } - cfs_list_for_each_entry(rtr, &gw->lp_routes, lr_gwlist) { - int ptl_status = LNET_NI_STATUS_INVALID; + if ((gw->lp_ping_feats & LNET_PING_FEAT_NI_STATUS) == 0) + return; /* can't carry NI status info */ + + list_for_each_entry(rte, &gw->lp_routes, lr_gwlist) { int down = 0; int up = 0; int i; + if ((gw->lp_ping_feats & LNET_PING_FEAT_RTE_DISABLED) != 0) { + rte->lr_downis = 1; + continue; + } + 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; @@ -615,7 +701,7 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd) 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; + gw->lp_ping_feats = LNET_PING_FEAT_INVAL; return; } @@ -623,43 +709,35 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd) 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; + down++; continue; } if (stat->ns_status == LNET_NI_STATUS_UP) { - if (LNET_NIDNET(nid) == rtr->lr_net) { + if (LNET_NIDNET(nid) == rte->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; + gw->lp_ping_feats = LNET_PING_FEAT_INVAL; return; } if (up) { /* ignore downed NIs if NI for dest network is up */ - rtr->lr_downis = 0; + rte->lr_downis = 0; continue; } - rtr->lr_downis = down + (ptl_status == LNET_NI_STATUS_DOWN); + rte->lr_downis = down; } } 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; @@ -668,7 +746,7 @@ lnet_router_checker_event(lnet_event_t *event) if (event->unlinked) { LNetInvalidateHandle(&rcd->rcd_mdh); return; - } + } LASSERT(event->type == LNET_EVENT_SEND || event->type == LNET_EVENT_REPLY); @@ -676,13 +754,19 @@ lnet_router_checker_event(lnet_event_t *event) lp = rcd->rcd_gateway; LASSERT(lp != NULL); - if (!lnet_isrouter(lp)) /* ignore if no longer a router */ - return; + /* NB: it's called with holding lnet_res_lock, we have a few + * places need to hold both locks at the same time, please take + * care of lock ordering */ + lnet_net_lock(lp->lp_cpt); + if (!lnet_isrouter(lp) || lp->lp_rcd != rcd) { + /* ignore if no longer a router or rcd is replaced */ + goto out; + } if (event->type == LNET_EVENT_SEND) { - lp->lp_ping_notsent = 0; /* NB: re-enable another ping */ + lp->lp_ping_notsent = 0; if (event->status == 0) - return; + goto out; } /* LNET_EVENT_REPLY */ @@ -699,33 +783,36 @@ lnet_router_checker_event(lnet_event_t *event) if (avoid_asym_router_failure && event->status == 0) lnet_parse_rc_info(rcd); + + out: + lnet_net_unlock(lp->lp_cpt); } void lnet_wait_known_routerstate(void) { - lnet_peer_t *rtr; - cfs_list_t *entry; - int all_known; + lnet_peer_t *rtr; + struct list_head *entry; + int all_known; - LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING); + LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING); - for (;;) { - LNET_LOCK(); + for (;;) { + int cpt = lnet_net_lock_current(); - all_known = 1; - cfs_list_for_each (entry, &the_lnet.ln_routers) { - rtr = cfs_list_entry(entry, lnet_peer_t, lp_rtr_list); + 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; - } - } + if (rtr->lp_alive_count == 0) { + all_known = 0; + break; + } + } - LNET_UNLOCK(); + lnet_net_unlock(cpt); - if (all_known) + if (all_known) return; #ifndef __KERNEL__ @@ -736,6 +823,21 @@ lnet_wait_known_routerstate(void) } void +lnet_router_ni_update_locked(lnet_peer_t *gw, __u32 net) +{ + lnet_route_t *rte; + + if ((gw->lp_ping_feats & LNET_PING_FEAT_NI_STATUS) != 0) { + list_for_each_entry(rte, &gw->lp_routes, lr_gwlist) { + if (rte->lr_net == net) { + rte->lr_downis = 0; + break; + } + } + } +} + +void lnet_update_ni_status_locked(void) { lnet_ni_t *ni; @@ -748,13 +850,20 @@ lnet_update_ni_status_locked(void) MAX(live_router_check_interval, dead_router_check_interval); now = cfs_time_current_sec(); - cfs_list_for_each_entry(ni, &the_lnet.ln_nis, ni_list) { + list_for_each_entry(ni, &the_lnet.ln_nis, ni_list) { if (ni->ni_lnd->lnd_type == LOLND) continue; if (now < ni->ni_last_alive + timeout) continue; + lnet_ni_lock(ni); + /* re-check with lock */ + if (now < ni->ni_last_alive + timeout) { + lnet_ni_unlock(ni); + continue; + } + LASSERT(ni->ni_status != NULL); if (ni->ni_status->ns_status != LNET_NI_STATUS_DOWN) { @@ -764,20 +873,23 @@ lnet_update_ni_status_locked(void) * NI status to "down" */ ni->ni_status->ns_status = LNET_NI_STATUS_DOWN; } + lnet_ni_unlock(ni); } } void -lnet_destroy_rc_data (lnet_rc_data_t *rcd) +lnet_destroy_rc_data(lnet_rc_data_t *rcd) { - LASSERT(cfs_list_empty(&rcd->rcd_list)); + LASSERT(list_empty(&rcd->rcd_list)); /* detached from network */ LASSERT(LNetHandleIsInvalid(rcd->rcd_mdh)); if (rcd->rcd_gateway != NULL) { - LNET_LOCK(); + int cpt = rcd->rcd_gateway->lp_cpt; + + lnet_net_lock(cpt); lnet_peer_decref_locked(rcd->rcd_gateway); - LNET_UNLOCK(); + lnet_net_unlock(cpt); } if (rcd->rcd_pinginfo != NULL) @@ -794,20 +906,19 @@ lnet_create_rc_data_locked(lnet_peer_t *gateway) int rc; int i; - LNET_UNLOCK(); + lnet_net_unlock(gateway->lp_cpt); LIBCFS_ALLOC(rcd, sizeof(*rcd)); if (rcd == NULL) goto out; LNetInvalidateHandle(&rcd->rcd_mdh); - CFS_INIT_LIST_HEAD(&rcd->rcd_list); + INIT_LIST_HEAD(&rcd->rcd_list); 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++) { pi->pi_ni[i].ns_nid = LNET_NID_ANY; pi->pi_ni[i].ns_status = LNET_NI_STATUS_INVALID; @@ -829,16 +940,18 @@ lnet_create_rc_data_locked(lnet_peer_t *gateway) } LASSERT(rc == 0); - LNET_LOCK(); + lnet_net_lock(gateway->lp_cpt); /* router table changed or someone has created rcd for this gateway */ if (!lnet_isrouter(gateway) || gateway->lp_rcd != NULL) { - LNET_UNLOCK(); + lnet_net_unlock(gateway->lp_cpt); goto out; } lnet_peer_addref_locked(gateway); rcd->rcd_gateway = gateway; gateway->lp_rcd = rcd; + gateway->lp_ping_notsent = 0; + return rcd; out: @@ -850,7 +963,7 @@ lnet_create_rc_data_locked(lnet_peer_t *gateway) lnet_destroy_rc_data(rcd); } - LNET_LOCK(); + lnet_net_lock(gateway->lp_cpt); return gateway->lp_rcd; } @@ -913,7 +1026,7 @@ lnet_ping_router_locked (lnet_peer_t *rtr) lnet_handle_md_t mdh; id.nid = rtr->lp_nid; - id.pid = LUSTRE_SRV_LNET_PID; + id.pid = LNET_PID_LUSTRE; CDEBUG(D_NET, "Check: %s\n", libcfs_id2str(id)); rtr->lp_ping_notsent = 1; @@ -922,16 +1035,16 @@ lnet_ping_router_locked (lnet_peer_t *rtr) mdh = rcd->rcd_mdh; if (rtr->lp_ping_deadline == 0) { - rtr->lp_ping_deadline = \ + rtr->lp_ping_deadline = cfs_time_shift(router_ping_timeout); } - LNET_UNLOCK(); + lnet_net_unlock(rtr->lp_cpt); - rc = LNetGet(LNET_NID_ANY, mdh, id, LNET_RESERVED_PORTAL, - LNET_PROTO_PING_MATCHBITS, 0); + rc = LNetGet(LNET_NID_ANY, mdh, id, LNET_RESERVED_PORTAL, + LNET_PROTO_PING_MATCHBITS, 0); - LNET_LOCK(); + lnet_net_lock(rtr->lp_cpt); if (rc != 0) rtr->lp_ping_notsent = 0; /* no event pending */ } @@ -943,24 +1056,26 @@ lnet_ping_router_locked (lnet_peer_t *rtr) int lnet_router_checker_start(void) { - int rc; - int eqsz; -#ifndef __KERNEL__ - lnet_peer_t *rtr; - __u64 version; - int nrtr = 0; - int router_checker_max_eqsize = 10240; + int rc; + int eqsz; +#ifdef __KERNEL__ + struct task_struct *task; +#else /* __KERNEL__ */ + lnet_peer_t *rtr; + __u64 version; + int nrtr = 0; + int router_checker_max_eqsize = 10240; LASSERT (check_routers_before_use); LASSERT (dead_router_check_interval > 0); - LNET_LOCK(); + lnet_net_lock(0); /* 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; - cfs_list_for_each_entry(rtr, &the_lnet.ln_routers, lp_rtr_list) { + list_for_each_entry(rtr, &the_lnet.ln_routers, lp_rtr_list) { lnet_ni_t *ni = rtr->lp_ni; lnet_process_id_t id; @@ -969,9 +1084,9 @@ lnet_router_checker_start(void) /* one async ping reply per router */ id.nid = rtr->lp_nid; - id.pid = LUSTRE_SRV_LNET_PID; + id.pid = LNET_PID_LUSTRE; - LNET_UNLOCK(); + lnet_net_unlock(0); rc = LNetSetAsync(id, 1); if (rc != 0) { @@ -980,12 +1095,12 @@ lnet_router_checker_start(void) return rc; } - LNET_LOCK(); - /* NB router list doesn't change in userspace */ - LASSERT (version == the_lnet.ln_routers_version); - } + lnet_net_lock(0); + /* NB router list doesn't change in userspace */ + LASSERT(version == the_lnet.ln_routers_version); + } - LNET_UNLOCK(); + lnet_net_unlock(0); if (nrtr == 0) { CDEBUG(D_NET, @@ -1018,7 +1133,7 @@ lnet_router_checker_start(void) return 0; #ifdef __KERNEL__ - cfs_sema_init(&the_lnet.ln_rc_signal, 0); + sema_init(&the_lnet.ln_rc_signal, 0); /* EQ size doesn't matter; the callback is guaranteed to get every * event */ eqsz = 0; @@ -1035,16 +1150,17 @@ lnet_router_checker_start(void) 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); - /* block until event callback signals exit */ - cfs_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; - return -ENOMEM; - } + task = kthread_run(lnet_router_checker, NULL, "router_checker"); + if (IS_ERR(task)) { + rc = PTR_ERR(task); + CERROR("Can't start router checker thread: %d\n", rc); + /* block until event callback signals exit */ + 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; + return -ENOMEM; + } #endif if (check_routers_before_use) { @@ -1070,7 +1186,7 @@ lnet_router_checker_stop (void) #ifdef __KERNEL__ /* block until event callback signals exit */ - cfs_down(&the_lnet.ln_rc_signal); + down(&the_lnet.ln_rc_signal); #else lnet_router_checker(); #endif @@ -1087,76 +1203,78 @@ lnet_prune_rc_data(int wait_unlink) lnet_rc_data_t *rcd; lnet_rc_data_t *tmp; lnet_peer_t *lp; - cfs_list_t head; - int i = 2; + struct list_head head; + int i = 2; 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))) + list_empty(&the_lnet.ln_rcd_deathrow) && + list_empty(&the_lnet.ln_rcd_zombie))) return; - CFS_INIT_LIST_HEAD(&head); + INIT_LIST_HEAD(&head); - LNET_LOCK(); + lnet_net_lock(LNET_LOCK_EX); 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) { + list_for_each_entry(lp, &the_lnet.ln_routers, + lp_rtr_list) { if (lp->lp_rcd == NULL) continue; - LASSERT(cfs_list_empty(&lp->lp_rcd->rcd_list)); - cfs_list_add(&lp->lp_rcd->rcd_list, - &the_lnet.ln_rcd_deathrow); + LASSERT(list_empty(&lp->lp_rcd->rcd_list)); + 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); + list_splice_init(&the_lnet.ln_rcd_deathrow, &head); - if (!cfs_list_empty(&head)) { - LNET_UNLOCK(); + if (!list_empty(&head)) { + lnet_net_unlock(LNET_LOCK_EX); - cfs_list_for_each_entry(rcd, &head, rcd_list) + list_for_each_entry(rcd, &head, rcd_list) LNetMDUnlink(rcd->rcd_mdh); - LNET_LOCK(); - } + lnet_net_lock(LNET_LOCK_EX); + } - cfs_list_splice_init(&head, &the_lnet.ln_rcd_zombie); + 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); - } + while (!list_empty(&the_lnet.ln_rcd_zombie)) { + list_for_each_entry_safe(rcd, tmp, &the_lnet.ln_rcd_zombie, + rcd_list) { + if (LNetHandleIsInvalid(rcd->rcd_mdh)) + list_move(&rcd->rcd_list, &head); + } wait_unlink = wait_unlink && - !cfs_list_empty(&the_lnet.ln_rcd_zombie); + !list_empty(&the_lnet.ln_rcd_zombie); - LNET_UNLOCK(); + lnet_net_unlock(LNET_LOCK_EX); - while (!cfs_list_empty(&head)) { - rcd = cfs_list_entry(head.next, - lnet_rc_data_t, rcd_list); - cfs_list_del_init(&rcd->rcd_list); + while (!list_empty(&head)) { + rcd = list_entry(head.next, + lnet_rc_data_t, rcd_list); + list_del_init(&rcd->rcd_list); lnet_destroy_rc_data(rcd); } if (!wait_unlink) - break; + return; i++; CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET, "Waiting for rc buffers to unlink\n"); cfs_pause(cfs_time_seconds(1) / 4); - LNET_LOCK(); + lnet_net_lock(LNET_LOCK_EX); } + + lnet_net_unlock(LNET_LOCK_EX); } @@ -1166,22 +1284,34 @@ static int lnet_router_checker(void *arg) { lnet_peer_t *rtr; - cfs_list_t *entry; + struct list_head *entry; - cfs_daemonize("router_checker"); cfs_block_allsigs(); LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING); while (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING) { - __u64 version; + __u64 version; + int cpt; + int cpt2; - LNET_LOCK(); + cpt = lnet_net_lock_current(); rescan: - version = the_lnet.ln_routers_version; + version = the_lnet.ln_routers_version; + + list_for_each(entry, &the_lnet.ln_routers) { + rtr = list_entry(entry, lnet_peer_t, lp_rtr_list); + + cpt2 = lnet_cpt_of_nid_locked(rtr->lp_nid); + if (cpt != cpt2) { + lnet_net_unlock(cpt); + cpt = cpt2; + lnet_net_lock(cpt); + /* the routers list has changed */ + if (version != the_lnet.ln_routers_version) + goto rescan; + } - cfs_list_for_each (entry, &the_lnet.ln_routers) { - rtr = cfs_list_entry(entry, lnet_peer_t, lp_rtr_list); lnet_ping_router_locked(rtr); /* NB dropped lock */ @@ -1194,25 +1324,25 @@ rescan: if (the_lnet.ln_routing) lnet_update_ni_status_locked(); - LNET_UNLOCK(); + lnet_net_unlock(cpt); 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 - * + nr_uninterruptible. */ - cfs_schedule_timeout_and_set_state(CFS_TASK_INTERRUPTIBLE, - cfs_time_seconds(1)); - } + /* Call cfs_pause() here always adds 1 to load average + * because kernel counts # active tasks as nr_running + * + nr_uninterruptible. */ + schedule_timeout_and_set_state(TASK_INTERRUPTIBLE, + cfs_time_seconds(1)); + } LASSERT(the_lnet.ln_rc_state == LNET_RC_STATE_STOPPING); 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; + up(&the_lnet.ln_rc_signal); + /* The unlink event callback will signal final completion */ + return 0; } void @@ -1221,37 +1351,38 @@ lnet_destroy_rtrbuf(lnet_rtrbuf_t *rb, int npages) int sz = offsetof(lnet_rtrbuf_t, rb_kiov[npages]); while (--npages >= 0) - cfs_free_page(rb->rb_kiov[npages].kiov_page); + __free_page(rb->rb_kiov[npages].kiov_page); LIBCFS_FREE(rb, sz); } lnet_rtrbuf_t * -lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp) +lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp, int cpt) { - int npages = rbp->rbp_npages; - int sz = offsetof(lnet_rtrbuf_t, rb_kiov[npages]); - struct page *page; - lnet_rtrbuf_t *rb; - int i; + int npages = rbp->rbp_npages; + int sz = offsetof(lnet_rtrbuf_t, rb_kiov[npages]); + struct page *page; + lnet_rtrbuf_t *rb; + int i; - LIBCFS_ALLOC(rb, sz); - if (rb == NULL) - return NULL; + LIBCFS_CPT_ALLOC(rb, lnet_cpt_table(), cpt, sz); + if (rb == NULL) + return NULL; - rb->rb_pool = rbp; + rb->rb_pool = rbp; - for (i = 0; i < npages; i++) { - page = cfs_alloc_page(CFS_ALLOC_ZERO | CFS_ALLOC_STD); + for (i = 0; i < npages; i++) { + page = cfs_page_cpt_alloc(lnet_cpt_table(), cpt, + __GFP_ZERO | GFP_IOFS); if (page == NULL) { while (--i >= 0) - cfs_free_page(rb->rb_kiov[i].kiov_page); + __free_page(rb->rb_kiov[i].kiov_page); LIBCFS_FREE(rb, sz); return NULL; } - rb->rb_kiov[i].kiov_len = CFS_PAGE_SIZE; + rb->rb_kiov[i].kiov_len = PAGE_CACHE_SIZE; rb->rb_kiov[i].kiov_offset = 0; rb->rb_kiov[i].kiov_page = page; } @@ -1260,70 +1391,103 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp) } void -lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp) +lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp, int cpt) { - int npages = rbp->rbp_npages; - int nbuffers = 0; - lnet_rtrbuf_t *rb; + int npages = rbp->rbp_npages; + lnet_rtrbuf_t *rb; + struct list_head tmp; - LASSERT (cfs_list_empty(&rbp->rbp_msgs)); - LASSERT (rbp->rbp_credits == rbp->rbp_nbuffers); + if (rbp->rbp_nbuffers == 0) /* not initialized or already freed */ + return; - while (!cfs_list_empty(&rbp->rbp_bufs)) { - LASSERT (rbp->rbp_credits > 0); + INIT_LIST_HEAD(&tmp); - rb = cfs_list_entry(rbp->rbp_bufs.next, - lnet_rtrbuf_t, rb_list); - cfs_list_del(&rb->rb_list); - lnet_destroy_rtrbuf(rb, npages); - nbuffers++; - } + lnet_net_lock(cpt); + lnet_drop_routed_msgs_locked(&rbp->rbp_msgs, cpt); + list_splice_init(&rbp->rbp_bufs, &tmp); + rbp->rbp_nbuffers = rbp->rbp_credits = 0; + rbp->rbp_mincredits = 0; + lnet_net_unlock(cpt); - LASSERT (rbp->rbp_nbuffers == nbuffers); - LASSERT (rbp->rbp_credits == nbuffers); - - rbp->rbp_nbuffers = rbp->rbp_credits = 0; + /* Free buffers on the free list. */ + while (!list_empty(&tmp)) { + rb = list_entry(tmp.next, lnet_rtrbuf_t, rb_list); + list_del(&rb->rb_list); + lnet_destroy_rtrbuf(rb, npages); + } } -int -lnet_rtrpool_alloc_bufs(lnet_rtrbufpool_t *rbp, int nbufs) +static int +lnet_rtrpool_adjust_bufs(lnet_rtrbufpool_t *rbp, int nbufs, int cpt) { - lnet_rtrbuf_t *rb; - int i; + struct list_head rb_list; + lnet_rtrbuf_t *rb; + int num_rb; + int num_buffers = 0; + int npages = rbp->rbp_npages; + + /* If we are called for less buffers than already in the pool, we + * just lower the nbuffers number and excess buffers will be + * thrown away as they are returned to the free list. Credits + * then get adjusted as well. */ + if (nbufs <= rbp->rbp_nbuffers) { + lnet_net_lock(cpt); + rbp->rbp_nbuffers = nbufs; + lnet_net_unlock(cpt); + return 0; + } - if (rbp->rbp_nbuffers != 0) { - LASSERT (rbp->rbp_nbuffers == nbufs); - return 0; - } + INIT_LIST_HEAD(&rb_list); - for (i = 0; i < nbufs; i++) { - rb = lnet_new_rtrbuf(rbp); + /* allocate the buffers on a local list first. If all buffers are + * allocated successfully then join this list to the rbp buffer + * list. If not then free all allocated buffers. */ + num_rb = rbp->rbp_nbuffers; - if (rb == NULL) { - CERROR("Failed to allocate %d router bufs of %d pages\n", - nbufs, rbp->rbp_npages); - return -ENOMEM; - } + while (num_rb < nbufs) { + rb = lnet_new_rtrbuf(rbp, cpt); + if (rb == NULL) { + CERROR("Failed to allocate %d route bufs of %d pages\n", + nbufs, npages); + goto failed; + } - rbp->rbp_nbuffers++; - rbp->rbp_credits++; - rbp->rbp_mincredits++; - cfs_list_add(&rb->rb_list, &rbp->rbp_bufs); + list_add(&rb->rb_list, &rb_list); + num_buffers++; + num_rb++; + } - /* No allocation "under fire" */ - /* Otherwise we'd need code to schedule blocked msgs etc */ - LASSERT (!the_lnet.ln_routing); - } + lnet_net_lock(cpt); - LASSERT (rbp->rbp_credits == nbufs); - return 0; + list_splice_tail(&rb_list, &rbp->rbp_bufs); + rbp->rbp_nbuffers += num_buffers; + rbp->rbp_credits += num_buffers; + rbp->rbp_mincredits = rbp->rbp_credits; + /* We need to schedule blocked msg using the newly + * added buffers. */ + while (!list_empty(&rbp->rbp_bufs) && + !list_empty(&rbp->rbp_msgs)) + lnet_schedule_blocked_locked(rbp); + + lnet_net_unlock(cpt); + + return 0; + +failed: + while (!list_empty(&rb_list)) { + rb = list_entry(rb_list.next, lnet_rtrbuf_t, rb_list); + list_del(&rb->rb_list); + lnet_destroy_rtrbuf(rb, npages); + } + + return -ENOMEM; } void lnet_rtrpool_init(lnet_rtrbufpool_t *rbp, int npages) { - CFS_INIT_LIST_HEAD(&rbp->rbp_msgs); - CFS_INIT_LIST_HEAD(&rbp->rbp_bufs); + INIT_LIST_HEAD(&rbp->rbp_msgs); + INIT_LIST_HEAD(&rbp->rbp_bufs); rbp->rbp_npages = npages; rbp->rbp_credits = 0; @@ -1331,104 +1495,277 @@ lnet_rtrpool_init(lnet_rtrbufpool_t *rbp, int npages) } void -lnet_free_rtrpools(void) +lnet_rtrpools_free(int keep_pools) +{ + lnet_rtrbufpool_t *rtrp; + int i; + + if (the_lnet.ln_rtrpools == NULL) /* uninitialized or freed */ + return; + + cfs_percpt_for_each(rtrp, i, the_lnet.ln_rtrpools) { + lnet_rtrpool_free_bufs(&rtrp[LNET_TINY_BUF_IDX], i); + lnet_rtrpool_free_bufs(&rtrp[LNET_SMALL_BUF_IDX], i); + lnet_rtrpool_free_bufs(&rtrp[LNET_LARGE_BUF_IDX], i); + } + + if (!keep_pools) { + cfs_percpt_free(the_lnet.ln_rtrpools); + the_lnet.ln_rtrpools = NULL; + } +} + +static int +lnet_nrb_tiny_calculate(void) { - lnet_rtrpool_free_bufs(&the_lnet.ln_rtrpools[0]); - lnet_rtrpool_free_bufs(&the_lnet.ln_rtrpools[1]); - lnet_rtrpool_free_bufs(&the_lnet.ln_rtrpools[2]); + int nrbs = LNET_NRB_TINY; + + if (tiny_router_buffers < 0) { + LCONSOLE_ERROR_MSG(0x10c, + "tiny_router_buffers=%d invalid when " + "routing enabled\n", tiny_router_buffers); + return -1; + } + + if (tiny_router_buffers > 0) + nrbs = tiny_router_buffers; + + nrbs /= LNET_CPT_NUMBER; + return max(nrbs, LNET_NRB_TINY_MIN); } -void -lnet_init_rtrpools(void) +static int +lnet_nrb_small_calculate(void) +{ + int nrbs = LNET_NRB_SMALL; + + if (small_router_buffers < 0) { + LCONSOLE_ERROR_MSG(0x10c, + "small_router_buffers=%d invalid when " + "routing enabled\n", small_router_buffers); + return -1; + } + + if (small_router_buffers > 0) + nrbs = small_router_buffers; + + nrbs /= LNET_CPT_NUMBER; + return max(nrbs, LNET_NRB_SMALL_MIN); +} + +static int +lnet_nrb_large_calculate(void) { - int small_pages = 1; - int large_pages = (LNET_MTU + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT; + int nrbs = LNET_NRB_LARGE; + + if (large_router_buffers < 0) { + LCONSOLE_ERROR_MSG(0x10c, + "large_router_buffers=%d invalid when " + "routing enabled\n", large_router_buffers); + return -1; + } + + if (large_router_buffers > 0) + nrbs = large_router_buffers; + + nrbs /= LNET_CPT_NUMBER; + return max(nrbs, LNET_NRB_LARGE_MIN); +} + +int +lnet_rtrpools_alloc(int im_a_router) +{ + lnet_rtrbufpool_t *rtrp; + int nrb_tiny; + int nrb_small; + int nrb_large; + int rc; + int i; + + if (!strcmp(forwarding, "")) { + /* not set either way */ + if (!im_a_router) + return 0; + } else if (!strcmp(forwarding, "disabled")) { + /* explicitly disabled */ + return 0; + } else if (!strcmp(forwarding, "enabled")) { + /* explicitly enabled */ + } else { + LCONSOLE_ERROR_MSG(0x10b, "'forwarding' not set to either " + "'enabled' or 'disabled'\n"); + return -EINVAL; + } + + nrb_tiny = lnet_nrb_tiny_calculate(); + if (nrb_tiny < 0) + return -EINVAL; + + nrb_small = lnet_nrb_small_calculate(); + if (nrb_small < 0) + return -EINVAL; + + nrb_large = lnet_nrb_large_calculate(); + if (nrb_large < 0) + return -EINVAL; + + the_lnet.ln_rtrpools = cfs_percpt_alloc(lnet_cpt_table(), + LNET_NRBPOOLS * + sizeof(lnet_rtrbufpool_t)); + if (the_lnet.ln_rtrpools == NULL) { + LCONSOLE_ERROR_MSG(0x10c, + "Failed to initialize router buffe pool\n"); + return -ENOMEM; + } - lnet_rtrpool_init(&the_lnet.ln_rtrpools[0], 0); - lnet_rtrpool_init(&the_lnet.ln_rtrpools[1], small_pages); - lnet_rtrpool_init(&the_lnet.ln_rtrpools[2], large_pages); + cfs_percpt_for_each(rtrp, i, the_lnet.ln_rtrpools) { + lnet_rtrpool_init(&rtrp[LNET_TINY_BUF_IDX], 0); + rc = lnet_rtrpool_adjust_bufs(&rtrp[LNET_TINY_BUF_IDX], + nrb_tiny, i); + if (rc != 0) + goto failed; + + lnet_rtrpool_init(&rtrp[LNET_SMALL_BUF_IDX], + LNET_NRB_SMALL_PAGES); + rc = lnet_rtrpool_adjust_bufs(&rtrp[LNET_SMALL_BUF_IDX], + nrb_small, i); + if (rc != 0) + goto failed; + + lnet_rtrpool_init(&rtrp[LNET_LARGE_BUF_IDX], + LNET_NRB_LARGE_PAGES); + rc = lnet_rtrpool_adjust_bufs(&rtrp[LNET_LARGE_BUF_IDX], + nrb_large, i); + if (rc != 0) + goto failed; + } + + lnet_net_lock(LNET_LOCK_EX); + the_lnet.ln_routing = 1; + lnet_net_unlock(LNET_LOCK_EX); + return 0; + + failed: + lnet_rtrpools_free(0); + return rc; } +static int +lnet_rtrpools_adjust_helper(int tiny, int small, int large) +{ + int nrb = 0; + int rc = 0; + int i; + lnet_rtrbufpool_t *rtrp; + + /* If the provided values for each buffer pool are different than the + * configured values, we need to take action. */ + if (tiny >= 0) { + tiny_router_buffers = tiny; + nrb = lnet_nrb_tiny_calculate(); + cfs_percpt_for_each(rtrp, i, the_lnet.ln_rtrpools) { + rc = lnet_rtrpool_adjust_bufs(&rtrp[LNET_TINY_BUF_IDX], + nrb, i); + if (rc != 0) + return rc; + } + } + if (small >= 0) { + small_router_buffers = small; + nrb = lnet_nrb_small_calculate(); + cfs_percpt_for_each(rtrp, i, the_lnet.ln_rtrpools) { + rc = lnet_rtrpool_adjust_bufs(&rtrp[LNET_SMALL_BUF_IDX], + nrb, i); + if (rc != 0) + return rc; + } + } + if (large >= 0) { + large_router_buffers = large; + nrb = lnet_nrb_large_calculate(); + cfs_percpt_for_each(rtrp, i, the_lnet.ln_rtrpools) { + rc = lnet_rtrpool_adjust_bufs(&rtrp[LNET_LARGE_BUF_IDX], + nrb, i); + if (rc != 0) + return rc; + } + } + + return 0; +} int -lnet_alloc_rtrpools(int im_a_router) +lnet_rtrpools_adjust(int tiny, int small, int large) { - int rc; - - if (!strcmp(forwarding, "")) { - /* not set either way */ - if (!im_a_router) - return 0; - } else if (!strcmp(forwarding, "disabled")) { - /* explicitly disabled */ - return 0; - } else if (!strcmp(forwarding, "enabled")) { - /* explicitly enabled */ - } else { - LCONSOLE_ERROR_MSG(0x10b, "'forwarding' not set to either " - "'enabled' or 'disabled'\n"); - return -EINVAL; - } + /* this function doesn't revert the changes if adding new buffers + * failed. It's up to the user space caller to revert the + * changes. */ - if (tiny_router_buffers <= 0) { - LCONSOLE_ERROR_MSG(0x10c, "tiny_router_buffers=%d invalid when " - "routing enabled\n", tiny_router_buffers); - rc = -EINVAL; - goto failed; - } + if (!the_lnet.ln_routing) + return 0; - rc = lnet_rtrpool_alloc_bufs(&the_lnet.ln_rtrpools[0], - tiny_router_buffers); - if (rc != 0) - goto failed; + return lnet_rtrpools_adjust_helper(tiny, small, large); +} - if (small_router_buffers <= 0) { - LCONSOLE_ERROR_MSG(0x10d, "small_router_buffers=%d invalid when" - " routing enabled\n", small_router_buffers); - rc = -EINVAL; - goto failed; - } +int +lnet_rtrpools_enable(void) +{ + int rc; - rc = lnet_rtrpool_alloc_bufs(&the_lnet.ln_rtrpools[1], - small_router_buffers); - if (rc != 0) - goto failed; + if (the_lnet.ln_routing) + return 0; - if (large_router_buffers <= 0) { - LCONSOLE_ERROR_MSG(0x10e, "large_router_buffers=%d invalid when" - " routing enabled\n", large_router_buffers); - rc = -EINVAL; - goto failed; - } + if (the_lnet.ln_rtrpools == NULL) + /* If routing is turned off, and we have never + * initialized the pools before, just call the + * standard buffer pool allocation routine as + * if we are just configuring this for the first + * time. */ + return lnet_rtrpools_alloc(1); - rc = lnet_rtrpool_alloc_bufs(&the_lnet.ln_rtrpools[2], - large_router_buffers); - if (rc != 0) - goto failed; + rc = lnet_rtrpools_adjust_helper(0, 0, 0); + if (rc != 0) + return rc; - LNET_LOCK(); - the_lnet.ln_routing = 1; - LNET_UNLOCK(); + lnet_net_lock(LNET_LOCK_EX); + the_lnet.ln_routing = 1; - return 0; + the_lnet.ln_ping_info->pi_features &= ~LNET_PING_FEAT_RTE_DISABLED; + lnet_net_unlock(LNET_LOCK_EX); - failed: - lnet_free_rtrpools(); - return rc; + return 0; +} + +void +lnet_rtrpools_disable(void) +{ + if (!the_lnet.ln_routing) + return; + + lnet_net_lock(LNET_LOCK_EX); + the_lnet.ln_routing = 0; + the_lnet.ln_ping_info->pi_features |= LNET_PING_FEAT_RTE_DISABLED; + + tiny_router_buffers = 0; + small_router_buffers = 0; + large_router_buffers = 0; + lnet_net_unlock(LNET_LOCK_EX); + lnet_rtrpools_free(1); } int -lnet_notify (lnet_ni_t *ni, lnet_nid_t nid, int alive, cfs_time_t when) +lnet_notify(lnet_ni_t *ni, lnet_nid_t nid, int alive, cfs_time_t when) { - lnet_peer_t *lp = NULL; - cfs_time_t now = cfs_time_current(); + struct lnet_peer *lp = NULL; + cfs_time_t now = cfs_time_current(); + int cpt = lnet_cpt_of_nid(nid); - LASSERT (!cfs_in_interrupt ()); + 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"); + 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)) { @@ -1454,12 +1791,17 @@ lnet_notify (lnet_ni_t *ni, lnet_nid_t nid, int alive, cfs_time_t when) return 0; } - LNET_LOCK(); + lnet_net_lock(cpt); + + if (the_lnet.ln_shutdown) { + lnet_net_unlock(cpt); + return -ESHUTDOWN; + } - lp = lnet_find_peer_locked(nid); - if (lp == NULL) { - /* nid not found */ - LNET_UNLOCK(); + lp = lnet_find_peer_locked(the_lnet.ln_peer_tables[cpt], nid); + if (lp == NULL) { + /* nid not found */ + lnet_net_unlock(cpt); CDEBUG(D_NET, "%s not found\n", libcfs_nid2str(nid)); return 0; } @@ -1473,12 +1815,13 @@ 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_ni_notify_locked(ni, lp); + if (ni != NULL) + lnet_ni_notify_locked(ni, lp); - lnet_peer_decref_locked(lp); + lnet_peer_decref_locked(lp); - LNET_UNLOCK(); - return 0; + lnet_net_unlock(cpt); + return 0; } EXPORT_SYMBOL(lnet_notify); @@ -1520,12 +1863,14 @@ lnet_router_checker (void) live_router_check_interval, dead_router_check_interval, interval); - LNET_LOCK(); - LASSERT (!running); /* recursion check */ - running = 1; - LNET_UNLOCK(); + LASSERT(LNET_CPT_NUMBER == 1); - last = now; + lnet_net_lock(0); + LASSERT(!running); /* recursion check */ + running = 1; + lnet_net_unlock(0); + + last = now; if (the_lnet.ln_rc_state == LNET_RC_STATE_STOPPING) lnet_prune_rc_data(0); /* unlink all rcd and nowait */ @@ -1549,9 +1894,7 @@ lnet_router_checker (void) LASSERT (rc == 1); - LNET_LOCK(); lnet_router_checker_event(&ev); - LNET_UNLOCK(); } if (the_lnet.ln_rc_state == LNET_RC_STATE_STOPPING) { @@ -1563,18 +1906,18 @@ lnet_router_checker (void) LASSERT (the_lnet.ln_rc_state == LNET_RC_STATE_RUNNING); - LNET_LOCK(); + lnet_net_lock(0); - version = the_lnet.ln_routers_version; - cfs_list_for_each_entry (rtr, &the_lnet.ln_routers, lp_rtr_list) { - lnet_ping_router_locked(rtr); - LASSERT (version == the_lnet.ln_routers_version); - } + 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(); + lnet_net_unlock(0); - running = 0; /* lock only needed for the recursion check */ - return; + running = 0; /* lock only needed for the recursion check */ + return; } /* NB lnet_peers_start_down depends on me, @@ -1600,17 +1943,12 @@ lnet_get_tunables (void) } void -lnet_free_rtrpools (void) -{ -} - -void -lnet_init_rtrpools (void) +lnet_rtrpools_free(int keep_pools) { } int -lnet_alloc_rtrpools (int im_a_arouter) +lnet_rtrpools_alloc(int im_a_arouter) { return 0; }