X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Flst.c;h=63db07dc2b8507eefd82982697eeb6d5381c492c;hb=11b08d4ee69a242b763e5f4a34c511cb857f7868;hp=37a7580c82652f575b6ae290a8d26c061930244a;hpb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;p=fs%2Flustre-release.git diff --git a/lnet/utils/lst.c b/lnet/utils/lst.c index 37a7580..63db07d 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. @@ -26,8 +24,10 @@ * 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, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,11 +43,21 @@ #include #include #include - +/* NB: these includes are layering violation */ +#include +#include lst_sid_t LST_INVALID_SID = {LNET_NID_ANY, -1}; static lst_sid_t session_id; 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 { @@ -456,7 +466,7 @@ 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)); } @@ -505,7 +515,7 @@ 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, lst_sid_t *sid) { lstio_session_new_args_t args = {0}; @@ -513,6 +523,7 @@ lst_new_session_ioctl (char *name, int timeout, int force, lst_sid_t *sid) 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; @@ -600,32 +611,31 @@ 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, + lst_sid_t *sid, lstcon_ndlist_ent_t *ndinfo) { - lstio_session_info_args_t args = {0}; + lstio_session_info_args_t 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 @@ -634,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", @@ -645,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; } @@ -728,14 +740,15 @@ 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; @@ -898,7 +911,7 @@ out: int lst_add_nodes_ioctl (char *name, int count, lnet_process_id_t *ids, - cfs_list_t *resultp) + unsigned *featp, cfs_list_t *resultp) { lstio_group_nodes_args_t args = {0}; @@ -906,6 +919,7 @@ lst_add_nodes_ioctl (char *name, int count, lnet_process_id_t *ids, 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; @@ -930,6 +944,7 @@ jt_lst_add_group(int argc, char **argv) cfs_list_t head; lnet_process_id_t *ids; char *name; + unsigned feats = session_features; int count; int rc; int i; @@ -976,31 +991,50 @@ jt_lst_add_group(int argc, char **argv) rc = lst_alloc_rpcent(&head, count, 0); if (rc != 0) { fprintf(stderr, "Out of memory\n"); - break; - } + return -1; + } - rc = lst_add_nodes_ioctl(name, count, ids, &head); + rc = lst_add_nodes_ioctl(name, count, ids, &feats, &head); - free(ids); + free(ids); - if (rc == 0) { - lst_free_rpcent(&head); - fprintf(stderr, "%s are added to session\n", argv[i]); - continue; - } + if (rc != 0) + goto failed; - if (rc == -1) { - lst_free_rpcent(&head); - lst_print_error("group", "Failed to add nodes %s: %s\n", - argv[i], strerror(errno)); - break; - } + fprintf(stdout, "%s are added to session\n", argv[i]); - lst_print_transerr(&head, "create session"); - lst_free_rpcent(&head); - } + 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)); + } - return rc; + lst_free_rpcent(&head); + } + + return 0; + +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); + + return rc; } int @@ -1558,18 +1592,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 @@ -1692,7 +1726,7 @@ lst_print_lnet_stat(char *name, int bwrt, int rdwr, int type) void lst_print_stat(char *name, cfs_list_t *resultp, - int idx, int lnet, int bwrt, int rdwr, int type) + int idx, int lnet, int bwrt, int rdwr, int type) { cfs_list_t tmp[2]; lstcon_rpc_ent_t *new; @@ -1703,7 +1737,6 @@ lst_print_stat(char *name, cfs_list_t *resultp, srpc_counters_t *srpc_old; lnet_counters_t *lnet_new; lnet_counters_t *lnet_old; - struct timeval tv; float delta; int errcount = 0; @@ -1754,9 +1787,26 @@ lst_print_stat(char *name, cfs_list_t *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 = tv.tv_sec + (float)tv.tv_usec/1000000; + delta = (float) (sfwk_new->running_ms - + sfwk_old->running_ms) / 1000; + } else { + struct timeval tv; + + lst_timeval_diff(&new->rpe_stamp, &old->rpe_stamp, &tv); + delta = tv.tv_sec + (float)tv.tv_usec / 1000000; + } if (!lnet) /* TODO */ continue; @@ -1785,6 +1835,7 @@ jt_lst_stat(int argc, char **argv) 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; @@ -1795,18 +1846,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) { @@ -1816,7 +1868,7 @@ 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; @@ -1828,6 +1880,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; @@ -1867,6 +1922,7 @@ jt_lst_stat(int argc, char **argv) } type |= 4; break; + default: lst_print_usage(argv[0]); return -1; @@ -1883,6 +1939,15 @@ 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) { @@ -1893,7 +1958,7 @@ jt_lst_stat(int argc, char **argv) cfs_list_add_tail(&srp->srp_link, &head); } - while (1) { + do { time_t now = time(NULL); if (now - last < delay) { @@ -1914,14 +1979,17 @@ 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 (!cfs_list_empty(&head)) { @@ -1942,7 +2010,6 @@ jt_lst_show_error(int argc, char **argv) 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; @@ -1996,7 +2063,7 @@ jt_lst_show_error(int argc, char **argv) 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", @@ -2026,7 +2093,6 @@ 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) @@ -3137,9 +3203,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] " + " [--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 +3228,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");