X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Flst.c;h=779c79cddd953af750dcd7bd905e691f56d555c2;hb=97b5d13cddd72fe400731bcb7b90f374bae97969;hp=37a7580c82652f575b6ae290a8d26c061930244a;hpb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;p=fs%2Flustre-release.git diff --git a/lnet/utils/lst.c b/lnet/utils/lst.c index 37a7580..779c79c 100644 --- a/lnet/utils/lst.c +++ b/lnet/utils/lst.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -17,17 +15,15 @@ * * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -37,23 +33,38 @@ * * Author: Liang Zhen */ - -#define _GNU_SOURCE - -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include #include #include +#include +#include - -lst_sid_t LST_INVALID_SID = {LNET_NID_ANY, -1}; -static lst_sid_t session_id; +struct lst_sid LST_INVALID_SID = {LNET_NID_ANY, -1}; +static struct lst_sid session_id; static int session_key; -static lstcon_trans_stat_t trans_stat; + +/* All nodes running 2.6.50 or later understand feature LST_FEAT_BULK_LEN */ +static unsigned session_features = LST_FEATS_MASK; +static struct lstcon_trans_stat 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; #ifndef offsetof @@ -279,7 +290,7 @@ out: rc = -1; } - (*idspp)[i].pid = LUSTRE_LNET_PID; + (*idspp)[i].pid = LNET_PID_LUSTRE; i++; } @@ -391,63 +402,63 @@ lst_print_error(char *sub, const char *def_format, ...) } void -lst_free_rpcent(cfs_list_t *head) +lst_free_rpcent(struct list_head *head) { - lstcon_rpc_ent_t *ent; + struct lstcon_rpc_ent *ent; - while (!cfs_list_empty(head)) { - ent = cfs_list_entry(head->next, lstcon_rpc_ent_t, rpe_link); + while (!list_empty(head)) { + ent = list_entry(head->next, struct lstcon_rpc_ent, rpe_link); - cfs_list_del(&ent->rpe_link); - free(ent); - } + list_del(&ent->rpe_link); + free(ent); + } } void -lst_reset_rpcent(cfs_list_t *head) +lst_reset_rpcent(struct list_head *head) { - lstcon_rpc_ent_t *ent; + struct lstcon_rpc_ent *ent; - 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.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 -lst_alloc_rpcent(cfs_list_t *head, int count, int offset) +lst_alloc_rpcent(struct list_head *head, int count, int offset) { - lstcon_rpc_ent_t *ent; + struct lstcon_rpc_ent *ent; int i; for (i = 0; i < count; i++) { - ent = malloc(offsetof(lstcon_rpc_ent_t, rpe_payload[offset])); + ent = malloc(offsetof(struct lstcon_rpc_ent, rpe_payload[offset])); if (ent == NULL) { lst_free_rpcent(head); return -1; } - memset(ent, 0, offsetof(lstcon_rpc_ent_t, rpe_payload[offset])); + memset(ent, 0, offsetof(struct lstcon_rpc_ent, rpe_payload[offset])); - ent->rpe_sid = LST_INVALID_SID; - ent->rpe_peer.nid = LNET_NID_ANY; - ent->rpe_peer.pid = LNET_PID_ANY; - cfs_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(cfs_list_t *head, char *optstr) +lst_print_transerr(struct list_head *head, char *optstr) { - lstcon_rpc_ent_t *ent; + struct lstcon_rpc_ent *ent; - 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; + 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", @@ -456,21 +467,21 @@ lst_print_transerr(cfs_list_t *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); + struct lstcon_test_batch_ent *entp, int *idxp, + int *ndentp, struct lstcon_node_ent *dentsp); -int lst_info_group_ioctl(char *name, lstcon_ndlist_ent_t *gent, - int *idx, int *count, lstcon_node_ent_t *dents); +int lst_info_group_ioctl(char *name, struct lstcon_ndlist_ent *gent, + int *idx, int *count, struct lstcon_node_ent *dents); int lst_query_batch_ioctl(char *batch, int test, int server, - int timeout, cfs_list_t *head); + int timeout, struct list_head *head); int lst_ioctl(unsigned int opc, void *buf, int len) @@ -505,14 +516,15 @@ lst_ioctl(unsigned int opc, void *buf, int len) } int -lst_new_session_ioctl (char *name, int timeout, int force, lst_sid_t *sid) +lst_new_session_ioctl(char *name, int timeout, int force, struct lst_sid *sid) { - lstio_session_new_args_t args = {0}; + struct lstio_session_new_args 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; @@ -591,7 +603,7 @@ 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 { @@ -600,44 +612,45 @@ jt_lst_new_session(int argc, char **argv) } 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) +lst_session_info_ioctl(char *name, int len, int *key, unsigned *featp, + struct lst_sid *sid, struct lstcon_ndlist_ent *ndinfo) { - lstio_session_info_args_t args = {0}; + struct lstio_session_info_args args = { 0 }; - args.lstio_ses_idp = sid; - args.lstio_ses_keyp = key; - args.lstio_ses_ndinfo = ndinfo; - args.lstio_ses_nmlen = len; - args.lstio_ses_namep = name; + 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 jt_lst_show_session(int argc, char **argv) { - lstcon_ndlist_ent_t ndinfo; - lst_sid_t sid; + struct lstcon_ndlist_ent ndinfo; + struct lst_sid 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", @@ -645,9 +658,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; } @@ -655,10 +668,10 @@ jt_lst_show_session(int argc, char **argv) int lst_end_session_ioctl(void) { - lstio_session_end_args_t args = {0}; + struct lstio_session_end_args args = { 0 }; - args.lstio_ses_key = session_key; - return lst_ioctl (LSTIO_SESSION_END, &args, sizeof(args)); + args.lstio_ses_key = session_key; + return lst_ioctl(LSTIO_SESSION_END, &args, sizeof(args)); } int @@ -704,9 +717,9 @@ 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, cfs_list_t *head) + int count, lnet_process_id_t *ids, struct list_head *head) { - lstio_debug_args_t args = {0}; + struct lstio_debug_args args = { 0 }; args.lstio_dbg_key = session_key; args.lstio_dbg_type = type; @@ -725,17 +738,18 @@ int lst_get_node_count(int type, char *str, int *countp, lnet_process_id_t **idspp) { char buf[LST_NAME_SIZE]; - lstcon_test_batch_ent_t ent; - lstcon_ndlist_ent_t *entp = &ent.tbe_cli_nle; - lst_sid_t sid; - int key; - int rc; - - switch (type) { - case LST_OPC_SESSION: - rc = lst_session_info_ioctl(buf, LST_NAME_SIZE, - &key, &sid, entp); - break; + struct lstcon_test_batch_ent ent; + struct lstcon_ndlist_ent *entp = &ent.tbe_cli_nle; + struct lst_sid sid; + unsigned feats; + int key; + int rc; + + 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; @@ -765,9 +779,9 @@ lst_get_node_count(int type, char *str, int *countp, lnet_process_id_t **idspp) int jt_lst_ping(int argc, char **argv) { - cfs_list_t head; - lnet_process_id_t *ids = NULL; - lstcon_rpc_ent_t *ent = NULL; + struct list_head head; + lnet_process_id_t *ids = NULL; + struct lstcon_rpc_ent *ent = NULL; char *str = NULL; int optidx = 0; int server = 0; @@ -851,7 +865,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) { @@ -874,17 +888,17 @@ jt_lst_ping(int argc, char **argv) goto out; } - /* ignore RPC errors and framwork errors */ - 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), - (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); @@ -897,15 +911,16 @@ out: } int -lst_add_nodes_ioctl (char *name, int count, lnet_process_id_t *ids, - cfs_list_t *resultp) +lst_add_nodes_ioctl(char *name, int count, lnet_process_id_t *ids, + unsigned *featp, struct list_head *resultp) { - lstio_group_nodes_args_t args = {0}; + struct lstio_group_nodes_args 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; @@ -913,106 +928,195 @@ lst_add_nodes_ioctl (char *name, int count, lnet_process_id_t *ids, } int -lst_add_group_ioctl (char *name) +lst_del_group_ioctl(char *name) { - lstio_group_add_args_t args = {0}; + struct lstio_group_del_args args = { 0 }; - args.lstio_grp_key = session_key; - args.lstio_grp_nmlen = strlen(name); - args.lstio_grp_namep = name; + args.lstio_grp_key = session_key; + args.lstio_grp_nmlen = strlen(name); + args.lstio_grp_namep = name; - return lst_ioctl(LSTIO_GROUP_ADD, &args, sizeof(args)); + return lst_ioctl(LSTIO_GROUP_DEL, &args, sizeof(args)); } int -jt_lst_add_group(int argc, char **argv) +lst_del_group(char *grp_name) { - cfs_list_t 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; - } + if (rc == -1) { + lst_print_error("group", "Failed to delete group: %s\n", + strerror(errno)); + return rc; + } - name = argv[1]; - if (strlen(name) >= LST_NAME_SIZE) { - fprintf(stderr, "Name length is limited to %d\n", - LST_NAME_SIZE - 1); - return -1; - } + fprintf(stderr, "Group is deleted with some errors\n"); - 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; - } + 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)); + } - CFS_INIT_LIST_HEAD(&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)); + } - 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"); - 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) +{ + struct lstio_group_add_args 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 = {0}; - - 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)); + 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 @@ -1031,41 +1135,16 @@ 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; - } + rc = lst_del_group(argv[1]); - 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)); - } - - return -1; + return rc; } int lst_update_group_ioctl(int opc, char *name, int clean, int count, - lnet_process_id_t *ids, cfs_list_t *resultp) + lnet_process_id_t *ids, struct list_head *resultp) { - lstio_group_update_args_t args = {0}; + struct lstio_group_update_args args = { 0 }; args.lstio_grp_key = session_key; args.lstio_grp_opc = opc; @@ -1082,7 +1161,7 @@ lst_update_group_ioctl(int opc, char *name, int clean, int count, int jt_lst_update_group(int argc, char **argv) { - cfs_list_t head; + struct list_head head; lnet_process_id_t *ids = NULL; char *str = NULL; char *grp = NULL; @@ -1156,7 +1235,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 : @@ -1207,7 +1286,7 @@ 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 = {0}; + struct lstio_group_list_args args = { 0 }; args.lstio_grp_key = session_key; args.lstio_grp_idx = idx; @@ -1218,10 +1297,10 @@ lst_list_group_ioctl(int len, char *name, int idx) } int -lst_info_group_ioctl(char *name, lstcon_ndlist_ent_t *gent, - int *idx, int *count, lstcon_node_ent_t *dents) +lst_info_group_ioctl(char *name, struct lstcon_ndlist_ent *gent, + int *idx, int *count, struct lstcon_node_ent *dents) { - lstio_group_info_args_t args = {0}; + struct lstio_group_info_args args = { 0 }; args.lstio_grp_key = session_key; args.lstio_grp_nmlen = strlen(name); @@ -1267,8 +1346,8 @@ lst_list_group_all(void) int jt_lst_list_group(int argc, char **argv) { - lstcon_ndlist_ent_t gent; - lstcon_node_ent_t *dents; + struct lstcon_ndlist_ent gent; + struct lstcon_node_ent *dents; int optidx = 0; int verbose = 0; int active = 0; @@ -1373,7 +1452,7 @@ jt_lst_list_group(int argc, char **argv) count = gent.nle_nnode; - dents = malloc(count * sizeof(lstcon_node_ent_t)); + dents = malloc(count * sizeof(struct lstcon_node_ent)); if (dents == NULL) { fprintf(stderr, "Failed to malloc: %s\n", strerror(errno)); @@ -1413,27 +1492,27 @@ jt_lst_list_group(int argc, char **argv) int lst_stat_ioctl (char *name, int count, lnet_process_id_t *idsp, - int timeout, cfs_list_t *resultp) + int timeout, struct list_head *resultp) { - lstio_stat_args_t args = {0}; + struct lstio_stat_args 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; + 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)); + return lst_ioctl(LSTIO_STAT_QUERY, &args, sizeof(args)); } typedef struct { - cfs_list_t srp_link; + struct list_head srp_link; int srp_count; char *srp_name; lnet_process_id_t *srp_ids; - cfs_list_t srp_result[2]; + struct list_head srp_result[2]; } lst_stat_req_param_t; static void @@ -1463,8 +1542,8 @@ lst_stat_req_param_alloc(char *name, lst_stat_req_param_t **srpp, int save_old) 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); @@ -1486,8 +1565,8 @@ lst_stat_req_param_alloc(char *name, lst_stat_req_param_t **srpp, int save_old) 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) + + sizeof(struct sfw_counters) + + sizeof(struct srpc_counters) + sizeof(lnet_counters_t)); if (rc != 0) { fprintf(stderr, "Out of memory\n"); @@ -1558,169 +1637,173 @@ 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; - - perf = (float)(lnet_new->send_length - - lnet_old->send_length) / (1024 * 1024) / delta; - lnet_stat_result.lnet_total_sndperf += perf; + float perf; + float rate; + unsigned int unit_divisor; - if (lnet_stat_result.lnet_min_sndperf > perf || - lnet_stat_result.lnet_min_sndperf == 0) - lnet_stat_result.lnet_min_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_max_sndperf < perf) - lnet_stat_result.lnet_max_sndperf = perf; + if (lnet_stat_result.lnet_min_sndperf > perf || + lnet_stat_result.lnet_min_sndperf == 0) + lnet_stat_result.lnet_min_sndperf = perf; - perf = (float)(lnet_new->recv_length - - lnet_old->recv_length) / (1024 * 1024) / delta; - lnet_stat_result.lnet_total_rcvperf += perf; + if (lnet_stat_result.lnet_max_sndperf < perf) + lnet_stat_result.lnet_max_sndperf = perf; - if (lnet_stat_result.lnet_min_rcvperf > perf || - lnet_stat_result.lnet_min_rcvperf == 0) - lnet_stat_result.lnet_min_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_max_rcvperf < perf) - lnet_stat_result.lnet_max_rcvperf = perf; + if (lnet_stat_result.lnet_min_rcvperf > perf || + lnet_stat_result.lnet_min_rcvperf == 0) + lnet_stat_result.lnet_min_rcvperf = perf; - rate = (lnet_new->send_count - lnet_old->send_count) / delta; - lnet_stat_result.lnet_total_sndrate += rate; + if (lnet_stat_result.lnet_max_rcvperf < perf) + lnet_stat_result.lnet_max_rcvperf = perf; - if (lnet_stat_result.lnet_min_sndrate > rate || - lnet_stat_result.lnet_min_sndrate == 0) - lnet_stat_result.lnet_min_sndrate = rate; + rate = (lnet_new->send_count - lnet_old->send_count) / delta; + lnet_stat_result.lnet_total_sndrate += rate; - if (lnet_stat_result.lnet_max_sndrate < rate) - lnet_stat_result.lnet_max_sndrate = rate; + if (lnet_stat_result.lnet_min_sndrate > rate || + lnet_stat_result.lnet_min_sndrate == 0) + lnet_stat_result.lnet_min_sndrate = rate; - rate = (lnet_new->recv_count - lnet_old->recv_count) / delta; - lnet_stat_result.lnet_total_rcvrate += rate; + if (lnet_stat_result.lnet_max_sndrate < rate) + lnet_stat_result.lnet_max_sndrate = rate; - if (lnet_stat_result.lnet_min_rcvrate > rate || - lnet_stat_result.lnet_min_rcvrate == 0) - lnet_stat_result.lnet_min_rcvrate = rate; + rate = (lnet_new->recv_count - lnet_old->recv_count) / delta; + lnet_stat_result.lnet_total_rcvrate += rate; - if (lnet_stat_result.lnet_max_rcvrate < rate) - lnet_stat_result.lnet_max_rcvrate = rate; + if (lnet_stat_result.lnet_min_rcvrate > rate || + lnet_stat_result.lnet_min_rcvrate == 0) + lnet_stat_result.lnet_min_rcvrate = rate; - lnet_stat_result.lnet_stat_count ++; + if (lnet_stat_result.lnet_max_rcvrate < rate) + lnet_stat_result.lnet_max_rcvrate = rate; - 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_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) +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; + 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 ? 'R' : 'W'); + 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 -lst_print_stat(char *name, cfs_list_t *resultp, - int idx, int lnet, int bwrt, int rdwr, int type) -{ - cfs_list_t tmp[2]; - lstcon_rpc_ent_t *new; - lstcon_rpc_ent_t *old; - sfw_counters_t *sfwk_new; - sfw_counters_t *sfwk_old; - srpc_counters_t *srpc_new; - srpc_counters_t *srpc_old; +static void +lst_print_stat(char *name, struct list_head *resultp, + int idx, int lnet, int bwrt, int rdwr, int type, + int mbs) +{ + struct list_head tmp[2]; + struct lstcon_rpc_ent *new; + struct lstcon_rpc_ent *old; + struct sfw_counters *sfwk_new; + struct sfw_counters *sfwk_old; + struct srpc_counters *srpc_new; + struct srpc_counters *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 (!cfs_list_empty(&resultp[idx])) { - if (cfs_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 = cfs_list_entry(resultp[idx].next, lstcon_rpc_ent_t, + new = list_entry(resultp[idx].next, struct lstcon_rpc_ent, rpe_link); - old = cfs_list_entry(resultp[1 - idx].next, lstcon_rpc_ent_t, + old = list_entry(resultp[1 - idx].next, struct lstcon_rpc_ent, rpe_link); /* first time get stats result, can't calculate diff */ @@ -1733,11 +1816,11 @@ lst_print_stat(char *name, cfs_list_t *resultp, break; } - cfs_list_del(&new->rpe_link); - cfs_list_add_tail(&new->rpe_link, &tmp[idx]); + list_del(&new->rpe_link); + list_add_tail(&new->rpe_link, &tmp[idx]); - cfs_list_del(&old->rpe_link); - cfs_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) { @@ -1745,68 +1828,88 @@ lst_print_stat(char *name, cfs_list_t *resultp, continue; } - sfwk_new = (sfw_counters_t *)&new->rpe_payload[0]; - sfwk_old = (sfw_counters_t *)&old->rpe_payload[0]; + sfwk_new = (struct sfw_counters *)&new->rpe_payload[0]; + sfwk_old = (struct sfw_counters *)&old->rpe_payload[0]; - srpc_new = (srpc_counters_t *)((char *)sfwk_new + sizeof(*sfwk_new)); - srpc_old = (srpc_counters_t *)((char *)sfwk_old + sizeof(*sfwk_old)); + srpc_new = (struct srpc_counters *)((char *)sfwk_new + sizeof(*sfwk_new)); + srpc_old = (struct srpc_counters *)((char *)sfwk_old + sizeof(*sfwk_old)); 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; + delta = (float) (sfwk_new->running_ms - + sfwk_old->running_ms) / 1000; + } else { + struct timeval tv; - lst_cal_lnet_stat(delta, lnet_new, lnet_old); - } + lst_timeval_diff(&new->rpe_stamp, &old->rpe_stamp, &tv); + delta = tv.tv_sec + (float)tv.tv_usec / 1000000; + } - cfs_list_splice(&tmp[idx], &resultp[idx]); - cfs_list_splice(&tmp[1 - idx], &resultp[1 - idx]); + if (!lnet) /* TODO */ + continue; - if (errcount > 0) - fprintf(stdout, "Failed to stat on %d nodes\n", errcount); + lst_cal_lnet_stat(delta, lnet_new, lnet_old, mbs); + } - if (!lnet) /* TODO */ - return; + list_splice(&tmp[idx], &resultp[idx]); + list_splice(&tmp[1 - idx], &resultp[1 - idx]); - lst_print_lnet_stat(name, bwrt, rdwr, type); + if (errcount > 0) + fprintf(stdout, "Failed to stat on %d nodes\n", errcount); + + if (!lnet) /* TODO */ + return; + + lst_print_lnet_stat(name, bwrt, rdwr, type, mbs); } int jt_lst_stat(int argc, char **argv) { - 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 lnet = 1; /* lnet stat by default */ - int bwrt = 0; - int rdwr = 0; - int type = -1; - int idx = 0; - int rc; - 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) { @@ -1816,7 +1919,8 @@ 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; @@ -1828,6 +1932,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; @@ -1860,18 +1967,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]); @@ -1883,28 +1994,35 @@ 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) { rc = lst_stat_req_param_alloc(argv[optind++], &srp, 1); if (rc != 0) goto out; - cfs_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; - - cfs_list_for_each_entry_typed(srp, &head, lst_stat_req_param_t, - 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]); @@ -1914,20 +2032,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, 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 (!cfs_list_empty(&head)) { - srp = cfs_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); - cfs_list_del(&srp->srp_link); + list_del(&srp->srp_link); lst_stat_req_param_free(srp); } @@ -1937,12 +2058,11 @@ out: int jt_lst_show_error(int argc, char **argv) { - cfs_list_t 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; + struct lstcon_rpc_ent *ent; + struct sfw_counters *sfwk; + struct srpc_counters *srpc; int show_rpc = 1; int optidx = 0; int rc = 0; @@ -1983,20 +2103,19 @@ jt_lst_show_error(int argc, char **argv) return -1; } - CFS_INIT_LIST_HEAD(&head); + INIT_LIST_HEAD(&head); while (optind < argc) { rc = lst_stat_req_param_alloc(argv[optind++], &srp, 0); if (rc != 0) goto out; - cfs_list_add_tail(&srp->srp_link, &head); + list_add_tail(&srp->srp_link, &head); } - cfs_list_for_each_entry_typed(srp, &head, lst_stat_req_param_t, - srp_link) { + list_for_each_entry(srp, &head, 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", @@ -2008,8 +2127,7 @@ jt_lst_show_error(int argc, char **argv) ecount = 0; - cfs_list_for_each_entry_typed(ent, &srp->srp_result[0], - lstcon_rpc_ent_t, rpe_link) { + 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", @@ -2024,9 +2142,8 @@ jt_lst_show_error(int argc, char **argv) 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)); + sfwk = (struct sfw_counters *)&ent->rpe_payload[0]; + srpc = (struct srpc_counters *)((char *)sfwk + sizeof(*sfwk)); if (srpc->errors == 0 && sfwk->brw_errors == 0 && sfwk->ping_errors == 0) @@ -2053,10 +2170,10 @@ jt_lst_show_error(int argc, char **argv) fprintf(stdout, "Total %d error nodes in %s\n", ecount, srp->srp_name); } out: - while (!cfs_list_empty(&head)) { - srp = cfs_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); - cfs_list_del(&srp->srp_link); + list_del(&srp->srp_link); lst_stat_req_param_free(srp); } @@ -2064,9 +2181,9 @@ out: } int -lst_add_batch_ioctl (char *name) +lst_add_batch_ioctl(char *name) { - lstio_batch_add_args_t args = {0}; + struct lstio_batch_add_args args = { 0 }; args.lstio_bat_key = session_key; args.lstio_bat_nmlen = strlen(name); @@ -2110,9 +2227,9 @@ jt_lst_add_batch(int argc, char **argv) } int -lst_start_batch_ioctl (char *name, int timeout, cfs_list_t *resultp) +lst_start_batch_ioctl(char *name, int timeout, struct list_head *resultp) { - lstio_batch_run_args_t args = {0}; + struct lstio_batch_run_args args = { 0 }; args.lstio_bat_key = session_key; args.lstio_bat_timeout = timeout; @@ -2126,7 +2243,7 @@ lst_start_batch_ioctl (char *name, int timeout, cfs_list_t *resultp) int jt_lst_start_batch(int argc, char **argv) { - cfs_list_t head; + struct list_head head; char *batch; int optidx = 0; int timeout = 0; @@ -2182,7 +2299,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) { @@ -2213,9 +2330,9 @@ jt_lst_start_batch(int argc, char **argv) } int -lst_stop_batch_ioctl(char *name, int force, cfs_list_t *resultp) +lst_stop_batch_ioctl(char *name, int force, struct list_head *resultp) { - lstio_batch_stop_args_t args = {0}; + struct lstio_batch_stop_args args = { 0 }; args.lstio_bat_key = session_key; args.lstio_bat_force = force; @@ -2229,7 +2346,7 @@ lst_stop_batch_ioctl(char *name, int force, cfs_list_t *resultp) int jt_lst_stop_batch(int argc, char **argv) { - cfs_list_t head; + struct list_head head; char *batch; int force = 0; int optidx; @@ -2285,7 +2402,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) { @@ -2335,7 +2452,7 @@ out: int lst_list_batch_ioctl(int len, char *name, int index) { - lstio_batch_list_args_t args = {0}; + struct lstio_batch_list_args args = { 0 }; args.lstio_bat_key = session_key; args.lstio_bat_idx = index; @@ -2347,10 +2464,10 @@ lst_list_batch_ioctl(int len, char *name, int index) 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) + struct lstcon_test_batch_ent *entp, int *idxp, + int *ndentp, struct lstcon_node_ent *dentsp) { - lstio_batch_info_args_t args = {0}; + struct lstio_batch_info_args args = { 0 }; args.lstio_bat_key = session_key; args.lstio_bat_nmlen = strlen(batch); @@ -2396,7 +2513,7 @@ int lst_list_tsb_nodes(char *batch, int test, int server, int count, int active, int invalid) { - lstcon_node_ent_t *dents; + struct lstcon_node_ent *dents; int index = 0; int rc; int c; @@ -2406,7 +2523,7 @@ lst_list_tsb_nodes(char *batch, int test, int server, return 0; /* verbose list, show nodes in batch or test */ - dents = malloc(count * sizeof(lstcon_node_ent_t)); + dents = malloc(count * sizeof(struct lstcon_node_ent)); if (dents == NULL) { fprintf(stdout, "Can't allocate memory\n"); return -1; @@ -2445,7 +2562,7 @@ lst_list_tsb_nodes(char *batch, int test, int server, int jt_lst_list_batch(int argc, char **argv) { - lstcon_test_batch_ent_t ent; + struct lstcon_test_batch_ent ent; char *batch = NULL; int optidx = 0; int verbose = 0; /* list nodes in batch or test */ @@ -2582,9 +2699,9 @@ loop: int lst_query_batch_ioctl(char *batch, int test, int server, - int timeout, cfs_list_t *head) + int timeout, struct list_head *head) { - lstio_batch_query_args_t args = {0}; + struct lstio_batch_query_args args = { 0 }; args.lstio_bat_key = session_key; args.lstio_bat_testidx = test; @@ -2598,12 +2715,12 @@ lst_query_batch_ioctl(char *batch, int test, int server, } void -lst_print_tsb_verbose(cfs_list_t *head, +lst_print_tsb_verbose(struct list_head *head, int active, int idle, int error) { - lstcon_rpc_ent_t *ent; + struct lstcon_rpc_ent *ent; - cfs_list_for_each_entry_typed(ent, head, lstcon_rpc_ent_t, rpe_link) { + list_for_each_entry(ent, head, rpe_link) { if (ent->rpe_priv[0] == 0 && active) continue; @@ -2625,8 +2742,8 @@ lst_print_tsb_verbose(cfs_list_t *head, int jt_lst_query_batch(int argc, char **argv) { - lstcon_test_batch_ent_t ent; - cfs_list_t head; + struct lstcon_test_batch_ent ent; + struct list_head head; char *batch = NULL; time_t last = 0; int optidx = 0; @@ -2723,7 +2840,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, @@ -2824,7 +2941,7 @@ lst_parse_distribute(char *dstr, int *dist, int *span) } int -lst_get_bulk_param(int argc, char **argv, lst_test_bulk_param_t *bulk) +lst_get_bulk_param(int argc, char **argv, struct lst_test_bulk_param *bulk) { char *tok = NULL; char *end = NULL; @@ -2834,6 +2951,7 @@ lst_get_bulk_param(int argc, char **argv, lst_test_bulk_param_t *bulk) 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] || @@ -2849,8 +2967,10 @@ lst_get_bulk_param(int argc, char **argv, lst_test_bulk_param_t *bulk) return -1; } - } else if (strcasestr(argv[i], "size=") == argv[i] || - strcasestr(argv[i], "s=") == argv[i]) { + } 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); @@ -2867,12 +2987,33 @@ 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 > 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; @@ -2895,7 +3036,7 @@ lst_get_bulk_param(int argc, char **argv, lst_test_bulk_param_t *bulk) int lst_get_test_param(char *test, int argc, char **argv, void **param, int *plen) { - lst_test_bulk_param_t *bulk = NULL; + struct lst_test_bulk_param *bulk = NULL; int type; type = lst_test_name2type(test); @@ -2938,9 +3079,9 @@ 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, cfs_list_t *resultp) + void *param, int plen, int *retp, struct list_head *resultp) { - lstio_test_args_t args = {0}; + struct lstio_test_args args = { 0 }; args.lstio_tes_key = session_key; args.lstio_tes_bat_nmlen = strlen(batch); @@ -2966,7 +3107,7 @@ lst_add_test_ioctl(char *batch, int type, int loop, int concur, int jt_lst_add_test(int argc, char **argv) { - cfs_list_t head; + struct list_head head; char *batch = NULL; char *test = NULL; char *dstr = NULL; @@ -3068,7 +3209,7 @@ jt_lst_add_test(int argc, char **argv) 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) { @@ -3137,9 +3278,9 @@ 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 NAME | IDS ..." }, {"add_batch", jt_lst_add_batch, NULL, @@ -3162,7 +3303,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"); @@ -3183,10 +3337,6 @@ main(int argc, char **argv) setlinebuf(stdout); - rc = libcfs_arch_init(); - if (rc < 0) - return rc; - rc = lst_initialize(); if (rc < 0) goto errorout; @@ -3194,7 +3344,7 @@ main(int argc, char **argv) rc = ptl_initialize(argc, argv); if (rc < 0) goto errorout; - + Parser_init("lst > ", lst_cmdlist); if (argc != 1) { @@ -3205,6 +3355,5 @@ main(int argc, char **argv) Parser_commands(); errorout: - libcfs_arch_cleanup(); return rc; }