X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fselftest%2Fframework.c;h=b5bd9e5f38b39a8f0a8bac8f03a7d04bf0f13965;hp=5f1568ab5901e79672ec20f6b7692fc6fc1d3a22;hb=3b84a1ee5213563945225854a50e9037bb9646db;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c index 5f1568a..b5bd9e5 100644 --- a/lnet/selftest/framework.c +++ b/lnet/selftest/framework.c @@ -27,7 +27,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, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -100,18 +100,26 @@ do { \ __swab64s(&(lc).route_length); \ } while (0) -#define sfw_test_active(t) (cfs_atomic_read(&(t)->tsi_nactive) != 0) -#define sfw_batch_active(b) (cfs_atomic_read(&(b)->bat_nactive) != 0) - -struct smoketest_framework { - cfs_list_t fw_zombie_rpcs; /* RPCs to be recycled */ - cfs_list_t fw_zombie_sessions; /* stopping sessions */ - cfs_list_t fw_tests; /* registered test cases */ - cfs_atomic_t fw_nzombies; /* # zombie sessions */ - spinlock_t fw_lock; /* serialise */ - sfw_session_t *fw_session; /* _the_ session */ - int fw_shuttingdown; /* shutdown in progress */ - srpc_server_rpc_t *fw_active_srpc; /* running RPC */ +#define sfw_test_active(t) (atomic_read(&(t)->tsi_nactive) != 0) +#define sfw_batch_active(b) (atomic_read(&(b)->bat_nactive) != 0) + +static struct smoketest_framework { + /* RPCs to be recycled */ + struct list_head fw_zombie_rpcs; + /* stopping sessions */ + struct list_head fw_zombie_sessions; + /* registered test cases */ + struct list_head fw_tests; + /* # zombie sessions */ + atomic_t fw_nzombies; + /* serialise */ + spinlock_t fw_lock; + /* _the_ session */ + sfw_session_t *fw_session; + /* shutdown in progress */ + int fw_shuttingdown; + /* running RPC */ + srpc_server_rpc_t *fw_active_srpc; } sfw_data; /* forward ref's */ @@ -121,18 +129,17 @@ void sfw_destroy_session (sfw_session_t *sn); static inline sfw_test_case_t * sfw_find_test_case(int id) { - sfw_test_case_t *tsc; + sfw_test_case_t *tsc; - LASSERT (id <= SRPC_SERVICE_MAX_ID); - LASSERT (id > SRPC_FRAMEWORK_SERVICE_MAX_ID); + LASSERT(id <= SRPC_SERVICE_MAX_ID); + LASSERT(id > SRPC_FRAMEWORK_SERVICE_MAX_ID); - cfs_list_for_each_entry_typed (tsc, &sfw_data.fw_tests, - sfw_test_case_t, tsc_list) { - if (tsc->tsc_srv_service->sv_id == id) - return tsc; - } + list_for_each_entry(tsc, &sfw_data.fw_tests, tsc_list) { + if (tsc->tsc_srv_service->sv_id == id) + return tsc; + } - return NULL; + return NULL; } static int @@ -154,11 +161,11 @@ sfw_register_test (srpc_service_t *service, sfw_test_client_ops_t *cliops) tsc->tsc_cli_ops = cliops; tsc->tsc_srv_service = service; - cfs_list_add_tail(&tsc->tsc_list, &sfw_data.fw_tests); - return 0; + list_add_tail(&tsc->tsc_list, &sfw_data.fw_tests); + return 0; } -void +static void sfw_add_session_timer (void) { sfw_session_t *sn = sfw_data.fw_session; @@ -178,7 +185,7 @@ sfw_add_session_timer (void) return; } -int +static int sfw_del_session_timer (void) { sfw_session_t *sn = sfw_data.fw_session; @@ -193,16 +200,13 @@ 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() */ } /* called with sfw_data.fw_lock held */ static void sfw_deactivate_session (void) +__must_hold(&sfw_data.fw_lock) { sfw_session_t *sn = sfw_data.fw_session; int nactive = 0; @@ -211,33 +215,31 @@ sfw_deactivate_session (void) if (sn == NULL) return; - LASSERT (!sn->sn_timer_active); + LASSERT(!sn->sn_timer_active); - sfw_data.fw_session = NULL; - cfs_atomic_inc(&sfw_data.fw_nzombies); - cfs_list_add(&sn->sn_list, &sfw_data.fw_zombie_sessions); + sfw_data.fw_session = NULL; + atomic_inc(&sfw_data.fw_nzombies); + list_add(&sn->sn_list, &sfw_data.fw_zombie_sessions); spin_unlock(&sfw_data.fw_lock); - cfs_list_for_each_entry_typed(tsc, &sfw_data.fw_tests, - sfw_test_case_t, tsc_list) { + list_for_each_entry(tsc, &sfw_data.fw_tests, tsc_list) { srpc_abort_service(tsc->tsc_srv_service); } spin_lock(&sfw_data.fw_lock); - cfs_list_for_each_entry_typed (tsb, &sn->sn_batches, - sfw_batch_t, bat_list) { - if (sfw_batch_active(tsb)) { - nactive++; - sfw_stop_batch(tsb, 1); - } - } + list_for_each_entry(tsb, &sn->sn_batches, bat_list) { + if (sfw_batch_active(tsb)) { + nactive++; + sfw_stop_batch(tsb, 1); + } + } - if (nactive != 0) - return; /* wait for active batches to stop */ + if (nactive != 0) + return; /* wait for active batches to stop */ - cfs_list_del_init(&sn->sn_list); + list_del_init(&sn->sn_list); spin_unlock(&sfw_data.fw_lock); sfw_destroy_session(sn); @@ -245,17 +247,8 @@ sfw_deactivate_session (void) 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; @@ -282,12 +275,12 @@ sfw_init_session(sfw_session_t *sn, lst_sid_t sid, stt_timer_t *timer = &sn->sn_timer; memset(sn, 0, sizeof(sfw_session_t)); - CFS_INIT_LIST_HEAD(&sn->sn_list); - CFS_INIT_LIST_HEAD(&sn->sn_batches); - cfs_atomic_set(&sn->sn_refcount, 1); /* +1 for caller */ - cfs_atomic_set(&sn->sn_brw_errors, 0); - cfs_atomic_set(&sn->sn_ping_errors, 0); - strncpy(&sn->sn_name[0], name, LST_NAME_SIZE); + INIT_LIST_HEAD(&sn->sn_list); + INIT_LIST_HEAD(&sn->sn_batches); + atomic_set(&sn->sn_refcount, 1); /* +1 for caller */ + atomic_set(&sn->sn_brw_errors, 0); + atomic_set(&sn->sn_ping_errors, 0); + strlcpy(&sn->sn_name[0], name, sizeof(sn->sn_name)); sn->sn_timer_active = 0; sn->sn_id = sid; @@ -297,11 +290,11 @@ sfw_init_session(sfw_session_t *sn, lst_sid_t sid, timer->stt_data = sn; timer->stt_func = sfw_session_expired; - CFS_INIT_LIST_HEAD(&timer->stt_list); + INIT_LIST_HEAD(&timer->stt_list); } /* 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; @@ -319,50 +312,45 @@ 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 (cfs_list_empty(&rpc->crpc_list)); - LASSERT (cfs_atomic_read(&rpc->crpc_refcount) == 0); -#ifndef __KERNEL__ - LASSERT (rpc->crpc_bulk.bk_pages == NULL); -#endif + LASSERT(rpc->crpc_bulk.bk_niov == 0); + LASSERT(list_empty(&rpc->crpc_list)); + LASSERT(atomic_read(&rpc->crpc_refcount) == 0); - CDEBUG (D_NET, - "Outgoing framework RPC done: " - "service %d, peer %s, status %s:%d:%d\n", - rpc->crpc_service, libcfs_id2str(rpc->crpc_dest), - swi_state2str(rpc->crpc_wi.swi_state), - rpc->crpc_aborted, rpc->crpc_status); + CDEBUG(D_NET, "Outgoing framework RPC done: " + "service %d, peer %s, status %s:%d:%d\n", + rpc->crpc_service, libcfs_id2str(rpc->crpc_dest), + swi_state2str(rpc->crpc_wi.swi_state), + rpc->crpc_aborted, rpc->crpc_status); spin_lock(&sfw_data.fw_lock); /* my callers must finish all RPCs before shutting me down */ LASSERT(!sfw_data.fw_shuttingdown); - cfs_list_add(&rpc->crpc_list, &sfw_data.fw_zombie_rpcs); + list_add(&rpc->crpc_list, &sfw_data.fw_zombie_rpcs); spin_unlock(&sfw_data.fw_lock); } -sfw_batch_t * +static sfw_batch_t * sfw_find_batch (lst_bid_t bid) { - sfw_session_t *sn = sfw_data.fw_session; - sfw_batch_t *bat; + sfw_session_t *sn = sfw_data.fw_session; + sfw_batch_t *bat; - LASSERT (sn != NULL); + LASSERT(sn != NULL); - cfs_list_for_each_entry_typed (bat, &sn->sn_batches, - sfw_batch_t, bat_list) { - if (bat->bat_id.bat_id == bid.bat_id) - return bat; - } + list_for_each_entry(bat, &sn->sn_batches, bat_list) { + if (bat->bat_id.bat_id == bid.bat_id) + return bat; + } - return NULL; + return NULL; } -sfw_batch_t * +static sfw_batch_t * sfw_bid2batch (lst_bid_t bid) { sfw_session_t *sn = sfw_data.fw_session; @@ -375,20 +363,20 @@ 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; - bat->bat_session = sn; - bat->bat_id = bid; - cfs_atomic_set(&bat->bat_nactive, 0); - CFS_INIT_LIST_HEAD(&bat->bat_tests); + bat->bat_error = 0; + bat->bat_session = sn; + bat->bat_id = bid; + atomic_set(&bat->bat_nactive, 0); + INIT_LIST_HEAD(&bat->bat_tests); - cfs_list_add_tail(&bat->bat_list, &sn->sn_batches); - return bat; + list_add_tail(&bat->bat_list, &sn->sn_batches); + 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; @@ -417,19 +405,18 @@ sfw_get_stats (srpc_stat_reqst_t *request, srpc_stat_reply_t *reply) sn->sn_started), &tv); cnt->running_ms = (__u32)(tv.tv_sec * 1000 + tv.tv_usec / 1000); - cnt->brw_errors = cfs_atomic_read(&sn->sn_brw_errors); - cnt->ping_errors = cfs_atomic_read(&sn->sn_ping_errors); - cnt->zombie_sessions = cfs_atomic_read(&sfw_data.fw_nzombies); - - cnt->active_batches = 0; - cfs_list_for_each_entry_typed (bat, &sn->sn_batches, - sfw_batch_t, bat_list) { - if (cfs_atomic_read(&bat->bat_nactive) > 0) - cnt->active_batches++; - } + cnt->brw_errors = atomic_read(&sn->sn_brw_errors); + cnt->ping_errors = atomic_read(&sn->sn_ping_errors); + cnt->zombie_sessions = atomic_read(&sfw_data.fw_nzombies); + + cnt->active_batches = 0; + list_for_each_entry(bat, &sn->sn_batches, bat_list) { + if (atomic_read(&bat->bat_nactive) > 0) + cnt->active_batches++; + } - reply->str_status = 0; - return 0; + reply->str_status = 0; + return 0; } int @@ -438,6 +425,7 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply) sfw_session_t *sn = sfw_data.fw_session; srpc_msg_t *msg = container_of(request, srpc_msg_t, msg_body.mksn_reqst); + int cplen = 0; if (request->mksn_sid.ses_nid == LNET_NID_ANY) { reply->mksn_sid = (sn == NULL) ? LST_INVALID_SID : sn->sn_id; @@ -451,13 +439,16 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply) reply->mksn_timeout = sn->sn_timeout; if (sfw_sid_equal(request->mksn_sid, sn->sn_id)) { - cfs_atomic_inc(&sn->sn_refcount); + atomic_inc(&sn->sn_refcount); return 0; } if (!request->mksn_force) { reply->mksn_status = EBUSY; - strncpy(&reply->mksn_name[0], &sn->sn_name[0], LST_NAME_SIZE); + cplen = strlcpy(&reply->mksn_name[0], &sn->sn_name[0], + sizeof(reply->mksn_name)); + if (cplen >= sizeof(reply->mksn_name)) + return -E2BIG; return 0; } } @@ -473,12 +464,12 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply) return 0; } - /* brand new or create by force */ - LIBCFS_ALLOC(sn, sizeof(sfw_session_t)); - if (sn == NULL) { - CERROR ("Dropping RPC (mksn) under memory pressure.\n"); - return -ENOMEM; - } + /* brand new or create by force */ + LIBCFS_ALLOC(sn, sizeof(sfw_session_t)); + if (sn == NULL) { + CERROR("dropping RPC mksn under memory pressure\n"); + return -ENOMEM; + } sfw_init_session(sn, request->mksn_sid, msg->msg_ses_feats, &request->mksn_name[0]); @@ -497,7 +488,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; @@ -514,7 +505,7 @@ sfw_remove_session (srpc_rmsn_reqst_t *request, srpc_rmsn_reply_t *reply) return 0; } - if (!cfs_atomic_dec_and_test(&sn->sn_refcount)) { + if (!atomic_dec_and_test(&sn->sn_refcount)) { reply->rmsn_status = 0; return 0; } @@ -529,7 +520,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; @@ -538,47 +529,59 @@ 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; - reply->dbg_timeout = sn->sn_timeout; - strncpy(reply->dbg_name, &sn->sn_name[0], LST_NAME_SIZE); + reply->dbg_status = 0; + reply->dbg_sid = sn->sn_id; + reply->dbg_timeout = sn->sn_timeout; + if (strlcpy(reply->dbg_name, &sn->sn_name[0], sizeof(reply->dbg_name)) + >= sizeof(reply->dbg_name)) + return -E2BIG; return 0; } -void +static void sfw_test_rpc_fini (srpc_client_rpc_t *rpc) { - sfw_test_unit_t *tsu = rpc->crpc_priv; - sfw_test_instance_t *tsi = tsu->tsu_instance; + sfw_test_unit_t *tsu = rpc->crpc_priv; + sfw_test_instance_t *tsi = tsu->tsu_instance; - /* Called with hold of tsi->tsi_lock */ - LASSERT (cfs_list_empty(&rpc->crpc_list)); - cfs_list_add(&rpc->crpc_list, &tsi->tsi_free_rpcs); + /* Called with hold of tsi->tsi_lock */ + LASSERT(list_empty(&rpc->crpc_list)); + list_add(&rpc->crpc_list, &tsi->tsi_free_rpcs); } static inline int sfw_test_buffers(sfw_test_instance_t *tsi) { - struct sfw_test_case *tsc = sfw_find_test_case(tsi->tsi_service); - struct srpc_service *svc = tsc->tsc_srv_service; + struct sfw_test_case *tsc; + struct srpc_service *svc; int nbuf; + LASSERT(tsi != NULL); + tsc = sfw_find_test_case(tsi->tsi_service); + LASSERT(tsc != NULL); + svc = tsc->tsc_srv_service; + LASSERT(svc != NULL); + nbuf = min(svc->sv_wi_total, tsi->tsi_loop) / svc->sv_ncpts; 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 = sfw_find_test_case(tsi->tsi_service); - struct srpc_service *svc = tsc->tsc_srv_service; - int nbuf = sfw_test_buffers(tsi); + struct sfw_test_case *tsc; + struct srpc_service *svc; + int nbuf; int rc; + LASSERT(tsi != NULL); + tsc = sfw_find_test_case(tsi->tsi_service); + nbuf = sfw_test_buffers(tsi); LASSERT(tsc != NULL); + svc = tsc->tsc_srv_service; if (tsi->tsi_is_client) { tsi->tsi_ops = tsc->tsc_cli_ops; @@ -603,11 +606,13 @@ 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 = sfw_find_test_case(tsi->tsi_service); + struct sfw_test_case *tsc; + LASSERT(tsi != NULL); + tsc = sfw_find_test_case(tsi->tsi_service); LASSERT(tsc != NULL); if (tsi->tsi_is_client) @@ -621,7 +626,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; @@ -631,70 +636,70 @@ sfw_destroy_test_instance (sfw_test_instance_t *tsi) tsi->tsi_ops->tso_fini(tsi); - LASSERT (!tsi->tsi_stopping); - LASSERT (cfs_list_empty(&tsi->tsi_active_rpcs)); - LASSERT (!sfw_test_active(tsi)); + LASSERT(!tsi->tsi_stopping); + LASSERT(list_empty(&tsi->tsi_active_rpcs)); + LASSERT(!sfw_test_active(tsi)); - while (!cfs_list_empty(&tsi->tsi_units)) { - tsu = cfs_list_entry(tsi->tsi_units.next, - sfw_test_unit_t, tsu_list); - cfs_list_del(&tsu->tsu_list); - LIBCFS_FREE(tsu, sizeof(*tsu)); - } + while (!list_empty(&tsi->tsi_units)) { + tsu = list_entry(tsi->tsi_units.next, + sfw_test_unit_t, tsu_list); + list_del(&tsu->tsu_list); + LIBCFS_FREE(tsu, sizeof(*tsu)); + } - while (!cfs_list_empty(&tsi->tsi_free_rpcs)) { - rpc = cfs_list_entry(tsi->tsi_free_rpcs.next, - srpc_client_rpc_t, crpc_list); - cfs_list_del(&rpc->crpc_list); - LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc)); - } + while (!list_empty(&tsi->tsi_free_rpcs)) { + rpc = list_entry(tsi->tsi_free_rpcs.next, + srpc_client_rpc_t, crpc_list); + list_del(&rpc->crpc_list); + LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc)); + } clean: - sfw_unload_test(tsi); - LIBCFS_FREE(tsi, sizeof(*tsi)); - return; + sfw_unload_test(tsi); + LIBCFS_FREE(tsi, sizeof(*tsi)); + return; } -void +static void sfw_destroy_batch (sfw_batch_t *tsb) { - sfw_test_instance_t *tsi; + sfw_test_instance_t *tsi; - LASSERT (!sfw_batch_active(tsb)); - LASSERT (cfs_list_empty(&tsb->bat_list)); + LASSERT(!sfw_batch_active(tsb)); + LASSERT(list_empty(&tsb->bat_list)); - while (!cfs_list_empty(&tsb->bat_tests)) { - tsi = cfs_list_entry(tsb->bat_tests.next, - sfw_test_instance_t, tsi_list); - cfs_list_del_init(&tsi->tsi_list); - sfw_destroy_test_instance(tsi); - } + while (!list_empty(&tsb->bat_tests)) { + tsi = list_entry(tsb->bat_tests.next, + sfw_test_instance_t, tsi_list); + list_del_init(&tsi->tsi_list); + sfw_destroy_test_instance(tsi); + } - LIBCFS_FREE(tsb, sizeof(sfw_batch_t)); - return; + LIBCFS_FREE(tsb, sizeof(sfw_batch_t)); + return; } void sfw_destroy_session (sfw_session_t *sn) { - sfw_batch_t *batch; + sfw_batch_t *batch; - LASSERT (cfs_list_empty(&sn->sn_list)); - LASSERT (sn != sfw_data.fw_session); + LASSERT(list_empty(&sn->sn_list)); + LASSERT(sn != sfw_data.fw_session); - while (!cfs_list_empty(&sn->sn_batches)) { - batch = cfs_list_entry(sn->sn_batches.next, - sfw_batch_t, bat_list); - cfs_list_del_init(&batch->bat_list); - sfw_destroy_batch(batch); - } + while (!list_empty(&sn->sn_batches)) { + batch = list_entry(sn->sn_batches.next, + sfw_batch_t, bat_list); + list_del_init(&batch->bat_list); + sfw_destroy_batch(batch); + } - LIBCFS_FREE(sn, sizeof(*sn)); - cfs_atomic_dec(&sfw_data.fw_nzombies); - return; + LIBCFS_FREE(sn, sizeof(*sn)); + atomic_dec(&sfw_data.fw_nzombies); + return; } -void +static void sfw_unpack_addtest_req(srpc_msg_t *msg) { srpc_test_reqst_t *req = &msg->msg_body.tes_reqst; @@ -735,11 +740,11 @@ sfw_unpack_addtest_req(srpc_msg_t *msg) return; } - LBUG (); - return; + LBUG(); + 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; @@ -760,10 +765,10 @@ sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc) memset(tsi, 0, sizeof(*tsi)); spin_lock_init(&tsi->tsi_lock); - cfs_atomic_set(&tsi->tsi_nactive, 0); - CFS_INIT_LIST_HEAD(&tsi->tsi_units); - CFS_INIT_LIST_HEAD(&tsi->tsi_free_rpcs); - CFS_INIT_LIST_HEAD(&tsi->tsi_active_rpcs); + atomic_set(&tsi->tsi_nactive, 0); + INIT_LIST_HEAD(&tsi->tsi_units); + INIT_LIST_HEAD(&tsi->tsi_free_rpcs); + INIT_LIST_HEAD(&tsi->tsi_active_rpcs); tsi->tsi_stopping = 0; tsi->tsi_batch = tsb; @@ -781,16 +786,13 @@ sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc) LASSERT (!sfw_batch_active(tsb)); - if (!tsi->tsi_is_client) { - /* it's test server, just add it to tsb */ - cfs_list_add_tail(&tsi->tsi_list, &tsb->bat_tests); - return 0; - } + if (!tsi->tsi_is_client) { + /* it's test server, just add it to tsb */ + list_add_tail(&tsi->tsi_list, &tsb->bat_tests); + return 0; + } 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); @@ -803,12 +805,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 = cfs_page_address(bk->bk_iovs[i / SFW_ID_PER_PAGE].kiov_page); - LASSERT (dests != NULL); /* my pages are within KVM always */ -#else - dests = cfs_page_address(bk->bk_pages[i / SFW_ID_PER_PAGE]); -#endif + dests = page_address(bk->bk_iovs[i / SFW_ID_PER_PAGE].kiov_page); + LASSERT (dests != NULL); /* my pages are within KVM always */ id = dests[i % SFW_ID_PER_PAGE]; if (msg->msg_magic != SRPC_MSG_MAGIC) sfw_unpack_id(id); @@ -822,24 +820,24 @@ sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc) goto error; } - tsu->tsu_dest.nid = id.nid; - tsu->tsu_dest.pid = id.pid; - tsu->tsu_instance = tsi; - tsu->tsu_private = NULL; - cfs_list_add_tail(&tsu->tsu_list, &tsi->tsi_units); - } - } + tsu->tsu_dest.nid = id.nid; + tsu->tsu_dest.pid = id.pid; + tsu->tsu_instance = tsi; + tsu->tsu_private = NULL; + list_add_tail(&tsu->tsu_list, &tsi->tsi_units); + } + } - rc = tsi->tsi_ops->tso_init(tsi); - if (rc == 0) { - cfs_list_add_tail(&tsi->tsi_list, &tsb->bat_tests); - return 0; - } + rc = tsi->tsi_ops->tso_init(tsi); + if (rc == 0) { + list_add_tail(&tsi->tsi_list, &tsb->bat_tests); + return 0; + } error: - LASSERT (rc != 0); - sfw_destroy_test_instance(tsi); - return rc; + LASSERT(rc != 0); + sfw_destroy_test_instance(tsi); + return rc; } static void @@ -851,7 +849,7 @@ sfw_test_unit_done (sfw_test_unit_t *tsu) LASSERT (sfw_test_active(tsi)); - if (!cfs_atomic_dec_and_test(&tsi->tsi_nactive)) + if (!atomic_dec_and_test(&tsi->tsi_nactive)) return; /* the test instance is done */ @@ -863,30 +861,29 @@ sfw_test_unit_done (sfw_test_unit_t *tsu) spin_lock(&sfw_data.fw_lock); - if (!cfs_atomic_dec_and_test(&tsb->bat_nactive) ||/* tsb still active */ + if (!atomic_dec_and_test(&tsb->bat_nactive) ||/* tsb still active */ sn == sfw_data.fw_session) { /* sn also active */ spin_unlock(&sfw_data.fw_lock); return; } - LASSERT (!cfs_list_empty(&sn->sn_list)); /* I'm a zombie! */ + LASSERT(!list_empty(&sn->sn_list)); /* I'm a zombie! */ - cfs_list_for_each_entry_typed (tsb, &sn->sn_batches, - sfw_batch_t, bat_list) { - if (sfw_batch_active(tsb)) { + list_for_each_entry(tsb, &sn->sn_batches, bat_list) { + if (sfw_batch_active(tsb)) { spin_unlock(&sfw_data.fw_lock); return; } } - cfs_list_del_init(&sn->sn_list); + list_del_init(&sn->sn_list); spin_unlock(&sfw_data.fw_lock); sfw_destroy_session(sn); return; } -void +static void sfw_test_rpc_done (srpc_client_rpc_t *rpc) { sfw_test_unit_t *tsu = rpc->crpc_priv; @@ -897,10 +894,10 @@ sfw_test_rpc_done (srpc_client_rpc_t *rpc) spin_lock(&tsi->tsi_lock); - LASSERT (sfw_test_active(tsi)); - LASSERT (!cfs_list_empty(&rpc->crpc_list)); + LASSERT(sfw_test_active(tsi)); + LASSERT(!list_empty(&rpc->crpc_list)); - cfs_list_del_init(&rpc->crpc_list); + list_del_init(&rpc->crpc_list); /* batch is stopping or loop is done or get error */ if (tsi->tsi_stopping || @@ -934,13 +931,13 @@ sfw_create_test_rpc(sfw_test_unit_t *tsu, lnet_process_id_t peer, LASSERT (sfw_test_active(tsi)); - if (!cfs_list_empty(&tsi->tsi_free_rpcs)) { - /* pick request from buffer */ - rpc = cfs_list_entry(tsi->tsi_free_rpcs.next, - srpc_client_rpc_t, crpc_list); - LASSERT (nblk == rpc->crpc_bulk.bk_niov); - cfs_list_del_init(&rpc->crpc_list); - } + if (!list_empty(&tsi->tsi_free_rpcs)) { + /* pick request from buffer */ + rpc = list_entry(tsi->tsi_free_rpcs.next, + srpc_client_rpc_t, crpc_list); + LASSERT(nblk == rpc->crpc_bulk.bk_niov); + list_del_init(&rpc->crpc_list); + } spin_unlock(&tsi->tsi_lock); @@ -965,7 +962,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; @@ -984,7 +981,7 @@ sfw_run_test (swi_workitem_t *wi) spin_lock(&tsi->tsi_lock); if (tsi->tsi_stopping) { - cfs_list_add(&rpc->crpc_list, &tsi->tsi_free_rpcs); + list_add(&rpc->crpc_list, &tsi->tsi_free_rpcs); spin_unlock(&tsi->tsi_lock); goto test_done; } @@ -992,12 +989,11 @@ sfw_run_test (swi_workitem_t *wi) if (tsu->tsu_loop > 0) tsu->tsu_loop--; - cfs_list_add_tail(&rpc->crpc_list, &tsi->tsi_active_rpcs); + list_add_tail(&rpc->crpc_list, &tsi->tsi_active_rpcs); spin_unlock(&tsi->tsi_lock); - rpc->crpc_timeout = rpc_timeout; - spin_lock(&rpc->crpc_lock); + rpc->crpc_timeout = rpc_timeout; srpc_post_rpc(rpc); spin_unlock(&rpc->crpc_lock); return 0; @@ -1015,7 +1011,7 @@ test_done: return 1; } -int +static int sfw_run_batch (sfw_batch_t *tsb) { swi_workitem_t *wi; @@ -1024,33 +1020,31 @@ sfw_run_batch (sfw_batch_t *tsb) if (sfw_batch_active(tsb)) { CDEBUG(D_NET, "Batch already active: "LPU64" (%d)\n", - tsb->bat_id.bat_id, cfs_atomic_read(&tsb->bat_nactive)); + tsb->bat_id.bat_id, atomic_read(&tsb->bat_nactive)); return 0; } - cfs_list_for_each_entry_typed (tsi, &tsb->bat_tests, - sfw_test_instance_t, tsi_list) { - if (!tsi->tsi_is_client) /* skip server instances */ - continue; + list_for_each_entry(tsi, &tsb->bat_tests, tsi_list) { + if (!tsi->tsi_is_client) /* skip server instances */ + continue; - LASSERT (!tsi->tsi_stopping); - LASSERT (!sfw_test_active(tsi)); + LASSERT(!tsi->tsi_stopping); + LASSERT(!sfw_test_active(tsi)); - cfs_atomic_inc(&tsb->bat_nactive); + atomic_inc(&tsb->bat_nactive); - cfs_list_for_each_entry_typed (tsu, &tsi->tsi_units, - sfw_test_unit_t, tsu_list) { - cfs_atomic_inc(&tsi->tsi_nactive); - tsu->tsu_loop = tsi->tsi_loop; - wi = &tsu->tsu_worker; + list_for_each_entry(tsu, &tsi->tsi_units, tsu_list) { + atomic_inc(&tsi->tsi_nactive); + tsu->tsu_loop = tsi->tsi_loop; + wi = &tsu->tsu_worker; swi_init_workitem(wi, tsu, sfw_run_test, lst_sched_test[\ lnet_cpt_of_nid(tsu->tsu_dest.nid)]); - swi_schedule_workitem(wi); - } - } + swi_schedule_workitem(wi); + } + } - return 0; + return 0; } int @@ -1064,8 +1058,7 @@ sfw_stop_batch (sfw_batch_t *tsb, int force) return 0; } - cfs_list_for_each_entry_typed (tsi, &tsb->bat_tests, - sfw_test_instance_t, tsi_list) { + list_for_each_entry(tsi, &tsb->bat_tests, tsi_list) { spin_lock(&tsi->tsi_lock); if (!tsi->tsi_is_client || @@ -1082,8 +1075,7 @@ sfw_stop_batch (sfw_batch_t *tsb, int force) } /* abort launched rpcs in the test */ - cfs_list_for_each_entry_typed(rpc, &tsi->tsi_active_rpcs, - srpc_client_rpc_t, crpc_list) { + list_for_each_entry(rpc, &tsi->tsi_active_rpcs, crpc_list) { spin_lock(&rpc->crpc_lock); srpc_abort_rpc(rpc, -EINTR); @@ -1097,7 +1089,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; @@ -1106,16 +1098,15 @@ sfw_query_batch (sfw_batch_t *tsb, int testidx, srpc_batch_reply_t *reply) return -EINVAL; if (testidx == 0) { - reply->bar_active = cfs_atomic_read(&tsb->bat_nactive); + reply->bar_active = atomic_read(&tsb->bat_nactive); return 0; } - cfs_list_for_each_entry_typed (tsi, &tsb->bat_tests, - sfw_test_instance_t, tsi_list) { + list_for_each_entry(tsi, &tsb->bat_tests, tsi_list) { if (testidx-- > 1) continue; - reply->bar_active = cfs_atomic_read(&tsi->tsi_nactive); + reply->bar_active = atomic_read(&tsi->tsi_nactive); return 0; } @@ -1143,7 +1134,7 @@ sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len, return 0; } -int +static int sfw_add_test (srpc_server_rpc_t *rpc) { sfw_session_t *sn = sfw_data.fw_session; @@ -1173,9 +1164,9 @@ sfw_add_test (srpc_server_rpc_t *rpc) return 0; } - bat = sfw_bid2batch(request->tsr_bid); - if (bat == NULL) { - CERROR ("Dropping RPC (%s) from %s under memory pressure.\n", + bat = sfw_bid2batch(request->tsr_bid); + if (bat == NULL) { + CERROR("dropping RPC %s from %s under memory pressure\n", rpc->srpc_scd->scd_svc->sv_name, libcfs_id2str(rpc->srpc_peer)); return -ENOMEM; @@ -1192,7 +1183,7 @@ sfw_add_test (srpc_server_rpc_t *rpc) int len; if ((sn->sn_features & LST_FEAT_BULK_LEN) == 0) { - len = npg * CFS_PAGE_SIZE; + len = npg * PAGE_CACHE_SIZE; } else { len = sizeof(lnet_process_id_packed_t) * @@ -1213,7 +1204,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; @@ -1254,7 +1245,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; @@ -1275,7 +1266,7 @@ sfw_handle_server_rpc(struct srpc_server_rpc *rpc) /* Remove timer to avoid racing with it or expiring active session */ if (sfw_del_session_timer() != 0) { - CERROR("Dropping RPC (%s) from %s: racing with expiry timer.", + CERROR("dropping RPC %s from %s: racing with expiry timer\n", sv->sv_name, libcfs_id2str(rpc->srpc_peer)); spin_unlock(&sfw_data.fw_lock); return -EAGAIN; @@ -1352,20 +1343,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; @@ -1392,7 +1378,7 @@ sfw_bulk_ready(struct srpc_server_rpc *rpc, int status) } if (sfw_del_session_timer() != 0) { - CERROR("Dropping RPC (%s) from %s: racing with expiry timer", + CERROR("dropping RPC %s from %s: racing with expiry timer\n", sv->sv_name, libcfs_id2str(rpc->srpc_peer)); spin_unlock(&sfw_data.fw_lock); return -EAGAIN; @@ -1405,13 +1391,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); @@ -1430,10 +1411,10 @@ sfw_create_rpc(lnet_process_id_t peer, int service, LASSERT (!sfw_data.fw_shuttingdown); LASSERT (service <= SRPC_FRAMEWORK_SERVICE_MAX_ID); - if (nbulkiov == 0 && !cfs_list_empty(&sfw_data.fw_zombie_rpcs)) { - rpc = cfs_list_entry(sfw_data.fw_zombie_rpcs.next, + if (nbulkiov == 0 && !list_empty(&sfw_data.fw_zombie_rpcs)) { + rpc = list_entry(sfw_data.fw_zombie_rpcs.next, srpc_client_rpc_t, crpc_list); - cfs_list_del(&rpc->crpc_list); + list_del(&rpc->crpc_list); srpc_init_client_rpc(rpc, peer, service, 0, 0, done, sfw_client_rpc_fini, priv); @@ -1602,7 +1583,7 @@ sfw_unpack_message (srpc_msg_t *msg) void sfw_abort_rpc (srpc_client_rpc_t *rpc) { - LASSERT(cfs_atomic_read(&rpc->crpc_refcount) > 0); + LASSERT(atomic_read(&rpc->crpc_refcount) > 0); LASSERT(rpc->crpc_service <= SRPC_FRAMEWORK_SERVICE_MAX_ID); spin_lock(&rpc->crpc_lock); @@ -1616,19 +1597,19 @@ sfw_post_rpc (srpc_client_rpc_t *rpc) { spin_lock(&rpc->crpc_lock); - LASSERT (!rpc->crpc_closed); - LASSERT (!rpc->crpc_aborted); - LASSERT (cfs_list_empty(&rpc->crpc_list)); - LASSERT (!sfw_data.fw_shuttingdown); + LASSERT(!rpc->crpc_closed); + LASSERT(!rpc->crpc_aborted); + LASSERT(list_empty(&rpc->crpc_list)); + LASSERT(!sfw_data.fw_shuttingdown); - rpc->crpc_timeout = rpc_timeout; - srpc_post_rpc(rpc); + rpc->crpc_timeout = rpc_timeout; + srpc_post_rpc(rpc); spin_unlock(&rpc->crpc_lock); return; } -static srpc_service_t sfw_services[] = +static srpc_service_t sfw_services[] = { { /* sv_id */ SRPC_SERVICE_DEBUG, @@ -1667,17 +1648,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) { @@ -1687,15 +1657,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", @@ -1722,10 +1683,10 @@ sfw_startup (void) sfw_data.fw_session = NULL; sfw_data.fw_active_srpc = NULL; spin_lock_init(&sfw_data.fw_lock); - cfs_atomic_set(&sfw_data.fw_nzombies, 0); - CFS_INIT_LIST_HEAD(&sfw_data.fw_tests); - CFS_INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs); - CFS_INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions); + atomic_set(&sfw_data.fw_nzombies, 0); + INIT_LIST_HEAD(&sfw_data.fw_tests); + INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs); + INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions); brw_init_test_client(); brw_init_test_service(); @@ -1737,19 +1698,18 @@ sfw_startup (void) rc = sfw_register_test(&ping_test_service, &ping_test_client); LASSERT (rc == 0); - error = 0; - cfs_list_for_each_entry_typed (tsc, &sfw_data.fw_tests, - sfw_test_case_t, tsc_list) { - sv = tsc->tsc_srv_service; + error = 0; + list_for_each_entry(tsc, &sfw_data.fw_tests, tsc_list) { + sv = tsc->tsc_srv_service; - rc = srpc_add_service(sv); - LASSERT (rc != -EBUSY); - if (rc != 0) { - CWARN ("Failed to add %s service: %d\n", - sv->sv_name, rc); - error = rc; - } - } + rc = srpc_add_service(sv); + LASSERT(rc != -EBUSY); + if (rc != 0) { + CWARN("Failed to add %s service: %d\n", + sv->sv_name, rc); + error = rc; + } + } for (i = 0; ; i++) { sv = &sfw_services[i]; @@ -1796,22 +1756,18 @@ 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, "waiting for session timer to explode.\n"); sfw_deactivate_session(); - lst_wait_until(cfs_atomic_read(&sfw_data.fw_nzombies) == 0, + lst_wait_until(atomic_read(&sfw_data.fw_nzombies) == 0, sfw_data.fw_lock, "waiting for %d zombie sessions to die.\n", - cfs_atomic_read(&sfw_data.fw_nzombies)); + atomic_read(&sfw_data.fw_nzombies)); spin_unlock(&sfw_data.fw_lock); @@ -1824,22 +1780,21 @@ sfw_shutdown (void) srpc_remove_service(sv); } - cfs_list_for_each_entry_typed (tsc, &sfw_data.fw_tests, - sfw_test_case_t, tsc_list) { + list_for_each_entry(tsc, &sfw_data.fw_tests, tsc_list) { sv = tsc->tsc_srv_service; srpc_shutdown_service(sv); srpc_remove_service(sv); } - while (!cfs_list_empty(&sfw_data.fw_zombie_rpcs)) { - srpc_client_rpc_t *rpc; + while (!list_empty(&sfw_data.fw_zombie_rpcs)) { + srpc_client_rpc_t *rpc; - rpc = cfs_list_entry(sfw_data.fw_zombie_rpcs.next, - srpc_client_rpc_t, crpc_list); - cfs_list_del(&rpc->crpc_list); + rpc = list_entry(sfw_data.fw_zombie_rpcs.next, + srpc_client_rpc_t, crpc_list); + list_del(&rpc->crpc_list); - LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc)); - } + LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc)); + } for (i = 0; ; i++) { sv = &sfw_services[i]; @@ -1849,15 +1804,15 @@ sfw_shutdown (void) srpc_wait_service_shutdown(sv); } - while (!cfs_list_empty(&sfw_data.fw_tests)) { - tsc = cfs_list_entry(sfw_data.fw_tests.next, - sfw_test_case_t, tsc_list); + while (!list_empty(&sfw_data.fw_tests)) { + tsc = list_entry(sfw_data.fw_tests.next, + sfw_test_case_t, tsc_list); - srpc_wait_service_shutdown(tsc->tsc_srv_service); + srpc_wait_service_shutdown(tsc->tsc_srv_service); - cfs_list_del(&tsc->tsc_list); - LIBCFS_FREE(tsc, sizeof(*tsc)); - } + list_del(&tsc->tsc_list); + LIBCFS_FREE(tsc, sizeof(*tsc)); + } - return; + return; }