X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Flst.c;h=6ab41a963c02e1251632cb78db172892f6f09412;hb=ff8198e01924600ae68b4a7f44378989b74c5882;hp=b41734d70bb872623d5ed06ba3acc71c6ac864b4;hpb=ad827bb6de60b86d153918610953d4be79ef6075;p=fs%2Flustre-release.git diff --git a/lnet/utils/lst.c b/lnet/utils/lst.c index b41734d..6ab41a9 100644 --- a/lnet/utils/lst.c +++ b/lnet/utils/lst.c @@ -1,26 +1,63 @@ -/* -*- 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. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. * - * This file is part of Lustre, http://www.lustre.org + * Copyright (c) 2012, 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 */ #define _GNU_SOURCE -#include -#include -#include -#include -#include -#include +#include #include #include -#include "parser.h" +/* NB: these includes are layering violation */ +#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 int session_key; + +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(2, 6, 50, 0) +/* assume all nodes can understand feature LST_FEAT_BULK_LEN */ +static unsigned session_features = LST_FEATS_MASK; +#else +static unsigned session_features = LST_FEATS_EMPTY; +#endif + static lstcon_trans_stat_t trans_stat; typedef struct list_string { @@ -29,7 +66,9 @@ typedef struct list_string { 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; @@ -79,7 +118,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", @@ -103,9 +142,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; @@ -362,33 +401,33 @@ lst_print_error(char *sub, const char *def_format, ...) } void -lst_free_rpcent(struct list_head *head) +lst_free_rpcent(cfs_list_t *head) { lstcon_rpc_ent_t *ent; - while (!list_empty(head)) { - ent = list_entry(head->next, lstcon_rpc_ent_t, rpe_link); + while (!cfs_list_empty(head)) { + ent = cfs_list_entry(head->next, lstcon_rpc_ent_t, rpe_link); - list_del(&ent->rpe_link); + cfs_list_del(&ent->rpe_link); free(ent); } } void -lst_reset_rpcent(struct list_head *head) +lst_reset_rpcent(cfs_list_t *head) { lstcon_rpc_ent_t *ent; - list_for_each_entry(ent, head, rpe_link) { + cfs_list_for_each_entry_typed(ent, head, lstcon_rpc_ent_t, rpe_link) { ent->rpe_sid = LST_INVALID_SID; - ent->rpe_peer.nid = LNET_NID_ANY; + ent->rpe_peer.nid = LNET_NID_ANY; ent->rpe_peer.pid = LNET_PID_ANY; ent->rpe_rpc_errno = ent->rpe_fwk_errno = 0; } } int -lst_alloc_rpcent(struct list_head *head, int count, int offset) +lst_alloc_rpcent(cfs_list_t *head, int count, int offset) { lstcon_rpc_ent_t *ent; int i; @@ -403,20 +442,20 @@ 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.nid = LNET_NID_ANY; ent->rpe_peer.pid = LNET_PID_ANY; - list_add(&ent->rpe_link, head); + cfs_list_add(&ent->rpe_link, head); } return 0; } void -lst_print_transerr(struct list_head *head, char *optstr) +lst_print_transerr(cfs_list_t *head, char *optstr) { lstcon_rpc_ent_t *ent; - list_for_each_entry(ent, head, rpe_link) { + cfs_list_for_each_entry_typed(ent, head, lstcon_rpc_ent_t, rpe_link) { if (ent->rpe_rpc_errno == 0 && ent->rpe_fwk_errno == 0) continue; @@ -427,7 +466,7 @@ 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)); } @@ -441,7 +480,7 @@ 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 timeout, cfs_list_t *head); int lst_ioctl(unsigned int opc, void *buf, int len) @@ -476,16 +515,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)); } @@ -521,7 +561,7 @@ jt_lst_new_session(int argc, char **argv) if (c == -1) break; - + switch (c) { case 'f': force = 1; @@ -565,38 +605,37 @@ jt_lst_new_session(int argc, char **argv) snprintf(buf, LST_NAME_SIZE, "%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 @@ -605,10 +644,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, LST_NAME_SIZE, &key, + &feats, &sid, &ndinfo); if (rc != 0) { lst_print_error("session", "Failed to show session: %s\n", @@ -616,9 +657,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: "LPU64"@%s, KEY: %d FEATURES: %x NODES: %d\n", + name, sid.ses_stamp, libcfs_nid2str(sid.ses_nid), + key, feats, ndinfo.nle_nnode); return 0; } @@ -626,10 +667,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)); } @@ -675,20 +715,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, cfs_list_t *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)); } @@ -700,21 +740,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; @@ -728,7 +769,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; @@ -737,7 +778,7 @@ 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; + cfs_list_t head; lnet_process_id_t *ids = NULL; lstcon_rpc_ent_t *ent = NULL; char *str = NULL; @@ -773,7 +814,7 @@ jt_lst_ping(int argc, char **argv) if (c == -1) break; - + switch (c) { case 's': type = LST_OPC_SESSION; @@ -847,7 +888,7 @@ jt_lst_ping(int argc, char **argv) } /* ignore RPC errors and framwork errors */ - list_for_each_entry(ent, &head, rpe_link) { + cfs_list_for_each_entry_typed(ent, &head, lstcon_rpc_ent_t, rpe_link) { fprintf(stdout, "\t%s: %s [session: %s id: %s]\n", libcfs_id2str(ent->rpe_peer), lst_node_state2str(ent->rpe_state), @@ -865,126 +906,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, cfs_list_t *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; + int rc; - if (session_key == 0) { - fprintf(stderr, - "Can't find env LST_SESSION or value is not valid\n"); - return -1; - } + rc = lst_del_group_ioctl(grp_name); + if (rc == 0) { + fprintf(stdout, "Group is deleted\n"); + return 0; + } - 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; - } + if (rc == -1) { + lst_print_error("group", "Failed to delete group: %s\n", + strerror(errno)); + return 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; - } + fprintf(stderr, "Group is deleted with some errors\n"); - CFS_INIT_LIST_HEAD(&head); + 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)); + } - 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 (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)); + } - if (count == 0) - continue; - - rc = lst_alloc_rpcent(&head, count, 0); - if (rc != 0) { - fprintf(stderr, "Out of memory\n"); - break; - } - - rc = lst_add_nodes_ioctl(name, count, ids, &head); - - 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)); + cfs_list_t 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; + } + + 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 (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 @@ -1003,50 +1134,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"); - - 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)); - } + rc = lst_del_group(argv[1]); - 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, cfs_list_t *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)); } @@ -1054,7 +1160,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; + cfs_list_t head; lnet_process_id_t *ids = NULL; char *str = NULL; char *grp = NULL; @@ -1086,7 +1192,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) { @@ -1150,7 +1256,7 @@ jt_lst_update_group(int argc, char **argv) return -1; } - } + } rc = lst_update_group_ioctl(opc, grp, clean, count, ids, &head); @@ -1179,12 +1285,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)); } @@ -1193,15 +1299,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)); } @@ -1221,7 +1327,7 @@ lst_list_group_all(void) continue; } - if (errno == ENOENT) + if (errno == ENOENT) break; lst_print_error("group", "Failed to list group: %s\n", @@ -1277,7 +1383,7 @@ jt_lst_list_group(int argc, char **argv) if (c == -1) break; - + switch (c) { case 'a': verbose = active = 1; @@ -1385,27 +1491,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, cfs_list_t *resultp) +{ + lstio_stat_args_t args = {0}; + + 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; + cfs_list_t srp_link; int srp_count; char *srp_name; lnet_process_id_t *srp_ids; - struct list_head srp_result[2]; + cfs_list_t srp_result[2]; } lst_stat_req_param_t; static void @@ -1413,7 +1519,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) @@ -1479,6 +1585,7 @@ lst_stat_req_param_alloc(char *name, lst_stat_req_param_t **srpp, int save_old) typedef struct { /* TODO */ + int foo; } lst_srpc_stat_result; #define LST_LNET_AVG 0 @@ -1520,7 +1627,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; @@ -1529,18 +1636,18 @@ 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 @@ -1636,7 +1743,7 @@ lst_print_lnet_stat(char *name, int bwrt, int rdwr, int type) i == 0 ? "Rates" : "Bandwidth", name); for (j = start2; j <= end2; j++) { - fprintf(stdout, "[%c] ", j == 0 ? 'W' : 'R'); + fprintf(stdout, "[%c] ", j == 0 ? 'R' : 'W'); if ((type & 1) != 0) { fprintf(stdout, i == 0 ? "Avg: %-8.0f RPC/s " : @@ -1662,10 +1769,10 @@ lst_print_lnet_stat(char *name, int bwrt, int rdwr, int type) } void -lst_print_stat(char *name, struct list_head *resultp, - int idx, int lnet, int bwrt, int rdwr, int type) +lst_print_stat(char *name, cfs_list_t *resultp, + int idx, int lnet, int bwrt, int rdwr, int type) { - struct list_head tmp[2]; + cfs_list_t tmp[2]; lstcon_rpc_ent_t *new; lstcon_rpc_ent_t *old; sfw_counters_t *sfwk_new; @@ -1674,7 +1781,6 @@ 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; @@ -1683,14 +1789,16 @@ lst_print_stat(char *name, struct list_head *resultp, memset(&lnet_stat_result, 0, sizeof(lnet_stat_result)); - while (!list_empty(&resultp[idx])) { - if (list_empty(&resultp[1 - idx])) { + while (!cfs_list_empty(&resultp[idx])) { + if (cfs_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 = cfs_list_entry(resultp[idx].next, lstcon_rpc_ent_t, + rpe_link); + old = cfs_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) @@ -1702,11 +1810,11 @@ lst_print_stat(char *name, struct list_head *resultp, break; } - list_del(&new->rpe_link); - list_add_tail(&new->rpe_link, &tmp[idx]); + cfs_list_del(&new->rpe_link); + cfs_list_add_tail(&new->rpe_link, &tmp[idx]); - list_del(&old->rpe_link); - list_add_tail(&old->rpe_link, &tmp[1 - idx]); + cfs_list_del(&old->rpe_link); + cfs_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) { @@ -1723,18 +1831,35 @@ 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. */ + + 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 */ + + delta = (float) (sfwk_new->running_ms - + sfwk_old->running_ms) / 1000; + } else { + struct timeval tv; - delta = tv.tv_sec + (float)tv.tv_usec/1000000; + lst_timeval_diff(&new->rpe_stamp, &old->rpe_stamp, &tv); + delta = tv.tv_sec + (float)tv.tv_usec / 1000000; + } if (!lnet) /* TODO */ continue; - + lst_cal_lnet_stat(delta, lnet_new, lnet_old); } - list_splice(&tmp[idx], &resultp[idx]); - list_splice(&tmp[1 - idx], &resultp[1 - idx]); + cfs_list_splice(&tmp[idx], &resultp[idx]); + cfs_list_splice(&tmp[1 - idx], &resultp[1 - idx]); if (errcount > 0) fprintf(stdout, "Failed to stat on %d nodes\n", errcount); @@ -1748,12 +1873,13 @@ lst_print_stat(char *name, struct list_head *resultp, int jt_lst_stat(int argc, char **argv) { - struct list_head head; + cfs_list_t 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; @@ -1764,18 +1890,19 @@ jt_lst_stat(int argc, char **argv) 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 } + {"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' }, + {0, 0, 0, 0 } }; if (session_key == 0) { @@ -1785,11 +1912,11 @@ 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:lcbarwgnx", stat_opts, &optidx); if (c == -1) break; - + switch (c) { case 't': timeout = atoi(optarg); @@ -1797,6 +1924,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; @@ -1836,6 +1966,7 @@ jt_lst_stat(int argc, char **argv) } type |= 4; break; + default: lst_print_usage(argv[0]); return -1; @@ -1852,19 +1983,28 @@ jt_lst_stat(int argc, char **argv) return -1; } + if (count < -1) { + fprintf(stderr, "Invalid count value\n"); + return -1; + } + + /* extra count to get first data point */ + if (count != -1) + count++; + CFS_INIT_LIST_HEAD(&head); while (optind < argc) { rc = lst_stat_req_param_alloc(argv[optind++], &srp, 1); - if (rc != 0) + if (rc != 0) goto out; - list_add_tail(&srp->srp_link, &head); + cfs_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); @@ -1872,7 +2012,8 @@ jt_lst_stat(int argc, char **argv) last = now; - list_for_each_entry(srp, &head, srp_link) { + cfs_list_for_each_entry_typed(srp, &head, lst_stat_req_param_t, + srp_link) { rc = lst_stat_ioctl(srp->srp_name, srp->srp_count, srp->srp_ids, timeout, &srp->srp_result[idx]); @@ -1882,20 +2023,23 @@ jt_lst_stat(int argc, char **argv) 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); 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 (!cfs_list_empty(&head)) { + srp = cfs_list_entry(head.next, lst_stat_req_param_t, srp_link); - list_del(&srp->srp_link); + cfs_list_del(&srp->srp_link); lst_stat_req_param_free(srp); } @@ -1905,12 +2049,11 @@ out: int jt_lst_show_error(int argc, char **argv) { - struct list_head head; + cfs_list_t head; lst_stat_req_param_t *srp; lstcon_rpc_ent_t *ent; sfw_counters_t *sfwk; srpc_counters_t *srpc; - lnet_counters_t *lnet; int show_rpc = 1; int optidx = 0; int rc = 0; @@ -1922,7 +2065,7 @@ jt_lst_show_error(int argc, char **argv) {"session", no_argument, 0, 's' }, {0, 0, 0, 0 } }; - + if (session_key == 0) { fprintf(stderr, "Can't find env LST_SESSION or value is not valid\n"); @@ -1934,7 +2077,7 @@ jt_lst_show_error(int argc, char **argv) if (c == -1) break; - + switch (c) { case 's': show_rpc = 0; @@ -1945,7 +2088,7 @@ jt_lst_show_error(int argc, char **argv) return -1; } } - + if (optind == argc) { lst_print_usage(argv[0]); return -1; @@ -1955,15 +2098,16 @@ jt_lst_show_error(int argc, char **argv) while (optind < argc) { rc = lst_stat_req_param_alloc(argv[optind++], &srp, 0); - if (rc != 0) + if (rc != 0) goto out; - list_add_tail(&srp->srp_link, &head); + cfs_list_add_tail(&srp->srp_link, &head); } - list_for_each_entry(srp, &head, srp_link) { + cfs_list_for_each_entry_typed(srp, &head, lst_stat_req_param_t, + srp_link) { rc = lst_stat_ioctl(srp->srp_name, srp->srp_count, - srp->srp_ids, 5, &srp->srp_result[0]); + srp->srp_ids, 10, &srp->srp_result[0]); if (rc == -1) { lst_print_error(srp->srp_name, "Failed to show errors of %s: %s\n", @@ -1975,7 +2119,8 @@ jt_lst_show_error(int argc, char **argv) ecount = 0; - list_for_each_entry(ent, &srp->srp_result[0], rpe_link) { + cfs_list_for_each_entry_typed(ent, &srp->srp_result[0], + lstcon_rpc_ent_t, rpe_link) { if (ent->rpe_rpc_errno != 0) { ecount ++; fprintf(stderr, "RPC failure, can't show error on %s\n", @@ -1992,20 +2137,19 @@ jt_lst_show_error(int argc, char **argv) sfwk = (sfw_counters_t *)&ent->rpe_payload[0]; srpc = (srpc_counters_t *)((char *)sfwk + sizeof(*sfwk)); - lnet = (lnet_counters_t *)((char *)srpc + sizeof(*srpc)); if (srpc->errors == 0 && sfwk->brw_errors == 0 && sfwk->ping_errors == 0) continue; - if (!show_rpc && + if (!show_rpc && sfwk->brw_errors == 0 && sfwk->ping_errors == 0) continue; - + ecount ++; fprintf(stderr, "%s: [Session %d brw errors, %d ping errors]%c", - libcfs_id2str(ent->rpe_peer), + libcfs_id2str(ent->rpe_peer), sfwk->brw_errors, sfwk->ping_errors, show_rpc ? ' ' : '\n'); @@ -2015,14 +2159,14 @@ jt_lst_show_error(int argc, char **argv) fprintf(stderr, "[RPC: %d errors, %d dropped, %d expired]\n", srpc->errors, srpc->rpcs_dropped, srpc->rpcs_expired); } - + fprintf(stdout, "Total %d error nodes in %s\n", ecount, srp->srp_name); } out: - while (!list_empty(&head)) { - srp = list_entry(head.next, lst_stat_req_param_t, srp_link); + while (!cfs_list_empty(&head)) { + srp = cfs_list_entry(head.next, lst_stat_req_param_t, srp_link); - list_del(&srp->srp_link); + cfs_list_del(&srp->srp_link); lst_stat_req_param_free(srp); } @@ -2032,11 +2176,11 @@ out: 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)); } @@ -2058,7 +2202,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); @@ -2076,15 +2220,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, cfs_list_t *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)); } @@ -2092,7 +2236,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; + cfs_list_t head; char *batch; int optidx = 0; int timeout = 0; @@ -2119,7 +2263,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); @@ -2129,7 +2273,7 @@ jt_lst_start_batch(int argc, char **argv) return -1; } } - + if (optind == argc) { batch = LST_DEFAULT_BATCH; @@ -2179,15 +2323,15 @@ 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, - }; +lst_stop_batch_ioctl(char *name, int force, cfs_list_t *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)); } @@ -2195,7 +2339,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; + cfs_list_t head; char *batch; int force = 0; int optidx; @@ -2222,7 +2366,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; @@ -2301,12 +2445,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)); } @@ -2316,17 +2460,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)); } @@ -2345,7 +2489,7 @@ lst_list_batch_all(void) continue; } - if (errno == ENOENT) + if (errno == ENOENT) break; lst_print_error("batch", "Failed to list batch: %s\n", @@ -2368,7 +2512,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 */ @@ -2393,7 +2537,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", @@ -2401,7 +2545,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); @@ -2445,7 +2589,7 @@ jt_lst_list_batch(int argc, char **argv) if (c == -1) break; - + switch (c) { case 'a': verbose = active = 1; @@ -2484,7 +2628,7 @@ jt_lst_list_batch(int argc, char **argv) lst_print_usage(argv[0]); return -1; } - + batch = argv[optind]; loop: @@ -2529,7 +2673,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, @@ -2548,28 +2692,28 @@ 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, cfs_list_t *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)); } void -lst_print_tsb_verbose(struct list_head *head, +lst_print_tsb_verbose(cfs_list_t *head, int active, int idle, int error) { lstcon_rpc_ent_t *ent; - list_for_each_entry(ent, head, rpe_link) { + cfs_list_for_each_entry_typed(ent, head, lstcon_rpc_ent_t, rpe_link) { if (ent->rpe_priv[0] == 0 && active) continue; @@ -2592,23 +2736,23 @@ int jt_lst_query_batch(int argc, char **argv) { lstcon_test_batch_ent_t ent; - 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; + cfs_list_t 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[] = { @@ -2637,7 +2781,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); @@ -2716,7 +2860,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); @@ -2770,7 +2914,7 @@ jt_lst_query_batch(int argc, char **argv) return rc; } - + int lst_parse_distribute(char *dstr, int *dist, int *span) { @@ -2779,7 +2923,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); @@ -2814,7 +2958,7 @@ lst_get_bulk_param(int argc, char **argv, lst_test_bulk_param_t *bulk) fprintf(stderr, "Unknow flag %s\n", tok); return -1; } - + } else if (strcasestr(argv[i], "size=") == argv[i] || strcasestr(argv[i], "s=") == argv[i]) { tok = strchr(argv[i], '=') + 1; @@ -2833,16 +2977,16 @@ lst_get_bulk_param(int argc, char **argv, lst_test_bulk_param_t *bulk) else if (*end == 'm' || *end == 'M') bulk->blk_size *= 1024 * 1024; - if (bulk->blk_size > CFS_PAGE_SIZE * LNET_MAX_IOV) { + if (bulk->blk_size > PAGE_CACHE_SIZE * LNET_MAX_IOV) { fprintf(stderr, "Size exceed limitation: %d bytes\n", bulk->blk_size); return -1; } - + } 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; @@ -2896,7 +3040,7 @@ lst_get_test_param(char *test, int argc, char **argv, void **param, int *plen) default: break; } - + /* TODO: parse more parameter */ return type; } @@ -2904,26 +3048,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, cfs_list_t *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)); } @@ -2931,25 +3076,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; + cfs_list_t 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[] = { @@ -2975,7 +3120,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; @@ -3102,11 +3247,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] " + " [--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, @@ -3127,7 +3272,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"); @@ -3144,20 +3302,32 @@ lst_initialize(void) int main(int argc, char **argv) { + int rc = 0; + setlinebuf(stdout); - if (lst_initialize() < 0) - exit(0); + rc = libcfs_arch_init(); + if (rc < 0) + return rc; + + rc = lst_initialize(); + if (rc < 0) + goto errorout; - if (ptl_initialize(argc, argv) < 0) - exit(0); + rc = ptl_initialize(argc, argv); + if (rc < 0) + goto errorout; 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: + libcfs_arch_cleanup(); + return rc; }