Whamcloud - gitweb
LU-14939 lnet: Allow specifying a source NID for lnetctl ping
[fs/lustre-release.git] / lnet / utils / lnetctl.c
index 40deca5..6c76812 100644 (file)
@@ -50,6 +50,7 @@ static int jt_show_stats(int argc, char **argv);
 static int jt_show_peer(int argc, char **argv);
 static int jt_show_recovery(int argc, char **argv);
 static int jt_show_global(int argc, char **argv);
+static int jt_show_udsp(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);
@@ -59,12 +60,15 @@ static int jt_set_transaction_to(int argc, char **argv);
 static int jt_set_recov_intrv(int argc, char **argv);
 static int jt_set_rtr_sensitivity(int argc, char **argv);
 static int jt_set_hsensitivity(int argc, char **argv);
+static int jt_reset_stats(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_set_drop_asym_route(int argc, char **argv);
 static int jt_list_peer(int argc, char **argv);
+static int jt_add_udsp(int argc, char **argv);
+static int jt_del_udsp(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);
@@ -83,24 +87,34 @@ static int jt_peers(int argc, char **argv);
 static int jt_set_ni_value(int argc, char **argv);
 static int jt_set_peer_ni_value(int argc, char **argv);
 static int jt_calc_service_id(int argc, char **argv);
+static int jt_set_response_tracking(int argc, char **argv);
+static int jt_set_recovery_limit(int argc, char **argv);
+static int jt_udsp(int argc, char **argv);
+static int jt_setup_mrrouting(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}"},
+       {"net", jt_net, 0, "net {add | del | show | set | 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}"},
+                          " | discovery | drop_asym_route | retry_count"
+                          " | transaction_timeout | health_sensitivity"
+                          " | recovery_interval | router_sensitivity"
+                          " | response_tracking | recovery_limit}"},
        {"import", jt_import, 0, "import FILE.yaml"},
        {"export", jt_export, 0, "export FILE.yaml"},
        {"stats", jt_stats, 0, "stats {show | help}"},
        {"debug", jt_debug, 0, "debug recovery {local | peer}"},
        {"global", jt_global, 0, "global {show | help}"},
-       {"peer", jt_peers, 0, "peer {add | del | show | help}"},
+       {"peer", jt_peers, 0, "peer {add | del | show | list | set | help}"},
        {"ping", jt_ping, 0, "ping nid,[nid,...]"},
        {"discover", jt_discover, 0, "discover nid[,nid,...]"},
        {"service-id", jt_calc_service_id, 0, "Calculate IB Lustre service ID\n"},
+       {"udsp", jt_udsp, 0, "udsp {add | del | help}"},
+       {"setup-mrrouting", jt_setup_mrrouting, 0,
+        "setup linux routing tables\n"},
        {"help", Parser_help, 0, "help"},
        {"exit", Parser_quit, 0, "quit"},
        {"quit", Parser_quit, 0, "quit"},
@@ -144,7 +158,9 @@ command_t net_cmds[] = {
         "\t--peer-credits: define the max number of inflight messages\n"
         "\t--peer-buffer-credits: the number of buffer credits per peer\n"
         "\t--credits: Network Interface credits\n"
-        "\t--cpt: CPU Partitions configured net uses (e.g. [0,1]\n"},
+        "\t--cpt: CPU Partitions configured net uses (e.g. [0,1]\n"
+        "\t--conns-per-peer: number of connections per peer\n"
+        "\t--skip-mr-route-setup: do not add linux route for the ni\n"},
        {"del", jt_del_ni, 0, "delete a network\n"
         "\t--net: net name (e.g. tcp0)\n"
         "\t--if: physical interface (e.g. eth0)\n"},
@@ -155,6 +171,7 @@ command_t net_cmds[] = {
        {"set", jt_set_ni_value, 0, "set local NI specific parameter\n"
         "\t--nid: NI NID to set the\n"
         "\t--health: specify health value to set\n"
+        "\t--conns-per-peer: number of connections per peer\n"
         "\t--all: set all NIs value to the one specified\n"},
        { 0, 0, 0, NULL }
 };
@@ -166,6 +183,7 @@ command_t routing_cmds[] = {
 
 command_t stats_cmds[] = {
        {"show", jt_show_stats, 0, "show LNET statistics\n"},
+       {"reset", jt_reset_stats, 0, "reset LNET statistics\n"},
        { 0, 0, 0, NULL }
 };
 
@@ -216,6 +234,18 @@ command_t set_cmds[] = {
        {"router_sensitivity", jt_set_rtr_sensitivity, 0, "router sensitivity %\n"
         "\t100 - router interfaces need to be fully healthy to be used\n"
         "\t<100 - router interfaces can be used even if not healthy\n"},
+       {"response_tracking", jt_set_response_tracking, 0,
+        "Set the behavior of response tracking\n"
+        "\t0 - Only LNet pings and discovery pushes utilize response tracking\n"
+        "\t1 - GETs are eligible for response tracking\n"
+        "\t2 - PUTs are eligible for response tracking\n"
+        "\t3 - Both PUTs and GETs are eligible for response tracking (default)\n"
+        "\tNote: Regardless of the value of the response_tracking parameter LNet\n"
+        "\t      pings and discovery pushes always utilize response tracking\n"},
+       {"recovery_limit", jt_set_recovery_limit, 0,
+        "Set how long LNet will attempt to recover unhealthy interfaces.\n"
+        "\t0 - Recover indefinitely (default)\n"
+        "\t>0 - Recover for the specified number of seconds.\n"},
        { 0, 0, 0, NULL }
 };
 
@@ -242,6 +272,21 @@ command_t peer_cmds[] = {
        { 0, 0, 0, NULL }
 };
 
+command_t udsp_cmds[] = {
+       {"add", jt_add_udsp, 0, "add a udsp\n"
+        "\t--src: ip2nets syntax specifying the local NID to match\n"
+        "\t--dst: ip2nets syntax specifying the remote NID to match\n"
+        "\t--rte: ip2nets syntax specifying the router NID to match\n"
+        "\t--priority: priority value (0 - highest priority)\n"
+        "\t--idx: index of where to insert the rule.\n"
+        "\t       By default, appends to the end of the rule list.\n"},
+       {"del", jt_del_udsp, 0, "delete a udsp\n"
+       "\t--idx: index of the Policy.\n"},
+       {"show", jt_show_udsp, 0, "show udsps\n"
+        "\t --idx: index of the policy to show.\n"},
+       { 0, 0, 0, NULL }
+};
+
 static int jt_calc_service_id(int argc, char **argv)
 {
        int rc;
@@ -255,7 +300,22 @@ static int jt_calc_service_id(int argc, char **argv)
         * cYAML currently doesn't support printing hex values.
         * Therefore just print it locally here
         */
-       printf("service id:\n    value: 0x%llx\n", service_id);
+       printf("service id:\n    value: 0x%jx\n", (uintmax_t)service_id);
+
+       return rc;
+}
+
+static int jt_setup_mrrouting(int argc, char **argv)
+{
+       int rc;
+       struct cYAML *err_rc = NULL;
+
+       rc = lustre_lnet_setup_mrrouting(&err_rc);
+
+       if (rc != LUSTRE_CFG_RC_NO_ERR)
+               cYAML_print_tree2file(stderr, err_rc);
+
+       cYAML_free_tree(err_rc);
 
        return rc;
 }
@@ -334,6 +394,64 @@ out:
        return rc;
 }
 
+static int jt_set_response_tracking(int argc, char **argv)
+{
+       long int value;
+       int rc;
+       struct cYAML *err_rc = NULL;
+
+       rc = check_cmd(set_cmds, "set", "response_tracking", 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 response_tracking value",
+                                 &err_rc);
+               cYAML_print_tree2file(stderr, err_rc);
+               cYAML_free_tree(err_rc);
+               return -1;
+       }
+
+       rc = lustre_lnet_config_response_tracking(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_recovery_limit(int argc, char **argv)
+{
+       long int value;
+       int rc;
+       struct cYAML *err_rc = NULL;
+
+       rc = check_cmd(set_cmds, "set", "recovery_limit", 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 recovery_limit value",
+                                 &err_rc);
+               cYAML_print_tree2file(stderr, err_rc);
+               cYAML_free_tree(err_rc);
+               return -1;
+       }
+
+       rc = lustre_lnet_config_recovery_limit(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_max_intf(int argc, char **argv)
 {
        long int value;
@@ -474,6 +592,24 @@ static int jt_set_hsensitivity(int argc, char **argv)
        return rc;
 }
 
+static int jt_reset_stats(int argc, char **argv)
+{
+       int rc;
+       struct cYAML *err_rc = NULL;
+
+       rc = check_cmd(stats_cmds, "stats", "reset", 0, argc, argv);
+       if (rc)
+               return rc;
+
+       rc = lustre_lnet_reset_stats(-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_transaction_to(int argc, char **argv)
 {
        long int value;
@@ -833,28 +969,33 @@ static int jt_add_route(int argc, char **argv)
 static int jt_add_ni(int argc, char **argv)
 {
        char *ip2net = NULL;
-       long int pto = -1, pc = -1, pbc = -1, cre = -1;
+       long int pto = -1, pc = -1, pbc = -1, cre = -1, cpp = -1;
        struct cYAML *err_rc = NULL;
        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;
        bool found = false;
+       bool skip_mr_route_setup = false;
 
        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:";
+       const char *const short_options = "b:c:i:k:m:n:p:r:s:t:";
        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 = "peer-credits", .has_arg = required_argument, .val = 'c' },
+       { .name = "if",           .has_arg = required_argument, .val = 'i' },
+       { .name = "skip-mr-route-setup",
+                                 .has_arg = no_argument, .val = 'k' },
+       { .name = "conns-per-peer",
+                                 .has_arg = required_argument, .val = 'm' },
+       { .name = "net",          .has_arg = required_argument, .val = 'n' },
+       { .name = "ip2net",       .has_arg = required_argument, .val = 'p' },
        { .name = "credits",      .has_arg = required_argument, .val = 'r' },
        { .name = "cpt",          .has_arg = required_argument, .val = 's' },
+       { .name = "peer-timeout", .has_arg = required_argument, .val = 't' },
        { .name = NULL } };
 
        rc = check_cmd(net_cmds, "net", "add", 0, argc, argv);
@@ -864,26 +1005,11 @@ static int jt_add_ni(int argc, char **argv)
        while ((opt = getopt_long(argc, argv, short_options,
                                   long_options, NULL)) != -1) {
                switch (opt) {
-               case 'n':
-                       nw_descr.nw_id = libcfs_str2net(optarg);
-                       break;
-               case 'i':
-                       rc = lustre_lnet_parse_interfaces(optarg, &nw_descr);
-                       if (rc != 0) {
-                               cYAML_build_error(-1, -1, "ni", "add",
-                                               "bad interface list",
-                                               &err_rc);
-                               goto failed;
-                       }
-                       break;
-               case 'p':
-                       ip2net = optarg;
-                       break;
-               case 't':
-                       rc = parse_long(optarg, &pto);
+               case 'b':
+                       rc = parse_long(optarg, &pbc);
                        if (rc != 0) {
                                /* ignore option */
-                               pto = -1;
+                               pbc = -1;
                                continue;
                        }
                        break;
@@ -895,14 +1021,33 @@ static int jt_add_ni(int argc, char **argv)
                                continue;
                        }
                        break;
-               case 'b':
-                       rc = parse_long(optarg, &pbc);
+               case 'i':
+                       rc = lustre_lnet_parse_interfaces(optarg, &nw_descr);
+                       if (rc != 0) {
+                               cYAML_build_error(-1, -1, "ni", "add",
+                                               "bad interface list",
+                                               &err_rc);
+                               goto failed;
+                       }
+                       break;
+               case 'k':
+                       skip_mr_route_setup = true;
+                       break;
+               case 'm':
+                       rc = parse_long(optarg, &cpp);
                        if (rc != 0) {
                                /* ignore option */
-                               pbc = -1;
+                               cpp = -1;
                                continue;
                        }
                        break;
+
+               case 'n':
+                       nw_descr.nw_id = libcfs_str2net(optarg);
+                       break;
+               case 'p':
+                       ip2net = optarg;
+                       break;
                case 'r':
                        rc = parse_long(optarg, &cre);
                        if (rc != 0) {
@@ -916,6 +1061,14 @@ static int jt_add_ni(int argc, char **argv)
                                                     strlen(optarg), 0,
                                                     UINT_MAX, &global_cpts);
                        break;
+               case 't':
+                       rc = parse_long(optarg, &pto);
+                       if (rc != 0) {
+                               /* ignore option */
+                               pto = -1;
+                               continue;
+                       }
+                       break;
                case '?':
                        print_help(net_cmds, "net", "add");
                default:
@@ -923,7 +1076,7 @@ static int jt_add_ni(int argc, char **argv)
                }
        }
 
-       if (pto > 0 || pc > 0 || pbc > 0 || cre > 0) {
+       if (pto > 0 || pc > 0 || pbc > 0 || cre > 0 || cpp > -1) {
                tunables.lt_cmn.lct_peer_timeout = pto;
                tunables.lt_cmn.lct_peer_tx_credits = pc;
                tunables.lt_cmn.lct_peer_rtr_credits = pbc;
@@ -934,7 +1087,7 @@ static int jt_add_ni(int argc, char **argv)
        rc = lustre_lnet_config_ni(&nw_descr,
                                   (cpt_rc == 0) ? global_cpts: NULL,
                                   ip2net, (found) ? &tunables : NULL,
-                                  -1, &err_rc);
+                                  cpp, -1, &err_rc);
 
        if (global_cpts != NULL)
                cfs_expr_list_free(global_cpts);
@@ -945,6 +1098,16 @@ failed:
 
        cYAML_free_tree(err_rc);
 
+       if (rc == LUSTRE_CFG_RC_NO_ERR && !skip_mr_route_setup) {
+               err_rc = NULL;
+               rc = lustre_lnet_setup_mrrouting(&err_rc);
+
+               if (rc != LUSTRE_CFG_RC_NO_ERR)
+                       cYAML_print_tree2file(stderr, err_rc);
+
+               cYAML_free_tree(err_rc);
+       }
+
        return rc;
 }
 
@@ -1160,7 +1323,66 @@ static int set_value_helper(int argc, char **argv,
 
 static int jt_set_ni_value(int argc, char **argv)
 {
-       return set_value_helper(argc, argv, lustre_lnet_config_ni_healthv);
+       char *nid = NULL;
+       long int healthv = -1, cpp = -1;
+       bool all = false;
+       int rc, opt;
+       struct cYAML *err_rc = NULL;
+
+       const char *const short_options = "a:m:n:t:";
+       static const struct option long_options[] = {
+       { .name = "all",            .has_arg = no_argument,       .val = 'a' },
+       { .name = "conns-per-peer", .has_arg = required_argument, .val = 'm' },
+       { .name = "nid",            .has_arg = required_argument, .val = 'n' },
+       { .name = "health",         .has_arg = required_argument, .val = 't' },
+       { .name = NULL } };
+
+       rc = check_cmd(net_cmds, "net", "set", 0, argc, argv);
+       if (rc)
+               return rc;
+
+       while ((opt = getopt_long(argc, argv, short_options,
+                                  long_options, NULL)) != -1) {
+               switch (opt) {
+               case 'a':
+                       all = true;
+                       break;
+               case 'm':
+                       rc = parse_long(optarg, &cpp);
+                       if (rc != 0) {
+                               /* ignore option */
+                               cpp = -1;
+                               continue;
+                       }
+                       break;
+               case 'n':
+                       nid = optarg;
+                       break;
+               case 't':
+                       if (parse_long(optarg, &healthv) != 0) {
+                               /* ignore option */
+                               healthv = -1;
+                               continue;
+                       }
+                       break;
+               default:
+                       return 0;
+               }
+       }
+
+       if (cpp > -1)
+               rc = lustre_lnet_config_ni_conns_per_peer(cpp, all, nid,
+                                                         -1, &err_rc);
+       if (healthv > -1)
+               rc = lustre_lnet_config_ni_healthv(healthv, all, nid,
+                                                  -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_peer_ni_value(int argc, char **argv)
@@ -1305,6 +1527,48 @@ static int jt_show_stats(int argc, char **argv)
        return rc;
 }
 
+static int jt_show_udsp(int argc, char **argv)
+{
+       int idx = -1;
+       int rc, opt;
+       struct cYAML *err_rc = NULL, *show_rc = NULL;
+
+       const char *const short_options = "i:";
+       static const struct option long_options[] = {
+               { .name = "idx", .has_arg = required_argument, .val = 'i' },
+               { .name = NULL }
+       };
+
+       rc = check_cmd(udsp_cmds, "udsp", "show", 0, argc, argv);
+       if (rc)
+               return rc;
+
+       while ((opt = getopt_long(argc, argv, short_options,
+                                  long_options, NULL)) != -1) {
+               switch (opt) {
+               case 'i':
+                       idx = atoi(optarg);
+                       break;
+               case '?':
+                       print_help(net_cmds, "net", "show");
+               default:
+                       return 0;
+               }
+       }
+
+       rc = lustre_lnet_show_udsp(idx, -1, &show_rc, &err_rc);
+
+       if (rc != LUSTRE_CFG_RC_NO_ERR)
+               cYAML_print_tree2file(stderr, err_rc);
+       else if (show_rc)
+               cYAML_print_tree(show_rc);
+
+       cYAML_free_tree(err_rc);
+       cYAML_free_tree(show_rc);
+
+       return rc;
+}
+
 static int jt_show_global(int argc, char **argv)
 {
        int rc;
@@ -1374,6 +1638,18 @@ static int jt_show_global(int argc, char **argv)
                goto out;
        }
 
+       rc = lustre_lnet_show_response_tracking(-1, &show_rc, &err_rc);
+       if (rc != LUSTRE_CFG_RC_NO_ERR) {
+               cYAML_print_tree2file(stderr, err_rc);
+               goto out;
+       }
+
+       rc = lustre_lnet_show_recovery_limit(-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);
 
@@ -1483,6 +1759,17 @@ static int jt_set(int argc, char **argv)
        return Parser_execarg(argc - 1, &argv[1], set_cmds);
 }
 
+static int jt_udsp(int argc, char **argv)
+{
+       int rc;
+
+       rc = check_cmd(udsp_cmds, "udsp", NULL, 2, argc, argv);
+       if (rc)
+               return rc;
+
+       return Parser_execarg(argc - 1, &argv[1], udsp_cmds);
+}
+
 static int jt_import(int argc, char **argv)
 {
        char *file = NULL;
@@ -1667,6 +1954,63 @@ static int jt_export(int argc, char **argv)
                err_rc = NULL;
        }
 
+       rc = lustre_lnet_show_retry_count(-1, &show_rc, &err_rc);
+       if (rc != LUSTRE_CFG_RC_NO_ERR) {
+               cYAML_print_tree2file(stderr, err_rc);
+               err_rc = NULL;
+       }
+
+       rc = lustre_lnet_show_transaction_to(-1, &show_rc, &err_rc);
+       if (rc != LUSTRE_CFG_RC_NO_ERR) {
+               cYAML_print_tree2file(stderr, err_rc);
+               err_rc = NULL;
+       }
+
+       rc = lustre_lnet_show_hsensitivity(-1, &show_rc, &err_rc);
+       if (rc != LUSTRE_CFG_RC_NO_ERR) {
+               cYAML_print_tree2file(stderr, err_rc);
+               err_rc = NULL;
+       }
+
+       rc = lustre_lnet_show_recov_intrv(-1, &show_rc, &err_rc);
+       if (rc != LUSTRE_CFG_RC_NO_ERR) {
+               cYAML_print_tree2file(stderr, err_rc);
+               err_rc = NULL;
+       }
+
+       rc = lustre_lnet_show_rtr_sensitivity(-1, &show_rc, &err_rc);
+       if (rc != LUSTRE_CFG_RC_NO_ERR) {
+               cYAML_print_tree2file(stderr, err_rc);
+               err_rc = NULL;
+       }
+
+       rc = lustre_lnet_show_lnd_timeout(-1, &show_rc, &err_rc);
+       if (rc != LUSTRE_CFG_RC_NO_ERR) {
+               cYAML_print_tree2file(stderr, err_rc);
+               err_rc = NULL;
+       }
+
+       rc = lustre_lnet_show_response_tracking(-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_recovery_limit(-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_udsp(-1, -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) {
                cYAML_print_tree2file(f, show_rc);
                cYAML_free_tree(show_rc);
@@ -1834,21 +2178,27 @@ static int jt_ping(int argc, char **argv)
        struct cYAML *show_rc = NULL;
        int timeout = 1000;
        int rc = 0, opt;
+       char *src_nidstr = NULL;
 
-       const char *const short_options = "ht:";
+       const char *const short_options = "hs:t:";
        const struct option long_options[] = {
        { .name = "help",       .has_arg = no_argument,         .val = 'h' },
        { .name = "timeout",    .has_arg = required_argument,   .val = 't' },
+       { .name = "source",     .has_arg = required_argument,   .val = 's' },
        { .name = NULL } };
 
        while ((opt = getopt_long(argc, argv, short_options,
                                  long_options, NULL)) != -1) {
                switch (opt) {
+               case 's':
+                       src_nidstr = optarg;
+                       break;
                case 't':
                        timeout = 1000 * atol(optarg);
                        break;
                case 'h':
                        printf("ping nid[,nid,...]\n"
+                              "\t --source: source nid\n"
                               "\t --timeout: ping timeout\n"
                               "\t --help: display this help\n");
                        return 0;
@@ -1858,7 +2208,8 @@ static int jt_ping(int argc, char **argv)
        }
 
        for (; optind < argc; optind++)
-               rc = lustre_lnet_ping_nid(argv[optind], timeout, -1, &show_rc, &err_rc);
+               rc = lustre_lnet_ping_nid(argv[optind], src_nidstr, timeout, -1,
+                                         &show_rc, &err_rc);
 
        if (show_rc)
                cYAML_print_tree(show_rc);
@@ -1917,6 +2268,109 @@ static int jt_discover(int argc, char **argv)
        return rc;
 }
 
+static int jt_add_udsp(int argc, char **argv)
+{
+       char *src = NULL, *dst = NULL, *rte = NULL;
+       struct cYAML *err_rc = NULL;
+       union lnet_udsp_action udsp_action;
+       long int idx = -1, priority = -1;
+       int opt, rc = 0;
+       char *action_type = "pref";
+
+       const char *const short_options = "s:d:r:p:i:";
+       static const struct option long_options[] = {
+       { .name = "src",         .has_arg = required_argument, .val = 's' },
+       { .name = "dst",         .has_arg = required_argument, .val = 'd' },
+       { .name = "rte",         .has_arg = required_argument, .val = 'r' },
+       { .name = "priority",    .has_arg = required_argument, .val = 'p' },
+       { .name = "idx",         .has_arg = required_argument, .val = 'i' },
+       { .name = NULL } };
+
+       rc = check_cmd(udsp_cmds, "udsp", "add", 0, argc, argv);
+       if (rc)
+               return rc;
+
+       while ((opt = getopt_long(argc, argv, short_options,
+                                 long_options, NULL)) != -1) {
+               switch (opt) {
+               case 's':
+                       src = optarg;
+                       break;
+               case 'd':
+                       dst = optarg;
+                       break;
+               case 'r':
+                       rte = optarg;
+                       break;
+               case 'p':
+                       rc = parse_long(optarg, &priority);
+                       if (rc != 0)
+                               priority = -1;
+                       action_type = "priority";
+                       udsp_action.udsp_priority = priority;
+                       break;
+               case 'i':
+                       rc = parse_long(optarg, &idx);
+                       if (rc != 0)
+                               idx = 0;
+                       break;
+               case '?':
+                       print_help(udsp_cmds, "udsp", "add");
+               default:
+                       return 0;
+               }
+       }
+
+       rc = lustre_lnet_add_udsp(src, dst, rte, action_type, &udsp_action,
+                                 idx, -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_del_udsp(int argc, char **argv)
+{
+       struct cYAML *err_rc = NULL;
+       long int idx = 0;
+       int opt, rc = 0;
+
+       const char *const short_options = "i:";
+       static const struct option long_options[] = {
+       { .name = "idx",        .has_arg = required_argument, .val = 'i' },
+       { .name = NULL } };
+
+       rc = check_cmd(udsp_cmds, "udsp", "del", 0, argc, argv);
+       if (rc)
+               return rc;
+
+       while ((opt = getopt_long(argc, argv, short_options,
+                                 long_options, NULL)) != -1) {
+               switch (opt) {
+               case 'i':
+                       rc = parse_long(optarg, &idx);
+                       if (rc != 0)
+                               idx = 0;
+                       break;
+               case '?':
+                       print_help(udsp_cmds, "udsp", "add");
+               default:
+                       return 0;
+               }
+       }
+
+       rc = lustre_lnet_del_udsp(idx, -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 lnetctl_list_commands(int argc, char **argv)
 {
        char buffer[81] = ""; /* 80 printable chars + terminating NUL */