X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fselftest%2Fframework.c;h=1ad3c1edfa4ea8206907f6277df571abf7895a0a;hp=4e14a78783a5f65a51aee7397c417cfa2a8f0d4d;hb=7eb7f852ba4cb642ef0d45842a0dc8cbd6f2024d;hpb=bc5b01bba4a6d934bb1092fab37adc9295a98487 diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c index 4e14a78..1ad3c1e 100644 --- a/lnet/selftest/framework.c +++ b/lnet/selftest/framework.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 (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -43,111 +39,110 @@ #include "selftest.h" -lst_sid_t LST_INVALID_SID = {LNET_NID_ANY, -1}; - -int brw_inject_errors = 0; -CFS_MODULE_PARM(brw_inject_errors, "i", int, 0644, - "# data errors to inject randomly, zero by default"); +struct lst_sid LST_INVALID_SID = { .ses_nid = LNET_NID_ANY, .ses_stamp = -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)"); - -#define SFW_TEST_CONCURRENCY 1792 -#define SFW_EXTRA_TEST_BUFFERS 8 /* tolerate buggy peers with extra buffers */ - -#define sfw_test_buffers(tsi) ((tsi)->tsi_loop + SFW_EXTRA_TEST_BUFFERS) +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 { \ - __swab64s(&(id).nid); \ - __swab32s(&(id).pid); \ + __swab64s(&(id).nid); \ + __swab32s(&(id).pid); \ } while (0) #define sfw_unpack_sid(sid) \ do { \ - __swab64s(&(sid).ses_nid); \ - __swab64s(&(sid).ses_stamp); \ + __swab64s(&(sid).ses_nid); \ + __swab64s(&(sid).ses_stamp); \ } while (0) #define sfw_unpack_fw_counters(fc) \ do { \ - __swab32s(&(fc).running_ms); \ - __swab32s(&(fc).active_batches); \ - __swab32s(&(fc).zombie_sessions); \ - __swab32s(&(fc).brw_errors); \ - __swab32s(&(fc).ping_errors); \ + __swab32s(&(fc).running_ms); \ + __swab32s(&(fc).active_batches); \ + __swab32s(&(fc).zombie_sessions); \ + __swab32s(&(fc).brw_errors); \ + __swab32s(&(fc).ping_errors); \ } while (0) #define sfw_unpack_rpc_counters(rc) \ do { \ - __swab32s(&(rc).errors); \ - __swab32s(&(rc).rpcs_sent); \ - __swab32s(&(rc).rpcs_rcvd); \ - __swab32s(&(rc).rpcs_dropped); \ - __swab32s(&(rc).rpcs_expired); \ - __swab64s(&(rc).bulk_get); \ - __swab64s(&(rc).bulk_put); \ + __swab32s(&(rc).errors); \ + __swab32s(&(rc).rpcs_sent); \ + __swab32s(&(rc).rpcs_rcvd); \ + __swab32s(&(rc).rpcs_dropped); \ + __swab32s(&(rc).rpcs_expired); \ + __swab64s(&(rc).bulk_get); \ + __swab64s(&(rc).bulk_put); \ } while (0) #define sfw_unpack_lnet_counters(lc) \ do { \ - __swab32s(&(lc).errors); \ - __swab32s(&(lc).msgs_max); \ - __swab32s(&(lc).msgs_alloc); \ - __swab32s(&(lc).send_count); \ - __swab32s(&(lc).recv_count); \ - __swab32s(&(lc).drop_count); \ - __swab32s(&(lc).route_count); \ - __swab64s(&(lc).send_length); \ - __swab64s(&(lc).recv_length); \ - __swab64s(&(lc).drop_length); \ - __swab64s(&(lc).route_length); \ + __swab32s(&(lc).lcc_errors); \ + __swab32s(&(lc).lcc_msgs_max); \ + __swab32s(&(lc).lcc_msgs_alloc); \ + __swab32s(&(lc).lcc_send_count); \ + __swab32s(&(lc).lcc_recv_count); \ + __swab32s(&(lc).lcc_drop_count); \ + __swab32s(&(lc).lcc_route_count); \ + __swab64s(&(lc).lcc_send_length); \ + __swab64s(&(lc).lcc_recv_length); \ + __swab64s(&(lc).lcc_drop_length); \ + __swab64s(&(lc).lcc_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 */ - cfs_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 */ + struct sfw_session *fw_session; + /* shutdown in progress */ + int fw_shuttingdown; + /* running RPC */ + struct srpc_server_rpc *fw_active_srpc; } sfw_data; /* forward ref's */ -int sfw_stop_batch (sfw_batch_t *tsb, int force); -void sfw_destroy_session (sfw_session_t *sn); +static int sfw_stop_batch(struct sfw_batch *tsb, int force); +static void sfw_destroy_session(struct sfw_session *sn); -static inline sfw_test_case_t * +static inline struct sfw_test_case * sfw_find_test_case(int id) { - sfw_test_case_t *tsc; + struct sfw_test_case *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 -sfw_register_test (srpc_service_t *service, sfw_test_client_ops_t *cliops) +sfw_register_test(struct srpc_service *service, + struct sfw_test_client_ops *cliops) { - sfw_test_case_t *tsc; + struct sfw_test_case *tsc; if (sfw_find_test_case(service->sv_id) != NULL) { CERROR ("Failed to register test %s (%d)\n", @@ -155,23 +150,22 @@ sfw_register_test (srpc_service_t *service, sfw_test_client_ops_t *cliops) return -EEXIST; } - LIBCFS_ALLOC(tsc, sizeof(sfw_test_case_t)); + LIBCFS_ALLOC(tsc, sizeof(*tsc)); if (tsc == NULL) return -ENOMEM; - memset(tsc, 0, sizeof(sfw_test_case_t)); 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; - stt_timer_t *timer = &sn->sn_timer; + struct sfw_session *sn = sfw_data.fw_session; + struct stt_timer *timer = &sn->sn_timer; LASSERT (!sfw_data.fw_shuttingdown); @@ -181,16 +175,15 @@ sfw_add_session_timer (void) LASSERT (!sn->sn_timer_active); sn->sn_timer_active = 1; - timer->stt_expires = cfs_time_add(sn->sn_timeout, - cfs_time_current_sec()); + timer->stt_expires = ktime_get_real_seconds()+ sn->sn_timeout; stt_add_timer(timer); return; } -int +static int sfw_del_session_timer (void) { - sfw_session_t *sn = sfw_data.fw_session; + struct sfw_session *sn = sfw_data.fw_session; if (sn == NULL || !sn->sn_timer_active) return 0; @@ -202,119 +195,105 @@ 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; + struct sfw_session *sn = sfw_data.fw_session; int nactive = 0; - sfw_batch_t *tsb; - sfw_test_case_t *tsc; + struct sfw_batch *tsb; + struct sfw_test_case *tsc; 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); - cfs_spin_unlock(&sfw_data.fw_lock); + spin_unlock(&sfw_data.fw_lock); - cfs_list_for_each_entry_typed (tsc, &sfw_data.fw_tests, - sfw_test_case_t, tsc_list) { - srpc_abort_service(tsc->tsc_srv_service); - } + list_for_each_entry(tsc, &sfw_data.fw_tests, tsc_list) { + srpc_abort_service(tsc->tsc_srv_service); + } - cfs_spin_lock(&sfw_data.fw_lock); + 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); - cfs_spin_unlock(&sfw_data.fw_lock); + list_del_init(&sn->sn_list); + spin_unlock(&sfw_data.fw_lock); - sfw_destroy_session(sn); + sfw_destroy_session(sn); - cfs_spin_lock(&sfw_data.fw_lock); - return; + 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; + struct sfw_session *sn = data; - cfs_spin_lock(&sfw_data.fw_lock); + spin_lock(&sfw_data.fw_lock); 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]); sn->sn_timer_active = 0; sfw_deactivate_session(); - cfs_spin_unlock(&sfw_data.fw_lock); - return; + spin_unlock(&sfw_data.fw_lock); } static inline void -sfw_init_session (sfw_session_t *sn, lst_sid_t sid, const char *name) +sfw_init_session(struct sfw_session *sn, struct lst_sid sid, + unsigned features, const char *name) { - 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); - - sn->sn_timer_active = 0; - sn->sn_id = sid; - sn->sn_timeout = session_timeout; - sn->sn_started = cfs_time_current(); - - timer->stt_data = sn; - timer->stt_func = sfw_session_expired; - CFS_INIT_LIST_HEAD(&timer->stt_list); + struct stt_timer *timer = &sn->sn_timer; + + memset(sn, 0, sizeof(struct sfw_session)); + 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; + sn->sn_features = features; + sn->sn_timeout = session_timeout; + sn->sn_started = ktime_get(); + + timer->stt_data = sn; + timer->stt_func = sfw_session_expired; + INIT_LIST_HEAD(&timer->stt_list); } /* completion handler for incoming framework RPCs */ -void -sfw_server_rpc_done (srpc_server_rpc_t *rpc) +static void +sfw_server_rpc_done(struct srpc_server_rpc *rpc) { - srpc_service_t *sv = rpc->srpc_service; - int status = rpc->srpc_status; + struct srpc_service *sv = rpc->srpc_scd->scd_svc; + int status = rpc->srpc_status; CDEBUG (D_NET, "Incoming framework RPC done: " @@ -328,55 +307,49 @@ sfw_server_rpc_done (srpc_server_rpc_t *rpc) return; } -void -sfw_client_rpc_fini (srpc_client_rpc_t *rpc) +static void +sfw_client_rpc_fini(struct srpc_client_rpc *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); - cfs_spin_lock(&sfw_data.fw_lock); + 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); + /* my callers must finish all RPCs before shutting me down */ + LASSERT(!sfw_data.fw_shuttingdown); + list_add(&rpc->crpc_list, &sfw_data.fw_zombie_rpcs); - cfs_spin_unlock(&sfw_data.fw_lock); - return; + spin_unlock(&sfw_data.fw_lock); } -sfw_batch_t * -sfw_find_batch (lst_bid_t bid) +static struct sfw_batch * +sfw_find_batch(struct lst_bid bid) { - sfw_session_t *sn = sfw_data.fw_session; - sfw_batch_t *bat; + struct sfw_session *sn = sfw_data.fw_session; + struct sfw_batch *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 * -sfw_bid2batch (lst_bid_t bid) +static struct sfw_batch * +sfw_bid2batch(struct lst_bid bid) { - sfw_session_t *sn = sfw_data.fw_session; - sfw_batch_t *bat; + struct sfw_session *sn = sfw_data.fw_session; + struct sfw_batch *bat; LASSERT (sn != NULL); @@ -384,27 +357,26 @@ sfw_bid2batch (lst_bid_t bid) if (bat != NULL) return bat; - LIBCFS_ALLOC(bat, sizeof(sfw_batch_t)); - if (bat == NULL) + LIBCFS_ALLOC(bat, sizeof(*bat)); + 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 -sfw_get_stats (srpc_stat_reqst_t *request, srpc_stat_reply_t *reply) +static int +sfw_get_stats(struct srpc_stat_reqst *request, struct srpc_stat_reply *reply) { - sfw_session_t *sn = sfw_data.fw_session; - sfw_counters_t *cnt = &reply->str_fw; - sfw_batch_t *bat; - struct timeval tv; + struct sfw_session *sn = sfw_data.fw_session; + struct sfw_counters *cnt = &reply->str_fw; + struct sfw_batch *bat; reply->str_sid = (sn == NULL) ? LST_INVALID_SID : sn->sn_id; @@ -418,37 +390,33 @@ sfw_get_stats (srpc_stat_reqst_t *request, srpc_stat_reply_t *reply) return 0; } - LNET_LOCK(); - reply->str_lnet = the_lnet.ln_counters; - LNET_UNLOCK(); - - srpc_get_counters(&reply->str_rpc); + lnet_counters_get_common(&reply->str_lnet); + srpc_get_counters(&reply->str_rpc); /* send over the msecs since the session was started - with 32 bits to send, this is ~49 days */ - cfs_duration_usec(cfs_time_sub(cfs_time_current(), - 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++; - } - - reply->str_status = 0; - return 0; + cnt->running_ms = ktime_ms_delta(ktime_get(), sn->sn_started); + 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; } int -sfw_make_session (srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply) +sfw_make_session(struct srpc_mksn_reqst *request, struct srpc_mksn_reply *reply) { - sfw_session_t *sn = sfw_data.fw_session; + struct sfw_session *sn = sfw_data.fw_session; + struct srpc_msg *msg = container_of(request, struct srpc_msg, + 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; @@ -462,44 +430,60 @@ 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; } } - /* 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; - } + /* reject the request if it requires unknown features + * NB: old version will always accept all features because it's not + * aware of struct srpc_msg::msg_ses_feats, it's a defect but it's also + * harmless because it will return zero feature to console, and it's + * console's responsibility to make sure all nodes in a session have + * same feature mask. */ + if ((msg->msg_ses_feats & ~LST_FEATS_MASK) != 0) { + reply->mksn_status = EPROTO; + return 0; + } - sfw_init_session(sn, request->mksn_sid, &request->mksn_name[0]); + /* brand new or create by force */ + LIBCFS_ALLOC(sn, sizeof(*sn)); + if (sn == NULL) { + CERROR("dropping RPC mksn under memory pressure\n"); + return -ENOMEM; + } - cfs_spin_lock(&sfw_data.fw_lock); + sfw_init_session(sn, request->mksn_sid, + msg->msg_ses_feats, &request->mksn_name[0]); - sfw_deactivate_session(); - LASSERT (sfw_data.fw_session == NULL); - sfw_data.fw_session = sn; + spin_lock(&sfw_data.fw_lock); - cfs_spin_unlock(&sfw_data.fw_lock); + sfw_deactivate_session(); + LASSERT(sfw_data.fw_session == NULL); + sfw_data.fw_session = sn; - reply->mksn_status = 0; - reply->mksn_sid = sn->sn_id; - reply->mksn_timeout = sn->sn_timeout; - return 0; + spin_unlock(&sfw_data.fw_lock); + + reply->mksn_status = 0; + reply->mksn_sid = sn->sn_id; + reply->mksn_timeout = sn->sn_timeout; + return 0; } -int -sfw_remove_session (srpc_rmsn_reqst_t *request, srpc_rmsn_reply_t *reply) +static int +sfw_remove_session(struct srpc_rmsn_reqst *request, + struct srpc_rmsn_reply *reply) { - sfw_session_t *sn = sfw_data.fw_session; + struct sfw_session *sn = sfw_data.fw_session; reply->rmsn_sid = (sn == NULL) ? LST_INVALID_SID : sn->sn_id; @@ -513,169 +497,205 @@ 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; } - cfs_spin_lock(&sfw_data.fw_lock); - sfw_deactivate_session(); - cfs_spin_unlock(&sfw_data.fw_lock); + spin_lock(&sfw_data.fw_lock); + sfw_deactivate_session(); + spin_unlock(&sfw_data.fw_lock); - reply->rmsn_status = 0; - reply->rmsn_sid = LST_INVALID_SID; - LASSERT (sfw_data.fw_session == NULL); - return 0; + reply->rmsn_status = 0; + reply->rmsn_sid = LST_INVALID_SID; + LASSERT(sfw_data.fw_session == NULL); + return 0; } -int -sfw_debug_session (srpc_debug_reqst_t *request, srpc_debug_reply_t *reply) +static int +sfw_debug_session(struct srpc_debug_reqst *request, + struct srpc_debug_reply *reply) { - sfw_session_t *sn = sfw_data.fw_session; + struct sfw_session *sn = sfw_data.fw_session; if (sn == NULL) { 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 -sfw_test_rpc_fini (srpc_client_rpc_t *rpc) +static void +sfw_test_rpc_fini(struct srpc_client_rpc *rpc) { - sfw_test_unit_t *tsu = rpc->crpc_priv; - sfw_test_instance_t *tsi = tsu->tsu_instance; + struct sfw_test_unit *tsu = rpc->crpc_priv; + struct sfw_test_instance *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); } -int -sfw_load_test (sfw_test_instance_t *tsi) +static inline int +sfw_test_buffers(struct sfw_test_instance *tsi) { - sfw_test_case_t *tsc = sfw_find_test_case(tsi->tsi_service); - int nrequired = sfw_test_buffers(tsi); - int nposted; - - LASSERT (tsc != NULL); - - if (tsi->tsi_is_client) { - tsi->tsi_ops = tsc->tsc_cli_ops; - return 0; - } - - nposted = srpc_service_add_buffers(tsc->tsc_srv_service, nrequired); - if (nposted != nrequired) { - CWARN ("Failed to reserve enough buffers: " - "service %s, %d needed, %d reserved\n", - tsc->tsc_srv_service->sv_name, nrequired, nposted); - srpc_service_remove_buffers(tsc->tsc_srv_service, nposted); - return -ENOMEM; - } + 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); +} - CDEBUG (D_NET, "Reserved %d buffers for test %s\n", - nposted, tsc->tsc_srv_service->sv_name); - return 0; +static int +sfw_load_test(struct sfw_test_instance *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; + return 0; + } + + rc = srpc_service_add_buffers(svc, nbuf); + if (rc != 0) { + CWARN("Failed to reserve enough buffers: " + "service %s, %d needed: %d\n", svc->sv_name, nbuf, rc); + /* NB: this error handler is not strictly correct, because + * it may release more buffers than already allocated, + * but it doesn't matter because request portal should + * be lazy portal and will grow buffers if necessary. */ + srpc_service_remove_buffers(svc, nbuf); + return -ENOMEM; + } + + CDEBUG(D_NET, "Reserved %d buffers for test %s\n", + nbuf * (srpc_serv_is_framework(svc) ? + 1 : cfs_cpt_number(cfs_cpt_table)), svc->sv_name); + return 0; } -void -sfw_unload_test (sfw_test_instance_t *tsi) +static void +sfw_unload_test(struct sfw_test_instance *tsi) { - sfw_test_case_t *tsc = sfw_find_test_case(tsi->tsi_service); + struct sfw_test_case *tsc; - LASSERT (tsc != NULL); + LASSERT(tsi != NULL); + tsc = sfw_find_test_case(tsi->tsi_service); + LASSERT(tsc != NULL); - if (!tsi->tsi_is_client) - srpc_service_remove_buffers(tsc->tsc_srv_service, - sfw_test_buffers(tsi)); - return; + if (tsi->tsi_is_client) + return; + + /* shrink buffers, because request portal is lazy portal + * which can grow buffers at runtime so we may leave + * some buffers behind, but never mind... */ + srpc_service_remove_buffers(tsc->tsc_srv_service, + sfw_test_buffers(tsi)); + return; } -void -sfw_destroy_test_instance (sfw_test_instance_t *tsi) +static void +sfw_destroy_test_instance(struct sfw_test_instance *tsi) { - srpc_client_rpc_t *rpc; - sfw_test_unit_t *tsu; + struct srpc_client_rpc *rpc; + struct sfw_test_unit *tsu; if (!tsi->tsi_is_client) goto clean; 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, + struct sfw_test_unit, 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, + struct srpc_client_rpc, 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 -sfw_destroy_batch (sfw_batch_t *tsb) +static void +sfw_destroy_batch(struct sfw_batch *tsb) { - sfw_test_instance_t *tsi; + struct sfw_test_instance *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, + struct sfw_test_instance, 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(*tsb)); + return; } -void -sfw_destroy_session (sfw_session_t *sn) +static void +sfw_destroy_session(struct sfw_session *sn) { - sfw_batch_t *batch; + struct sfw_batch *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, + struct sfw_batch, 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 -sfw_unpack_test_req (srpc_msg_t *msg) +static void +sfw_unpack_addtest_req(struct srpc_msg *msg) { - srpc_test_reqst_t *req = &msg->msg_body.tes_reqst; + struct srpc_test_reqst *req = &msg->msg_body.tes_reqst; LASSERT (msg->msg_type == SRPC_MSG_TEST_REQST); LASSERT (req->tsr_is_client); @@ -685,52 +705,62 @@ sfw_unpack_test_req (srpc_msg_t *msg) LASSERT (msg->msg_magic == __swab32(SRPC_MSG_MAGIC)); - if (req->tsr_service == SRPC_SERVICE_BRW) { - test_bulk_req_t *bulk = &req->tsr_u.bulk; + if (req->tsr_service == SRPC_SERVICE_BRW) { + if ((msg->msg_ses_feats & LST_FEAT_BULK_LEN) == 0) { + struct test_bulk_req *bulk = &req->tsr_u.bulk_v0; - __swab32s(&bulk->blk_opc); - __swab32s(&bulk->blk_npg); - __swab32s(&bulk->blk_flags); - return; - } + __swab32s(&bulk->blk_opc); + __swab32s(&bulk->blk_npg); + __swab32s(&bulk->blk_flags); + + } else { + struct test_bulk_req_v1 *bulk = &req->tsr_u.bulk_v1; + + __swab16s(&bulk->blk_opc); + __swab16s(&bulk->blk_flags); + __swab32s(&bulk->blk_offset); + __swab32s(&bulk->blk_len); + } + + return; + } if (req->tsr_service == SRPC_SERVICE_PING) { - test_ping_req_t *ping = &req->tsr_u.ping; + struct test_ping_req *ping = &req->tsr_u.ping; __swab32s(&ping->png_size); __swab32s(&ping->png_flags); return; } - LBUG (); - return; + LBUG(); + return; } -int -sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc) +static int +sfw_add_test_instance(struct sfw_batch *tsb, struct srpc_server_rpc *rpc) { - srpc_msg_t *msg = &rpc->srpc_reqstbuf->buf_msg; - srpc_test_reqst_t *req = &msg->msg_body.tes_reqst; - srpc_bulk_t *bk = rpc->srpc_bulk; - int ndest = req->tsr_ndest; - sfw_test_unit_t *tsu; - sfw_test_instance_t *tsi; - int i; - int rc; + struct srpc_msg *msg = &rpc->srpc_reqstbuf->buf_msg; + struct srpc_test_reqst *req = &msg->msg_body.tes_reqst; + struct srpc_bulk *bk = rpc->srpc_bulk; + int ndest = req->tsr_ndest; + struct sfw_test_unit *tsu; + struct sfw_test_instance *tsi; + int i; + int rc; 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)); - cfs_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); + spin_lock_init(&tsi->tsi_lock); + 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; @@ -748,39 +778,33 @@ 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_t) * ndest); + LASSERT((unsigned int)bk->bk_len >= + sizeof(struct lnet_process_id_packed) * ndest); - sfw_unpack_test_req(msg); + sfw_unpack_addtest_req(msg); memcpy(&tsi->tsi_u, &req->tsr_u, sizeof(tsi->tsi_u)); for (i = 0; i < ndest; i++) { - lnet_process_id_packed_t *dests; - lnet_process_id_packed_t id; + struct lnet_process_id_packed *dests; + struct lnet_process_id_packed 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); for (j = 0; j < tsi->tsi_concur; j++) { - LIBCFS_ALLOC(tsu, sizeof(sfw_test_unit_t)); + LIBCFS_ALLOC(tsu, sizeof(*tsu)); if (tsu == NULL) { rc = -ENOMEM; CERROR ("Can't allocate tsu for %d\n", @@ -788,85 +812,84 @@ 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 -sfw_test_unit_done (sfw_test_unit_t *tsu) +sfw_test_unit_done(struct sfw_test_unit *tsu) { - sfw_test_instance_t *tsi = tsu->tsu_instance; - sfw_batch_t *tsb = tsi->tsi_batch; - sfw_session_t *sn = tsb->bat_session; + struct sfw_test_instance *tsi = tsu->tsu_instance; + struct sfw_batch *tsb = tsi->tsi_batch; + struct sfw_session *sn = tsb->bat_session; 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 */ - cfs_spin_lock(&tsi->tsi_lock); + spin_lock(&tsi->tsi_lock); - tsi->tsi_stopping = 0; + tsi->tsi_stopping = 0; - cfs_spin_unlock(&tsi->tsi_lock); + spin_unlock(&tsi->tsi_lock); - cfs_spin_lock(&sfw_data.fw_lock); + spin_lock(&sfw_data.fw_lock); - if (!cfs_atomic_dec_and_test(&tsb->bat_nactive) ||/* tsb still active */ - sn == sfw_data.fw_session) { /* sn also active */ - cfs_spin_unlock(&sfw_data.fw_lock); + 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)) { - cfs_spin_unlock(&sfw_data.fw_lock); - return; - } - } + 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); - cfs_spin_unlock(&sfw_data.fw_lock); + list_del_init(&sn->sn_list); + spin_unlock(&sfw_data.fw_lock); - sfw_destroy_session(sn); - return; + sfw_destroy_session(sn); + return; } -void -sfw_test_rpc_done (srpc_client_rpc_t *rpc) +static void +sfw_test_rpc_done(struct srpc_client_rpc *rpc) { - sfw_test_unit_t *tsu = rpc->crpc_priv; - sfw_test_instance_t *tsi = tsu->tsu_instance; + struct sfw_test_unit *tsu = rpc->crpc_priv; + struct sfw_test_instance *tsi = tsu->tsu_instance; int done = 0; tsi->tsi_ops->tso_done_rpc(tsu, rpc); - - cfs_spin_lock(&tsi->tsi_lock); - LASSERT (sfw_test_active(tsi)); - LASSERT (!cfs_list_empty(&rpc->crpc_list)); + spin_lock(&tsi->tsi_lock); - cfs_list_del_init(&rpc->crpc_list); + LASSERT(sfw_test_active(tsi)); + LASSERT(!list_empty(&rpc->crpc_list)); + + list_del_init(&rpc->crpc_list); /* batch is stopping or loop is done or get error */ if (tsi->tsi_stopping || @@ -877,7 +900,7 @@ sfw_test_rpc_done (srpc_client_rpc_t *rpc) /* dec ref for poster */ srpc_client_rpc_decref(rpc); - cfs_spin_unlock(&tsi->tsi_lock); + spin_unlock(&tsi->tsi_lock); if (!done) { swi_schedule_workitem(&tsu->tsu_worker); @@ -889,49 +912,54 @@ sfw_test_rpc_done (srpc_client_rpc_t *rpc) } int -sfw_create_test_rpc (sfw_test_unit_t *tsu, lnet_process_id_t peer, - int nblk, int blklen, srpc_client_rpc_t **rpcpp) +sfw_create_test_rpc(struct sfw_test_unit *tsu, struct lnet_process_id peer, + unsigned features, int nblk, int blklen, + struct srpc_client_rpc **rpcpp) { - srpc_client_rpc_t *rpc = NULL; - sfw_test_instance_t *tsi = tsu->tsu_instance; + struct srpc_client_rpc *rpc = NULL; + struct sfw_test_instance *tsi = tsu->tsu_instance; - cfs_spin_lock(&tsi->tsi_lock); + spin_lock(&tsi->tsi_lock); 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); - - srpc_init_client_rpc(rpc, peer, tsi->tsi_service, nblk, - blklen, sfw_test_rpc_done, - sfw_test_rpc_fini, tsu); - } - - cfs_spin_unlock(&tsi->tsi_lock); - - if (rpc == NULL) - rpc = srpc_create_client_rpc(peer, tsi->tsi_service, nblk, - blklen, sfw_test_rpc_done, - sfw_test_rpc_fini, tsu); - if (rpc == NULL) { - CERROR ("Can't create rpc for test %d\n", tsi->tsi_service); - return -ENOMEM; - } - - *rpcpp = rpc; - return 0; + if (!list_empty(&tsi->tsi_free_rpcs)) { + /* pick request from buffer */ + rpc = list_entry(tsi->tsi_free_rpcs.next, + struct srpc_client_rpc, crpc_list); + LASSERT(nblk == rpc->crpc_bulk.bk_niov); + list_del_init(&rpc->crpc_list); + } + + spin_unlock(&tsi->tsi_lock); + + if (rpc == NULL) { + rpc = srpc_create_client_rpc(peer, tsi->tsi_service, nblk, + blklen, sfw_test_rpc_done, + sfw_test_rpc_fini, tsu); + } else { + srpc_init_client_rpc(rpc, peer, tsi->tsi_service, nblk, + blklen, sfw_test_rpc_done, + sfw_test_rpc_fini, tsu); + } + + if (rpc == NULL) { + CERROR("Can't create rpc for test %d\n", tsi->tsi_service); + return -ENOMEM; + } + + rpc->crpc_reqstmsg.msg_ses_feats = features; + *rpcpp = rpc; + + return 0; } -int -sfw_run_test (swi_workitem_t *wi) +static int +sfw_run_test(struct swi_workitem *wi) { - sfw_test_unit_t *tsu = wi->swi_workitem.wi_data; - sfw_test_instance_t *tsi = tsu->tsu_instance; - srpc_client_rpc_t *rpc = NULL; + struct sfw_test_unit *tsu = container_of(wi, struct sfw_test_unit, tsu_worker); + struct sfw_test_instance *tsi = tsu->tsu_instance; + struct srpc_client_rpc *rpc = NULL; LASSERT (wi == &tsu->tsu_worker); @@ -942,26 +970,25 @@ sfw_run_test (swi_workitem_t *wi) LASSERT (rpc != NULL); - cfs_spin_lock(&tsi->tsi_lock); + spin_lock(&tsi->tsi_lock); - if (tsi->tsi_stopping) { - cfs_list_add(&rpc->crpc_list, &tsi->tsi_free_rpcs); - cfs_spin_unlock(&tsi->tsi_lock); - goto test_done; - } - - if (tsu->tsu_loop > 0) - tsu->tsu_loop--; + if (tsi->tsi_stopping) { + list_add(&rpc->crpc_list, &tsi->tsi_free_rpcs); + spin_unlock(&tsi->tsi_lock); + goto test_done; + } - cfs_list_add_tail(&rpc->crpc_list, &tsi->tsi_active_rpcs); - cfs_spin_unlock(&tsi->tsi_lock); + if (tsu->tsu_loop > 0) + tsu->tsu_loop--; - rpc->crpc_timeout = rpc_timeout; + list_add_tail(&rpc->crpc_list, &tsi->tsi_active_rpcs); + spin_unlock(&tsi->tsi_lock); - cfs_spin_lock(&rpc->crpc_lock); - srpc_post_rpc(rpc); - cfs_spin_unlock(&rpc->crpc_lock); - return 0; + spin_lock(&rpc->crpc_lock); + rpc->crpc_timeout = rpc_timeout; + srpc_post_rpc(rpc); + spin_unlock(&rpc->crpc_lock); + return 0; test_done: /* @@ -971,111 +998,107 @@ test_done: * - my batch is still active; no one can run it again now. * Cancel pending schedules and prevent future schedule attempts: */ - swi_kill_workitem(wi); - sfw_test_unit_done(tsu); - return 1; + swi_exit_workitem(wi); + sfw_test_unit_done(tsu); + return 1; } -int -sfw_run_batch (sfw_batch_t *tsb) +static int +sfw_run_batch(struct sfw_batch *tsb) { - swi_workitem_t *wi; - sfw_test_unit_t *tsu; - sfw_test_instance_t *tsi; + struct swi_workitem *wi; + struct sfw_test_unit *tsu; + struct sfw_test_instance *tsi; 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)); + CDEBUG(D_NET, "Batch already active: %llu (%d)\n", + 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; - swi_init_workitem(wi, tsu, sfw_run_test, - CFS_WI_SCHED_ANY); - swi_schedule_workitem(wi); - } - } + 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, sfw_run_test, + lst_sched_test[lnet_cpt_of_nid(tsu->tsu_dest.nid, NULL)]); + swi_schedule_workitem(wi); + } + } - return 0; + return 0; } -int -sfw_stop_batch (sfw_batch_t *tsb, int force) +static int +sfw_stop_batch(struct sfw_batch *tsb, int force) { - sfw_test_instance_t *tsi; - srpc_client_rpc_t *rpc; + struct sfw_test_instance *tsi; + struct srpc_client_rpc *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; } - cfs_list_for_each_entry_typed (tsi, &tsb->bat_tests, - sfw_test_instance_t, tsi_list) { - cfs_spin_lock(&tsi->tsi_lock); + list_for_each_entry(tsi, &tsb->bat_tests, tsi_list) { + spin_lock(&tsi->tsi_lock); - if (!tsi->tsi_is_client || - !sfw_test_active(tsi) || tsi->tsi_stopping) { - cfs_spin_unlock(&tsi->tsi_lock); - continue; - } + if (!tsi->tsi_is_client || + !sfw_test_active(tsi) || tsi->tsi_stopping) { + spin_unlock(&tsi->tsi_lock); + continue; + } - tsi->tsi_stopping = 1; + tsi->tsi_stopping = 1; - if (!force) { - cfs_spin_unlock(&tsi->tsi_lock); - continue; - } + if (!force) { + spin_unlock(&tsi->tsi_lock); + continue; + } - /* abort launched rpcs in the test */ - cfs_list_for_each_entry_typed (rpc, &tsi->tsi_active_rpcs, - srpc_client_rpc_t, crpc_list) { - cfs_spin_lock(&rpc->crpc_lock); + /* abort launched rpcs in the test */ + list_for_each_entry(rpc, &tsi->tsi_active_rpcs, crpc_list) { + spin_lock(&rpc->crpc_lock); - srpc_abort_rpc(rpc, -EINTR); + srpc_abort_rpc(rpc, -EINTR); - cfs_spin_unlock(&rpc->crpc_lock); - } + spin_unlock(&rpc->crpc_lock); + } - cfs_spin_unlock(&tsi->tsi_lock); - } + spin_unlock(&tsi->tsi_lock); + } - return 0; + return 0; } -int -sfw_query_batch (sfw_batch_t *tsb, int testidx, srpc_batch_reply_t *reply) +static int +sfw_query_batch(struct sfw_batch *tsb, int testidx, + struct srpc_batch_reply *reply) { - sfw_test_instance_t *tsi; + struct sfw_test_instance *tsi; if (testidx < 0) 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; } @@ -1083,32 +1106,34 @@ sfw_query_batch (sfw_batch_t *tsb, int testidx, srpc_batch_reply_t *reply) } void -sfw_free_pages (srpc_server_rpc_t *rpc) +sfw_free_pages(struct srpc_server_rpc *rpc) { srpc_free_bulk(rpc->srpc_bulk); rpc->srpc_bulk = NULL; } int -sfw_alloc_pages (srpc_server_rpc_t *rpc, int npages, int sink) +sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len, + int sink) { - LASSERT (rpc->srpc_bulk == NULL); - LASSERT (npages > 0 && npages <= LNET_MAX_IOV); + LASSERT(rpc->srpc_bulk == NULL); + LASSERT(npages > 0 && npages <= LNET_MAX_IOV); - rpc->srpc_bulk = srpc_alloc_bulk(npages, sink); - if (rpc->srpc_bulk == NULL) return -ENOMEM; + rpc->srpc_bulk = srpc_alloc_bulk(cpt, 0, npages, len, sink); + if (rpc->srpc_bulk == NULL) + return -ENOMEM; - return 0; + return 0; } -int -sfw_add_test (srpc_server_rpc_t *rpc) +static int +sfw_add_test(struct srpc_server_rpc *rpc) { - sfw_session_t *sn = sfw_data.fw_session; - srpc_test_reply_t *reply = &rpc->srpc_replymsg.msg_body.tes_reply; - srpc_test_reqst_t *request; - int rc; - sfw_batch_t *bat; + struct sfw_session *sn = sfw_data.fw_session; + struct srpc_test_reply *reply = &rpc->srpc_replymsg.msg_body.tes_reply; + struct srpc_test_reqst *request; + int rc; + struct sfw_batch *bat; request = &rpc->srpc_reqstbuf->buf_msg.msg_body.tes_reqst; reply->tsr_sid = (sn == NULL) ? LST_INVALID_SID : sn->sn_id; @@ -1131,10 +1156,10 @@ 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", - rpc->srpc_service->sv_name, + 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; } @@ -1145,9 +1170,19 @@ sfw_add_test (srpc_server_rpc_t *rpc) } if (request->tsr_is_client && rpc->srpc_bulk == NULL) { - /* rpc will be resumed later in sfw_bulk_ready */ - return sfw_alloc_pages(rpc, - sfw_id_pages(request->tsr_ndest), 1); + /* rpc will be resumed later in sfw_bulk_ready */ + int npg = sfw_id_pages(request->tsr_ndest); + int len; + + if ((sn->sn_features & LST_FEAT_BULK_LEN) == 0) { + len = npg * PAGE_SIZE; + + } else { + len = sizeof(struct lnet_process_id_packed) * + request->tsr_ndest; + } + + return sfw_alloc_pages(rpc, CFS_CPT_ANY, npg, len, 1); } rc = sfw_add_test_instance(bat, rpc); @@ -1161,12 +1196,13 @@ sfw_add_test (srpc_server_rpc_t *rpc) return 0; } -int -sfw_control_batch (srpc_batch_reqst_t *request, srpc_batch_reply_t *reply) +static int +sfw_control_batch(struct srpc_batch_reqst *request, + struct srpc_batch_reply *reply) { - sfw_session_t *sn = sfw_data.fw_session; + struct sfw_session *sn = sfw_data.fw_session; int rc = 0; - sfw_batch_t *bat; + struct sfw_batch *bat; reply->bar_sid = (sn == NULL) ? LST_INVALID_SID : sn->sn_id; @@ -1202,37 +1238,63 @@ sfw_control_batch (srpc_batch_reqst_t *request, srpc_batch_reply_t *reply) return 0; } -int -sfw_handle_server_rpc (srpc_server_rpc_t *rpc) +static int +sfw_handle_server_rpc(struct srpc_server_rpc *rpc) { - srpc_service_t *sv = rpc->srpc_service; - srpc_msg_t *reply = &rpc->srpc_replymsg; - srpc_msg_t *request = &rpc->srpc_reqstbuf->buf_msg; - int rc = 0; - - LASSERT (sfw_data.fw_active_srpc == NULL); - LASSERT (sv->sv_id <= SRPC_FRAMEWORK_SERVICE_MAX_ID); - - cfs_spin_lock(&sfw_data.fw_lock); - - if (sfw_data.fw_shuttingdown) { - cfs_spin_unlock(&sfw_data.fw_lock); - return -ESHUTDOWN; - } - - /* 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.", - sv->sv_name, libcfs_id2str(rpc->srpc_peer)); - cfs_spin_unlock(&sfw_data.fw_lock); - return -EAGAIN; - } - - sfw_data.fw_active_srpc = rpc; - cfs_spin_unlock(&sfw_data.fw_lock); - - sfw_unpack_message(request); - LASSERT (request->msg_type == srpc_service2request(sv->sv_id)); + struct srpc_service *sv = rpc->srpc_scd->scd_svc; + struct srpc_msg *reply = &rpc->srpc_replymsg; + struct srpc_msg *request = &rpc->srpc_reqstbuf->buf_msg; + unsigned features = LST_FEATS_MASK; + int rc = 0; + + LASSERT(sfw_data.fw_active_srpc == NULL); + LASSERT(sv->sv_id <= SRPC_FRAMEWORK_SERVICE_MAX_ID); + + spin_lock(&sfw_data.fw_lock); + + if (sfw_data.fw_shuttingdown) { + spin_unlock(&sfw_data.fw_lock); + return -ESHUTDOWN; + } + + /* 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\n", + sv->sv_name, libcfs_id2str(rpc->srpc_peer)); + spin_unlock(&sfw_data.fw_lock); + return -EAGAIN; + } + + sfw_data.fw_active_srpc = rpc; + spin_unlock(&sfw_data.fw_lock); + + sfw_unpack_message(request); + LASSERT(request->msg_type == srpc_service2request(sv->sv_id)); + + /* rpc module should have checked this */ + LASSERT(request->msg_version == SRPC_MSG_VERSION); + + if (sv->sv_id != SRPC_SERVICE_MAKE_SESSION && + sv->sv_id != SRPC_SERVICE_DEBUG) { + struct sfw_session *sn = sfw_data.fw_session; + + if (sn != NULL && + sn->sn_features != request->msg_ses_feats) { + CNETERR("Features of framework RPC don't match " + "features of current session: %x/%x\n", + request->msg_ses_feats, sn->sn_features); + reply->msg_body.reply.status = EPROTO; + reply->msg_body.reply.sid = sn->sn_id; + goto out; + } + + } else if ((request->msg_ses_feats & ~LST_FEATS_MASK) != 0) { + /* NB: at this point, old version will ignore features and + * create new session anyway, so console should be able + * to handle this */ + reply->msg_body.reply.status = EPROTO; + goto out; + } switch(sv->sv_id) { default: @@ -1267,118 +1329,117 @@ sfw_handle_server_rpc (srpc_server_rpc_t *rpc) break; } - rpc->srpc_done = sfw_server_rpc_done; - cfs_spin_lock(&sfw_data.fw_lock); + if (sfw_data.fw_session != NULL) + features = sfw_data.fw_session->sn_features; + out: + reply->msg_ses_feats = features; + 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 + if (!sfw_data.fw_shuttingdown) + sfw_add_session_timer(); - sfw_data.fw_active_srpc = NULL; - cfs_spin_unlock(&sfw_data.fw_lock); - return rc; + sfw_data.fw_active_srpc = NULL; + spin_unlock(&sfw_data.fw_lock); + return rc; } -int -sfw_bulk_ready (srpc_server_rpc_t *rpc, int status) +static int +sfw_bulk_ready(struct srpc_server_rpc *rpc, int status) { - srpc_service_t *sv = rpc->srpc_service; - int rc; - - LASSERT (rpc->srpc_bulk != NULL); - LASSERT (sv->sv_id == SRPC_SERVICE_TEST); - LASSERT (sfw_data.fw_active_srpc == NULL); - LASSERT (rpc->srpc_reqstbuf->buf_msg.msg_body.tes_reqst.tsr_is_client); - - cfs_spin_lock(&sfw_data.fw_lock); - - if (status != 0) { - CERROR ("Bulk transfer failed for RPC: " - "service %s, peer %s, status %d\n", - sv->sv_name, libcfs_id2str(rpc->srpc_peer), status); - cfs_spin_unlock(&sfw_data.fw_lock); - return -EIO; - } + struct srpc_service *sv = rpc->srpc_scd->scd_svc; + int rc; - if (sfw_data.fw_shuttingdown) { - cfs_spin_unlock(&sfw_data.fw_lock); - return -ESHUTDOWN; - } + LASSERT(rpc->srpc_bulk != NULL); + LASSERT(sv->sv_id == SRPC_SERVICE_TEST); + LASSERT(sfw_data.fw_active_srpc == NULL); + LASSERT(rpc->srpc_reqstbuf->buf_msg.msg_body.tes_reqst.tsr_is_client); - if (sfw_del_session_timer() != 0) { - CERROR ("Dropping RPC (%s) from %s: racing with expiry timer", - sv->sv_name, libcfs_id2str(rpc->srpc_peer)); - cfs_spin_unlock(&sfw_data.fw_lock); - return -EAGAIN; - } + spin_lock(&sfw_data.fw_lock); - sfw_data.fw_active_srpc = rpc; - cfs_spin_unlock(&sfw_data.fw_lock); + if (status != 0) { + CERROR("Bulk transfer failed for RPC: " + "service %s, peer %s, status %d\n", + sv->sv_name, libcfs_id2str(rpc->srpc_peer), status); + spin_unlock(&sfw_data.fw_lock); + return -EIO; + } - rc = sfw_add_test(rpc); + if (sfw_data.fw_shuttingdown) { + spin_unlock(&sfw_data.fw_lock); + return -ESHUTDOWN; + } - cfs_spin_lock(&sfw_data.fw_lock); + if (sfw_del_session_timer() != 0) { + 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; + } -#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 = rpc; + spin_unlock(&sfw_data.fw_lock); - sfw_data.fw_active_srpc = NULL; - cfs_spin_unlock(&sfw_data.fw_lock); - return rc; + rc = sfw_add_test(rpc); + + spin_lock(&sfw_data.fw_lock); + + if (!sfw_data.fw_shuttingdown) + sfw_add_session_timer(); + + sfw_data.fw_active_srpc = NULL; + spin_unlock(&sfw_data.fw_lock); + return rc; } -srpc_client_rpc_t * -sfw_create_rpc (lnet_process_id_t peer, int service, - int nbulkiov, int bulklen, - void (*done) (srpc_client_rpc_t *), void *priv) +struct srpc_client_rpc * +sfw_create_rpc(struct lnet_process_id peer, int service, + unsigned features, int nbulkiov, int bulklen, + void (*done)(struct srpc_client_rpc *), void *priv) { - srpc_client_rpc_t *rpc; + struct srpc_client_rpc *rpc = NULL; - cfs_spin_lock(&sfw_data.fw_lock); + spin_lock(&sfw_data.fw_lock); 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, - srpc_client_rpc_t, crpc_list); - cfs_list_del(&rpc->crpc_list); - cfs_spin_unlock(&sfw_data.fw_lock); + if (nbulkiov == 0 && !list_empty(&sfw_data.fw_zombie_rpcs)) { + rpc = list_entry(sfw_data.fw_zombie_rpcs.next, + struct srpc_client_rpc, crpc_list); + list_del(&rpc->crpc_list); srpc_init_client_rpc(rpc, peer, service, 0, 0, done, sfw_client_rpc_fini, priv); - return rpc; } - cfs_spin_unlock(&sfw_data.fw_lock); + spin_unlock(&sfw_data.fw_lock); - rpc = srpc_create_client_rpc(peer, service, nbulkiov, bulklen, done, - nbulkiov != 0 ? NULL : sfw_client_rpc_fini, - priv); - return rpc; + if (rpc == NULL) { + rpc = srpc_create_client_rpc(peer, service, + nbulkiov, bulklen, done, + nbulkiov != 0 ? NULL : + sfw_client_rpc_fini, + priv); + } + + if (rpc != NULL) /* "session" is concept in framework */ + rpc->crpc_reqstmsg.msg_ses_feats = features; + + return rpc; } void -sfw_unpack_message (srpc_msg_t *msg) +sfw_unpack_message(struct srpc_msg *msg) { if (msg->msg_magic == SRPC_MSG_MAGIC) return; /* no flipping needed */ + /* srpc module should guarantee I wouldn't get crap */ LASSERT (msg->msg_magic == __swab32(SRPC_MSG_MAGIC)); - __swab32s(&msg->msg_type); - if (msg->msg_type == SRPC_MSG_STAT_REQST) { - srpc_stat_reqst_t *req = &msg->msg_body.stat_reqst; + struct srpc_stat_reqst *req = &msg->msg_body.stat_reqst; __swab32s(&req->str_type); __swab64s(&req->str_rpyid); @@ -1387,7 +1448,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_STAT_REPLY) { - srpc_stat_reply_t *rep = &msg->msg_body.stat_reply; + struct srpc_stat_reply *rep = &msg->msg_body.stat_reply; __swab32s(&rep->str_status); sfw_unpack_sid(rep->str_sid); @@ -1398,7 +1459,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_MKSN_REQST) { - srpc_mksn_reqst_t *req = &msg->msg_body.mksn_reqst; + struct srpc_mksn_reqst *req = &msg->msg_body.mksn_reqst; __swab64s(&req->mksn_rpyid); __swab32s(&req->mksn_force); @@ -1407,7 +1468,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_MKSN_REPLY) { - srpc_mksn_reply_t *rep = &msg->msg_body.mksn_reply; + struct srpc_mksn_reply *rep = &msg->msg_body.mksn_reply; __swab32s(&rep->mksn_status); __swab32s(&rep->mksn_timeout); @@ -1416,7 +1477,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_RMSN_REQST) { - srpc_rmsn_reqst_t *req = &msg->msg_body.rmsn_reqst; + struct srpc_rmsn_reqst *req = &msg->msg_body.rmsn_reqst; __swab64s(&req->rmsn_rpyid); sfw_unpack_sid(req->rmsn_sid); @@ -1424,7 +1485,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_RMSN_REPLY) { - srpc_rmsn_reply_t *rep = &msg->msg_body.rmsn_reply; + struct srpc_rmsn_reply *rep = &msg->msg_body.rmsn_reply; __swab32s(&rep->rmsn_status); sfw_unpack_sid(rep->rmsn_sid); @@ -1432,7 +1493,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_DEBUG_REQST) { - srpc_debug_reqst_t *req = &msg->msg_body.dbg_reqst; + struct srpc_debug_reqst *req = &msg->msg_body.dbg_reqst; __swab64s(&req->dbg_rpyid); __swab32s(&req->dbg_flags); @@ -1441,7 +1502,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_DEBUG_REPLY) { - srpc_debug_reply_t *rep = &msg->msg_body.dbg_reply; + struct srpc_debug_reply *rep = &msg->msg_body.dbg_reply; __swab32s(&rep->dbg_nbatch); __swab32s(&rep->dbg_timeout); @@ -1450,7 +1511,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_BATCH_REQST) { - srpc_batch_reqst_t *req = &msg->msg_body.bat_reqst; + struct srpc_batch_reqst *req = &msg->msg_body.bat_reqst; __swab32s(&req->bar_opc); __swab64s(&req->bar_rpyid); @@ -1462,7 +1523,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_BATCH_REPLY) { - srpc_batch_reply_t *rep = &msg->msg_body.bat_reply; + struct srpc_batch_reply *rep = &msg->msg_body.bat_reply; __swab32s(&rep->bar_status); sfw_unpack_sid(rep->bar_sid); @@ -1470,7 +1531,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_TEST_REQST) { - srpc_test_reqst_t *req = &msg->msg_body.tes_reqst; + struct srpc_test_reqst *req = &msg->msg_body.tes_reqst; __swab64s(&req->tsr_rpyid); __swab64s(&req->tsr_bulkid); @@ -1484,7 +1545,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_TEST_REPLY) { - srpc_test_reply_t *rep = &msg->msg_body.tes_reply; + struct srpc_test_reply *rep = &msg->msg_body.tes_reply; __swab32s(&rep->tsr_status); sfw_unpack_sid(rep->tsr_sid); @@ -1492,7 +1553,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_JOIN_REQST) { - srpc_join_reqst_t *req = &msg->msg_body.join_reqst; + struct srpc_join_reqst *req = &msg->msg_body.join_reqst; __swab64s(&req->join_rpyid); sfw_unpack_sid(req->join_sid); @@ -1500,7 +1561,7 @@ sfw_unpack_message (srpc_msg_t *msg) } if (msg->msg_type == SRPC_MSG_JOIN_REPLY) { - srpc_join_reply_t *rep = &msg->msg_body.join_reply; + struct srpc_join_reply *rep = &msg->msg_body.join_reply; __swab32s(&rep->join_status); __swab32s(&rep->join_timeout); @@ -1513,83 +1574,42 @@ sfw_unpack_message (srpc_msg_t *msg) } void -sfw_abort_rpc (srpc_client_rpc_t *rpc) +sfw_abort_rpc(struct srpc_client_rpc *rpc) { - LASSERT (cfs_atomic_read(&rpc->crpc_refcount) > 0); - LASSERT (rpc->crpc_service <= SRPC_FRAMEWORK_SERVICE_MAX_ID); + LASSERT(atomic_read(&rpc->crpc_refcount) > 0); + LASSERT(rpc->crpc_service <= SRPC_FRAMEWORK_SERVICE_MAX_ID); - cfs_spin_lock(&rpc->crpc_lock); - srpc_abort_rpc(rpc, -EINTR); - cfs_spin_unlock(&rpc->crpc_lock); - return; + spin_lock(&rpc->crpc_lock); + srpc_abort_rpc(rpc, -EINTR); + spin_unlock(&rpc->crpc_lock); + return; } void -sfw_post_rpc (srpc_client_rpc_t *rpc) +sfw_post_rpc(struct srpc_client_rpc *rpc) { - cfs_spin_lock(&rpc->crpc_lock); + 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); - cfs_spin_unlock(&rpc->crpc_lock); - return; + spin_unlock(&rpc->crpc_lock); + return; } -static srpc_service_t sfw_services[] = -{ - { - /* sv_id */ SRPC_SERVICE_DEBUG, - /* sv_name */ "debug", - 0 - }, - { - /* sv_id */ SRPC_SERVICE_QUERY_STAT, - /* sv_name */ "query stats", - 0 - }, - { - /* sv_id */ SRPC_SERVICE_MAKE_SESSION, - /* sv_name */ "make session", - 0 - }, - { - /* sv_id */ SRPC_SERVICE_REMOVE_SESSION, - /* sv_name */ "remove session", - 0 - }, - { - /* sv_id */ SRPC_SERVICE_BATCH, - /* sv_name */ "batch service", - 0 - }, - { - /* sv_id */ SRPC_SERVICE_TEST, - /* sv_name */ "test service", - 0 - }, - { - /* sv_id */ 0, - /* sv_name */ NULL, - 0 - } -}; - -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); - +static struct srpc_service sfw_services[] = { + { .sv_id = SRPC_SERVICE_DEBUG, .sv_name = "debug", }, + { .sv_id = SRPC_SERVICE_QUERY_STAT, .sv_name = "query stats", }, + { .sv_id = SRPC_SERVICE_MAKE_SESSION, .sv_name = "make session", }, + { .sv_id = SRPC_SERVICE_REMOVE_SESSION, .sv_name = "remove session", }, + { .sv_id = SRPC_SERVICE_BATCH, .sv_name = "batch service", }, + { .sv_id = SRPC_SERVICE_TEST, .sv_name = "test service", }, + { .sv_id = 0, } }; int sfw_startup (void) @@ -1597,21 +1617,9 @@ sfw_startup (void) int i; int rc; int error; - 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; + struct srpc_service *sv; + struct sfw_test_case *tsc; - s = getenv("BRW_INJECT_ERRORS"); - brw_inject_errors = s != NULL ? atoi(s) : brw_inject_errors; - - 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", @@ -1637,11 +1645,11 @@ sfw_startup (void) sfw_data.fw_session = NULL; sfw_data.fw_active_srpc = NULL; - cfs_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); + spin_lock_init(&sfw_data.fw_lock); + 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(); @@ -1653,20 +1661,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; - sv->sv_concur = SFW_TEST_CONCURRENCY; + 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]; @@ -1674,7 +1680,7 @@ sfw_startup (void) sv->sv_bulk_ready = NULL; sv->sv_handler = sfw_handle_server_rpc; - sv->sv_concur = SFW_SERVICE_CONCURRENCY; + sv->sv_wi_total = SFW_FRWK_WI_MAX; if (sv->sv_id == SRPC_SERVICE_TEST) sv->sv_bulk_ready = sfw_bulk_ready; @@ -1689,13 +1695,13 @@ sfw_startup (void) /* about to sfw_shutdown, no need to add buffer */ if (error) continue; - rc = srpc_service_add_buffers(sv, SFW_POST_BUFFERS); - if (rc != SFW_POST_BUFFERS) { - CWARN ("Failed to reserve enough buffers: " - "service %s, %d needed, %d reserved\n", - sv->sv_name, SFW_POST_BUFFERS, rc); - error = -ENOMEM; - } + rc = srpc_service_add_buffers(sv, sv->sv_wi_total); + if (rc != 0) { + CWARN("Failed to reserve enough buffers: " + "service %s, %d needed: %d\n", + sv->sv_name, sv->sv_wi_total, rc); + error = -ENOMEM; + } } if (error != 0) @@ -1706,31 +1712,27 @@ sfw_startup (void) void sfw_shutdown (void) { - srpc_service_t *sv; - sfw_test_case_t *tsc; - int i; + struct srpc_service *sv; + struct sfw_test_case *tsc; + int i; - cfs_spin_lock(&sfw_data.fw_lock); + 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)); - cfs_spin_unlock(&sfw_data.fw_lock); + spin_unlock(&sfw_data.fw_lock); for (i = 0; ; i++) { sv = &sfw_services[i]; @@ -1741,22 +1743,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)) { + struct srpc_client_rpc *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, + struct srpc_client_rpc, 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]; @@ -1766,15 +1767,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, + struct sfw_test_case, 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; }