X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Flnetctl.c;h=cfd16fe79daefe2b5f805c00d5a7dc23a3d85564;hb=01a727fa0db8095657975b4589d768556cb6745c;hp=cbbd33e75597a804e94eaf3bcbc6eb5f9db2f993;hpb=f016fea9a349b450733329cba010634f010b1d0d;p=fs%2Flustre-release.git diff --git a/lnet/utils/lnetctl.c b/lnet/utils/lnetctl.c index cbbd33e..cfd16fe 100644 --- a/lnet/utils/lnetctl.c +++ b/lnet/utils/lnetctl.c @@ -30,9 +30,7 @@ #include #include #include -#include -#include -#include "cyaml/cyaml.h" +#include #include "lnetconfig/liblnetconfig.h" #define LNET_CONFIGURE true @@ -50,14 +48,53 @@ static int jt_show_net(int argc, char **argv); static int jt_show_routing(int argc, char **argv); static int jt_show_stats(int argc, char **argv); static int jt_show_peer(int argc, char **argv); -static int jt_show_numa(int argc, char **argv); +static int jt_show_global(int argc, char **argv); static int jt_set_tiny(int argc, char **argv); static int jt_set_small(int argc, char **argv); static int jt_set_large(int argc, char **argv); static int jt_set_numa(int argc, char **argv); static int jt_add_peer_nid(int argc, char **argv); static int jt_del_peer_nid(int argc, char **argv); +static int jt_set_max_intf(int argc, char **argv); +static int jt_set_discovery(int argc, char **argv); +static int jt_list_peer(int argc, char **argv); /*static int jt_show_peer(int argc, char **argv);*/ +static int lnetctl_list_commands(int argc, char **argv); +static int jt_import(int argc, char **argv); +static int jt_export(int argc, char **argv); +static int jt_ping(int argc, char **argv); +static int jt_discover(int argc, char **argv); +static int jt_lnet(int argc, char **argv); +static int jt_route(int argc, char **argv); +static int jt_net(int argc, char **argv); +static int jt_routing(int argc, char **argv); +static int jt_set(int argc, char **argv); +static int jt_stats(int argc, char **argv); +static int jt_global(int argc, char **argv); +static int jt_peers(int argc, char **argv); + + +command_t cmd_list[] = { + {"lnet", jt_lnet, 0, "lnet {configure | unconfigure} [--all]"}, + {"route", jt_route, 0, "route {add | del | show | help}"}, + {"net", jt_net, 0, "net {add | del | show | help}"}, + {"routing", jt_routing, 0, "routing {show | help}"}, + {"set", jt_set, 0, "set {tiny_buffers | small_buffers | large_buffers" + " | routing | numa_range | max_interfaces" + " | discovery}"}, + {"import", jt_import, 0, "import FILE.yaml"}, + {"export", jt_export, 0, "export FILE.yaml"}, + {"stats", jt_stats, 0, "stats {show | help}"}, + {"global", jt_global, 0, "global {show | help}"}, + {"peer", jt_peers, 0, "peer {add | del | show | help}"}, + {"ping", jt_ping, 0, "ping nid,[nid,...]"}, + {"discover", jt_discover, 0, "discover nid[,nid,...]"}, + {"help", Parser_help, 0, "help"}, + {"exit", Parser_quit, 0, "quit"}, + {"quit", Parser_quit, 0, "quit"}, + {"--list-commands", lnetctl_list_commands, 0, "list commands"}, + { 0, 0, 0, NULL } +}; command_t lnet_cmds[] = { {"configure", jt_config_lnet, 0, "configure lnet\n" @@ -99,7 +136,8 @@ command_t net_cmds[] = { "\t--if: physical interface (e.g. eth0)\n"}, {"show", jt_show_net, 0, "show networks\n" "\t--net: net name (e.g. tcp0) to filter on\n" - "\t--verbose: display detailed output per network\n"}, + "\t--verbose: display detailed output per network." + " Optional argument of '2' outputs more stats\n"}, { 0, 0, 0, NULL } }; @@ -113,8 +151,8 @@ command_t stats_cmds[] = { { 0, 0, 0, NULL } }; -command_t numa_cmds[] = { - {"show", jt_show_numa, 0, "show NUMA range\n"}, +command_t global_cmds[] = { + {"show", jt_show_global, 0, "show global variables\n"}, { 0, 0, 0, NULL } }; @@ -130,21 +168,31 @@ command_t set_cmds[] = { "\t1 - enable routing\n"}, {"numa_range", jt_set_numa, 0, "set NUMA range for NI selection\n" "\tVALUE must be at least 0\n"}, + {"max_interfaces", jt_set_max_intf, 0, "set the default value for " + "max interfaces\n" + "\tValue must be greater than 16\n"}, + {"discovery", jt_set_discovery, 0, "enable/disable peer discovery\n" + "\t0 - disable peer discovery\n" + "\t1 - enable peer discovery (default)\n"}, { 0, 0, 0, NULL } }; command_t peer_cmds[] = { {"add", jt_add_peer_nid, 0, "add a peer NID\n" - "\t--key_nid: NID to identify peer. If not provided then the first\n" - "\t NID in the list becomes the key NID of a newly created\n" - "\t peer. \n" - "\t--nid: one or more peer NIDs\n"}, + "\t--prim_nid: Primary NID of the peer. If not provided then the first\n" + "\t NID in the list becomes the Primary NID of a newly created\n" + "\t peer. \n" + "\t--nid: one or more peer NIDs\n" + "\t--non_mr: create this peer as not Multi-Rail capable\n"}, {"del", jt_del_peer_nid, 0, "delete a peer NID\n" - "\t--key_nid: NID to identify peer.\n" + "\t--prim_nid: Primary NID of the peer.\n" "\t--nid: list of NIDs to remove. If none provided,\n" "\t peer is deleted\n"}, - {"show", jt_show_peer, 0, "show peer credits\n" - "\t--primary_nid: NID of peer to filter on.\n"}, + {"show", jt_show_peer, 0, "show peer information\n" + "\t--nid: NID of peer to filter on.\n" + "\t--verbose: display detailed output per peer." + " Optional argument of '2' outputs more stats\n"}, + {"list", jt_list_peer, 0, "list all peers\n"}, { 0, 0, 0, NULL } }; @@ -170,6 +218,9 @@ static int parse_long(const char *number, long int *value) { char *end; + if (!number) + return -1; + *value = strtol(number, &end, 0); if (end != NULL && *end != 0) return -1; @@ -177,46 +228,85 @@ static int parse_long(const char *number, long int *value) return 0; } -static int handle_help(const command_t *cmd_list, const char *cmd, - const char *sub_cmd, int argc, char **argv) +static int check_cmd(const command_t *cmd_list, const char *cmd, + const char *sub_cmd, const int min_args, + int argc, char **argv) { int opt; - int rc = -1; + int rc = 0; optind = 0; opterr = 0; const char *const short_options = "h"; - const struct option long_options[] = { - { "help", 0, NULL, 'h' }, - { NULL, 0, NULL, 0 }, + static const struct option long_options[] = { + { .name = "help", .has_arg = no_argument, .val = 'h' }, + { .name = NULL } }; + if (argc < min_args) { + print_help(cmd_list, cmd, sub_cmd); + rc = -1; + goto out; + } else if (argc > 2) { + return 0; + } + while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { switch (opt) { case 'h': print_help(cmd_list, cmd, sub_cmd); - rc = 0; + rc = 1; break; default: - rc = -1; + rc = 0; break; } } +out: opterr = 1; optind = 0; return rc; } +static int jt_set_max_intf(int argc, char **argv) +{ + long int value; + int rc; + struct cYAML *err_rc = NULL; + + rc = check_cmd(set_cmds, "set", "max_interfaces", 2, argc, argv); + if (rc) + return rc; + + rc = parse_long(argv[1], &value); + if (rc != 0) { + cYAML_build_error(-1, -1, "parser", "set", + "cannot parse max_interfaces value", &err_rc); + cYAML_print_tree2file(stderr, err_rc); + cYAML_free_tree(err_rc); + return -1; + } + + rc = lustre_lnet_config_max_intf(value, -1, &err_rc); + if (rc != LUSTRE_CFG_RC_NO_ERR) + cYAML_print_tree2file(stderr, err_rc); + + cYAML_free_tree(err_rc); + + return rc; +} + static int jt_set_numa(int argc, char **argv) { long int value; int rc; struct cYAML *err_rc = NULL; - if (handle_help(set_cmds, "set", "numa_range", argc, argv) == 0) - return 0; + rc = check_cmd(set_cmds, "set", "numa_range", 2, argc, argv); + if (rc) + return rc; rc = parse_long(argv[1], &value); if (rc != 0) { @@ -227,7 +317,35 @@ static int jt_set_numa(int argc, char **argv) return -1; } - rc = lustre_lnet_config_buffers(value, -1, -1, -1, &err_rc); + rc = lustre_lnet_config_numa_range(value, -1, &err_rc); + if (rc != LUSTRE_CFG_RC_NO_ERR) + cYAML_print_tree2file(stderr, err_rc); + + cYAML_free_tree(err_rc); + + return rc; +} + +static int jt_set_discovery(int argc, char **argv) +{ + long int value; + int rc; + struct cYAML *err_rc = NULL; + + rc = check_cmd(set_cmds, "set", "discovery", 2, argc, argv); + if (rc) + return rc; + + rc = parse_long(argv[1], &value); + if (rc != 0) { + cYAML_build_error(-1, -1, "parser", "set", + "cannot parse discovery value", &err_rc); + cYAML_print_tree2file(stderr, err_rc); + cYAML_free_tree(err_rc); + return -1; + } + + rc = lustre_lnet_config_discovery(value, -1, &err_rc); if (rc != LUSTRE_CFG_RC_NO_ERR) cYAML_print_tree2file(stderr, err_rc); @@ -242,8 +360,9 @@ static int jt_set_tiny(int argc, char **argv) int rc; struct cYAML *err_rc = NULL; - if (handle_help(set_cmds, "set", "tiny_buffers", argc, argv) == 0) - return 0; + rc = check_cmd(set_cmds, "set", "tiny_buffers", 2, argc, argv); + if (rc) + return rc; rc = parse_long(argv[1], &value); if (rc != 0) { @@ -269,8 +388,9 @@ static int jt_set_small(int argc, char **argv) int rc; struct cYAML *err_rc = NULL; - if (handle_help(set_cmds, "set", "small_buffers", argc, argv) == 0) - return 0; + rc = check_cmd(set_cmds, "set", "small_buffers", 2, argc, argv); + if (rc) + return rc; rc = parse_long(argv[1], &value); if (rc != 0) { @@ -296,8 +416,9 @@ static int jt_set_large(int argc, char **argv) int rc; struct cYAML *err_rc = NULL; - if (handle_help(set_cmds, "set", "large_buffers", argc, argv) == 0) - return 0; + rc = check_cmd(set_cmds, "set", "large_buffers", 2, argc, argv); + if (rc) + return rc; rc = parse_long(argv[1], &value); if (rc != 0) { @@ -323,8 +444,9 @@ static int jt_set_routing(int argc, char **argv) struct cYAML *err_rc = NULL; int rc; - if (handle_help(set_cmds, "set", "routing", argc, argv) == 0) - return 0; + rc = check_cmd(set_cmds, "set", "routing", 2, argc, argv); + if (rc) + return rc; rc = parse_long(argv[1], &value); if (rc != 0 || (value != 0 && value != 1)) { @@ -353,22 +475,22 @@ static int jt_config_lnet(int argc, char **argv) bool load_mod_params = false; int rc, opt; - const char *const short_options = "ah"; - const struct option long_options[] = { - { "all", 0, NULL, 'a' }, - { "help", 0, NULL, 'h' }, - { NULL, 0, NULL, 0 }, + const char *const short_options = "a"; + static const struct option long_options[] = { + { .name = "all", .has_arg = no_argument, .val = 'a' }, + { .name = NULL } }; + rc = check_cmd(lnet_cmds, "lnet", "configure", 0, argc, argv); + if (rc) + return rc; + while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { switch (opt) { case 'a': load_mod_params = true; break; - case 'h': - print_help(lnet_cmds, "lnet", "configure"); - return 0; default: return 0; } @@ -390,8 +512,9 @@ static int jt_unconfig_lnet(int argc, char **argv) struct cYAML *err_rc = NULL; int rc; - if (handle_help(lnet_cmds, "lnet", "unconfigure", argc, argv) == 0) - return 0; + rc = check_cmd(lnet_cmds, "lnet", "unconfigure", 0, argc, argv); + if (rc) + return rc; rc = lustre_lnet_config_ni_system(LNET_UNCONFIGURE, 0, -1, &err_rc); @@ -409,15 +532,17 @@ static int jt_add_route(int argc, char **argv) struct cYAML *err_rc = NULL; int rc, opt; - const char *const short_options = "n:g:c:p:h"; - const struct option long_options[] = { - { "net", 1, NULL, 'n' }, - { "gateway", 1, NULL, 'g' }, - { "hop-count", 1, NULL, 'c' }, - { "priority", 1, NULL, 'p' }, - { "help", 0, NULL, 'h' }, - { NULL, 0, NULL, 0 }, - }; + const char *const short_options = "n:g:c:p:"; + static const struct option long_options[] = { + { .name = "net", .has_arg = required_argument, .val = 'n' }, + { .name = "gateway", .has_arg = required_argument, .val = 'g' }, + { .name = "hop-count", .has_arg = required_argument, .val = 'c' }, + { .name = "priority", .has_arg = required_argument, .val = 'p' }, + { .name = NULL } }; + + rc = check_cmd(route_cmds, "route", "add", 0, argc, argv); + if (rc) + return rc; while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { @@ -444,9 +569,6 @@ static int jt_add_route(int argc, char **argv) continue; } break; - case 'h': - print_help(route_cmds, "route", "add"); - return 0; default: return 0; } @@ -467,7 +589,7 @@ static int jt_add_ni(int argc, char **argv) char *ip2net = NULL; long int pto = -1, pc = -1, pbc = -1, cre = -1; struct cYAML *err_rc = NULL; - int rc, opt, num_global_cpts = 0; + int rc, opt, cpt_rc = -1; struct lnet_dlc_network_descr nw_descr; struct cfs_expr_list *global_cpts = NULL; struct lnet_ioctl_config_lnd_tunables tunables; @@ -476,19 +598,22 @@ static int jt_add_ni(int argc, char **argv) memset(&tunables, 0, sizeof(tunables)); lustre_lnet_init_nw_descr(&nw_descr); - const char *const short_options = "n:i:p:t:c:b:r:s:h"; - const struct option long_options[] = { - { "net", 1, NULL, 'n' }, - { "if", 1, NULL, 'i' }, - { "ip2net", 1, NULL, 'p' }, - { "peer-timeout", 1, NULL, 't' }, - { "peer-credits", 1, NULL, 'c' }, - { "peer-buffer-credits", 1, NULL, 'b' }, - { "credits", 1, NULL, 'r' }, - { "cpt", 1, NULL, 's' }, - { "help", 0, NULL, 'h' }, - { NULL, 0, NULL, 0 }, - }; + const char *const short_options = "n:i:p:t:c:b:r:s:"; + static const struct option long_options[] = { + { .name = "net", .has_arg = required_argument, .val = 'n' }, + { .name = "if", .has_arg = required_argument, .val = 'i' }, + { .name = "ip2net", .has_arg = required_argument, .val = 'p' }, + { .name = "peer-timeout", .has_arg = required_argument, .val = 't' }, + { .name = "peer-credits", .has_arg = required_argument, .val = 'c' }, + { .name = "peer-buffer-credits", + .has_arg = required_argument, .val = 'b' }, + { .name = "credits", .has_arg = required_argument, .val = 'r' }, + { .name = "cpt", .has_arg = required_argument, .val = 's' }, + { .name = NULL } }; + + rc = check_cmd(net_cmds, "net", "add", 0, argc, argv); + if (rc) + return rc; while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { @@ -541,14 +666,10 @@ static int jt_add_ni(int argc, char **argv) } break; case 's': - num_global_cpts = - cfs_expr_list_parse(optarg, - strlen(optarg), - 0, UINT_MAX, &global_cpts); + cpt_rc = cfs_expr_list_parse(optarg, + strlen(optarg), 0, + UINT_MAX, &global_cpts); break; - case 'h': - print_help(net_cmds, "net", "add"); - return 0; default: return 0; } @@ -563,7 +684,7 @@ static int jt_add_ni(int argc, char **argv) } rc = lustre_lnet_config_ni(&nw_descr, - (num_global_cpts > 0) ? global_cpts: NULL, + (cpt_rc == 0) ? global_cpts: NULL, ip2net, (found) ? &tunables : NULL, -1, &err_rc); @@ -585,13 +706,15 @@ static int jt_del_route(int argc, char **argv) struct cYAML *err_rc = NULL; int rc, opt; - const char *const short_options = "n:g:h"; - const struct option long_options[] = { - { "net", 1, NULL, 'n' }, - { "gateway", 1, NULL, 'g' }, - { "help", 0, NULL, 'h' }, - { NULL, 0, NULL, 0 }, - }; + const char *const short_options = "n:g:"; + static const struct option long_options[] = { + { .name = "net", .has_arg = required_argument, .val = 'n' }, + { .name = "gateway", .has_arg = required_argument, .val = 'g' }, + { .name = NULL } }; + + rc = check_cmd(route_cmds, "route", "del", 0, argc, argv); + if (rc) + return rc; while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { @@ -602,9 +725,6 @@ static int jt_del_route(int argc, char **argv) case 'g': gateway = optarg; break; - case 'h': - print_help(route_cmds, "route", "del"); - return 0; default: return 0; } @@ -628,13 +748,15 @@ static int jt_del_ni(int argc, char **argv) lustre_lnet_init_nw_descr(&nw_descr); - const char *const short_options = "n:i:h"; - const struct option long_options[] = { - { "net", 1, NULL, 'n' }, - { "if", 1, NULL, 'i' }, - { "help", 0, NULL, 'h' }, - { NULL, 0, NULL, 0 }, - }; + const char *const short_options = "n:i:"; + static const struct option long_options[] = { + { .name = "net", .has_arg = required_argument, .val = 'n' }, + { .name = "if", .has_arg = required_argument, .val = 'i' }, + { .name = NULL } }; + + rc = check_cmd(net_cmds, "net", "del", 0, argc, argv); + if (rc) + return rc; while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { @@ -651,9 +773,6 @@ static int jt_del_ni(int argc, char **argv) goto out; } break; - case 'h': - print_help(net_cmds, "net", "del"); - return 0; default: return 0; } @@ -677,16 +796,18 @@ static int jt_show_route(int argc, char **argv) int detail = 0, rc, opt; struct cYAML *err_rc = NULL, *show_rc = NULL; - const char *const short_options = "n:g:h:p:vh"; - const struct option long_options[] = { - { "net", 1, NULL, 'n' }, - { "gateway", 1, NULL, 'g' }, - { "hop-count", 1, NULL, 'c' }, - { "priority", 1, NULL, 'p' }, - { "verbose", 0, NULL, 'v' }, - { "help", 0, NULL, 'h' }, - { NULL, 0, NULL, 0 }, - }; + const char *const short_options = "n:g:h:p:v"; + static const struct option long_options[] = { + { .name = "net", .has_arg = required_argument, .val = 'n' }, + { .name = "gateway", .has_arg = required_argument, .val = 'g' }, + { .name = "hop-count", .has_arg = required_argument, .val = 'c' }, + { .name = "priority", .has_arg = required_argument, .val = 'p' }, + { .name = "verbose", .has_arg = no_argument, .val = 'v' }, + { .name = NULL } }; + + rc = check_cmd(route_cmds, "route", "show", 0, argc, argv); + if (rc) + return rc; while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { @@ -716,9 +837,6 @@ static int jt_show_route(int argc, char **argv) case 'v': detail = 1; break; - case 'h': - print_help(route_cmds, "route", "show"); - return 0; default: return 0; } @@ -741,16 +859,19 @@ static int jt_show_route(int argc, char **argv) static int jt_show_net(int argc, char **argv) { char *network = NULL; - int detail = 0, rc, opt; + int rc, opt; struct cYAML *err_rc = NULL, *show_rc = NULL; + long int detail = 0; - const char *const short_options = "n:vh"; - const struct option long_options[] = { - { "net", 1, NULL, 'n' }, - { "verbose", 0, NULL, 'v' }, - { "help", 0, NULL, 'h' }, - { NULL, 0, NULL, 0 }, - }; + const char *const short_options = "n:v"; + static const struct option long_options[] = { + { .name = "net", .has_arg = required_argument, .val = 'n' }, + { .name = "verbose", .has_arg = optional_argument, .val = 'v' }, + { .name = NULL } }; + + rc = check_cmd(net_cmds, "net", "show", 0, argc, argv); + if (rc) + return rc; while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { @@ -759,17 +880,20 @@ static int jt_show_net(int argc, char **argv) network = optarg; break; case 'v': - detail = 1; + if ((!optarg) && (argv[optind] != NULL) && + (argv[optind][0] != '-')) { + if (parse_long(argv[optind++], &detail) != 0) + detail = 1; + } else { + detail = 1; + } break; - case 'h': - print_help(net_cmds, "net", "show"); - return 0; default: return 0; } } - rc = lustre_lnet_show_net(network, detail, -1, &show_rc, &err_rc); + rc = lustre_lnet_show_net(network, (int) detail, -1, &show_rc, &err_rc); if (rc != LUSTRE_CFG_RC_NO_ERR) cYAML_print_tree2file(stderr, err_rc); @@ -787,8 +911,9 @@ static int jt_show_routing(int argc, char **argv) struct cYAML *err_rc = NULL, *show_rc = NULL; int rc; - if (handle_help(routing_cmds, "routing", "show", argc, argv) == 0) - return 0; + rc = check_cmd(routing_cmds, "routing", "show", 0, argc, argv); + if (rc) + return rc; rc = lustre_lnet_show_routing(-1, &show_rc, &err_rc); @@ -808,8 +933,9 @@ static int jt_show_stats(int argc, char **argv) int rc; struct cYAML *show_rc = NULL, *err_rc = NULL; - if (handle_help(stats_cmds, "stats", "show", argc, argv) == 0) - return 0; + rc = check_cmd(stats_cmds, "stats", "show", 0, argc, argv); + if (rc) + return rc; rc = lustre_lnet_show_stats(-1, &show_rc, &err_rc); @@ -824,119 +950,127 @@ static int jt_show_stats(int argc, char **argv) return rc; } -static int jt_show_numa(int argc, char **argv) +static int jt_show_global(int argc, char **argv) { int rc; struct cYAML *show_rc = NULL, *err_rc = NULL; - if (handle_help(numa_cmds, "numa", "show", argc, argv) == 0) - return 0; + rc = check_cmd(global_cmds, "global", "show", 0, argc, argv); + if (rc) + return rc; rc = lustre_lnet_show_numa_range(-1, &show_rc, &err_rc); + if (rc != LUSTRE_CFG_RC_NO_ERR) { + cYAML_print_tree2file(stderr, err_rc); + goto out; + } - if (rc != LUSTRE_CFG_RC_NO_ERR) + rc = lustre_lnet_show_max_intf(-1, &show_rc, &err_rc); + if (rc != LUSTRE_CFG_RC_NO_ERR) { cYAML_print_tree2file(stderr, err_rc); - else if (show_rc) + goto out; + } + + rc = lustre_lnet_show_discovery(-1, &show_rc, &err_rc); + if (rc != LUSTRE_CFG_RC_NO_ERR) { + cYAML_print_tree2file(stderr, err_rc); + goto out; + } + + if (show_rc) cYAML_print_tree(show_rc); +out: cYAML_free_tree(err_rc); cYAML_free_tree(show_rc); return rc; } -static inline int jt_lnet(int argc, char **argv) +static int jt_lnet(int argc, char **argv) { - if (argc < 2) - return CMD_HELP; + int rc; - if (argc == 2 && - handle_help(lnet_cmds, "lnet", NULL, argc, argv) == 0) - return 0; + rc = check_cmd(lnet_cmds, "lnet", NULL, 2, argc, argv); + if (rc) + return rc; return Parser_execarg(argc - 1, &argv[1], lnet_cmds); } -static inline int jt_route(int argc, char **argv) +static int jt_route(int argc, char **argv) { - if (argc < 2) - return CMD_HELP; + int rc; - if (argc == 2 && - handle_help(route_cmds, "route", NULL, argc, argv) == 0) - return 0; + rc = check_cmd(route_cmds, "route", NULL, 2, argc, argv); + if (rc) + return rc; return Parser_execarg(argc - 1, &argv[1], route_cmds); } -static inline int jt_net(int argc, char **argv) +static int jt_net(int argc, char **argv) { - if (argc < 2) - return CMD_HELP; + int rc; - if (argc == 2 && - handle_help(net_cmds, "net", NULL, argc, argv) == 0) - return 0; + rc = check_cmd(net_cmds, "net", NULL, 2, argc, argv); + if (rc) + return rc; return Parser_execarg(argc - 1, &argv[1], net_cmds); } -static inline int jt_routing(int argc, char **argv) +static int jt_routing(int argc, char **argv) { - if (argc < 2) - return CMD_HELP; + int rc; - if (argc == 2 && - handle_help(routing_cmds, "routing", NULL, argc, argv) == 0) - return 0; + rc = check_cmd(routing_cmds, "routing", NULL, 2, argc, argv); + if (rc) + return rc; return Parser_execarg(argc - 1, &argv[1], routing_cmds); } -static inline int jt_stats(int argc, char **argv) +static int jt_stats(int argc, char **argv) { - if (argc < 2) - return CMD_HELP; + int rc; - if (argc == 2 && - handle_help(stats_cmds, "stats", NULL, argc, argv) == 0) - return 0; + rc = check_cmd(stats_cmds, "stats", NULL, 2, argc, argv); + if (rc) + return rc; return Parser_execarg(argc - 1, &argv[1], stats_cmds); } -static inline int jt_numa(int argc, char **argv) +static int jt_global(int argc, char **argv) { - if (argc < 2) - return CMD_HELP; + int rc; - if (argc == 2 && - handle_help(numa_cmds, "numa", NULL, argc, argv) == 0) - return 0; + rc = check_cmd(global_cmds, "global", NULL, 2, argc, argv); + if (rc) + return rc; - return Parser_execarg(argc - 1, &argv[1], numa_cmds); + return Parser_execarg(argc - 1, &argv[1], global_cmds); } -static inline int jt_peers(int argc, char **argv) +static int jt_peers(int argc, char **argv) { - if (argc < 2) - return CMD_HELP; + int rc; - if (argc == 2 && - handle_help(peer_cmds, "peer", NULL, argc, argv) == 0) - return 0; + rc = check_cmd(peer_cmds, "peer", NULL, 2, argc, argv); + if (rc) + return rc; return Parser_execarg(argc - 1, &argv[1], peer_cmds); } -static inline int jt_set(int argc, char **argv) +static int jt_set(int argc, char **argv) { - if (argc < 2) - return CMD_HELP; + int rc; - if (argc == 2 && - handle_help(set_cmds, "set", NULL, argc, argv) == 0) - return 0; + rc = check_cmd(set_cmds, "set", NULL, 2, argc, argv); + if (rc) + return rc; return Parser_execarg(argc - 1, &argv[1], set_cmds); } @@ -946,33 +1080,39 @@ static int jt_import(int argc, char **argv) char *file = NULL; struct cYAML *err_rc = NULL; struct cYAML *show_rc = NULL; - int rc = 0, opt, opt_found = 0; + int rc = 0, return_rc = 0, opt, opt_found = 0; char cmd = 'a'; - const char *const short_options = "adsh"; - const struct option long_options[] = { - { "add", 0, NULL, 'a' }, - { "del", 0, NULL, 'd' }, - { "show", 0, NULL, 's' }, - { "help", 0, NULL, 'h' }, - { NULL, 0, NULL, 0 }, - }; + const char *const short_options = "adseh"; + static const struct option long_options[] = { + { .name = "add", .has_arg = no_argument, .val = 'a' }, + { .name = "del", .has_arg = no_argument, .val = 'd' }, + { .name = "show", .has_arg = no_argument, .val = 's' }, + { .name = "exec", .has_arg = no_argument, .val = 'e' }, + { .name = "help", .has_arg = no_argument, .val = 'h' }, + { .name = NULL } }; while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { opt_found = 1; switch (opt) { case 'a': + cmd = opt; + break; case 'd': case 's': cmd = opt; break; + case 'e': + cmd = opt; + break; case 'h': printf("import FILE\n" "import < FILE : import a file\n" "\t--add: add configuration\n" "\t--del: delete configuration\n" "\t--show: show configuration\n" + "\t--exec: execute command\n" "\t--help: display this help\n" "If no command option is given then --add" " is assumed by default\n"); @@ -991,6 +1131,9 @@ static int jt_import(int argc, char **argv) switch (cmd) { case 'a': rc = lustre_yaml_config(file, &err_rc); + return_rc = lustre_yaml_exec(file, &show_rc, &err_rc); + cYAML_print_tree(show_rc); + cYAML_free_tree(show_rc); break; case 'd': rc = lustre_yaml_del(file, &err_rc); @@ -1000,12 +1143,17 @@ static int jt_import(int argc, char **argv) cYAML_print_tree(show_rc); cYAML_free_tree(show_rc); break; + case 'e': + rc = lustre_yaml_exec(file, &show_rc, &err_rc); + cYAML_print_tree(show_rc); + cYAML_free_tree(show_rc); + break; } - if (rc != LUSTRE_CFG_RC_NO_ERR) + if (rc || return_rc) { cYAML_print_tree2file(stderr, err_rc); - - cYAML_free_tree(err_rc); + cYAML_free_tree(err_rc); + } return rc; } @@ -1014,21 +1162,20 @@ static int jt_export(int argc, char **argv) { struct cYAML *show_rc = NULL; struct cYAML *err_rc = NULL; - int rc, opt; + int rc; FILE *f = NULL; + int opt; const char *const short_options = "h"; - const struct option long_options[] = { - { "help", 0, NULL, 'h' }, - { NULL, 0, NULL, 0 }, - }; + static const struct option long_options[] = { + { .name = "help", .has_arg = no_argument, .val = 'h' }, + { .name = NULL } }; while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { switch (opt) { case 'h': - printf("export FILE\n" - "export > FILE : export configuration\n" + printf("export > FILE.yaml : export configuration\n" "\t--help: display this help\n"); return 0; default: @@ -1043,10 +1190,11 @@ static int jt_export(int argc, char **argv) } else f = stdout; - rc = lustre_lnet_show_net(NULL, 1, -1, &show_rc, &err_rc); + rc = lustre_lnet_show_net(NULL, 2, -1, &show_rc, &err_rc); if (rc != LUSTRE_CFG_RC_NO_ERR) { cYAML_print_tree2file(stderr, err_rc); cYAML_free_tree(err_rc); + err_rc = NULL; } rc = lustre_lnet_show_route(NULL, NULL, -1, -1, 1, -1, &show_rc, @@ -1054,12 +1202,42 @@ static int jt_export(int argc, char **argv) if (rc != LUSTRE_CFG_RC_NO_ERR) { cYAML_print_tree2file(stderr, err_rc); cYAML_free_tree(err_rc); + err_rc = NULL; } rc = lustre_lnet_show_routing(-1, &show_rc, &err_rc); if (rc != LUSTRE_CFG_RC_NO_ERR) { cYAML_print_tree2file(stderr, err_rc); cYAML_free_tree(err_rc); + err_rc = NULL; + } + + rc = lustre_lnet_show_peer(NULL, 2, -1, &show_rc, &err_rc); + if (rc != LUSTRE_CFG_RC_NO_ERR) { + cYAML_print_tree2file(stderr, err_rc); + cYAML_free_tree(err_rc); + err_rc = NULL; + } + + rc = lustre_lnet_show_numa_range(-1, &show_rc, &err_rc); + if (rc != LUSTRE_CFG_RC_NO_ERR) { + cYAML_print_tree2file(stderr, err_rc); + cYAML_free_tree(err_rc); + err_rc = NULL; + } + + rc = lustre_lnet_show_max_intf(-1, &show_rc, &err_rc); + if (rc != LUSTRE_CFG_RC_NO_ERR) { + cYAML_print_tree2file(stderr, err_rc); + cYAML_free_tree(err_rc); + err_rc = NULL; + } + + rc = lustre_lnet_show_discovery(-1, &show_rc, &err_rc); + if (rc != LUSTRE_CFG_RC_NO_ERR) { + cYAML_print_tree2file(stderr, err_rc); + cYAML_free_tree(err_rc); + err_rc = NULL; } if (show_rc != NULL) { @@ -1075,64 +1253,56 @@ static int jt_export(int argc, char **argv) static int jt_add_peer_nid(int argc, char **argv) { - char *key_nid = NULL; - char *nid[LNET_MAX_INTERFACES] = {NULL}; - int idx = 0; + char *prim_nid = NULL; + char **nids = NULL, **nids2 = NULL; + int size = 0; struct cYAML *err_rc = NULL; - int rc, opt; + int rc = LUSTRE_CFG_RC_NO_ERR, opt, i; bool non_mr = false; - const char *const short_options = "k:n:mh"; + const char *const short_options = "k:n:m"; const struct option long_options[] = { - { "key_nid", 1, NULL, 'k' }, + { "prim_nid", 1, NULL, 'k' }, { "nid", 1, NULL, 'n' }, - { "non_mr", 1, NULL, 'm'}, - { "help", 0, NULL, 'h' }, + { "non_mr", 0, NULL, 'm'}, { NULL, 0, NULL, 0 }, }; + rc = check_cmd(peer_cmds, "peer", "add", 2, argc, argv); + if (rc) + return rc; + while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { switch (opt) { case 'k': - key_nid = optarg; + prim_nid = optarg; break; case 'n': - if (idx >= LNET_MAX_INTERFACES) { - cYAML_build_error(-1, -1, "peer_ni", "add", - "too many interfaces", - &err_rc); - rc = LUSTRE_CFG_RC_BAD_PARAM; + size = lustre_lnet_parse_nids(optarg, nids, size, + &nids2); + if (nids2 == NULL) goto failed; - } - nid[idx] = calloc(strlen(optarg) + 1, 1); - if (nid[idx] == NULL) { - cYAML_build_error(-1, -1, "peer_ni", "add", - "out of memory", - &err_rc); - rc = LUSTRE_CFG_RC_BAD_PARAM; - goto failed; - } - strncpy(nid[idx], optarg, strlen(optarg)); - idx++; + nids = nids2; + rc = LUSTRE_CFG_RC_OUT_OF_MEM; break; case 'm': non_mr = true; - case 'h': - print_help(peer_cmds, "peer", "add"); - return 0; + break; default: return 0; } } - rc = lustre_lnet_config_peer_nid(key_nid, nid, !non_mr, -1, &err_rc); + rc = lustre_lnet_config_peer_nid(prim_nid, nids, size, + !non_mr, -1, &err_rc); failed: - idx = 0; - while (nid[idx] != NULL) { - free(nid[idx]); - idx++; + if (nids) { + /* free the array of nids */ + for (i = 0; i < size; i++) + free(nids[i]); + free(nids); } if (rc != LUSTRE_CFG_RC_NO_ERR) @@ -1145,56 +1315,50 @@ failed: static int jt_del_peer_nid(int argc, char **argv) { - char *key_nid = NULL; - char *nid[LNET_MAX_INTERFACES] = {NULL}; - int idx = 0; + char *prim_nid = NULL; + char **nids = NULL, **nids2 = NULL; struct cYAML *err_rc = NULL; - int rc, opt; + int rc = LUSTRE_CFG_RC_NO_ERR, opt, i, size = 0; - const char *const short_options = "k:n:h"; + const char *const short_options = "k:n:"; const struct option long_options[] = { - { "key_nid", 1, NULL, 'k' }, + { "prim_nid", 1, NULL, 'k' }, { "nid", 1, NULL, 'n' }, - { "help", 0, NULL, 'h' }, { NULL, 0, NULL, 0 }, }; + rc = check_cmd(peer_cmds, "peer", "del", 2, argc, argv); + if (rc) + return rc; + while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { switch (opt) { case 'k': - key_nid = optarg; + prim_nid = optarg; break; case 'n': - if (idx >= LNET_MAX_INTERFACES) { - cYAML_build_error(-1, -1, "peer_ni", "del", - "too many interfaces", - &err_rc); - rc = LUSTRE_CFG_RC_BAD_PARAM; - goto failed; - } - nid[idx] = calloc(strlen(optarg) + 1, 1); - if (nid[idx] == NULL) { - cYAML_build_error(-1, -1, "peer_ni", "del", - "out of memory", - &err_rc); - rc = LUSTRE_CFG_RC_BAD_PARAM; + size = lustre_lnet_parse_nids(optarg, nids, size, + &nids2); + if (nids2 == NULL) goto failed; - } - strncpy(nid[idx], optarg, strlen(optarg)); - idx++; + nids = nids2; + rc = LUSTRE_CFG_RC_OUT_OF_MEM; break; - case 'h': - print_help(peer_cmds, "peer", "del"); - return 0; default: return 0; } } - rc = lustre_lnet_del_peer_nid(key_nid, nid, -1, &err_rc); + rc = lustre_lnet_del_peer_nid(prim_nid, nids, size, -1, &err_rc); failed: + if (nids) { + for (i = 0; i < size; i++) + free(nids[i]); + free(nids); + } + if (rc != LUSTRE_CFG_RC_NO_ERR) cYAML_print_tree2file(stderr, err_rc); @@ -1205,32 +1369,44 @@ failed: static int jt_show_peer(int argc, char **argv) { - char *key_nid = NULL; + char *nid = NULL; int rc, opt; struct cYAML *err_rc = NULL, *show_rc = NULL; + long int detail = 0; - const char *const short_options = "k:vh"; + const char *const short_options = "n:v::h"; const struct option long_options[] = { - { "key_nid", 1, NULL, 'k' }, + { "nid", 1, NULL, 'n' }, + { "verbose", 2, NULL, 'v' }, { "help", 0, NULL, 'h' }, { NULL, 0, NULL, 0 }, }; + rc = check_cmd(peer_cmds, "peer", "show", 1, argc, argv); + if (rc) + return rc; + while ((opt = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) { switch (opt) { - case 'k': - key_nid = optarg; + case 'n': + nid = optarg; + break; + case 'v': + if ((!optarg) && (argv[optind] != NULL) && + (argv[optind][0] != '-')) { + if (parse_long(argv[optind++], &detail) != 0) + detail = 1; + } else { + detail = 1; + } break; - case 'h': - print_help(peer_cmds, "peer", "add"); - return 0; default: return 0; } } - rc = lustre_lnet_show_peer(key_nid, -1, &show_rc, &err_rc); + rc = lustre_lnet_show_peer(nid, (int) detail, -1, &show_rc, &err_rc); if (rc != LUSTRE_CFG_RC_NO_ERR) cYAML_print_tree2file(stderr, err_rc); @@ -1243,24 +1419,127 @@ static int jt_show_peer(int argc, char **argv) return rc; } -command_t list[] = { - {"lnet", jt_lnet, 0, "lnet {configure | unconfigure} [--all]"}, - {"route", jt_route, 0, "route {add | del | show | help}"}, - {"net", jt_net, 0, "net {add | del | show | help}"}, - {"routing", jt_routing, 0, "routing {show | help}"}, - {"set", jt_set, 0, "set {tiny_buffers | small_buffers | large_buffers" - " | routing}"}, - {"import", jt_import, 0, "import {--add | --del | --show | " - "--help} FILE.yaml"}, - {"export", jt_export, 0, "export {--help} FILE.yaml"}, - {"stats", jt_stats, 0, "stats {show | help}"}, - {"numa", jt_numa, 0, "numa {show | help}"}, - {"peer", jt_peers, 0, "peer {add | del | show | help}"}, - {"help", Parser_help, 0, "help"}, - {"exit", Parser_quit, 0, "quit"}, - {"quit", Parser_quit, 0, "quit"}, - { 0, 0, 0, NULL } -}; +static int jt_list_peer(int argc, char **argv) +{ + int rc; + struct cYAML *err_rc = NULL, *list_rc = NULL; + + rc = check_cmd(peer_cmds, "peer", "list", 0, argc, argv); + if (rc) + return rc; + + rc = lustre_lnet_list_peer(-1, &list_rc, &err_rc); + + if (rc != LUSTRE_CFG_RC_NO_ERR) + cYAML_print_tree2file(stderr, err_rc); + else if (list_rc) + cYAML_print_tree(list_rc); + + cYAML_free_tree(err_rc); + cYAML_free_tree(list_rc); + + return rc; +} + +static int jt_ping(int argc, char **argv) +{ + struct cYAML *err_rc = NULL; + struct cYAML *show_rc = NULL; + int timeout = 1000; + int rc = 0, opt; + + const char *const short_options = "t:h"; + const struct option long_options[] = { + { "timeout", 1, NULL, 't' }, + { "help", 0, NULL, 'h' }, + { NULL, 0, NULL, 0 }, + }; + + while ((opt = getopt_long(argc, argv, short_options, + long_options, NULL)) != -1) { + switch (opt) { + case 't': + timeout = 1000 * atol(optarg); + break; + case 'h': + printf("ping nid[,nid,...]\n" + "\t --timeout: ping timeout\n" + "\t --help: display this help\n"); + return 0; + default: + return 0; + } + } + + for (; optind < argc; optind++) + rc = lustre_lnet_ping_nid(argv[optind], timeout, -1, &show_rc, &err_rc); + + if (show_rc) + cYAML_print_tree(show_rc); + + if (err_rc) + cYAML_print_tree2file(stderr, err_rc); + + cYAML_free_tree(err_rc); + cYAML_free_tree(show_rc); + + return rc; +} + +static int jt_discover(int argc, char **argv) +{ + struct cYAML *err_rc = NULL; + struct cYAML *show_rc = NULL; + int force = 0; + int rc = 0, opt; + + const char *const short_options = "fh"; + const struct option long_options[] = { + { "force", 0, NULL, 'f' }, + { "help", 0, NULL, 'h' }, + { NULL, 0, NULL, 0 }, + }; + + while ((opt = getopt_long(argc, argv, short_options, + long_options, NULL)) != -1) { + switch (opt) { + case 'f': + force = 1; + break; + case 'h': + printf("discover nid[,nid,...]\n" + "\t --force: force discovery\n" + "\t --help: display this help\n"); + return 0; + default: + return 0; + } + } + + for (; optind < argc; optind++) + rc = lustre_lnet_discover_nid(argv[optind], force, -1, &show_rc, + &err_rc); + + if (show_rc) + cYAML_print_tree(show_rc); + + if (err_rc) + cYAML_print_tree2file(stderr, err_rc); + + cYAML_free_tree(err_rc); + cYAML_free_tree(show_rc); + + return rc; +} + +static int lnetctl_list_commands(int argc, char **argv) +{ + char buffer[81] = ""; /* 80 printable chars + terminating NUL */ + + Parser_list_commands(cmd_list, buffer, sizeof(buffer), NULL, 0, 4); + + return 0; +} int main(int argc, char **argv) { @@ -1275,9 +1554,9 @@ int main(int argc, char **argv) return rc; } - Parser_init("lnetctl > ", list); + Parser_init("lnetctl > ", cmd_list); if (argc > 1) { - rc = Parser_execarg(argc - 1, &argv[1], list); + rc = Parser_execarg(argc - 1, &argv[1], cmd_list); goto errorout; }