X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fselftest%2Fconsole.h;h=dd01b94878e1242b93ea2a836b28f63c3f09615f;hb=a28ae45d7709c89ae86af8de357842a454361a39;hp=5f61a864ca2c20e6517fb7384f066b89ea84ce7f;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git diff --git a/lnet/selftest/console.h b/lnet/selftest/console.h index 5f61a86..dd01b94 100644 --- a/lnet/selftest/console.h +++ b/lnet/selftest/console.h @@ -15,11 +15,7 @@ * * 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 */ @@ -27,11 +23,10 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Intel Corporation. + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. * * lnet/selftest/console.h * @@ -43,70 +38,88 @@ #ifndef __LST_CONSOLE_H__ #define __LST_CONSOLE_H__ -#ifdef __KERNEL__ +#include #include -#include #include -#include #include "selftest.h" #include "conrpc.h" -typedef struct lstcon_node { - lnet_process_id_t nd_id; /* id of the node */ +/* node descriptor */ +struct lstcon_node { + struct lnet_process_id nd_id; /* id of the node */ int nd_ref; /* reference count */ int nd_state; /* state of the node */ int nd_timeout; /* session timeout */ - cfs_time_t nd_stamp; /* timestamp of last replied RPC */ - struct lstcon_rpc nd_ping; /* ping rpc */ -} lstcon_node_t; /*** node descriptor */ - -typedef struct { - cfs_list_t ndl_link; /* chain on list */ - cfs_list_t ndl_hlink; /* chain on hash */ - lstcon_node_t *ndl_node; /* pointer to node */ -} lstcon_ndlink_t; /*** node link descriptor */ - -typedef struct { - cfs_list_t grp_link; /* chain on global group list */ - int grp_ref; /* reference count */ - int grp_userland; /* has userland nodes */ - int grp_nnode; /* # of nodes */ - char grp_name[LST_NAME_SIZE]; /* group name */ - - cfs_list_t grp_trans_list; /* transaction list */ - cfs_list_t grp_ndl_list; /* nodes list */ - cfs_list_t grp_ndl_hash[0];/* hash table for nodes */ -} lstcon_group_t; /*** (alias of nodes) group descriptor */ + ktime_t nd_stamp; /* last RPC reply timestamp */ + struct lstcon_rpc nd_ping; /* ping rpc */ +}; + +/* node link descriptor */ +struct lstcon_ndlink { + struct list_head ndl_link; /* chain on list */ + struct list_head ndl_hlink; /* chain on hash */ + struct lstcon_node *ndl_node; /* pointer to node */ +}; + +/* (alias of nodes) group descriptor */ +struct lstcon_group { + struct list_head grp_link; /* chain on global group list */ + int grp_ref; /* reference count */ + int grp_userland; /* has userland nodes */ + int grp_nnode; /* # of nodes */ + char grp_name[LST_NAME_SIZE]; /* group name */ + + struct list_head grp_trans_list; /* transaction list */ + struct list_head grp_ndl_list; /* nodes list */ + struct list_head grp_ndl_hash[0];/* hash table for nodes */ +}; #define LST_BATCH_IDLE 0xB0 /* idle batch */ #define LST_BATCH_RUNNING 0xB1 /* running batch */ -typedef struct lstcon_tsb_hdr { - lst_bid_t tsb_id; /* batch ID */ +struct lstcon_tsb_hdr { + struct lst_bid tsb_id; /* batch ID */ int tsb_index; /* test index */ -} lstcon_tsb_hdr_t; - -typedef struct { - lstcon_tsb_hdr_t bat_hdr; /* test_batch header */ - cfs_list_t bat_link; /* chain on session's batches list */ - int bat_ntest; /* # of test */ - int bat_state; /* state of the batch */ - int bat_arg; /* parameter for run|stop, timeout for run, force for stop */ - char bat_name[LST_NAME_SIZE]; /* name of batch */ - - cfs_list_t bat_test_list; /* list head of tests (lstcon_test_t) */ - cfs_list_t bat_trans_list; /* list head of transaction */ - cfs_list_t bat_cli_list; /* list head of client nodes (lstcon_node_t) */ - cfs_list_t *bat_cli_hash; /* hash table of client nodes */ - cfs_list_t bat_srv_list; /* list head of server nodes */ - cfs_list_t *bat_srv_hash; /* hash table of server nodes */ -} lstcon_batch_t; /*** (tests ) batch descritptor */ - -typedef struct lstcon_test { - lstcon_tsb_hdr_t tes_hdr; /* test batch header */ - cfs_list_t tes_link; /* chain on batch's tests list */ - lstcon_batch_t *tes_batch; /* pointer to batch */ +}; + +/* (tests ) batch descriptor */ +struct lstcon_batch { + /* test_batch header */ + struct lstcon_tsb_hdr bat_hdr; + /* chain on session's batches list */ + struct list_head bat_link; + /* # of test */ + int bat_ntest; + /* state of the batch */ + int bat_state; + /* parameter for run|stop, timeout for run, force for stop */ + int bat_arg; + /* name of batch */ + char bat_name[LST_NAME_SIZE]; + + /* list head of tests (lstcon_test_t) */ + struct list_head bat_test_list; + /* list head of transaction */ + struct list_head bat_trans_list; + /* list head of client nodes (struct lstcon_node) */ + struct list_head bat_cli_list; + /* hash table of client nodes */ + struct list_head *bat_cli_hash; + /* list head of server nodes */ + struct list_head bat_srv_list; + /* hash table of server nodes */ + struct list_head *bat_srv_hash; +}; + +/* a single test descriptor */ +struct lstcon_test { + /* test batch header */ + struct lstcon_tsb_hdr tes_hdr; + /* chain on batch's tests list */ + struct list_head tes_link; + /* pointer to batch */ + struct lstcon_batch *tes_batch; int tes_type; /* type of the test, i.e: bulk, ping */ int tes_stop_onerr; /* stop on error */ @@ -117,13 +130,13 @@ typedef struct lstcon_test { int tes_span; /* nodes span of target group */ int tes_cliidx; /* client index, used for RPC creating */ - cfs_list_t tes_trans_list; /* transaction list */ - lstcon_group_t *tes_src_grp; /* group run the test */ - lstcon_group_t *tes_dst_grp; /* target group */ + struct list_head tes_trans_list; /* transaction list */ + struct lstcon_group *tes_src_grp; /* group run the test */ + struct lstcon_group *tes_dst_grp; /* target group */ int tes_paramlen; /* test parameter length */ char tes_param[0]; /* test parameter */ -} lstcon_test_t; /*** a single test descriptor */ +}; #define LST_GLOBAL_HASHSIZE 503 /* global nodes hash table size */ #define LST_NODE_HASHSIZE 239 /* node hash table (for batch or group) */ @@ -133,13 +146,13 @@ typedef struct lstcon_test { #define LST_CONSOLE_TIMEOUT 300 /* default console timeout */ -typedef struct { +struct lstcon_session { struct mutex ses_mutex; /* only 1 thread in session */ - lst_sid_t ses_id; /* global session id */ - int ses_key; /* local session key */ + struct lst_session_id ses_id; /* global session id */ + u32 ses_key; /* local session key */ int ses_state; /* state of session */ int ses_timeout; /* timeout in seconds */ - time_t ses_laststamp; /* last operation stamp (seconds) */ + time64_t ses_laststamp; /* last operation stamp (seconds) */ /** tests features of the session */ unsigned ses_features; /** features are synced with remote test nodes */ @@ -152,83 +165,100 @@ typedef struct { unsigned ses_expired:1; __u64 ses_id_cookie; /* batch id cookie */ char ses_name[LST_NAME_SIZE]; /* session name */ - lstcon_rpc_trans_t *ses_ping; /* session pinger */ - stt_timer_t ses_ping_timer; /* timer for pinger */ - lstcon_trans_stat_t ses_trans_stat; /* transaction stats */ + struct lstcon_rpc_trans *ses_ping; /* session pinger */ + struct stt_timer ses_ping_timer; /* timer for pinger */ + struct lstcon_trans_stat ses_trans_stat;/* transaction stats */ - cfs_list_t ses_trans_list; /* global list of transaction */ - cfs_list_t ses_grp_list; /* global list of groups */ - cfs_list_t ses_bat_list; /* global list of batches */ - cfs_list_t ses_ndl_list; /* global list of nodes */ - cfs_list_t *ses_ndl_hash; /* hash table of nodes */ + struct list_head ses_trans_list; /* global list of transaction */ + struct list_head ses_grp_list; /* global list of groups */ + struct list_head ses_bat_list; /* global list of batches */ + struct list_head ses_ndl_list; /* global list of nodes */ + struct list_head *ses_ndl_hash; /* hash table of nodes */ - spinlock_t ses_rpc_lock; /* serialize */ - cfs_atomic_t ses_rpc_counter;/* # of initialized RPCs */ - cfs_list_t ses_rpc_freelist; /* idle console rpc */ -} lstcon_session_t; /*** session descriptor */ + spinlock_t ses_rpc_lock; /* serialize */ + atomic_t ses_rpc_counter;/* # of initialized RPCs */ + struct list_head ses_rpc_freelist;/* idle console rpc */ +}; /* session descriptor */ -extern lstcon_session_t console_session; +extern struct lstcon_session console_session; -static inline lstcon_trans_stat_t * +static inline struct lstcon_trans_stat * lstcon_trans_stat(void) { return &console_session.ses_trans_stat; } -static inline cfs_list_t * -lstcon_id2hash (lnet_process_id_t id, cfs_list_t *hash) +static inline struct list_head * +lstcon_id2hash(struct lnet_process_id id, struct list_head *hash) { unsigned int idx = LNET_NIDADDR(id.nid) % LST_NODE_HASHSIZE; return &hash[idx]; } -extern int lstcon_session_match(lst_sid_t sid); +extern int lstcon_session_match(struct lst_sid sid); extern int lstcon_session_new(char *name, int key, unsigned version, - int timeout, int flags, lst_sid_t *sid_up); -extern int lstcon_session_info(lst_sid_t *sid_up, int *key, unsigned *verp, - lstcon_ndlist_ent_t *entp, char *name_up, int len); + int timeout, int flags); extern int lstcon_session_end(void); -extern int lstcon_session_debug(int timeout, cfs_list_t *result_up); +extern int lstcon_session_debug(int timeout, + struct list_head __user *result_up); extern int lstcon_session_feats_check(unsigned feats); extern int lstcon_batch_debug(int timeout, char *name, - int client, cfs_list_t *result_up); + int client, struct list_head __user *result_up); extern int lstcon_group_debug(int timeout, char *name, - cfs_list_t *result_up); -extern int lstcon_nodes_debug(int timeout, int nnd, lnet_process_id_t *nds_up, - cfs_list_t *result_up); + struct list_head __user *result_up); +extern int lstcon_nodes_debug(int timeout, int nnd, + struct lnet_process_id __user *nds_up, + struct list_head __user *result_up); extern int lstcon_group_add(char *name); extern int lstcon_group_del(char *name); +void lstcon_group_addref(struct lstcon_group *grp); +void lstcon_group_decref(struct lstcon_group *grp); +int lstcon_group_find(const char *name, struct lstcon_group **grpp); extern int lstcon_group_clean(char *name, int args); -extern int lstcon_group_refresh(char *name, cfs_list_t *result_up); -extern int lstcon_nodes_add(char *name, int nnd, lnet_process_id_t *nds_up, - unsigned *featp, cfs_list_t *result_up); -extern int lstcon_nodes_remove(char *name, int nnd, lnet_process_id_t *nds_up, - cfs_list_t *result_up); -extern int lstcon_group_info(char *name, lstcon_ndlist_ent_t *gent_up, - int *index_p, int *ndent_p, lstcon_node_ent_t *ndents_up); -extern int lstcon_group_list(int idx, int len, char *name_up); +extern int lstcon_group_refresh(char *name, struct list_head __user *result_up); +extern int lstcon_nodes_add(char *name, int nnd, + struct lnet_process_id __user *nds_up, + unsigned *featp, + struct list_head __user *result_up); +extern int lstcon_nodes_remove(char *name, int nnd, + struct lnet_process_id __user *nds_up, + struct list_head __user *result_up); +extern int lstcon_group_info(char *name, struct lstcon_ndlist_ent __user *gent_up, + int *index_p, int *ndent_p, + struct lstcon_node_ent __user *ndents_up); extern int lstcon_batch_add(char *name); extern int lstcon_batch_run(char *name, int timeout, - cfs_list_t *result_up); + struct list_head __user *result_up); extern int lstcon_batch_stop(char *name, int force, - cfs_list_t *result_up); + struct list_head __user *result_up); extern int lstcon_test_batch_query(char *name, int testidx, - int client, int timeout, - cfs_list_t *result_up); + int client, int timeout, + struct list_head __user *result_up); extern int lstcon_batch_del(char *name); -extern int lstcon_batch_list(int idx, int namelen, char *name_up); -extern int lstcon_batch_info(char *name, lstcon_test_batch_ent_t *ent_up, - int server, int testidx, int *index_p, - int *ndent_p, lstcon_node_ent_t *dents_up); +extern int lstcon_batch_list(int idx, int namelen, char __user *name_up); +extern int lstcon_batch_info(char *name, + struct lstcon_test_batch_ent __user *ent_up, + int server, int testidx, int *index_p, + int *ndent_p, + struct lstcon_node_ent __user *dents_up); extern int lstcon_group_stat(char *grp_name, int timeout, - cfs_list_t *result_up); -extern int lstcon_nodes_stat(int count, lnet_process_id_t *ids_up, - int timeout, cfs_list_t *result_up); -extern int lstcon_test_add(char *name, int type, int loop, int concur, - int dist, int span, char *src_name, char * dst_name, - void *param, int paramlen, int *retp, - cfs_list_t *result_up); -#endif + struct list_head __user *result_up); +extern int lstcon_nodes_stat(int count, struct lnet_process_id __user *ids_up, + int timeout, struct list_head __user *result_up); +extern int lstcon_test_add(char *batch_name, int type, int loop, + int concur, int dist, int span, + char *src_name, char *dst_name, + void *param, int paramlen, int *retp, + struct list_head __user *result_up); + +int lstcon_ioctl_entry(struct notifier_block *nb, + unsigned long cmd, void *vdata); + +int lstcon_console_init(void); +int lstcon_console_fini(void); + +int lstcon_init_netlink(void); +void lstcon_fini_netlink(void); #endif