X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Futils%2Flst.c;h=a0e722951a95795dd20ac7b40d9a457e4ebf0356;hp=b5221a3cf48562fda2a32a9ad57c6c3f11179f69;hb=efcef00cb3043b5f8661174fd80626b3dc0edc50;hpb=3425eac6525f6f3182c0c2ba61c7a7bcedd4e95a diff --git a/lnet/utils/lst.c b/lnet/utils/lst.c index b5221a3..a0e7229 100644 --- a/lnet/utils/lst.c +++ b/lnet/utils/lst.c @@ -1,32 +1,79 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * Author: Liang Zhen +/* + * GPL HEADER START + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. * - * This file is part of Lustre, http://www.lustre.org + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2012, 2014, Intel Corporation. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lnet/selftest/conctl.c + * + * Author: Liang Zhen */ - -#include -#include -#include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include #include #include -#include "parser.h" +#include +#include -static command_t lst_cmdlist[]; +lst_sid_t LST_INVALID_SID = {LNET_NID_ANY, -1}; static lst_sid_t session_id; -static int session_key; -static lstcon_trans_stat_t trans_stat; +static int session_key; + +/* All nodes running 2.6.50 or later understand feature LST_FEAT_BULK_LEN */ +static unsigned session_features = LST_FEATS_MASK; +static lstcon_trans_stat_t trans_stat; typedef struct list_string { - struct list_string *lstr_next; - int lstr_sz; - char lstr_str[0]; + struct list_string *lstr_next; + int lstr_sz; + char lstr_str[0]; } lstr_t; -#define offsetof(typ,memb) ((unsigned long)((char *)&(((typ *)0)->memb))) +#ifndef offsetof +# define offsetof(typ,memb) ((unsigned long)((char *)&(((typ *)0)->memb))) +#endif static int alloc_count = 0; static int alloc_nob = 0; @@ -68,6 +115,7 @@ free_lstrs(lstr_t **list) } } +void new_lstrs(lstr_t **list, char *prefix, char *postfix, int lo, int hi, int stride) { @@ -75,7 +123,7 @@ new_lstrs(lstr_t **list, char *prefix, char *postfix, int n2 = strlen(postfix); int sz = n1 + 20 + n2 + 1; - do { + do { lstr_t *n = alloc_lstr(sz); snprintf(n->lstr_str, sz - 1, "%s%u%s", @@ -99,9 +147,9 @@ expand_lstr(lstr_t **list, lstr_t *l) int x; int y; int z; - int n; + int n; - b1 = strchr(l->lstr_str, '['); + b1 = strchr(l->lstr_str, '['); if (b1 == NULL) { l->lstr_next = *list; *list = l; @@ -160,7 +208,7 @@ expand_strs(char *str, lstr_t **head) lstr_t *list = NULL; lstr_t *nlist; lstr_t *l; - int rc; + int rc = 0; int expanded; l = alloc_lstr(strlen(str) + 1); @@ -246,7 +294,7 @@ out: rc = -1; } - (*idspp)[i].pid = LUSTRE_LNET_PID; + (*idspp)[i].pid = LNET_PID_LUSTRE; i++; } @@ -360,27 +408,27 @@ lst_print_error(char *sub, const char *def_format, ...) void lst_free_rpcent(struct list_head *head) { - lstcon_rpc_ent_t *ent; + lstcon_rpc_ent_t *ent; - while (!list_empty(head)) { - ent = list_entry(head->next, lstcon_rpc_ent_t, rpe_link); + while (!list_empty(head)) { + ent = list_entry(head->next, lstcon_rpc_ent_t, rpe_link); - list_del(&ent->rpe_link); - free(ent); - } + list_del(&ent->rpe_link); + free(ent); + } } -int +void lst_reset_rpcent(struct list_head *head) { - lstcon_rpc_ent_t *ent; + lstcon_rpc_ent_t *ent; - list_for_each_entry(ent, head, rpe_link) { - ent->rpe_sid = LST_INVALID_SID; - ent->rpe_peer.nid = LNET_NID_ANY; - ent->rpe_peer.pid = LNET_PID_ANY; - ent->rpe_rpc_errno = ent->rpe_fwk_errno = 0; - } + list_for_each_entry(ent, head, rpe_link) { + ent->rpe_sid = LST_INVALID_SID; + ent->rpe_peer.nid = LNET_NID_ANY; + ent->rpe_peer.pid = LNET_PID_ANY; + ent->rpe_rpc_errno = ent->rpe_fwk_errno = 0; + } } int @@ -398,23 +446,23 @@ lst_alloc_rpcent(struct list_head *head, int count, int offset) memset(ent, 0, offsetof(lstcon_rpc_ent_t, rpe_payload[offset])); - ent->rpe_sid = LST_INVALID_SID; - ent->rpe_peer.nid = LNET_NID_ANY; - ent->rpe_peer.pid = LNET_PID_ANY; - list_add(&ent->rpe_link, head); - } + ent->rpe_sid = LST_INVALID_SID; + ent->rpe_peer.nid = LNET_NID_ANY; + ent->rpe_peer.pid = LNET_PID_ANY; + list_add(&ent->rpe_link, head); + } - return 0; + return 0; } void lst_print_transerr(struct list_head *head, char *optstr) { - lstcon_rpc_ent_t *ent; + lstcon_rpc_ent_t *ent; - list_for_each_entry(ent, head, rpe_link) { - if (ent->rpe_rpc_errno == 0 && ent->rpe_fwk_errno == 0) - continue; + list_for_each_entry(ent, head, rpe_link) { + if (ent->rpe_rpc_errno == 0 && ent->rpe_fwk_errno == 0) + continue; if (ent->rpe_rpc_errno != 0) { fprintf(stderr, "%s RPC failed on %s: %s\n", @@ -423,12 +471,22 @@ lst_print_transerr(struct list_head *head, char *optstr) continue; } - fprintf(stderr, "%s failed on %s: %s\n", + fprintf(stderr, "operation %s failed on %s: %s\n", optstr, libcfs_id2str(ent->rpe_peer), strerror(ent->rpe_fwk_errno)); } } +int lst_info_batch_ioctl(char *batch, int test, int server, + lstcon_test_batch_ent_t *entp, int *idxp, + int *ndentp, lstcon_node_ent_t *dentsp); + +int lst_info_group_ioctl(char *name, lstcon_ndlist_ent_t *gent, + int *idx, int *count, lstcon_node_ent_t *dents); + +int lst_query_batch_ioctl(char *batch, int test, int server, + int timeout, struct list_head *head); + int lst_ioctl(unsigned int opc, void *buf, int len) { @@ -462,16 +520,17 @@ lst_ioctl(unsigned int opc, void *buf, int len) } int -lst_new_session_ioctl (char *name, int timeout, int force, lst_sid_t *sid) -{ - lstio_session_new_args_t args = { - .lstio_ses_key = session_key, - .lstio_ses_timeout = timeout, - .lstio_ses_force = force, - .lstio_ses_idp = sid, - .lstio_ses_namep = name, - .lstio_ses_nmlen = strlen(name), - }; +lst_new_session_ioctl(char *name, int timeout, int force, lst_sid_t *sid) +{ + lstio_session_new_args_t args = {0}; + + args.lstio_ses_key = session_key; + args.lstio_ses_timeout = timeout; + args.lstio_ses_force = force; + args.lstio_ses_idp = sid; + args.lstio_ses_feats = session_features; + args.lstio_ses_nmlen = strlen(name); + args.lstio_ses_namep = name; return lst_ioctl (LSTIO_SESSION_NEW, &args, sizeof(args)); } @@ -507,7 +566,7 @@ jt_lst_new_session(int argc, char **argv) if (c == -1) break; - + switch (c) { case 'f': force = 1; @@ -548,41 +607,40 @@ jt_lst_new_session(int argc, char **argv) if (rc != 0) snprintf(host, sizeof(host), "unknown_host"); - snprintf(buf, LST_NAME_SIZE, "%s@%s", user, host); + snprintf(buf, sizeof(buf), "%s@%s", user, host); name = buf; - } else { + } else { lst_print_usage(argv[0]); return -1; } rc = lst_new_session_ioctl(name, timeout, force, &session_id); - if (rc != 0) { lst_print_error("session", "Failed to create session: %s\n", strerror(errno)); return rc; } - fprintf(stdout, "SESSION: %s TIMEOUT: %d FORCE: %s\n", - name, timeout, force ? "Yes": "No"); - - return rc; + fprintf(stdout, "SESSION: %s FEATURES: %x TIMEOUT: %d FORCE: %s\n", + name, session_features, timeout, force ? "Yes" : "No"); + return 0; } int -lst_session_info_ioctl(char *name, int len, int *key, - lst_sid_t *sid, lstcon_ndlist_ent_t *ndinfo) -{ - lstio_session_info_args_t args = { - .lstio_ses_keyp = key, - .lstio_ses_idp = sid, - .lstio_ses_ndinfo = ndinfo, - .lstio_ses_nmlen = len, - .lstio_ses_namep = name, - }; +lst_session_info_ioctl(char *name, int len, int *key, unsigned *featp, + lst_sid_t *sid, lstcon_ndlist_ent_t *ndinfo) +{ + lstio_session_info_args_t args = {0}; + + args.lstio_ses_idp = sid; + args.lstio_ses_keyp = key; + args.lstio_ses_featp = featp; + args.lstio_ses_ndinfo = ndinfo; + args.lstio_ses_nmlen = len; + args.lstio_ses_namep = name; - return lst_ioctl(LSTIO_SESSION_INFO, &args, sizeof(args)); + return lst_ioctl(LSTIO_SESSION_INFO, &args, sizeof(args)); } int @@ -591,10 +649,12 @@ jt_lst_show_session(int argc, char **argv) lstcon_ndlist_ent_t ndinfo; lst_sid_t sid; char name[LST_NAME_SIZE]; - int key; - int rc; + unsigned feats; + int key; + int rc; - rc = lst_session_info_ioctl(name, LST_NAME_SIZE, &key, &sid, &ndinfo); + rc = lst_session_info_ioctl(name, sizeof(name), &key, + &feats, &sid, &ndinfo); if (rc != 0) { lst_print_error("session", "Failed to show session: %s\n", @@ -602,9 +662,9 @@ jt_lst_show_session(int argc, char **argv) return -1; } - fprintf(stdout, "%s ID: %Lu@%s, KEY: %d NODES: %d\n", - name, sid.ses_stamp, libcfs_nid2str(sid.ses_nid), - key, ndinfo.nle_nnode); + fprintf(stdout, "%s ID: %ju@%s, KEY: %d FEATURES: %x NODES: %d\n", + name, (uintmax_t)sid.ses_stamp, libcfs_nid2str(sid.ses_nid), + key, feats, ndinfo.nle_nnode); return 0; } @@ -612,10 +672,9 @@ jt_lst_show_session(int argc, char **argv) int lst_end_session_ioctl(void) { - lstio_session_end_args_t args = { - .lstio_ses_key = session_key, - }; + lstio_session_end_args_t args = {0}; + args.lstio_ses_key = session_key; return lst_ioctl (LSTIO_SESSION_END, &args, sizeof(args)); } @@ -661,20 +720,20 @@ jt_lst_end_session(int argc, char **argv) } int -lst_ping_ioctl(char *str, int type, int timeout, - int count, lnet_process_id_t *ids, struct list_head *head) -{ - lstio_debug_args_t args = { - .lstio_dbg_key = session_key, - .lstio_dbg_type = type, - .lstio_dbg_flags = 0, - .lstio_dbg_timeout = timeout, - .lstio_dbg_nmlen = (str == NULL) ? 0: strlen(str), - .lstio_dbg_namep = str, - .lstio_dbg_count = count, - .lstio_dbg_idsp = ids, - .lstio_dbg_resultp = head, - }; +lst_ping_ioctl(char *str, int type, int timeout, + int count, lnet_process_id_t *ids, struct list_head *head) +{ + lstio_debug_args_t args = {0}; + + args.lstio_dbg_key = session_key; + args.lstio_dbg_type = type; + args.lstio_dbg_flags = 0; + args.lstio_dbg_timeout = timeout; + args.lstio_dbg_nmlen = (str == NULL) ? 0: strlen(str); + args.lstio_dbg_namep = str; + args.lstio_dbg_count = count; + args.lstio_dbg_idsp = ids; + args.lstio_dbg_resultp = head; return lst_ioctl (LSTIO_DEBUG, &args, sizeof(args)); } @@ -686,21 +745,22 @@ lst_get_node_count(int type, char *str, int *countp, lnet_process_id_t **idspp) lstcon_test_batch_ent_t ent; lstcon_ndlist_ent_t *entp = &ent.tbe_cli_nle; lst_sid_t sid; - int key; - int rc; + unsigned feats; + int key; + int rc; - switch (type) { - case LST_OPC_SESSION: - rc = lst_session_info_ioctl(buf, LST_NAME_SIZE, - &key, &sid, entp); - break; + switch (type) { + case LST_OPC_SESSION: + rc = lst_session_info_ioctl(buf, LST_NAME_SIZE, + &key, &feats, &sid, entp); + break; case LST_OPC_BATCHSRV: entp = &ent.tbe_srv_nle; case LST_OPC_BATCHCLI: rc = lst_info_batch_ioctl(str, 0, 0, &ent, NULL, NULL, NULL); break; - + case LST_OPC_GROUP: rc = lst_info_group_ioctl(str, entp, NULL, NULL, NULL); break; @@ -714,7 +774,7 @@ lst_get_node_count(int type, char *str, int *countp, lnet_process_id_t **idspp) break; } - if (rc == 0) + if (rc == 0) *countp = entp->nle_nnode; return rc; @@ -723,9 +783,9 @@ lst_get_node_count(int type, char *str, int *countp, lnet_process_id_t **idspp) int jt_lst_ping(int argc, char **argv) { - struct list_head head; - lnet_process_id_t *ids = NULL; - lstcon_rpc_ent_t *ent = NULL; + struct list_head head; + lnet_process_id_t *ids = NULL; + lstcon_rpc_ent_t *ent = NULL; char *str = NULL; int optidx = 0; int server = 0; @@ -734,7 +794,6 @@ jt_lst_ping(int argc, char **argv) int type = 0; int rc = 0; int c; - int i; static struct option ping_opts[] = { @@ -760,7 +819,7 @@ jt_lst_ping(int argc, char **argv) if (c == -1) break; - + switch (c) { case 's': type = LST_OPC_SESSION; @@ -810,7 +869,7 @@ jt_lst_ping(int argc, char **argv) return -1; } - CFS_INIT_LIST_HEAD(&head); + INIT_LIST_HEAD(&head); rc = lst_alloc_rpcent(&head, count, LST_NAME_SIZE); if (rc != 0) { @@ -833,17 +892,17 @@ jt_lst_ping(int argc, char **argv) goto out; } - /* ignore RPC errors and framwork errors */ - list_for_each_entry(ent, &head, rpe_link) { - fprintf(stdout, "\t%s: %s [session: %s id: %s]\n", - libcfs_id2str(ent->rpe_peer), - lst_node_state2str(ent->rpe_state), - (ent->rpe_state == LST_NODE_ACTIVE || - ent->rpe_state == LST_NODE_BUSY)? - (ent->rpe_rpc_errno == 0 ? - &ent->rpe_payload[0] : "Unknown") : - "", libcfs_nid2str(ent->rpe_sid.ses_nid)); - } + /* ignore RPC errors and framwork errors */ + list_for_each_entry(ent, &head, rpe_link) { + fprintf(stdout, "\t%s: %s [session: %s id: %s]\n", + libcfs_id2str(ent->rpe_peer), + lst_node_state2str(ent->rpe_state), + (ent->rpe_state == LST_NODE_ACTIVE || + ent->rpe_state == LST_NODE_BUSY) ? + (ent->rpe_rpc_errno == 0 ? + &ent->rpe_payload[0] : "Unknown") : + "", libcfs_nid2str(ent->rpe_sid.ses_nid)); + } out: lst_free_rpcent(&head); @@ -852,126 +911,216 @@ out: free(ids); return rc; - + } int lst_add_nodes_ioctl (char *name, int count, lnet_process_id_t *ids, - struct list_head *resultp) -{ - lstio_group_nodes_args_t args = { - .lstio_grp_key = session_key, - .lstio_grp_nmlen = strlen(name), - .lstio_grp_namep = name, - .lstio_grp_count = count, - .lstio_grp_idsp = ids, - .lstio_grp_resultp = resultp, - }; + unsigned *featp, struct list_head *resultp) +{ + lstio_group_nodes_args_t args = {0}; + + args.lstio_grp_key = session_key; + args.lstio_grp_nmlen = strlen(name); + args.lstio_grp_namep = name; + args.lstio_grp_count = count; + args.lstio_grp_featp = featp; + args.lstio_grp_idsp = ids; + args.lstio_grp_resultp = resultp; return lst_ioctl(LSTIO_NODES_ADD, &args, sizeof(args)); } int -lst_add_group_ioctl (char *name) +lst_del_group_ioctl(char *name) { - lstio_group_add_args_t args = { - .lstio_grp_key = session_key, - .lstio_grp_nmlen = strlen(name), - .lstio_grp_namep = name, - }; + lstio_group_del_args_t args = {0}; - return lst_ioctl(LSTIO_GROUP_ADD, &args, sizeof(args)); + args.lstio_grp_key = session_key; + args.lstio_grp_nmlen = strlen(name); + args.lstio_grp_namep = name; + + return lst_ioctl(LSTIO_GROUP_DEL, &args, sizeof(args)); } int -jt_lst_add_group(int argc, char **argv) +lst_del_group(char *grp_name) { - struct list_head head; - lnet_process_id_t *ids; - char *name; - int count; - int rc; - int i; - - if (session_key == 0) { - fprintf(stderr, - "Can't find env LST_SESSION or value is not valid\n"); - return -1; - } - - if (argc < 3) { - lst_print_usage(argv[0]); - return -1; - } - - name = argv[1]; - if (strlen(name) >= LST_NAME_SIZE) { - fprintf(stderr, "Name length is limited to %d\n", - LST_NAME_SIZE - 1); - return -1; - } + int rc; - rc = lst_add_group_ioctl(name); - if (rc != 0) { - lst_print_error("group", "Failed to add group %s: %s\n", - name, strerror(errno)); - return -1; - } + rc = lst_del_group_ioctl(grp_name); + if (rc == 0) { + fprintf(stdout, "Group is deleted\n"); + return 0; + } - CFS_INIT_LIST_HEAD(&head); - - for (i = 2; i < argc; i++) { - /* parse address list */ - rc = lst_parse_nids(argv[i], &count, &ids); - if (rc < 0) { - fprintf(stderr, "Ignore invalid id list %s\n", - argv[i]); - continue; - } + if (rc == -1) { + lst_print_error("group", "Failed to delete group: %s\n", + strerror(errno)); + return rc; + } - if (count == 0) - continue; + fprintf(stderr, "Group is deleted with some errors\n"); - rc = lst_alloc_rpcent(&head, count, 0); - if (rc != 0) { - fprintf(stderr, "Out of memory\n"); - break; - } + if (trans_stat.trs_rpc_errno != 0) { + fprintf(stderr, + "[RPC] Failed to send %d end session RPCs: %s\n", + lstcon_rpc_stat_failure(&trans_stat, 0), + strerror(trans_stat.trs_rpc_errno)); + } - rc = lst_add_nodes_ioctl(name, count, ids, &head); + if (trans_stat.trs_fwk_errno != 0) { + fprintf(stderr, + "[FWK] Failed to end session on %d nodes: %s\n", + lstcon_sesop_stat_failure(&trans_stat, 0), + strerror(trans_stat.trs_fwk_errno)); + } - free(ids); - - if (rc == 0) { - lst_free_rpcent(&head); - fprintf(stderr, "%s are added to session\n", argv[i]); - continue; - } + return -1; +} - if (rc == -1) { - lst_free_rpcent(&head); - lst_print_error("group", "Failed to add nodes %s: %s\n", - argv[i], strerror(errno)); - break; - } +int +lst_add_group_ioctl (char *name) +{ + lstio_group_add_args_t args = {0}; - lst_print_transerr(&head, "create session"); - lst_free_rpcent(&head); - } + args.lstio_grp_key = session_key; + args.lstio_grp_nmlen = strlen(name); + args.lstio_grp_namep = name; - return rc; + return lst_ioctl(LSTIO_GROUP_ADD, &args, sizeof(args)); } int -lst_del_group_ioctl (char *name) +jt_lst_add_group(int argc, char **argv) { - lstio_group_del_args_t args = { - .lstio_grp_key = session_key, - .lstio_grp_nmlen = strlen(name), - .lstio_grp_namep = name, - }; - - return lst_ioctl(LSTIO_GROUP_DEL, &args, sizeof(args)); + struct list_head head; + lnet_process_id_t *ids; + char *name; + unsigned feats = session_features; + int count; + int rc; + int i; + bool nodes_added = false; + + if (session_key == 0) { + fprintf(stderr, + "Can't find env LST_SESSION or value is not valid\n"); + return -1; + } + + if (argc < 3) { + lst_print_usage(argv[0]); + return -1; + } + + name = argv[1]; + if (strlen(name) >= LST_NAME_SIZE) { + fprintf(stderr, "Name length is limited to %d\n", + LST_NAME_SIZE - 1); + return -1; + } + + rc = lst_add_group_ioctl(name); + if (rc != 0) { + lst_print_error("group", "Failed to add group %s: %s\n", + name, strerror(errno)); + return -1; + } + + INIT_LIST_HEAD(&head); + + for (i = 2; i < argc; i++) { + /* parse address list */ + rc = lst_parse_nids(argv[i], &count, &ids); + if (rc < 0) { + fprintf(stderr, "Ignore invalid id list %s\n", + argv[i]); + continue; + } + + if (count == 0) + continue; + + rc = lst_alloc_rpcent(&head, count, 0); + if (rc != 0) { + fprintf(stderr, "Out of memory\n"); + free(ids); + rc = -1; + goto failed; + } + + rc = lst_add_nodes_ioctl(name, count, ids, &feats, &head); + + free(ids); + + if (rc != 0) + goto failed; + + fprintf(stdout, "%s are added to session\n", argv[i]); + + nodes_added = true; + + if ((feats & session_features) != session_features) { + fprintf(stdout, + "Warning, this session will run with " + "compatible mode because some test nodes " + "might not understand these features: %x\n", + (~feats & session_features)); + } + + lst_free_rpcent(&head); + } + + if (!nodes_added) { + /* + * The selftest kernel module expects that a group should + * have at least one node, since it doesn't make sense for + * an empty group to be added to a test. + */ + fprintf(stderr, + "No nodes added successfully, deleting group %s\n", + name); + rc = lst_del_group(name); + if (rc != 0) { + fprintf(stderr, + "Failed to delete group %s." + " Group is empty.\n", name); + } + } + + return rc; + +failed: + if (rc == -1) { + lst_print_error("group", "Failed to add nodes %s: %s\n", + argv[i], strerror(errno)); + + } else { + if (trans_stat.trs_fwk_errno == EPROTO) { + fprintf(stderr, + "test nodes might have different LST " + "features, please disable some features by " + "setting LST_FEATURES\n"); + } + + lst_print_transerr(&head, "create session"); + } + + lst_free_rpcent(&head); + + if (!nodes_added) { + fprintf(stderr, + "No nodes added successfully, deleting group %s\n", + name); + if (lst_del_group(name) != 0) { + fprintf(stderr, + "Failed to delete group %s." + " Group is empty.\n", name); + } + } + + return rc; } int @@ -990,50 +1139,25 @@ jt_lst_del_group(int argc, char **argv) return -1; } - rc = lst_del_group_ioctl(argv[1]); - if (rc == 0) { - fprintf(stdout, "Group is deleted\n"); - return 0; - } - - if (rc == -1) { - lst_print_error("group", "Failed to delete group: %s\n", - strerror(errno)); - return rc; - } - - fprintf(stderr, "Group is deleted with some errors\n"); + rc = lst_del_group(argv[1]); - if (trans_stat.trs_rpc_errno != 0) { - fprintf(stderr, "[RPC] Failed to send %d end session RPCs: %s\n", - lstcon_rpc_stat_failure(&trans_stat, 0), - strerror(trans_stat.trs_rpc_errno)); - } - - if (trans_stat.trs_fwk_errno != 0) { - fprintf(stderr, - "[FWK] Failed to end session on %d nodes: %s\n", - lstcon_sesop_stat_failure(&trans_stat, 0), - strerror(trans_stat.trs_fwk_errno)); - } - - return -1; + return rc; } int lst_update_group_ioctl(int opc, char *name, int clean, int count, - lnet_process_id_t *ids, struct list_head *resultp) -{ - lstio_group_update_args_t args = { - .lstio_grp_key = session_key, - .lstio_grp_opc = opc, - .lstio_grp_args = clean, - .lstio_grp_nmlen = strlen(name), - .lstio_grp_namep = name, - .lstio_grp_count = count, - .lstio_grp_idsp = ids, - .lstio_grp_resultp = resultp, - }; + lnet_process_id_t *ids, struct list_head *resultp) +{ + lstio_group_update_args_t args = {0}; + + args.lstio_grp_key = session_key; + args.lstio_grp_opc = opc; + args.lstio_grp_args = clean; + args.lstio_grp_nmlen = strlen(name); + args.lstio_grp_namep = name; + args.lstio_grp_count = count; + args.lstio_grp_idsp = ids; + args.lstio_grp_resultp = resultp; return lst_ioctl(LSTIO_GROUP_UPDATE, &args, sizeof(args)); } @@ -1041,7 +1165,7 @@ lst_update_group_ioctl(int opc, char *name, int clean, int count, int jt_lst_update_group(int argc, char **argv) { - struct list_head head; + struct list_head head; lnet_process_id_t *ids = NULL; char *str = NULL; char *grp = NULL; @@ -1073,7 +1197,7 @@ jt_lst_update_group(int argc, char **argv) /* Detect the end of the options. */ if (c == -1) break; - + switch (c) { case 'f': if (opc != 0) { @@ -1115,7 +1239,7 @@ jt_lst_update_group(int argc, char **argv) grp = argv[optind]; - CFS_INIT_LIST_HEAD(&head); + INIT_LIST_HEAD(&head); if (opc == LST_GROUP_RMND || opc == LST_GROUP_REFRESH) { rc = lst_get_node_count(opc == LST_GROUP_RMND ? LST_OPC_NODES : @@ -1137,7 +1261,7 @@ jt_lst_update_group(int argc, char **argv) return -1; } - } + } rc = lst_update_group_ioctl(opc, grp, clean, count, ids, &head); @@ -1166,12 +1290,12 @@ jt_lst_update_group(int argc, char **argv) int lst_list_group_ioctl(int len, char *name, int idx) { - lstio_group_list_args_t args = { - .lstio_grp_key = session_key, - .lstio_grp_idx = idx, - .lstio_grp_nmlen = len, - .lstio_grp_namep = name, - }; + lstio_group_list_args_t args = {0}; + + args.lstio_grp_key = session_key; + args.lstio_grp_idx = idx; + args.lstio_grp_nmlen = len; + args.lstio_grp_namep = name; return lst_ioctl(LSTIO_GROUP_LIST, &args, sizeof(args)); } @@ -1180,15 +1304,15 @@ int lst_info_group_ioctl(char *name, lstcon_ndlist_ent_t *gent, int *idx, int *count, lstcon_node_ent_t *dents) { - lstio_group_info_args_t args = { - .lstio_grp_key = session_key, - .lstio_grp_nmlen = strlen(name), - .lstio_grp_namep = name, - .lstio_grp_entp = gent, - .lstio_grp_idxp = idx, - .lstio_grp_ndentp = count, - .lstio_grp_dentsp = dents, - }; + lstio_group_info_args_t args = {0}; + + args.lstio_grp_key = session_key; + args.lstio_grp_nmlen = strlen(name); + args.lstio_grp_namep = name; + args.lstio_grp_entp = gent; + args.lstio_grp_idxp = idx; + args.lstio_grp_ndentp = count; + args.lstio_grp_dentsp = dents; return lst_ioctl(LSTIO_GROUP_INFO, &args, sizeof(args)); } @@ -1208,7 +1332,7 @@ lst_list_group_all(void) continue; } - if (errno == ENOENT) + if (errno == ENOENT) break; lst_print_error("group", "Failed to list group: %s\n", @@ -1240,7 +1364,7 @@ jt_lst_list_group(int argc, char **argv) int i; int j; int c; - int rc; + int rc = 0; static struct option list_group_opts[] = { @@ -1264,7 +1388,7 @@ jt_lst_list_group(int argc, char **argv) if (c == -1) break; - + switch (c) { case 'a': verbose = active = 1; @@ -1372,27 +1496,27 @@ jt_lst_list_group(int argc, char **argv) int lst_stat_ioctl (char *name, int count, lnet_process_id_t *idsp, - int timeout, struct list_head *resultp) -{ - lstio_stat_args_t args = { - .lstio_sta_key = session_key, - .lstio_sta_timeout = timeout, - .lstio_sta_nmlen = strlen(name), - .lstio_sta_namep = name, - .lstio_sta_count = count, - .lstio_sta_idsp = idsp, - .lstio_sta_resultp = resultp, - }; + int timeout, struct list_head *resultp) +{ + lstio_stat_args_t args = {0}; - return lst_ioctl (LSTIO_STAT_QUERY, &args, sizeof(args)); + args.lstio_sta_key = session_key; + args.lstio_sta_timeout = timeout; + args.lstio_sta_nmlen = strlen(name); + args.lstio_sta_namep = name; + args.lstio_sta_count = count; + args.lstio_sta_idsp = idsp; + args.lstio_sta_resultp = resultp; + + return lst_ioctl(LSTIO_STAT_QUERY, &args, sizeof(args)); } typedef struct { - struct list_head srp_link; + struct list_head srp_link; int srp_count; char *srp_name; lnet_process_id_t *srp_ids; - struct list_head srp_result[2]; + struct list_head srp_result[2]; } lst_stat_req_param_t; static void @@ -1400,7 +1524,7 @@ lst_stat_req_param_free(lst_stat_req_param_t *srp) { int i; - for (i = 0; i < 2; i++) + for (i = 0; i < 2; i++) lst_free_rpcent(&srp->srp_result[i]); if (srp->srp_ids != NULL) @@ -1410,9 +1534,10 @@ lst_stat_req_param_free(lst_stat_req_param_t *srp) } static int -lst_stat_req_param_alloc(char *name, lst_stat_req_param_t **srpp) +lst_stat_req_param_alloc(char *name, lst_stat_req_param_t **srpp, int save_old) { lst_stat_req_param_t *srp = NULL; + int count = save_old ? 2 : 1; int rc; int i; @@ -1421,19 +1546,20 @@ lst_stat_req_param_alloc(char *name, lst_stat_req_param_t **srpp) return -ENOMEM; memset(srp, 0, sizeof(*srp)); - CFS_INIT_LIST_HEAD(&srp->srp_result[0]); - CFS_INIT_LIST_HEAD(&srp->srp_result[1]); + INIT_LIST_HEAD(&srp->srp_result[0]); + INIT_LIST_HEAD(&srp->srp_result[1]); rc = lst_get_node_count(LST_OPC_GROUP, name, &srp->srp_count, NULL); - if (rc != 0) { + if (rc != 0 && errno == ENOENT) { rc = lst_get_node_count(LST_OPC_NODES, name, &srp->srp_count, &srp->srp_ids); } if (rc != 0) { fprintf(stderr, - "Failed to get count of nodes from %s\n", name); + "Failed to get count of nodes from %s: %s\n", + name, strerror(errno)); lst_stat_req_param_free(srp); return rc; @@ -1441,7 +1567,7 @@ lst_stat_req_param_alloc(char *name, lst_stat_req_param_t **srpp) srp->srp_name = name; - for (i = 0; i < 2; i++) { + for (i = 0; i < count; i++) { rc = lst_alloc_rpcent(&srp->srp_result[i], srp->srp_count, sizeof(sfw_counters_t) + sizeof(srpc_counters_t) + @@ -1464,6 +1590,7 @@ lst_stat_req_param_alloc(char *name, lst_stat_req_param_t **srpp) typedef struct { /* TODO */ + int foo; } lst_srpc_stat_result; #define LST_LNET_AVG 0 @@ -1505,7 +1632,7 @@ lst_lnet_stat_value(int bw, int send, int off) &lnet_stat_result.lnet_avg_sndrate; if (!send) - p += 4; + p += 4; p += off; @@ -1514,145 +1641,148 @@ lst_lnet_stat_value(int bw, int send, int off) static void lst_timeval_diff(struct timeval *tv1, - struct timeval *tv2, struct timeval *df) + struct timeval *tv2, struct timeval *df) { - if (tv1->tv_usec >= tv2->tv_usec) { - df->tv_sec = tv1->tv_sec - tv2->tv_sec; - df->tv_usec = tv1->tv_usec - tv2->tv_usec; - return; - } + if (tv1->tv_usec >= tv2->tv_usec) { + df->tv_sec = tv1->tv_sec - tv2->tv_sec; + df->tv_usec = tv1->tv_usec - tv2->tv_usec; + return; + } - df->tv_sec = tv1->tv_sec - 1 - tv2->tv_sec; - df->tv_usec = tv1->tv_sec + 1000000 - tv2->tv_usec; + df->tv_sec = tv1->tv_sec - 1 - tv2->tv_sec; + df->tv_usec = tv1->tv_usec + 1000000 - tv2->tv_usec; - return; + return; } -void +static void lst_cal_lnet_stat(float delta, lnet_counters_t *lnet_new, - lnet_counters_t *lnet_old) + lnet_counters_t *lnet_old, int mbs) { - float perf; - float rate; + float perf; + float rate; + unsigned int unit_divisor; - perf = (float)(lnet_new->send_length - - lnet_old->send_length) / (1024 * 1024) / delta; - lnet_stat_result.lnet_total_sndperf += perf; + unit_divisor = (mbs) ? (1000 * 1000) : (1024 * 1024); + perf = (float)(lnet_new->send_length - + lnet_old->send_length) / unit_divisor / delta; + lnet_stat_result.lnet_total_sndperf += perf; - if (lnet_stat_result.lnet_min_sndperf > perf || - lnet_stat_result.lnet_min_sndperf == 0) - lnet_stat_result.lnet_min_sndperf = perf; + if (lnet_stat_result.lnet_min_sndperf > perf || + lnet_stat_result.lnet_min_sndperf == 0) + lnet_stat_result.lnet_min_sndperf = perf; - if (lnet_stat_result.lnet_max_sndperf < perf) - lnet_stat_result.lnet_max_sndperf = perf; + if (lnet_stat_result.lnet_max_sndperf < perf) + lnet_stat_result.lnet_max_sndperf = perf; - perf = (float)(lnet_new->recv_length - - lnet_old->recv_length) / (1024 * 1024) / delta; - lnet_stat_result.lnet_total_rcvperf += perf; + perf = (float)(lnet_new->recv_length - + lnet_old->recv_length) / unit_divisor / delta; + lnet_stat_result.lnet_total_rcvperf += perf; - if (lnet_stat_result.lnet_min_rcvperf > perf || - lnet_stat_result.lnet_min_rcvperf == 0) - lnet_stat_result.lnet_min_rcvperf = perf; + if (lnet_stat_result.lnet_min_rcvperf > perf || + lnet_stat_result.lnet_min_rcvperf == 0) + lnet_stat_result.lnet_min_rcvperf = perf; - if (lnet_stat_result.lnet_max_rcvperf < perf) - lnet_stat_result.lnet_max_rcvperf = perf; + if (lnet_stat_result.lnet_max_rcvperf < perf) + lnet_stat_result.lnet_max_rcvperf = perf; - rate = (lnet_new->send_count - lnet_old->send_count) / delta; - lnet_stat_result.lnet_total_sndrate += rate; + rate = (lnet_new->send_count - lnet_old->send_count) / delta; + lnet_stat_result.lnet_total_sndrate += rate; - if (lnet_stat_result.lnet_min_sndrate > rate || - lnet_stat_result.lnet_min_sndrate == 0) - lnet_stat_result.lnet_min_sndrate = rate; + if (lnet_stat_result.lnet_min_sndrate > rate || + lnet_stat_result.lnet_min_sndrate == 0) + lnet_stat_result.lnet_min_sndrate = rate; - if (lnet_stat_result.lnet_max_sndrate < rate) - lnet_stat_result.lnet_max_sndrate = rate; + if (lnet_stat_result.lnet_max_sndrate < rate) + lnet_stat_result.lnet_max_sndrate = rate; - rate = (lnet_new->recv_count - lnet_old->recv_count) / delta; - lnet_stat_result.lnet_total_rcvrate += rate; + rate = (lnet_new->recv_count - lnet_old->recv_count) / delta; + lnet_stat_result.lnet_total_rcvrate += rate; - if (lnet_stat_result.lnet_min_rcvrate > rate || - lnet_stat_result.lnet_min_rcvrate == 0) - lnet_stat_result.lnet_min_rcvrate = rate; + if (lnet_stat_result.lnet_min_rcvrate > rate || + lnet_stat_result.lnet_min_rcvrate == 0) + lnet_stat_result.lnet_min_rcvrate = rate; - if (lnet_stat_result.lnet_max_rcvrate < rate) - lnet_stat_result.lnet_max_rcvrate = rate; + if (lnet_stat_result.lnet_max_rcvrate < rate) + lnet_stat_result.lnet_max_rcvrate = rate; - lnet_stat_result.lnet_stat_count ++; + lnet_stat_result.lnet_stat_count++; - lnet_stat_result.lnet_avg_sndrate = lnet_stat_result.lnet_total_sndrate / - lnet_stat_result.lnet_stat_count; - lnet_stat_result.lnet_avg_rcvrate = lnet_stat_result.lnet_total_rcvrate / - lnet_stat_result.lnet_stat_count; - - lnet_stat_result.lnet_avg_sndperf = lnet_stat_result.lnet_total_sndperf / - lnet_stat_result.lnet_stat_count; - lnet_stat_result.lnet_avg_rcvperf = lnet_stat_result.lnet_total_rcvperf / - lnet_stat_result.lnet_stat_count; + lnet_stat_result.lnet_avg_sndrate = lnet_stat_result.lnet_total_sndrate / + lnet_stat_result.lnet_stat_count; + lnet_stat_result.lnet_avg_rcvrate = lnet_stat_result.lnet_total_rcvrate / + lnet_stat_result.lnet_stat_count; + lnet_stat_result.lnet_avg_sndperf = lnet_stat_result.lnet_total_sndperf / + lnet_stat_result.lnet_stat_count; + lnet_stat_result.lnet_avg_rcvperf = lnet_stat_result.lnet_total_rcvperf / + lnet_stat_result.lnet_stat_count; } -void -lst_print_lnet_stat(char *name, int bwrt, int rdwr, int type) -{ - int start1 = 0; - int end1 = 1; - int start2 = 0; - int end2 = 1; - int start3 = 0; - int end3 = 2; - int i; - int j; +static void +lst_print_lnet_stat(char *name, int bwrt, int rdwr, int type, int mbs) +{ + int start1 = 0; + int end1 = 1; + int start2 = 0; + int end2 = 1; + int i; + int j; + char *units; - if (lnet_stat_result.lnet_stat_count == 0) - return; + if (lnet_stat_result.lnet_stat_count == 0) + return; - if (bwrt == 1) /* bw only */ - start1 = 1; + units = (mbs) ? "MB/s " : "MiB/s "; - if (bwrt == 2) /* rates only */ - end1 = 0; + if (bwrt == 1) /* bw only */ + start1 = 1; - if (rdwr == 1) /* recv only */ - start2 = 1; + if (bwrt == 2) /* rates only */ + end1 = 0; - if (rdwr == 2) /* send only */ - end2 = 0; + if (rdwr == 1) /* recv only */ + start2 = 1; - for (i = start1; i <= end1; i++) { - fprintf(stdout, "[LNet %s of %s]\n", - i == 0 ? "Rates" : "Bandwidth", name); + if (rdwr == 2) /* send only */ + end2 = 0; - for (j = start2; j <= end2; j++) { - fprintf(stdout, "[%c] ", j == 0 ? 'W' : 'R'); + for (i = start1; i <= end1; i++) { + fprintf(stdout, "[LNet %s of %s]\n", + i == 0 ? "Rates" : "Bandwidth", name); - if ((type & 1) != 0) { - fprintf(stdout, i == 0 ? "Avg: %-8.0f RPC/s " : - "Avg: %-8.2f MB/s ", - lst_lnet_stat_value(i, j, 0)); - } + for (j = start2; j <= end2; j++) { + fprintf(stdout, "[%c] ", j == 0 ? 'R' : 'W'); - if ((type & 2) != 0) { - fprintf(stdout, i == 0 ? "Min: %-8.0f RPC/s " : - "Min: %-8.2f MB/s ", - lst_lnet_stat_value(i, j, 1)); - } + if ((type & 1) != 0) { + fprintf(stdout, i == 0 ? "Avg: %-8.0f RPC/s " : + "Avg: %-8.2f %s", + lst_lnet_stat_value(i, j, 0), units); + } - if ((type & 4) != 0) { - fprintf(stdout, i == 0 ? "Max: %-8.0f RPC/s" : - "Max: %-8.2f MB/s", - lst_lnet_stat_value(i, j, 2)); - } + if ((type & 2) != 0) { + fprintf(stdout, i == 0 ? "Min: %-8.0f RPC/s " : + "Min: %-8.2f %s", + lst_lnet_stat_value(i, j, 1), units); + } - fprintf(stdout, "\n"); - } - } + if ((type & 4) != 0) { + fprintf(stdout, i == 0 ? "Max: %-8.0f RPC/s" : + "Max: %-8.2f %s", + lst_lnet_stat_value(i, j, 2), units); + } + + fprintf(stdout, "\n"); + } + } } -void +static void lst_print_stat(char *name, struct list_head *resultp, - int idx, int lnet, int bwrt, int rdwr, int type) + int idx, int lnet, int bwrt, int rdwr, int type, + int mbs) { - struct list_head tmp[2]; + struct list_head tmp[2]; lstcon_rpc_ent_t *new; lstcon_rpc_ent_t *old; sfw_counters_t *sfwk_new; @@ -1661,23 +1791,24 @@ lst_print_stat(char *name, struct list_head *resultp, srpc_counters_t *srpc_old; lnet_counters_t *lnet_new; lnet_counters_t *lnet_old; - struct timeval tv; float delta; int errcount = 0; - CFS_INIT_LIST_HEAD(&tmp[0]); - CFS_INIT_LIST_HEAD(&tmp[1]); + INIT_LIST_HEAD(&tmp[0]); + INIT_LIST_HEAD(&tmp[1]); memset(&lnet_stat_result, 0, sizeof(lnet_stat_result)); - while (!list_empty(&resultp[idx])) { - if (list_empty(&resultp[1 - idx])) { + while (!list_empty(&resultp[idx])) { + if (list_empty(&resultp[1 - idx])) { fprintf(stderr, "Group is changed, re-run stat\n"); break; } - new = list_entry(resultp[idx].next, lstcon_rpc_ent_t, rpe_link); - old = list_entry(resultp[1 - idx].next, lstcon_rpc_ent_t, rpe_link); + new = list_entry(resultp[idx].next, lstcon_rpc_ent_t, + rpe_link); + old = list_entry(resultp[1 - idx].next, lstcon_rpc_ent_t, + rpe_link); /* first time get stats result, can't calculate diff */ if (new->rpe_peer.nid == LNET_NID_ANY) @@ -1689,11 +1820,11 @@ lst_print_stat(char *name, struct list_head *resultp, break; } - list_del(&new->rpe_link); - list_add_tail(&new->rpe_link, &tmp[idx]); + list_del(&new->rpe_link); + list_add_tail(&new->rpe_link, &tmp[idx]); - list_del(&old->rpe_link); - list_add_tail(&old->rpe_link, &tmp[1 - idx]); + list_del(&old->rpe_link); + list_add_tail(&old->rpe_link, &tmp[1 - idx]); if (new->rpe_rpc_errno != 0 || new->rpe_fwk_errno != 0 || old->rpe_rpc_errno != 0 || old->rpe_fwk_errno != 0) { @@ -1710,63 +1841,79 @@ lst_print_stat(char *name, struct list_head *resultp, lnet_new = (lnet_counters_t *)((char *)srpc_new + sizeof(*srpc_new)); lnet_old = (lnet_counters_t *)((char *)srpc_old + sizeof(*srpc_old)); - lst_timeval_diff(&new->rpe_stamp, &old->rpe_stamp, &tv); + /* Prior to version 2.3, the running_ms field was a counter for + * the number of running tests. We are looking at this value + * to determine if it is a millisecond timestamep (>= 2.3) or a + * test counter (< 2.3). The number 500 is being used for this + * barrier as the test counter should never get this high, and + * the timestamp should never get this low. */ - delta = tv.tv_sec + (float)tv.tv_usec/1000000; + if (sfwk_new->running_ms > 500) { + /* use the timestamp from the remote node, not our + * rpe_stamp from when we copied up the data out of + * the kernel */ - if (!lnet) /* TODO */ - continue; - - lst_cal_lnet_stat(delta, lnet_new, lnet_old); - } + delta = (float) (sfwk_new->running_ms - + sfwk_old->running_ms) / 1000; + } else { + struct timeval tv; - list_splice(&tmp[idx], &resultp[idx]); - list_splice(&tmp[1 - idx], &resultp[1 - idx]); + lst_timeval_diff(&new->rpe_stamp, &old->rpe_stamp, &tv); + delta = tv.tv_sec + (float)tv.tv_usec / 1000000; + } - if (errcount > 0) - fprintf(stdout, "Failed to stat on %d nodes\n", errcount); + if (!lnet) /* TODO */ + continue; - if (!lnet) /* TODO */ - return; + lst_cal_lnet_stat(delta, lnet_new, lnet_old, mbs); + } + + list_splice(&tmp[idx], &resultp[idx]); + list_splice(&tmp[1 - idx], &resultp[1 - idx]); + + if (errcount > 0) + fprintf(stdout, "Failed to stat on %d nodes\n", errcount); - lst_print_lnet_stat(name, bwrt, rdwr, type); + if (!lnet) /* TODO */ + return; + + lst_print_lnet_stat(name, bwrt, rdwr, type, mbs); } int jt_lst_stat(int argc, char **argv) { - struct list_head head; - lst_stat_req_param_t *srp; - lstcon_rpc_ent_t *ent; - char *name; - time_t last = 0; - int optidx = 0; - int count = 0; - int timeout = 5; /* default timeout, 5 sec */ - int delay = 5; /* default delay, 5 sec */ - int lnet = 1; /* lnet stat by default */ - int bwrt = 0; - int rdwr = 0; - int type = -1; - int idx = 0; - int rc; - int i; - int c; - - static struct option stat_opts[] = - { - {"timeout", required_argument, 0, 't' }, - {"delay" , required_argument, 0, 'd' }, - {"lnet" , no_argument, 0, 'l' }, - {"rpc" , no_argument, 0, 'c' }, - {"bw" , no_argument, 0, 'b' }, - {"rate" , no_argument, 0, 'a' }, - {"read" , no_argument, 0, 'r' }, - {"write" , no_argument, 0, 'w' }, - {"avg" , no_argument, 0, 'g' }, - {"min" , no_argument, 0, 'n' }, - {"max" , no_argument, 0, 'x' }, - {0, 0, 0, 0 } + struct list_head head; + lst_stat_req_param_t *srp; + time_t last = 0; + int optidx = 0; + int timeout = 5; /* default timeout, 5 sec */ + int delay = 5; /* default delay, 5 sec */ + int count = -1; /* run forever */ + int lnet = 1; /* lnet stat by default */ + int bwrt = 0; + int rdwr = 0; + int type = -1; + int idx = 0; + int rc; + int c; + int mbs = 0; /* report as MB/s */ + + static struct option stat_opts[] = { + {"timeout" , required_argument, 0, 't' }, + {"delay" , required_argument, 0, 'd' }, + {"count" , required_argument, 0, 'o' }, + {"lnet" , no_argument, 0, 'l' }, + {"rpc" , no_argument, 0, 'c' }, + {"bw" , no_argument, 0, 'b' }, + {"rate" , no_argument, 0, 'a' }, + {"read" , no_argument, 0, 'r' }, + {"write" , no_argument, 0, 'w' }, + {"avg" , no_argument, 0, 'g' }, + {"min" , no_argument, 0, 'n' }, + {"max" , no_argument, 0, 'x' }, + {"mbs" , no_argument, 0, 'm' }, + {0, 0, 0, 0 } }; if (session_key == 0) { @@ -1776,11 +1923,12 @@ jt_lst_stat(int argc, char **argv) } while (1) { - c = getopt_long(argc, argv, "t:d:lcbarwgnx", stat_opts, &optidx); + c = getopt_long(argc, argv, "t:d:lcbarwgnxm", stat_opts, + &optidx); if (c == -1) break; - + switch (c) { case 't': timeout = atoi(optarg); @@ -1788,6 +1936,9 @@ jt_lst_stat(int argc, char **argv) case 'd': delay = atoi(optarg); break; + case 'o': + count = atoi(optarg); + break; case 'l': lnet = 1; break; @@ -1820,18 +1971,22 @@ jt_lst_stat(int argc, char **argv) } type |= 2; break; - case 'x': - if (type == -1) { - type = 4; - break; - } - type |= 4; - break; - default: - lst_print_usage(argv[0]); - return -1; - } - } + case 'x': + if (type == -1) { + type = 4; + break; + } + type |= 4; + break; + case 'm': + mbs = 1; + break; + + default: + lst_print_usage(argv[0]); + return -1; + } + } if (optind == argc) { lst_print_usage(argv[0]); @@ -1843,52 +1998,61 @@ jt_lst_stat(int argc, char **argv) return -1; } - CFS_INIT_LIST_HEAD(&head); + if (count < -1) { + fprintf(stderr, "Invalid count value\n"); + return -1; + } + + /* extra count to get first data point */ + if (count != -1) + count++; + + INIT_LIST_HEAD(&head); while (optind < argc) { - name = argv[optind++]; - - rc = lst_stat_req_param_alloc(name, &srp); - if (rc != 0) + rc = lst_stat_req_param_alloc(argv[optind++], &srp, 1); + if (rc != 0) goto out; - list_add_tail(&srp->srp_link, &head); + list_add_tail(&srp->srp_link, &head); } - while (1) { + do { time_t now = time(NULL); - + if (now - last < delay) { sleep(delay - now + last); time(&now); } + last = now; - last = now; - - list_for_each_entry(srp, &head, srp_link) { + list_for_each_entry(srp, &head, srp_link) { rc = lst_stat_ioctl(srp->srp_name, srp->srp_count, srp->srp_ids, timeout, &srp->srp_result[idx]); if (rc == -1) { lst_print_error("stat", "Failed to stat %s: %s\n", - name, strerror(errno)); + srp->srp_name, strerror(errno)); goto out; } - lst_print_stat(srp->srp_name, srp->srp_result, - idx, lnet, bwrt, rdwr, type); + lst_print_stat(srp->srp_name, srp->srp_result, + idx, lnet, bwrt, rdwr, type, mbs); - lst_reset_rpcent(&srp->srp_result[1 - idx]); - } + lst_reset_rpcent(&srp->srp_result[1 - idx]); + } idx = 1 - idx; - } + + if (count > 0) + count--; + } while (count == -1 || count > 0); out: - while (!list_empty(&head)) { - srp = list_entry(head.next, lst_stat_req_param_t, srp_link); + while (!list_empty(&head)) { + srp = list_entry(head.next, lst_stat_req_param_t, srp_link); - list_del(&srp->srp_link); + list_del(&srp->srp_link); lst_stat_req_param_free(srp); } @@ -1898,27 +2062,20 @@ out: int jt_lst_show_error(int argc, char **argv) { - struct list_head head; + struct list_head head; lst_stat_req_param_t *srp; lstcon_rpc_ent_t *ent; sfw_counters_t *sfwk; srpc_counters_t *srpc; - lnet_counters_t *lnet; - lnet_process_id_t *idsp = NULL; - char *name = NULL; - int optidx = 0; - int count = 0; - int type = 0; - int timeout = 5; - int ecount = 0; - int rc; + int show_rpc = 1; + int optidx = 0; + int rc = 0; + int ecount; int c; - - static struct option show_error_opts[] = + static struct option show_error_opts[] = { - {"group" , required_argument, 0, 'g' }, - {"nodes" , required_argument, 0, 'n' }, + {"session", no_argument, 0, 's' }, {0, 0, 0, 0 } }; @@ -1929,106 +2086,112 @@ jt_lst_show_error(int argc, char **argv) } while (1) { - c = getopt_long(argc, argv, "g:n:", show_error_opts, &optidx); + c = getopt_long(argc, argv, "s", show_error_opts, &optidx); if (c == -1) break; - + switch (c) { - case 'g': - type = LST_OPC_GROUP; - name = optarg; - break; - case 'n': - type = LST_OPC_NODES; - name = optarg; + case 's': + show_rpc = 0; break; + default: lst_print_usage(argv[0]); return -1; } } - if (optind != argc || type == 0) { + if (optind == argc) { lst_print_usage(argv[0]); return -1; } - if (name == NULL) { - fprintf(stderr, "Missing name of target (group | nodes)\n"); - return -1; - } + INIT_LIST_HEAD(&head); - rc = lst_get_node_count(type, name, &count, &idsp); - if (rc < 0) { - fprintf(stderr, "Failed to get count of nodes from %s: %s\n", - name, strerror(errno)); - return -1; - } - - CFS_INIT_LIST_HEAD(&head); + while (optind < argc) { + rc = lst_stat_req_param_alloc(argv[optind++], &srp, 0); + if (rc != 0) + goto out; - rc = lst_alloc_rpcent(&head, count, sizeof(sfw_counters_t) + - sizeof(srpc_counters_t) + - sizeof(lnet_counters_t)); - if (rc != 0) { - fprintf(stderr, "Out of memory\n"); - goto out; + list_add_tail(&srp->srp_link, &head); } - rc = lst_stat_ioctl(name, count, idsp, timeout, &head); - if (rc == -1) { - lst_print_error(name, "Failed to show errors of %s: %s\n", - name, strerror(errno)); - goto out; - } + list_for_each_entry(srp, &head, srp_link) { + rc = lst_stat_ioctl(srp->srp_name, srp->srp_count, + srp->srp_ids, 10, &srp->srp_result[0]); - list_for_each_entry(ent, &head, rpe_link) { - if (ent->rpe_rpc_errno != 0) { - ecount ++; - fprintf(stderr, "RPC failure, can't show error on %s\n", - libcfs_id2str(ent->rpe_peer)); - continue; + if (rc == -1) { + lst_print_error(srp->srp_name, "Failed to show errors of %s: %s\n", + srp->srp_name, strerror(errno)); + goto out; } - if (ent->rpe_fwk_errno != 0) { + fprintf(stdout, "%s:\n", srp->srp_name); + + ecount = 0; + + list_for_each_entry(ent, &srp->srp_result[0], rpe_link) { + if (ent->rpe_rpc_errno != 0) { + ecount ++; + fprintf(stderr, "RPC failure, can't show error on %s\n", + libcfs_id2str(ent->rpe_peer)); + continue; + } + + if (ent->rpe_fwk_errno != 0) { + ecount ++; + fprintf(stderr, "Framework failure, can't show error on %s\n", + libcfs_id2str(ent->rpe_peer)); + continue; + } + + sfwk = (sfw_counters_t *)&ent->rpe_payload[0]; + srpc = (srpc_counters_t *)((char *)sfwk + sizeof(*sfwk)); + + if (srpc->errors == 0 && + sfwk->brw_errors == 0 && sfwk->ping_errors == 0) + continue; + + if (!show_rpc && + sfwk->brw_errors == 0 && sfwk->ping_errors == 0) + continue; + ecount ++; - fprintf(stderr, "Framework failure, can't show error on %s\n", - libcfs_id2str(ent->rpe_peer)); - continue; - } - sfwk = (sfw_counters_t *)&ent->rpe_payload[0]; - srpc = (srpc_counters_t *)((char *)sfwk + sizeof(*sfwk)); - lnet = (lnet_counters_t *)((char *)srpc + sizeof(*srpc)); + fprintf(stderr, "%s: [Session %d brw errors, %d ping errors]%c", + libcfs_id2str(ent->rpe_peer), + sfwk->brw_errors, sfwk->ping_errors, + show_rpc ? ' ' : '\n'); - if (srpc->errors == 0 && - sfwk->brw_errors == 0 && sfwk->ping_errors == 0) - continue; + if (!show_rpc) + continue; - ecount ++; - fprintf(stderr, "[%s]: %d RPC errors, %d brw errors, %d ping errors\n", - libcfs_id2str(ent->rpe_peer), srpc->errors, - sfwk->brw_errors, sfwk->ping_errors); - } + fprintf(stderr, "[RPC: %d errors, %d dropped, %d expired]\n", + srpc->errors, srpc->rpcs_dropped, srpc->rpcs_expired); + } - fprintf(stdout, "Total %d errors in %s\n", ecount, name); + fprintf(stdout, "Total %d error nodes in %s\n", ecount, srp->srp_name); + } out: - lst_free_rpcent(&head); - if (idsp != NULL) - free(idsp); + while (!list_empty(&head)) { + srp = list_entry(head.next, lst_stat_req_param_t, srp_link); - return 0; + list_del(&srp->srp_link); + lst_stat_req_param_free(srp); + } + + return rc; } int lst_add_batch_ioctl (char *name) { - lstio_batch_add_args_t args = { - .lstio_bat_key = session_key, - .lstio_bat_nmlen = strlen(name), - .lstio_bat_namep = name, - }; + lstio_batch_add_args_t args = {0}; + + args.lstio_bat_key = session_key; + args.lstio_bat_nmlen = strlen(name); + args.lstio_bat_namep = name; return lst_ioctl (LSTIO_BATCH_ADD, &args, sizeof(args)); } @@ -2050,7 +2213,7 @@ jt_lst_add_batch(int argc, char **argv) return -1; } - name = argv[1]; + name = argv[1]; if (strlen(name) >= LST_NAME_SIZE) { fprintf(stderr, "Name length is limited to %d\n", LST_NAME_SIZE - 1); @@ -2068,15 +2231,15 @@ jt_lst_add_batch(int argc, char **argv) } int -lst_start_batch_ioctl (char *name, int timeout, struct list_head *resultp) -{ - lstio_batch_run_args_t args = { - .lstio_bat_key = session_key, - .lstio_bat_timeout = timeout, - .lstio_bat_nmlen = strlen(name), - .lstio_bat_namep = name, - .lstio_bat_resultp = resultp, - }; +lst_start_batch_ioctl(char *name, int timeout, struct list_head *resultp) +{ + lstio_batch_run_args_t args = {0}; + + args.lstio_bat_key = session_key; + args.lstio_bat_timeout = timeout; + args.lstio_bat_nmlen = strlen(name); + args.lstio_bat_namep = name; + args.lstio_bat_resultp = resultp; return lst_ioctl(LSTIO_BATCH_START, &args, sizeof(args)); } @@ -2084,7 +2247,7 @@ lst_start_batch_ioctl (char *name, int timeout, struct list_head *resultp) int jt_lst_start_batch(int argc, char **argv) { - struct list_head head; + struct list_head head; char *batch; int optidx = 0; int timeout = 0; @@ -2111,7 +2274,7 @@ jt_lst_start_batch(int argc, char **argv) /* Detect the end of the options. */ if (c == -1) break; - + switch (c) { case 't': timeout = atoi(optarg); @@ -2121,7 +2284,7 @@ jt_lst_start_batch(int argc, char **argv) return -1; } } - + if (optind == argc) { batch = LST_DEFAULT_BATCH; @@ -2140,7 +2303,7 @@ jt_lst_start_batch(int argc, char **argv) return -1; } - CFS_INIT_LIST_HEAD(&head); + INIT_LIST_HEAD(&head); rc = lst_alloc_rpcent(&head, count, 0); if (rc != 0) { @@ -2172,14 +2335,14 @@ jt_lst_start_batch(int argc, char **argv) int lst_stop_batch_ioctl(char *name, int force, struct list_head *resultp) -{ - lstio_batch_stop_args_t args = { - .lstio_bat_key = session_key, - .lstio_bat_force = force, - .lstio_bat_nmlen = strlen(name), - .lstio_bat_namep = name, - .lstio_bat_resultp = resultp, - }; +{ + lstio_batch_stop_args_t args = {0}; + + args.lstio_bat_key = session_key; + args.lstio_bat_force = force; + args.lstio_bat_nmlen = strlen(name); + args.lstio_bat_namep = name; + args.lstio_bat_resultp = resultp; return lst_ioctl(LSTIO_BATCH_STOP, &args, sizeof(args)); } @@ -2187,7 +2350,7 @@ lst_stop_batch_ioctl(char *name, int force, struct list_head *resultp) int jt_lst_stop_batch(int argc, char **argv) { - struct list_head head; + struct list_head head; char *batch; int force = 0; int optidx; @@ -2214,7 +2377,7 @@ jt_lst_stop_batch(int argc, char **argv) /* Detect the end of the options. */ if (c == -1) break; - + switch (c) { case 'f': force = 1; @@ -2243,7 +2406,7 @@ jt_lst_stop_batch(int argc, char **argv) return -1; } - CFS_INIT_LIST_HEAD(&head); + INIT_LIST_HEAD(&head); rc = lst_alloc_rpcent(&head, count, 0); if (rc != 0) { @@ -2293,12 +2456,12 @@ out: int lst_list_batch_ioctl(int len, char *name, int index) { - lstio_batch_list_args_t args = { - .lstio_bat_key = session_key, - .lstio_bat_idx = index, - .lstio_bat_nmlen = len, - .lstio_bat_namep = name, - }; + lstio_batch_list_args_t args = {0}; + + args.lstio_bat_key = session_key; + args.lstio_bat_idx = index; + args.lstio_bat_nmlen = len; + args.lstio_bat_namep = name; return lst_ioctl(LSTIO_BATCH_LIST, &args, sizeof(args)); } @@ -2308,17 +2471,17 @@ lst_info_batch_ioctl(char *batch, int test, int server, lstcon_test_batch_ent_t *entp, int *idxp, int *ndentp, lstcon_node_ent_t *dentsp) { - lstio_batch_info_args_t args = { - .lstio_bat_key = session_key, - .lstio_bat_nmlen = strlen(batch), - .lstio_bat_namep = batch, - .lstio_bat_server = server, - .lstio_bat_testidx = test, - .lstio_bat_entp = entp, - .lstio_bat_idxp = idxp, - .lstio_bat_ndentp = ndentp, - .lstio_bat_dentsp = dentsp, - }; + lstio_batch_info_args_t args = {0}; + + args.lstio_bat_key = session_key; + args.lstio_bat_nmlen = strlen(batch); + args.lstio_bat_namep = batch; + args.lstio_bat_server = server; + args.lstio_bat_testidx = test; + args.lstio_bat_entp = entp; + args.lstio_bat_idxp = idxp; + args.lstio_bat_ndentp = ndentp; + args.lstio_bat_dentsp = dentsp; return lst_ioctl(LSTIO_BATCH_INFO, &args, sizeof(args)); } @@ -2337,7 +2500,7 @@ lst_list_batch_all(void) continue; } - if (errno == ENOENT) + if (errno == ENOENT) break; lst_print_error("batch", "Failed to list batch: %s\n", @@ -2360,7 +2523,7 @@ lst_list_tsb_nodes(char *batch, int test, int server, int c; int i; - if (count == 0) + if (count == 0) return 0; /* verbose list, show nodes in batch or test */ @@ -2385,7 +2548,7 @@ lst_list_tsb_nodes(char *batch, int test, int server, if ((!active && dents[i].nde_state == LST_NODE_ACTIVE) || (!invalid && (dents[i].nde_state == LST_NODE_BUSY || dents[i].nde_state == LST_NODE_DOWN || - dents[i].nde_state == LST_NODE_UNKNOWN))) + dents[i].nde_state == LST_NODE_UNKNOWN))) continue; fprintf(stdout, "\t%s: %s\n", @@ -2393,7 +2556,7 @@ lst_list_tsb_nodes(char *batch, int test, int server, lst_node_state2str(dents[i].nde_state)); c++; } - + fprintf(stdout, "Total %d nodes\n", c); free(dents); @@ -2413,7 +2576,6 @@ jt_lst_list_batch(int argc, char **argv) int ntest = 0; int test = 0; int c = 0; - int i; int rc; static struct option list_batch_opts[] = @@ -2438,7 +2600,7 @@ jt_lst_list_batch(int argc, char **argv) if (c == -1) break; - + switch (c) { case 'a': verbose = active = 1; @@ -2477,7 +2639,7 @@ jt_lst_list_batch(int argc, char **argv) lst_print_usage(argv[0]); return -1; } - + batch = argv[optind]; loop: @@ -2522,7 +2684,7 @@ loop: fprintf(stdout, LST_NODES_TITLE); fprintf(stdout, "client\t%d\t%d\t%d\t%d\t%d\n" "server\t%d\t%d\t%d\t%d\t%d\n", - ent.tbe_cli_nle.nle_nactive, + ent.tbe_cli_nle.nle_nactive, ent.tbe_cli_nle.nle_nbusy, ent.tbe_cli_nle.nle_ndown, ent.tbe_cli_nle.nle_nunknown, @@ -2541,17 +2703,17 @@ loop: int lst_query_batch_ioctl(char *batch, int test, int server, - int timeout, struct list_head *head) -{ - lstio_batch_query_args_t args = { - .lstio_bat_key = session_key, - .lstio_bat_testidx = test, - .lstio_bat_client = !(server), - .lstio_bat_timeout = timeout, - .lstio_bat_nmlen = strlen(batch), - .lstio_bat_namep = batch, - .lstio_bat_resultp = head, - }; + int timeout, struct list_head *head) +{ + lstio_batch_query_args_t args = {0}; + + args.lstio_bat_key = session_key; + args.lstio_bat_testidx = test; + args.lstio_bat_client = !(server); + args.lstio_bat_timeout = timeout; + args.lstio_bat_nmlen = strlen(batch); + args.lstio_bat_namep = batch; + args.lstio_bat_resultp = head; return lst_ioctl(LSTIO_BATCH_QUERY, &args, sizeof(args)); } @@ -2562,7 +2724,7 @@ lst_print_tsb_verbose(struct list_head *head, { lstcon_rpc_ent_t *ent; - list_for_each_entry(ent, head, rpe_link) { + list_for_each_entry(ent, head, rpe_link) { if (ent->rpe_priv[0] == 0 && active) continue; @@ -2585,25 +2747,23 @@ int jt_lst_query_batch(int argc, char **argv) { lstcon_test_batch_ent_t ent; - struct list_head head; - lstcon_rpc_ent_t *rent = NULL; - char *batch = NULL; - time_t last = 0; - int optidx = 0; - int index = 0; - int verbose = 0; - int server = 0; - int timeout = 5; /* default 5 seconds */ - int delay = 5; /* default 5 seconds */ - int loop = 1; /* default 1 loop */ - int active = 0; - int error = 0; - int idle = 0; - int count = 0; - int test = 0; - int rc = 0; - int c = 0; - int i; + struct list_head head; + char *batch = NULL; + time_t last = 0; + int optidx = 0; + int verbose = 0; + int server = 0; + int timeout = 5; /* default 5 seconds */ + int delay = 5; /* default 5 seconds */ + int loop = 1; /* default 1 loop */ + int active = 0; + int error = 0; + int idle = 0; + int count = 0; + int test = 0; + int rc = 0; + int c = 0; + int i; static struct option query_batch_opts[] = { @@ -2632,7 +2792,7 @@ jt_lst_query_batch(int argc, char **argv) /* Detect the end of the options. */ if (c == -1) break; - + switch (c) { case 'o': timeout = atoi(optarg); @@ -2684,7 +2844,7 @@ jt_lst_query_batch(int argc, char **argv) } - CFS_INIT_LIST_HEAD(&head); + INIT_LIST_HEAD(&head); if (verbose) { rc = lst_info_batch_ioctl(batch, test, server, @@ -2711,7 +2871,7 @@ jt_lst_query_batch(int argc, char **argv) for (i = 0; i < loop; i++) { time_t now = time(NULL); - + if (now - last < delay) { sleep(delay - now + last); time(&now); @@ -2765,7 +2925,7 @@ jt_lst_query_batch(int argc, char **argv) return rc; } - + int lst_parse_distribute(char *dstr, int *dist, int *span) { @@ -2774,7 +2934,7 @@ lst_parse_distribute(char *dstr, int *dist, int *span) return -1; dstr = strchr(dstr, ':'); - if (dstr == NULL) + if (dstr == NULL) return -1; *span = atoi(dstr + 1); @@ -2785,68 +2945,128 @@ lst_parse_distribute(char *dstr, int *dist, int *span) } int +lst_get_bulk_param(int argc, char **argv, lst_test_bulk_param_t *bulk) +{ + char *tok = NULL; + char *end = NULL; + int rc = 0; + int i = 0; + + bulk->blk_size = 4096; + bulk->blk_opc = LST_BRW_READ; + bulk->blk_flags = LST_BRW_CHECK_NONE; + bulk->blk_srv_off = bulk->blk_cli_off = 0; + + while (i < argc) { + if (strcasestr(argv[i], "check=") == argv[i] || + strcasestr(argv[i], "c=") == argv[i]) { + tok = strchr(argv[i], '=') + 1; + + if (strcasecmp(tok, "full") == 0) { + bulk->blk_flags = LST_BRW_CHECK_FULL; + } else if (strcasecmp(tok, "simple") == 0) { + bulk->blk_flags = LST_BRW_CHECK_SIMPLE; + } else { + fprintf(stderr, "Unknow flag %s\n", tok); + return -1; + } + + } else if (strcasestr(argv[i], "size=") == argv[i] || + strcasestr(argv[i], "s=") == argv[i]) { + int max_size = sysconf(_SC_PAGESIZE) * LNET_MAX_IOV; + + tok = strchr(argv[i], '=') + 1; + + bulk->blk_size = strtol(tok, &end, 0); + if (bulk->blk_size <= 0) { + fprintf(stderr, "Invalid size %s\n", tok); + return -1; + } + + if (end == NULL) + return 0; + + if (*end == 'k' || *end == 'K') + bulk->blk_size *= 1024; + else if (*end == 'm' || *end == 'M') + bulk->blk_size *= 1024 * 1024; + + if (bulk->blk_size > max_size) { + fprintf(stderr, "Size exceed limitation: %d bytes\n", + bulk->blk_size); + return -1; + } + + } else if (strcasestr(argv[i], "off=") == argv[i]) { + int off; + + tok = strchr(argv[i], '=') + 1; + + off = strtol(tok, &end, 0); + /* NB: align with sizeof(__u64) to simplify page + * checking implementation */ + if (off < 0 || off % sizeof(__u64) != 0) { + fprintf(stderr, + "Invalid offset %s/%d, it should be " + "postive value and multiple of %d\n", + tok, off, (int)sizeof(__u64)); + return -1; + } + + /* NB: blk_srv_off is reserved so far */ + bulk->blk_cli_off = bulk->blk_srv_off = off; + if (end == NULL) + return 0; + + } else if (strcasecmp(argv[i], "read") == 0 || + strcasecmp(argv[i], "r") == 0) { + bulk->blk_opc = LST_BRW_READ; + + } else if (strcasecmp(argv[i], "write") == 0 || + strcasecmp(argv[i], "w") == 0) { + bulk->blk_opc = LST_BRW_WRITE; + + } else { + fprintf(stderr, "Unknow parameter: %s\n", argv[i]); + return -1; + } + + i++; + } + + return rc; +} + +int lst_get_test_param(char *test, int argc, char **argv, void **param, int *plen) { lst_test_bulk_param_t *bulk = NULL; - lst_test_ping_param_t *ping = NULL; int type; - int i = 0; type = lst_test_name2type(test); - if (type < 0) - return -EINVAL; + if (type < 0) { + fprintf(stderr, "Unknow test name %s\n", test); + return -1; + } switch (type) { case LST_TEST_PING: break; case LST_TEST_BULK: - if (i == argc) - return -EINVAL; - bulk = malloc(sizeof(*bulk)); - if (bulk == NULL) - return -ENOMEM; + if (bulk == NULL) { + fprintf(stderr, "Out of memory\n"); + return -1; + } memset(bulk, 0, sizeof(*bulk)); - if (strcmp(argv[i], "w") == 0) - bulk->blk_opc = LST_BRW_WRITE; - else /* read by default */ - bulk->blk_opc = LST_BRW_READ; - - if (++i == argc) { - /* 1 page by default */ - bulk->blk_flags = LST_BRW_CHECK_NONE; - bulk->blk_npg = 1; - *param = bulk; - *plen = sizeof(*bulk); - break; - - } - - bulk->blk_npg = atoi(argv[i]); - if (bulk->blk_npg <= 0 || - bulk->blk_npg >= LNET_MAX_IOV) { + if (lst_get_bulk_param(argc, argv, bulk) != 0) { free(bulk); - return -EINVAL; - } - - if (++i == argc) { - bulk->blk_flags = LST_BRW_CHECK_NONE; - *param = bulk; - *plen = sizeof(*bulk); - break; + return -1; } - /* posion pages */ - if (strcmp(argv[i], "s") == 0) - bulk->blk_flags = LST_BRW_CHECK_SIMPLE; - else if (strcmp(argv[i], "f") == 0) - bulk->blk_flags = LST_BRW_CHECK_FULL; - else - bulk->blk_flags = LST_BRW_CHECK_NONE; - *param = bulk; *plen = sizeof(*bulk); @@ -2855,7 +3075,7 @@ lst_get_test_param(char *test, int argc, char **argv, void **param, int *plen) default: break; } - + /* TODO: parse more parameter */ return type; } @@ -2863,26 +3083,27 @@ lst_get_test_param(char *test, int argc, char **argv, void **param, int *plen) int lst_add_test_ioctl(char *batch, int type, int loop, int concur, int dist, int span, char *sgrp, char *dgrp, - void *param, int plen, int *retp, struct list_head *resultp) -{ - lstio_test_args_t args = { - .lstio_tes_key = session_key, - .lstio_tes_bat_nmlen = strlen(batch), - .lstio_tes_bat_name = batch, - .lstio_tes_type = type, - .lstio_tes_loop = loop, - .lstio_tes_concur = concur, - .lstio_tes_dist = dist, - .lstio_tes_span = span, - .lstio_tes_sgrp_nmlen = strlen(sgrp), - .lstio_tes_sgrp_name = sgrp, - .lstio_tes_dgrp_nmlen = strlen(dgrp), - .lstio_tes_dgrp_name = dgrp, - .lstio_tes_param_len = plen, - .lstio_tes_param = param, - .lstio_tes_retp = retp, - .lstio_tes_resultp = resultp, - }; + void *param, int plen, int *retp, struct list_head *resultp) +{ + lstio_test_args_t args = {0}; + + args.lstio_tes_key = session_key; + args.lstio_tes_bat_nmlen = strlen(batch); + args.lstio_tes_bat_name = batch; + args.lstio_tes_type = type; + args.lstio_tes_oneside = 0; + args.lstio_tes_loop = loop; + args.lstio_tes_concur = concur; + args.lstio_tes_dist = dist; + args.lstio_tes_span = span; + args.lstio_tes_sgrp_nmlen = strlen(sgrp); + args.lstio_tes_sgrp_name = sgrp; + args.lstio_tes_dgrp_nmlen = strlen(dgrp); + args.lstio_tes_dgrp_name = dgrp; + args.lstio_tes_param_len = plen; + args.lstio_tes_param = param; + args.lstio_tes_retp = retp; + args.lstio_tes_resultp = resultp; return lst_ioctl(LSTIO_TEST_ADD, &args, sizeof(args)); } @@ -2890,25 +3111,25 @@ lst_add_test_ioctl(char *batch, int type, int loop, int concur, int jt_lst_add_test(int argc, char **argv) { - struct list_head head; - char *batch = NULL; - char *test = NULL; - char *dstr = NULL; - char *from = NULL; - char *to = NULL; - void *param = NULL; - int optidx = 0; - int concur = 1; - int loop = -1; - int dist = 1; - int span = 1; - int plen = 0; - int fcount = 0; - int tcount = 0; - int ret = 0; - int type; - int rc; - int c; + struct list_head head; + char *batch = NULL; + char *test = NULL; + char *dstr = NULL; + char *from = NULL; + char *to = NULL; + void *param = NULL; + int optidx = 0; + int concur = 1; + int loop = -1; + int dist = 1; + int span = 1; + int plen = 0; + int fcount = 0; + int tcount = 0; + int ret = 0; + int type; + int rc; + int c; static struct option add_test_opts[] = { @@ -2934,7 +3155,7 @@ jt_lst_add_test(int argc, char **argv) /* Detect the end of the options. */ if (c == -1) break; - + switch (c) { case 'b': batch = optarg; @@ -2988,12 +3209,11 @@ jt_lst_add_test(int argc, char **argv) type = lst_get_test_param(test, argc, argv, ¶m, &plen); if (type < 0) { - fprintf(stderr, "Can't parse test (%s) parameter: %s\n", - test, strerror(-type)); + fprintf(stderr, "Failed to add test (%s)\n", test); return -1; } - CFS_INIT_LIST_HEAD(&head); + INIT_LIST_HEAD(&head); rc = lst_get_node_count(LST_OPC_GROUP, from, &fcount, NULL); if (rc != 0) { @@ -3062,11 +3282,11 @@ static command_t lst_cmdlist[] = { "Usage: lst update_group NAME [--clean] [--refresh] [--remove IDs]" }, {"list_group", jt_lst_list_group, NULL, "Usage: lst list_group [--active] [--busy] [--down] [--unknown] GROUP ..." }, - {"stat", jt_lst_stat, NULL, - "Usage: lst stat [--bw] [--rate] [--read] [--write] [--max] [--min] [--avg] " - " [--timeout #] [--delay #] GROUP [GROUP]" }, + {"stat", jt_lst_stat, NULL, + "Usage: lst stat [--bw] [--rate] [--read] [--write] [--max] [--min] [--avg] " + " [--mbs] [--timeout #] [--delay #] [--count #] GROUP [GROUP]" }, {"show_error", jt_lst_show_error, NULL, - "Usage: lst show_error [--group NAME] | [--nodes IDS]" }, + "Usage: lst show_error NAME | IDS ..." }, {"add_batch", jt_lst_add_batch, NULL, "Usage: lst add_batch NAME" }, {"run", jt_lst_start_batch, NULL, @@ -3087,7 +3307,20 @@ static command_t lst_cmdlist[] = { int lst_initialize(void) { - char *key; + char *key; + char *feats; + + feats = getenv("LST_FEATURES"); + if (feats != NULL) + session_features = strtol(feats, NULL, 16); + + if ((session_features & ~LST_FEATS_MASK) != 0) { + fprintf(stderr, + "Unsupported session features %x, " + "only support these features so far: %x\n", + (session_features & ~LST_FEATS_MASK), LST_FEATS_MASK); + return -1; + } key = getenv("LST_SESSION"); @@ -3104,22 +3337,27 @@ lst_initialize(void) int main(int argc, char **argv) { - int rc; + int rc = 0; setlinebuf(stdout); - if (lst_initialize() < 0) - exit(0); + rc = lst_initialize(); + if (rc < 0) + goto errorout; + + rc = ptl_initialize(argc, argv); + if (rc < 0) + goto errorout; - if (ptl_initialize(argc, argv) < 0) - exit(0); - Parser_init("lst > ", lst_cmdlist); - if (argc != 1) - return Parser_execarg(argc - 1, argv + 1, lst_cmdlist); + if (argc != 1) { + rc = Parser_execarg(argc - 1, argv + 1, lst_cmdlist); + goto errorout; + } Parser_commands(); - return 0; +errorout: + return rc; }