X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lnet%2Fselftest%2Fframework.c;h=506fcd903d8c5416c832e839d1f8ec9fd5d4f115;hb=d10200a80770f0029d1d665af954187b9ad883df;hp=c67192d9b8d04a1ba50305dc2cfd43a6b32f23cc;hpb=8553494bca7381262843f900d14c58f5c242f3ea;p=fs%2Flustre-release.git diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c index c67192d..506fcd9 100644 --- a/lnet/selftest/framework.c +++ b/lnet/selftest/framework.c @@ -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,7 +23,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, Intel Corporation. + * Copyright (c) 2012, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,15 +39,15 @@ #include "selftest.h" -lst_sid_t LST_INVALID_SID = {LNET_NID_ANY, -1}; +struct lst_sid LST_INVALID_SID = {LNET_NID_ANY, -1}; static int session_timeout = 100; -CFS_MODULE_PARM(session_timeout, "i", int, 0444, - "test session timeout in seconds (100 by default, 0 == never)"); +module_param(session_timeout, int, 0444); +MODULE_PARM_DESC(session_timeout, "test session timeout in seconds (100 by default, 0 == never)"); static int rpc_timeout = 64; -CFS_MODULE_PARM(rpc_timeout, "i", int, 0644, - "rpc timeout in seconds (64 by default, 0 == never)"); +module_param(rpc_timeout, int, 0644); +MODULE_PARM_DESC(rpc_timeout, "rpc timeout in seconds (64 by default, 0 == never)"); #define sfw_unpack_id(id) \ do { \ @@ -103,7 +99,7 @@ do { \ #define sfw_test_active(t) (atomic_read(&(t)->tsi_nactive) != 0) #define sfw_batch_active(b) (atomic_read(&(b)->bat_nactive) != 0) -struct smoketest_framework { +static struct smoketest_framework { /* RPCs to be recycled */ struct list_head fw_zombie_rpcs; /* stopping sessions */ @@ -157,7 +153,6 @@ sfw_register_test (srpc_service_t *service, sfw_test_client_ops_t *cliops) if (tsc == NULL) return -ENOMEM; - memset(tsc, 0, sizeof(sfw_test_case_t)); tsc->tsc_cli_ops = cliops; tsc->tsc_srv_service = service; @@ -165,7 +160,7 @@ sfw_register_test (srpc_service_t *service, sfw_test_client_ops_t *cliops) return 0; } -void +static void sfw_add_session_timer (void) { sfw_session_t *sn = sfw_data.fw_session; @@ -185,7 +180,7 @@ sfw_add_session_timer (void) return; } -int +static int sfw_del_session_timer (void) { sfw_session_t *sn = sfw_data.fw_session; @@ -200,10 +195,6 @@ sfw_del_session_timer (void) return 0; } -#ifndef __KERNEL__ - /* Racing is impossible in single-threaded userland selftest */ - LBUG(); -#endif return EBUSY; /* racing with sfw_session_expired() */ } @@ -251,17 +242,8 @@ __must_hold(&sfw_data.fw_lock) spin_lock(&sfw_data.fw_lock); } -#ifndef __KERNEL__ -int -sfw_session_removed (void) -{ - return (sfw_data.fw_session == NULL) ? 1 : 0; -} - -#endif - -void +static void sfw_session_expired (void *data) { sfw_session_t *sn = data; @@ -271,7 +253,7 @@ sfw_session_expired (void *data) LASSERT (sn->sn_timer_active); LASSERT (sn == sfw_data.fw_session); - CWARN ("Session expired! sid: %s-"LPU64", name: %s\n", + CWARN ("Session expired! sid: %s-%llu, name: %s\n", libcfs_nid2str(sn->sn_id.ses_nid), sn->sn_id.ses_stamp, &sn->sn_name[0]); @@ -282,7 +264,7 @@ sfw_session_expired (void *data) } static inline void -sfw_init_session(sfw_session_t *sn, lst_sid_t sid, +sfw_init_session(sfw_session_t *sn, struct lst_sid sid, unsigned features, const char *name) { stt_timer_t *timer = &sn->sn_timer; @@ -307,7 +289,7 @@ sfw_init_session(sfw_session_t *sn, lst_sid_t sid, } /* completion handler for incoming framework RPCs */ -void +static void sfw_server_rpc_done(struct srpc_server_rpc *rpc) { struct srpc_service *sv = rpc->srpc_scd->scd_svc; @@ -325,15 +307,12 @@ sfw_server_rpc_done(struct srpc_server_rpc *rpc) return; } -void +static void sfw_client_rpc_fini (srpc_client_rpc_t *rpc) { LASSERT(rpc->crpc_bulk.bk_niov == 0); LASSERT(list_empty(&rpc->crpc_list)); LASSERT(atomic_read(&rpc->crpc_refcount) == 0); -#ifndef __KERNEL__ - LASSERT(rpc->crpc_bulk.bk_pages == NULL); -#endif CDEBUG(D_NET, "Outgoing framework RPC done: " "service %d, peer %s, status %s:%d:%d\n", @@ -350,8 +329,8 @@ sfw_client_rpc_fini (srpc_client_rpc_t *rpc) spin_unlock(&sfw_data.fw_lock); } -sfw_batch_t * -sfw_find_batch (lst_bid_t bid) +static sfw_batch_t * +sfw_find_batch(struct lst_bid bid) { sfw_session_t *sn = sfw_data.fw_session; sfw_batch_t *bat; @@ -366,8 +345,8 @@ sfw_find_batch (lst_bid_t bid) return NULL; } -sfw_batch_t * -sfw_bid2batch (lst_bid_t bid) +static sfw_batch_t * +sfw_bid2batch(struct lst_bid bid) { sfw_session_t *sn = sfw_data.fw_session; sfw_batch_t *bat; @@ -379,7 +358,7 @@ sfw_bid2batch (lst_bid_t bid) return bat; LIBCFS_ALLOC(bat, sizeof(sfw_batch_t)); - if (bat == NULL) + if (bat == NULL) return NULL; bat->bat_error = 0; @@ -392,11 +371,11 @@ sfw_bid2batch (lst_bid_t bid) return bat; } -int +static int sfw_get_stats (srpc_stat_reqst_t *request, srpc_stat_reply_t *reply) { sfw_session_t *sn = sfw_data.fw_session; - sfw_counters_t *cnt = &reply->str_fw; + struct sfw_counters *cnt = &reply->str_fw; sfw_batch_t *bat; struct timeval tv; @@ -504,7 +483,7 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply) return 0; } -int +static int sfw_remove_session (srpc_rmsn_reqst_t *request, srpc_rmsn_reply_t *reply) { sfw_session_t *sn = sfw_data.fw_session; @@ -536,7 +515,7 @@ sfw_remove_session (srpc_rmsn_reqst_t *request, srpc_rmsn_reply_t *reply) return 0; } -int +static int sfw_debug_session (srpc_debug_reqst_t *request, srpc_debug_reply_t *reply) { sfw_session_t *sn = sfw_data.fw_session; @@ -545,7 +524,7 @@ sfw_debug_session (srpc_debug_reqst_t *request, srpc_debug_reply_t *reply) reply->dbg_status = ESRCH; reply->dbg_sid = LST_INVALID_SID; return 0; - } + } reply->dbg_status = 0; reply->dbg_sid = sn->sn_id; @@ -557,7 +536,7 @@ sfw_debug_session (srpc_debug_reqst_t *request, srpc_debug_reply_t *reply) return 0; } -void +static void sfw_test_rpc_fini (srpc_client_rpc_t *rpc) { sfw_test_unit_t *tsu = rpc->crpc_priv; @@ -585,7 +564,7 @@ sfw_test_buffers(sfw_test_instance_t *tsi) return max(SFW_TEST_WI_MIN, nbuf + SFW_TEST_WI_EXTRA); } -int +static int sfw_load_test(struct sfw_test_instance *tsi) { struct sfw_test_case *tsc; @@ -622,7 +601,7 @@ sfw_load_test(struct sfw_test_instance *tsi) return 0; } -void +static void sfw_unload_test(struct sfw_test_instance *tsi) { struct sfw_test_case *tsc; @@ -642,7 +621,7 @@ sfw_unload_test(struct sfw_test_instance *tsi) return; } -void +static void sfw_destroy_test_instance (sfw_test_instance_t *tsi) { srpc_client_rpc_t *rpc; @@ -676,7 +655,7 @@ clean: return; } -void +static void sfw_destroy_batch (sfw_batch_t *tsb) { sfw_test_instance_t *tsi; @@ -715,7 +694,7 @@ sfw_destroy_session (sfw_session_t *sn) return; } -void +static void sfw_unpack_addtest_req(srpc_msg_t *msg) { srpc_test_reqst_t *req = &msg->msg_body.tes_reqst; @@ -760,7 +739,7 @@ sfw_unpack_addtest_req(srpc_msg_t *msg) return; } -int +static int sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc) { srpc_msg_t *msg = &rpc->srpc_reqstbuf->buf_msg; @@ -774,12 +753,11 @@ sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc) LIBCFS_ALLOC(tsi, sizeof(*tsi)); if (tsi == NULL) { - CERROR ("Can't allocate test instance for batch: "LPU64"\n", + CERROR ("Can't allocate test instance for batch: %llu\n", tsb->bat_id.bat_id); return -ENOMEM; } - memset(tsi, 0, sizeof(*tsi)); spin_lock_init(&tsi->tsi_lock); atomic_set(&tsi->tsi_nactive, 0); INIT_LIST_HEAD(&tsi->tsi_units); @@ -809,9 +787,6 @@ sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc) } LASSERT (bk != NULL); -#ifndef __KERNEL__ - LASSERT (bk->bk_pages != NULL); -#endif LASSERT (bk->bk_niov * SFW_ID_PER_PAGE >= (unsigned int)ndest); LASSERT((unsigned int)bk->bk_len >= sizeof(lnet_process_id_packed_t) * ndest); @@ -824,12 +799,8 @@ sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc) lnet_process_id_packed_t id; int j; -#ifdef __KERNEL__ dests = page_address(bk->bk_iovs[i / SFW_ID_PER_PAGE].kiov_page); LASSERT (dests != NULL); /* my pages are within KVM always */ -#else - dests = page_address(bk->bk_pages[i / SFW_ID_PER_PAGE]); -#endif id = dests[i % SFW_ID_PER_PAGE]; if (msg->msg_magic != SRPC_MSG_MAGIC) sfw_unpack_id(id); @@ -906,7 +877,7 @@ sfw_test_unit_done (sfw_test_unit_t *tsu) return; } -void +static void sfw_test_rpc_done (srpc_client_rpc_t *rpc) { sfw_test_unit_t *tsu = rpc->crpc_priv; @@ -985,7 +956,7 @@ sfw_create_test_rpc(sfw_test_unit_t *tsu, lnet_process_id_t peer, return 0; } -int +static int sfw_run_test (swi_workitem_t *wi) { sfw_test_unit_t *tsu = wi->swi_workitem.wi_data; @@ -1034,7 +1005,7 @@ test_done: return 1; } -int +static int sfw_run_batch (sfw_batch_t *tsb) { swi_workitem_t *wi; @@ -1042,7 +1013,7 @@ sfw_run_batch (sfw_batch_t *tsb) sfw_test_instance_t *tsi; if (sfw_batch_active(tsb)) { - CDEBUG(D_NET, "Batch already active: "LPU64" (%d)\n", + CDEBUG(D_NET, "Batch already active: %llu (%d)\n", tsb->bat_id.bat_id, atomic_read(&tsb->bat_nactive)); return 0; } @@ -1077,7 +1048,7 @@ sfw_stop_batch (sfw_batch_t *tsb, int force) srpc_client_rpc_t *rpc; if (!sfw_batch_active(tsb)) { - CDEBUG(D_NET, "Batch "LPU64" inactive\n", tsb->bat_id.bat_id); + CDEBUG(D_NET, "Batch %llu inactive\n", tsb->bat_id.bat_id); return 0; } @@ -1112,7 +1083,7 @@ sfw_stop_batch (sfw_batch_t *tsb, int force) return 0; } -int +static int sfw_query_batch (sfw_batch_t *tsb, int testidx, srpc_batch_reply_t *reply) { sfw_test_instance_t *tsi; @@ -1150,14 +1121,14 @@ sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len, LASSERT(rpc->srpc_bulk == NULL); LASSERT(npages > 0 && npages <= LNET_MAX_IOV); - rpc->srpc_bulk = srpc_alloc_bulk(cpt, npages, len, sink); + rpc->srpc_bulk = srpc_alloc_bulk(cpt, 0, npages, len, sink); if (rpc->srpc_bulk == NULL) return -ENOMEM; return 0; } -int +static int sfw_add_test (srpc_server_rpc_t *rpc) { sfw_session_t *sn = sfw_data.fw_session; @@ -1206,7 +1177,7 @@ sfw_add_test (srpc_server_rpc_t *rpc) int len; if ((sn->sn_features & LST_FEAT_BULK_LEN) == 0) { - len = npg * PAGE_CACHE_SIZE; + len = npg * PAGE_SIZE; } else { len = sizeof(lnet_process_id_packed_t) * @@ -1227,7 +1198,7 @@ sfw_add_test (srpc_server_rpc_t *rpc) return 0; } -int +static int sfw_control_batch (srpc_batch_reqst_t *request, srpc_batch_reply_t *reply) { sfw_session_t *sn = sfw_data.fw_session; @@ -1268,7 +1239,7 @@ sfw_control_batch (srpc_batch_reqst_t *request, srpc_batch_reply_t *reply) return 0; } -int +static int sfw_handle_server_rpc(struct srpc_server_rpc *rpc) { struct srpc_service *sv = rpc->srpc_scd->scd_svc; @@ -1366,20 +1337,15 @@ sfw_handle_server_rpc(struct srpc_server_rpc *rpc) rpc->srpc_done = sfw_server_rpc_done; spin_lock(&sfw_data.fw_lock); -#ifdef __KERNEL__ if (!sfw_data.fw_shuttingdown) sfw_add_session_timer(); -#else - LASSERT(!sfw_data.fw_shuttingdown); - sfw_add_session_timer(); -#endif sfw_data.fw_active_srpc = NULL; spin_unlock(&sfw_data.fw_lock); return rc; } -int +static int sfw_bulk_ready(struct srpc_server_rpc *rpc, int status) { struct srpc_service *sv = rpc->srpc_scd->scd_svc; @@ -1419,13 +1385,8 @@ sfw_bulk_ready(struct srpc_server_rpc *rpc, int status) spin_lock(&sfw_data.fw_lock); -#ifdef __KERNEL__ if (!sfw_data.fw_shuttingdown) sfw_add_session_timer(); -#else - LASSERT(!sfw_data.fw_shuttingdown); - sfw_add_session_timer(); -#endif sfw_data.fw_active_srpc = NULL; spin_unlock(&sfw_data.fw_lock); @@ -1642,7 +1603,7 @@ sfw_post_rpc (srpc_client_rpc_t *rpc) return; } -static srpc_service_t sfw_services[] = +static srpc_service_t sfw_services[] = { { /* sv_id */ SRPC_SERVICE_DEBUG, @@ -1681,17 +1642,6 @@ static srpc_service_t sfw_services[] = } }; -extern sfw_test_client_ops_t ping_test_client; -extern srpc_service_t ping_test_service; -extern void ping_init_test_client(void); -extern void ping_init_test_service(void); - -extern sfw_test_client_ops_t brw_test_client; -extern srpc_service_t brw_test_service; -extern void brw_init_test_client(void); -extern void brw_init_test_service(void); - - int sfw_startup (void) { @@ -1701,15 +1651,6 @@ sfw_startup (void) srpc_service_t *sv; sfw_test_case_t *tsc; -#ifndef __KERNEL__ - char *s; - - s = getenv("SESSION_TIMEOUT"); - session_timeout = s != NULL ? atoi(s) : session_timeout; - - s = getenv("RPC_TIMEOUT"); - rpc_timeout = s != NULL ? atoi(s) : rpc_timeout; -#endif if (session_timeout < 0) { CERROR ("Session timeout must be non-negative: %d\n", @@ -1809,12 +1750,8 @@ sfw_shutdown (void) spin_lock(&sfw_data.fw_lock); sfw_data.fw_shuttingdown = 1; -#ifdef __KERNEL__ lst_wait_until(sfw_data.fw_active_srpc == NULL, sfw_data.fw_lock, "waiting for active RPC to finish.\n"); -#else - LASSERT (sfw_data.fw_active_srpc == NULL); -#endif if (sfw_del_session_timer() != 0) lst_wait_until(sfw_data.fw_session == NULL, sfw_data.fw_lock,